From cfbdc424ae9aa93e760bc80ff9763ef63dcb72f4 Mon Sep 17 00:00:00 2001 From: mengjiao <3338049200@qq,com> Date: Thu, 15 Aug 2024 16:48:44 +0800 Subject: [PATCH] =?UTF-8?q?=E6=88=90=E5=93=81=E5=85=A5=E5=BA=93=E4=BF=AE?= =?UTF-8?q?=E6=94=B92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../op/wms/controller/WmsToWCSmissionController.java | 2 +- .../wms/service/impl/WmsProductPutServiceImpl.java | 12 +++++++++++- .../resources/mapper/wms/WmsProductPutMapper.xml | 3 ++- 3 files changed, 14 insertions(+), 3 deletions(-) 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 5538edd9..110160a3 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 @@ -310,7 +310,7 @@ public class WmsToWCSmissionController { if (wmsProductPut1==null) { return AjaxResult.error("标识卡未绑定"); } - return AjaxResult.success(); + return AjaxResult.success(wmsProductPut1); } diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsProductPutServiceImpl.java b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsProductPutServiceImpl.java index dcafd9ca..7f23b589 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsProductPutServiceImpl.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsProductPutServiceImpl.java @@ -1041,13 +1041,23 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService { wmsProductPut.setAttribute2(attribute2); wmsProductPut.setAttribute3(attribute3); WmsProductPut wmsProductPut1 = wmsProductPutMapper.WmsProductPutByWorkOrderqueryBS(wmsProductPut); + WmsProductPut wmsProductPut2 =new WmsProductPut(); + wmsProductPut2.setWorkOrder(attribute1); + wmsProductPut2.setBatchNumber(attribute2); + wmsProductPut2.setPallet(attribute3); + WmsProductPut wmsProductPut3= wmsProductPutMapper.selectProOrderWorkorderBatchPallet(wmsProductPut2); + //wmsProductPut.setProductCode(wmsProductPut3.getProductCode()); + // wmsProductPut.setProductName(wmsProductPut3.getProductName()); + // wmsProductPut.setUnitOfMeasure(wmsProductPut3.getAttr5()); + wmsProductPut1.setNumber(wmsProductPut3.getAttr3()); + //获取托盘信息--首先要他们有绑定数据 WmsProductProductionRecords wmsProductProductionRecord=new WmsProductProductionRecords(); wmsProductProductionRecord.setUserDefined1(wmsProductPut.getPallet()); List wmsProductProductionRecords= wmsProductPutRecordsMapper.selectProductProductionRecords(wmsProductProductionRecord); if (wmsProductProductionRecords.size()>0){ WmsProductProductionRecords wmsProductProductionRecords1= wmsProductProductionRecords.get(0); - wmsProductPut.setSn(wmsProductProductionRecords1.getSn()); + wmsProductPut1.setSn(wmsProductProductionRecords1.getSn()); }else { return null; } 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 74bd37ba..9e07573b 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 @@ -419,7 +419,8 @@ pro_order_workorder_batch_pallet.quantity AS attr3, pro_order_workorder.workorder_name AS attr4, pro_order_workorder.product_code, - pro_order_workorder.product_name + pro_order_workorder.product_name, + pro_order_workorder.unit AS attr5 FROM pro_order_workorder_batch_pallet LEFT JOIN pro_order_workorder ON pro_order_workorder.workorder_code_sap= pro_order_workorder_batch_pallet.workorder_code