diff --git a/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsToWCSmissionController.java b/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsToWCSmissionController.java index 8b7a6b55..91f224bd 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsToWCSmissionController.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsToWCSmissionController.java @@ -110,9 +110,6 @@ public class WmsToWCSmissionController { int tem = odsProcureOrderService.PurchaseOrderdeliPda(odsProcureOrder); return success(tem); } - /** - * 手持 --包材采购单采购收货查询总共已经收货数量 - */ /** * 手持 --包材采购单采购收货确认操作 @@ -136,6 +133,10 @@ public class WmsToWCSmissionController { String result = odsProcureOrderService.ArrivalRegistration(odsProcureOrder); return success(result); } + /** + * 手持 --包材采购单采购收货查询总共已经收货数量 + */ + @PostMapping("/selectOdsProcureOrderAlready") public AjaxResult selectOdsProcureOrderAlready(@RequestBody OdsProcureOrder odsProcureOrder) { // odsProcureOrderService.PurchaseOrderdeliPdas(odsProcureOrder); diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOrderServiceImpl.java b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOrderServiceImpl.java index e0c4b8aa..4a8eb2db 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOrderServiceImpl.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOrderServiceImpl.java @@ -166,7 +166,7 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService { wmsRawOrderInSn.setUserDefined2(odsProcureOrder.getIncomeBatchNo());//批次 wmsRawOrderInSn.setWhCode(odsProcureOrder.getWhCode());//厂库编号 wmsRawOrderInSn.setPoNo(order.getProcureCode());//采购单号 -// wmsRawOrderInSn.setPoLine(odsProcureOrder.getPoLine());//行项目 + wmsRawOrderInSn.setPoLine(odsProcureOrder.getPoLine());//行项目 wmsRawOrderInSn.setMaterialCode(odsProcureOrder.getMaterialCode()); wmsRawOrderInSn.setMaterialDesc(odsProcureOrder.getMaterialDesc()); wmsRawOrderInSn.setAmount(odsProcureOrder.getPlanNumber()); @@ -722,6 +722,7 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService { DynamicDataSourceContextHolder.push("ds_" + odsProcureOrder.getFactoryCode()); String result="操作成功"; List wmsRawOrderInSn = wmsRawOrderInSnMapper.selecPurchaseOrderdeliPdaList(odsProcureOrder); + return result; } diff --git a/op-modules/op-wms/src/main/resources/mapper/wms/WmsProductPutMapper.xml b/op-modules/op-wms/src/main/resources/mapper/wms/WmsProductPutMapper.xml index 232093a8..07564a79 100644 --- a/op-modules/op-wms/src/main/resources/mapper/wms/WmsProductPutMapper.xml +++ b/op-modules/op-wms/src/main/resources/mapper/wms/WmsProductPutMapper.xml @@ -51,7 +51,8 @@ and work_order like concat('%', #{workOrder}, '%') and factory_code = #{factoryCode} - and product_order = #{productOrder} + and product_order like concat('%', #{productOrder}, + '%') and wh_code = #{whCode} and wa_code = #{waCode} and wl_code = #{wlCode}