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 06f196a3..4ff5a911 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 @@ -97,10 +97,10 @@ public WmsToWCSDTO packingMaterialsOutBoundCompleted(@RequestBody WmsToWCSDTO wc @PostMapping("/PurchaseOrderdeliPda") public AjaxResult PurchaseOrderdeliPda(@RequestBody OdsProcureOrder odsProcureOrder) { - odsProcureOrderService.PurchaseOrderdeliPdas(odsProcureOrder); - return success(); -// int tem =odsProcureOrderService.PurchaseOrderdeliPda(odsProcureOrder); -// return success(tem); +// odsProcureOrderService.PurchaseOrderdeliPdas(odsProcureOrder); +// return success(); + int tem =odsProcureOrderService.PurchaseOrderdeliPda(odsProcureOrder); + return success(tem); } /** diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/IWmsProductPutService.java b/op-modules/op-wms/src/main/java/com/op/wms/service/IWmsProductPutService.java index 8f7a54b2..3d8152ab 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/service/IWmsProductPutService.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/service/IWmsProductPutService.java @@ -64,4 +64,8 @@ public interface IWmsProductPutService { public WmsProductPut selectWmsProductPutByWorkOrder(String workOrder); public WmsProductPut WmsProductPutByWorkOrderquery(WmsProductPut wmsProductPut); + + String WmsProductPutByWorkOrderConfirm(WmsProductPut wmsProductPut); + + String WmsProductPutByWorkOrderConfirmSAPPosting(List wmsProductPut); } 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 df3322f8..f3304753 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 @@ -593,7 +593,6 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService { odsProcureOutOrder.setUserDefined9(userDefined9); odsProcureOutOrder.setUserDefined10("2");//成功 odsProcureOutOrderMapper.updateOdsProcureOutOrderByid(odsProcureOutOrder); - }else {// odsProcureOutOrder.setUserDefined9(""); odsProcureOutOrder.setUserDefined10("3");//失败 @@ -693,7 +692,7 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService { qcCheckTaskIncomeDTO.setOrderType("bc"); qcCheckTaskIncomeDTO.setUnit("ST"); qcCheckTaskIncomeDTO.setQuality(new BigDecimal("10")); - qcCheckTaskIncomeDTO.setMaterialCode("000000040000015968"); + qcCheckTaskIncomeDTO.setMaterialCode("000000010900001055"); qcCheckTaskIncomeDTO.setMaterialName("榄菊植物力量蚊液(33mL+送12mL)*2瓶装纸盒(2201)"); qcCheckTaskIncomeDTO.setIncomeBatchNo("202312250001"); qcCheckTaskIncomeDTO.setOrderNo("4500297568");