aike/emis-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

md

Browse Source
This commit is contained in:
linfso 2025-01-21 12:02:55 +08:00
parent 9ff6b229b6
commit 8ec098c0c7
4 changed files with 60 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
emis-biz/src/main/java/com/xdadan/erp/emis/domain/enumtype/WaybillOperLogType.java
View File

@ -18,6 +18,8 @@ public enum WaybillOperLogType {
SITE_CANCEL_ORDER("81","站点取消"),
SITE_MODIFY_APPLY("82","网点申请调整费用"),
SITE_DO_SCAN("83","网点扫描"),
CUST_MODIFY_ORDER("91","客户改单"),
CUST_CANCEL_ORDER("92","客户取消"),

58
emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsScanRecordServiceImpl.java
View File

@ -21,10 +21,7 @@ import com.xdadan.erp.common.utils.DateUtils;
import com.xdadan.erp.common.utils.DictUtils;
import com.xdadan.erp.common.utils.ServletUtils;
import com.xdadan.erp.emis.domain.*;
import com.xdadan.erp.emis.domain.enumtype.EmisBizErrorType;
import com.xdadan.erp.emis.domain.enumtype.ScanType;
import com.xdadan.erp.emis.domain.enumtype.WaybillAttachType;
import com.xdadan.erp.emis.domain.enumtype.WaybillStatus;
import com.xdadan.erp.emis.domain.enumtype.*;
import com.xdadan.erp.emis.domain.exception.EmisBizError;
import com.xdadan.erp.emis.domain.stat.ScanStatDataInfo;
import com.xdadan.erp.emis.domain.vo.scan.ScanInfo;
@ -1028,15 +1025,6 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm
// 获取订单数据
EmisWaybill emisWaybill = getWaybillByBillCode(mainBillCode);
// 货物不在当前网点不允许扫描
// if(!getCurrentUser().getOwnerSiteCode().equals(emisWaybill.getCurrentSiteCode())){
// scanResultItem.setResult("fail");
// scanResultItem.setMessage("运单不在当前网点");
// scanResultItem.setErrorCode(EmisBizErrorType.SCAN_HAS_PACK.errorCode);
// itemList.add(scanResultItem);
// return itemList;
// }
// 如果是缅甸允许主单扫描,主单和子单只能二选一
if( "0095".equals(emisWaybill.getReceiveCountry()) ){
@ -1062,16 +1050,6 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm
}
}
// emisTmsPackDtlMapper.selectEmisTmsPackDtlByBillCode()
// 缅甸不限制,但要判断，子单和主单只能存在一种单号
// if (!mainBillCode.equals(scanBillCode)) {
// scanResultItem.setResult("fail");
// scanResultItem.setMessage("缅甸只允许主单");
// scanResultItem.setErrorCode(EmisBizErrorType.SCAN_NO_ALLOW.errorCode);
// itemList.add(scanResultItem);
// return itemList;
// }
}else{
if (mainBillCode.equals(scanBillCode)) {
@ -1080,23 +1058,9 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm
scanResultItem.setErrorCode(EmisBizErrorType.SCAN_NO_ALLOW.errorCode);
itemList.add(scanResultItem);
return itemList;
// throw new EmisBizError(EmisBizErrorType.SCAN_NO_ALLOW, "非缅甸只允许子单组包");
}
}
// if(destCountry==null){
// destCountry=emisWaybill.getReceiveCountry();
// }
// else{
// // 不允许有不同国家的货混装
// if( !destCountry.equals(emisWaybill.getReceiveCountry()) ){
// scanResultItem.setResult("fail");
// scanResultItem.setMessage("不同国家的货不允许混装");
// scanResultItem.setErrorCode(EmisBizErrorType.SCAN_NO_ALLOW.errorCode);
// itemList.add(scanResultItem);
// return itemList;
// }
// }
// 记录总票数
if(!mainBillMap.containsKey(mainBillCode)){
@ -1709,6 +1673,16 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm
// 主单扫描
emisTmsScanRecord.setMainBillCode(scanBillCode);
emisTmsScanRecordMapper.insertEmisTmsScanRecord(emisTmsScanRecord);
String scanTypeLabel = DictUtils.getDictLabel("emis_scan_type", emisTmsScanRecord.getScanType());
// 记录扫描操作日志
recordWaybillOperLog(
scanBillCode,
WaybillOperLogType.SITE_DO_SCAN,
getCurrentUser().getEmpName(),
getCurrentUser().getOwnerSiteName(),
""+scanTypeLabel+"-["+getCurrentUser().getOwnerSiteName()+","+getCurrentUser().getEmpName()+"]"
);
}else{
if(scanBillCode.equals(mainBillCode+"0001")){
// 0001子单扫描需要同时增加主单扫描记录
@ -1722,6 +1696,16 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm
emisTmsScanRecord.setMainBillCode(mainBillCode);
emisTmsScanRecordMapper.insertEmisTmsScanRecord(emisTmsScanRecord);
String scanTypeLabel = DictUtils.getDictLabel("emis_scan_type", emisTmsScanRecord.getScanType());
// 记录扫描操作日志
recordWaybillOperLog(
mainBillCode,
WaybillOperLogType.SITE_DO_SCAN,
getCurrentUser().getEmpName(),
getCurrentUser().getOwnerSiteName(),
""+scanTypeLabel+"-["+getCurrentUser().getOwnerSiteName()+","+getCurrentUser().getEmpName()+"]"
);
}else{
// 非0001的子单
emisTmsScanRecordMapper.insertEmisTmsScanRecord(emisTmsScanRecord);

36
emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillAjustApplyServiceImpl.java
View File

@ -17,6 +17,7 @@ import com.alibaba.fastjson.JSONObject;
import com.xdadan.erp.common.core.domain.entity.SysUser;
import com.xdadan.erp.emis.domain.*;
import com.xdadan.erp.emis.domain.enumtype.EmisBizErrorType;
import com.xdadan.erp.emis.domain.enumtype.WaybillOperLogType;
import com.xdadan.erp.emis.domain.exception.EmisBizError;
import com.xdadan.erp.emis.domain.vo.WaybillOrder;
import com.xdadan.erp.emis.service.EmisBaseService;
@ -97,6 +98,14 @@ public class EmisWaybillAjustApplyServiceImpl extends EmisBaseService implements
SysUser sysUser=getEmisStaffByCode(emisWaybillAjustApply.getApplyManCode());
recordWaybillOperLog(
emisWaybillAjustApply.getBillCode(),
WaybillOperLogType.SITE_MODIFY_APPLY,
getCurrentUser().getEmpName(),
getCurrentUser().getOwnerSiteName(),
"申请调整费用-["+getCurrentUser().getOwnerSiteName()+","+getCurrentUser().getEmpName()+"]"
);
String title=sysUser.getEmpName()+"提交了运单费用调整申请,请及时审批，单号【"+emisWaybillAjustApply.getBillCode()+"】";
// sendNoticeToEmpUser("88888042,88888047,88888034,88888059,88888083", title, "", "/d24/expenseRecognitionManagemen/WaybillAjustCenterConfirm");
@ -139,8 +148,6 @@ public class EmisWaybillAjustApplyServiceImpl extends EmisBaseService implements
return emisWaybillAjustApplyMapper.deleteEmisWaybillAjustApplyById(id);
}
@Transactional
@Override
public int auditDestPass(EmisWaybillAjustApply emisWaybillAjustApply) throws EmisBizError {
@ -172,7 +179,12 @@ public class EmisWaybillAjustApplyServiceImpl extends EmisBaseService implements
emisWaybillAjustApply.setDestConfirmNote(inputObj.getDestConfirmNote());
emisWaybillAjustApply.setDestConfirmManCode(getCurrentUser().getEmpCode());
return emisWaybillAjustApplyMapper.auditDestNoPass(emisWaybillAjustApply);
emisWaybillAjustApplyMapper.auditDestNoPass(emisWaybillAjustApply);
return 1;
}
@ -239,11 +251,21 @@ public class EmisWaybillAjustApplyServiceImpl extends EmisBaseService implements
throw new EmisBizError(EmisBizErrorType.FAIL,"单号不存在！");
}
recordWaybillOperLog(
emisWaybillAjustApply.getBillCode(),
WaybillOperLogType.SITE_MODIFY_APPLY,
getCurrentUser().getEmpName(),
getCurrentUser().getOwnerSiteName(),
"费用调整已审批通过-["+getCurrentUser().getOwnerSiteName()+","+getCurrentUser().getEmpName()+"]"
);
emisWaybillService.reUpdateWayBill(emisWaybillOld,emisWaybillSave);
String title="费用调整已审批通过，单号【"+emisWaybillAjustApply.getBillCode()+"】";
sendNoticeToEmpUser(emisWaybillAjustApply.getApplyManCode(), title, "", "/d24/expenseRecognitionManagemen/WaybillAjustApplyList");
// 审核通过
return emisWaybillAjustApplyMapper.auditCenterPass(emisWaybillAjustApply);
@ -268,6 +290,14 @@ public class EmisWaybillAjustApplyServiceImpl extends EmisBaseService implements
String title="费用调整审批拒绝，单号【"+emisWaybillAjustApply.getBillCode()+"】";
sendNoticeToEmpUser(emisWaybillAjustApply.getApplyManCode(), title, "", "/d24/expenseRecognitionManagemen/WaybillAjustApplyList");
recordWaybillOperLog(
emisWaybillAjustApply.getBillCode(),
WaybillOperLogType.SITE_MODIFY_APPLY,
getCurrentUser().getEmpName(),
getCurrentUser().getOwnerSiteName(),
"费用调整审批拒绝,原因:【"+inputObj.getDestConfirmNote()+"】-["+getCurrentUser().getOwnerSiteName()+","+getCurrentUser().getEmpName()+"]"
);
return emisWaybillAjustApplyMapper.auditCenterNoPass(emisWaybillAjustApply);
}

8
emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java
View File

@ -1528,7 +1528,7 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
WaybillOperLogType.SITE_CANCEL_ORDER,
getCurrentUser().getEmpName(),
getCurrentUser().getOwnerSiteName(),
"网点取消，原因:【"+emisWaybill.getOrderRemark()+"】网点:【"+getCurrentUser().getOwnerSiteName()+"】,操作:【"+getCurrentUser().getEmpName()+"】"
"网点取消，原因:【"+emisWaybill.getOrderRemark()+"-["+getCurrentUser().getOwnerSiteName()+","+getCurrentUser().getEmpName()+"]"
);
return 1;
@ -1638,7 +1638,7 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
WaybillOperLogType.SITE_GOT,
getCurrentUser().getEmpName(),
getCurrentUser().getOwnerSiteName(),
"网点接单,网点:【"+getCurrentUser().getOwnerSiteName()+"】,操作:【"+getCurrentUser().getEmpName()+"】"
"网点接单-["+getCurrentUser().getOwnerSiteName()+","+getCurrentUser().getEmpName()+"]"
);
// 绑定专属业务员
@ -3016,7 +3016,7 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
WaybillOperLogType.SITE_GOT,
getCurrentUser().getEmpName(),
getCurrentUser().getOwnerSiteName(),
"网点揽收开单,网点:【"+getCurrentUser().getOwnerSiteName()+"】,操作:【"+getCurrentUser().getEmpName()+"】"
"网点开单["+getCurrentUser().getOwnerSiteName()+","+getCurrentUser().getEmpName()+"]"
);
// 绑定专属业务员
@ -3448,7 +3448,7 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
WaybillOperLogType.SITE_MODIFY,
getCurrentUser().getEmpName(),
getCurrentUser().getOwnerSiteName(),
"运单修改,网点:【"+getCurrentUser().getOwnerSiteName()+"】,操作:【"+getCurrentUser().getEmpName()+"】"
"运单修改-["+getCurrentUser().getOwnerSiteName()+","+getCurrentUser().getEmpName()+"]"
);
// 记录修改的数据