diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java index 4d5c19ca1..229221b4a 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java @@ -1274,10 +1274,16 @@ public class EmisBaseService { EmisWaybillTransfer trans0=listTransfer.get(0); SysUser sysUser=getSysUserByUserId(Long.valueOf(trans0.getCreateBy())); +// updateSignStatus( +// rstUpd.getBillCode(),"转件签收",sysUser.getEmpCode(), +// trans0.getCreateSite(),rstUpd.getLastTraceDate(), +// "",sysUser.getEmpCode()); + + // bug:1410 转件签收 派件人:赋空值 updateSignStatus( - rstUpd.getBillCode(),"转件签收",sysUser.getEmpCode(), - trans0.getCreateSite(),rstUpd.getLastTraceDate(), - "",sysUser.getEmpCode()); + rstUpd.getBillCode(),"转件签收",null, + null,rstUpd.getLastTraceDate(), + "",null); } } emisTmsTransferTraceMapper.updateEmisTmsTransferTrace(rstUpd); @@ -2034,6 +2040,11 @@ public class EmisBaseService { String billPicDispatchRmk, String dispatchOrSendManCode) { +// updateSignStatus( +// rstUpd.getBillCode(),"转件签收",sysUser.getEmpCode(), +// trans0.getCreateSite(),rstUpd.getLastTraceDate(), +// "",""); +// EmisWaybill waybill = new EmisWaybill(); waybill.setBillCode(mainBillCode); waybill.setSignMan(signMan);