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 2024-12-25 11:04:55 +08:00
parent ebe66dbf32
commit b792cc49a3
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1496,11 +1496,11 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
} }
if(isNew) { if(isNew) {
if( "1".equals(emisWaybillSave.getPickupMethod()) && emisWaybillSave.getIntoWarehouseCode()==null ) { if( "1".equals(emisWaybillSave.getPickupMethod()) && "3".equals(emisWaybillSave.getPickupMethod()) && emisWaybillSave.getIntoWarehouseCode()==null ) {
throw new EmisBizError(EmisBizErrorType.PARAM_ERROR1,"收货仓库必填"); throw new EmisBizError(EmisBizErrorType.PARAM_ERROR1,"收货仓库必填");
} }
if( ("2".equals(emisWaybillSave.getPickupMethod()) || "1".equals(emisWaybillSave.getPickupMethod()) ) && emisWaybillSave.getPickStartDate()==null ){ if( ("2".equals(emisWaybillSave.getPickupMethod()) || "1".equals(emisWaybillSave.getPickupMethod()) || "3".equals(emisWaybillSave.getPickupMethod()) ) && emisWaybillSave.getPickStartDate()==null ){
throw new EmisBizError(EmisBizErrorType.PARAM_ERROR1,"发货/取件日期必填"); throw new EmisBizError(EmisBizErrorType.PARAM_ERROR1,"发货/取件日期必填");
} }
} }
@ -1528,15 +1528,16 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
} }
} }
if(!StringUtils.isEmpty(emisWaybillSave.getOperateEmployeeCode()) && "1".equals(emisWaybillSave.getPickupMethod()) ){ //
if(!StringUtils.isEmpty(emisWaybillSave.getOperateEmployeeCode()) && ( "1".equals(emisWaybillSave.getPickupMethod()) || "3".equals(emisWaybillSave.getPickupMethod()) ) ){
SysUser empUser = getEmisStaffByCode(emisWaybillSave.getOperateEmployeeCode()); SysUser empUser = getEmisStaffByCode(emisWaybillSave.getOperateEmployeeCode());
if(empUser!=null) { if(empUser!=null) {
emisWaybillSave.setSendSiteCode(empUser.getOwnerSiteCode()); emisWaybillSave.setSendSiteCode(empUser.getOwnerSiteCode());
} }
} }
// 如果是仓库收货，寄件网点使用仓库编号 // 如果是仓库收货/整柜提货，寄件网点使用仓库编号
if( "1".equals(emisWaybillSave.getPickupMethod()) ){ if( "1".equals(emisWaybillSave.getPickupMethod()) || "3".equals(emisWaybillSave.getPickupMethod()) ){
if(StringUtils.isEmpty(emisWaybillSave.getIntoWarehouseCode()) ) { if(StringUtils.isEmpty(emisWaybillSave.getIntoWarehouseCode()) ) {
throw new EmisBizError(EmisBizErrorType.PARAM_ERROR1, "仓库不能为空"); throw new EmisBizError(EmisBizErrorType.PARAM_ERROR1, "仓库不能为空");
}else{ }else{
@ -1663,8 +1664,8 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
emisWaybillSave.setSendDate(new Date()); emisWaybillSave.setSendDate(new Date());
} }
// 仓库收货时建立入仓预报单 // 仓库收货/整柜提货 建立入仓预报单
if("1".equals(emisWaybillSave.getPickupMethod())) { if( "1".equals(emisWaybillSave.getPickupMethod()) || "3".equals(emisWaybillSave.getPickupMethod()) ) {
// 获取进仓单号 // 获取进仓单号
try { try {
// TAN-SMD-240603-01 // TAN-SMD-240603-01