diff --git a/nladmin-system/wms-server/src/main/java/org/nl/wms/pda_manage/ios_manage/service/impl/PdaIosOutServiceImpl.java b/nladmin-system/wms-server/src/main/java/org/nl/wms/pda_manage/ios_manage/service/impl/PdaIosOutServiceImpl.java index 2c0d75f..29386c1 100644 --- a/nladmin-system/wms-server/src/main/java/org/nl/wms/pda_manage/ios_manage/service/impl/PdaIosOutServiceImpl.java +++ b/nladmin-system/wms-server/src/main/java/org/nl/wms/pda_manage/ios_manage/service/impl/PdaIosOutServiceImpl.java @@ -355,7 +355,7 @@ public class PdaIosOutServiceImpl implements PdaIosOutService { receiveOutRequest.setDeptno("01.09.14.02"); receiveOutRequest.setEntrys(entrys); ReceiveOutReturn entity = receiveOutReturnService.saveFromRequest( - receiveOutRequest, StockReturnStatusEnum.TODO.getCode(), null); + receiveOutRequest, StockReturnStatusEnum.TODO.getCode(), null,param.getWorkOrder()); return PdaResponse.requestOk(); } diff --git a/nladmin-system/wms-server/src/main/java/org/nl/wms/warehouse_manage/stockReturn/receiveOutRetur/service/IReceiveOutReturnService.java b/nladmin-system/wms-server/src/main/java/org/nl/wms/warehouse_manage/stockReturn/receiveOutRetur/service/IReceiveOutReturnService.java index 36ca0c2..86168cd 100644 --- a/nladmin-system/wms-server/src/main/java/org/nl/wms/warehouse_manage/stockReturn/receiveOutRetur/service/IReceiveOutReturnService.java +++ b/nladmin-system/wms-server/src/main/java/org/nl/wms/warehouse_manage/stockReturn/receiveOutRetur/service/IReceiveOutReturnService.java @@ -25,7 +25,7 @@ public interface IReceiveOutReturnService extends IService { void delete(Set ids); - ReceiveOutReturn saveFromRequest(ReceiveOutRequest request, String status, String remark); + ReceiveOutReturn saveFromRequest(ReceiveOutRequest request, String status, String remark, String workOrder); void updateUploadResult(Long id, String status, String remark); diff --git a/nladmin-system/wms-server/src/main/java/org/nl/wms/warehouse_manage/stockReturn/receiveOutRetur/service/impl/ReceiveOutReturnServiceImpl.java b/nladmin-system/wms-server/src/main/java/org/nl/wms/warehouse_manage/stockReturn/receiveOutRetur/service/impl/ReceiveOutReturnServiceImpl.java index 1823676..25d8ee6 100644 --- a/nladmin-system/wms-server/src/main/java/org/nl/wms/warehouse_manage/stockReturn/receiveOutRetur/service/impl/ReceiveOutReturnServiceImpl.java +++ b/nladmin-system/wms-server/src/main/java/org/nl/wms/warehouse_manage/stockReturn/receiveOutRetur/service/impl/ReceiveOutReturnServiceImpl.java @@ -138,7 +138,7 @@ public class ReceiveOutReturnServiceImpl extends ServiceImpl details) { ReceiveOutRequest request = new ReceiveOutRequest(); request.setOrgno(entity.getOrgno()); - request.setBillno(""); + request.setBillno(entity.getBillno()); request.setBiztype(entity.getBiztype()); request.setInvscheme(entity.getInvscheme()); request.setTranstype(entity.getTranstype());