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-06 13:22:13 +08:00
parent 203ad659dd
commit d4d63b20d7
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1322,9 +1322,9 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
}else { }else {
if(OrderStatus.INIT.statusCode.equals(emisWaybillOld.getOrderStatus())){ // if(OrderStatus.INIT.statusCode.equals(emisWaybillOld.getOrderStatus())){
throw new EmisBizError(EmisBizErrorType.BILL_LOCK, "未接单，不允许修改"); // throw new EmisBizError(EmisBizErrorType.BILL_LOCK, "未接单，不允许修改");
} // }
// 检查是否已锁单 // 检查是否已锁单
checkDBBillIsLock(emisWaybillOld); checkDBBillIsLock(emisWaybillOld);
@ -1537,7 +1537,7 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
scanInfo.setScanType(ScanType.GOT.opCode); scanInfo.setScanType(ScanType.GOT.opCode);
String dispatchOrSendManCode=""; String dispatchOrSendManCode="";
if("1".equals(emisWaybillSave.getPickupMethod())){ if("1".equals(emisWaybillSave.getPickupMethod())|| "3".equals(emisWaybillSave.getPickupMethod())){
dispatchOrSendManCode=emisWaybillSave.getOperateEmployeeCode(); dispatchOrSendManCode=emisWaybillSave.getOperateEmployeeCode();
} }
else if("2".equals(emisWaybillSave.getPickupMethod())){ else if("2".equals(emisWaybillSave.getPickupMethod())){