From 5b94a750cbef6be98de543847a4bc56253c23a2b Mon Sep 17 00:00:00 2001 From: mengjiao <3338049200@qq,com> Date: Mon, 13 May 2024 16:24:23 +0800 Subject: [PATCH 1/4] =?UTF-8?q?wms=E5=8C=85=E6=9D=90=E9=83=A8=E5=88=86?= =?UTF-8?q?=E4=BF=AE=E6=94=B941?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WmsToWCSmissionController.java | 11 +++++++ .../op/wms/mapper/WmsRawOrderInSnMapper.java | 2 ++ .../wms/service/IOdsProcureOrderService.java | 2 ++ .../impl/OdsProcureOrderServiceImpl.java | 31 +++++++++++++++++++ .../mapper/wms/WmsRawOrderInSnMapper.xml | 23 ++++++++++++++ 5 files changed, 69 insertions(+) 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 0a1484eb..e28f8a3e 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 @@ -114,6 +114,17 @@ public class WmsToWCSmissionController { * 手持 －－包材采购单采购收货查询总共已经收货数量 */ + /** + * 手持 －－包材采购单采购收货确认操作 + */ + + @PostMapping("/PurchaseOrderdeliPdaConfirm") + public AjaxResult PurchaseOrderdeliPdaConfirm(@RequestBody OdsProcureOrder odsProcureOrder) { +// odsProcureOrderService.PurchaseOrderdeliPdas(odsProcureOrder); +// return success(); + String result = odsProcureOrderService.PurchaseOrderdeliPdaConfirm(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/mapper/WmsRawOrderInSnMapper.java b/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsRawOrderInSnMapper.java index 528f9c5f..5d34d5a7 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsRawOrderInSnMapper.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsRawOrderInSnMapper.java @@ -2,6 +2,7 @@ package com.op.wms.mapper; import java.util.List; +import com.op.wms.domain.OdsProcureOrder; import com.op.wms.domain.WCSInventoryPlan; import com.op.wms.domain.WmsRawOrderInSn; import com.op.wms.domain.WmsToWCSDTO; @@ -66,4 +67,5 @@ public interface WmsRawOrderInSnMapper { void updateU1Byid(WmsRawOrderInSn wmsRawOrderInSn); + List selecPurchaseOrderdeliPdaList(OdsProcureOrder odsProcureOrder); } diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/IOdsProcureOrderService.java b/op-modules/op-wms/src/main/java/com/op/wms/service/IOdsProcureOrderService.java index 30cc9f60..eca17bf1 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/service/IOdsProcureOrderService.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/service/IOdsProcureOrderService.java @@ -95,4 +95,6 @@ public interface IOdsProcureOrderService { void PurchaseOrderdeliPdas(OdsProcureOrder odsProcureOrder); List selectOdsProcureOrderAlready(OdsProcureOrder odsProcureOrder); + + String PurchaseOrderdeliPdaConfirm(OdsProcureOrder 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 47a47251..e433c71a 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 @@ -72,6 +72,7 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService { @Autowired private BaseWarehouseMapper baseWarehouseMapper; + /** * 查询包材采购单 * @@ -715,6 +716,36 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService { return orderList; } + @Override + public String PurchaseOrderdeliPdaConfirm(OdsProcureOrder odsProcureOrder) { + DynamicDataSourceContextHolder.push("ds_" + odsProcureOrder.getFactoryCode()); + String result="操作成功"; + List wmsRawOrderInSn = wmsRawOrderInSnMapper.selecPurchaseOrderdeliPdaList(odsProcureOrder); + for (WmsRawOrderInSn order: wmsRawOrderInSn){ +// //查询这次收货信息----生成质检任务------- //插入检验集计划 + QcCheckTaskIncomeDTO qcCheckTaskIncomeDTO = new QcCheckTaskIncomeDTO(); + qcCheckTaskIncomeDTO.setCheckLoc("mjtest"); + qcCheckTaskIncomeDTO.setCheckType("checkTypeLL"); +// qcCheckTaskIncomeDTO.setCheckManCode("mobile"); +// qcCheckTaskIncomeDTO.setCheckManName("手持测试用户"); + OdsProcureOrder order1 = odsProcureOrderMapper.selectOdsProcureOrderByID(order.getUserDefined3()); + qcCheckTaskIncomeDTO.setSupplierCode(order1.getSupplierCode()); + String name = odsProcureOrderMapper.selectBaseSupplier(order1); + qcCheckTaskIncomeDTO.setSupplierName(name); + qcCheckTaskIncomeDTO.setOrderType("bc"); + qcCheckTaskIncomeDTO.setUnit(order1.getUnit()); + qcCheckTaskIncomeDTO.setFactoryCode(order1.getFactoryCode()); + qcCheckTaskIncomeDTO.setQuality(order.getAmount()); + qcCheckTaskIncomeDTO.setMaterialCode(order.getMaterialCode()); + qcCheckTaskIncomeDTO.setMaterialName(order.getMaterialDesc()); + qcCheckTaskIncomeDTO.setIncomeBatchNo(order.getIncomeBatchNo()); + qcCheckTaskIncomeDTO.setOrderNo(order.getPoNo()); + qcCheckTaskIncomeDTO.setIncomeTime(new Date()); + remoteQualityService.createIncomeTask(qcCheckTaskIncomeDTO); + } + return result; + } + public String DesignatedPalletOutboundWCS(WMSDesignatedPalle wmsDesignatedPalle) { // 定义请求的URL地址 String url = "http://192.168.202.37:9001/api/v1/ReceiveMesMsg/packingMaterialsOutBoundByPallet"; diff --git a/op-modules/op-wms/src/main/resources/mapper/wms/WmsRawOrderInSnMapper.xml b/op-modules/op-wms/src/main/resources/mapper/wms/WmsRawOrderInSnMapper.xml index 750a9109..e420965f 100644 --- a/op-modules/op-wms/src/main/resources/mapper/wms/WmsRawOrderInSnMapper.xml +++ b/op-modules/op-wms/src/main/resources/mapper/wms/WmsRawOrderInSnMapper.xml @@ -201,5 +201,28 @@ user_defined1 = '2' where raw_order_in_sn_id=#{rawOrderInSnId} + From 3f5ebda816e965943b59c7ea60a36defb7b5a5c5 Mon Sep 17 00:00:00 2001 From: mengjiao <3338049200@qq,com> Date: Mon, 13 May 2024 16:25:38 +0800 Subject: [PATCH 2/4] =?UTF-8?q?wms=E5=8C=85=E6=9D=90=E9=83=A8=E5=88=86?= =?UTF-8?q?=E4=BF=AE=E6=94=B942?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/wms/WmsRawOrderInSnMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/op-modules/op-wms/src/main/resources/mapper/wms/WmsRawOrderInSnMapper.xml b/op-modules/op-wms/src/main/resources/mapper/wms/WmsRawOrderInSnMapper.xml index e420965f..030d5bec 100644 --- a/op-modules/op-wms/src/main/resources/mapper/wms/WmsRawOrderInSnMapper.xml +++ b/op-modules/op-wms/src/main/resources/mapper/wms/WmsRawOrderInSnMapper.xml @@ -213,7 +213,7 @@ FROM wms_raw_order_in_sn WHERE - user_defined5 = ${receiptNoCode} + user_defined5 = #{receiptNoCode} AND active_flag='1' GROUP BY wh_code, From 284b2e89dc1e2fd022254e70c29fcc166fd6c547 Mon Sep 17 00:00:00 2001 From: mengjiao <3338049200@qq,com> Date: Mon, 13 May 2024 16:28:41 +0800 Subject: [PATCH 3/4] =?UTF-8?q?wms=E5=8C=85=E6=9D=90=E9=83=A8=E5=88=86?= =?UTF-8?q?=E4=BF=AE=E6=94=B943?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/wms/WmsRawOrderInSnMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/op-modules/op-wms/src/main/resources/mapper/wms/WmsRawOrderInSnMapper.xml b/op-modules/op-wms/src/main/resources/mapper/wms/WmsRawOrderInSnMapper.xml index 030d5bec..409b1a72 100644 --- a/op-modules/op-wms/src/main/resources/mapper/wms/WmsRawOrderInSnMapper.xml +++ b/op-modules/op-wms/src/main/resources/mapper/wms/WmsRawOrderInSnMapper.xml @@ -207,7 +207,7 @@ po_no, material_code, material_desc, - sum ( amount ), + sum ( amount ) AS amount, user_defined2, user_defined3 FROM From bf09a605014c1ca619f3063fd9d0c7ce29973c16 Mon Sep 17 00:00:00 2001 From: A0010407 Date: Mon, 13 May 2024 16:32:27 +0800 Subject: [PATCH 4/4] =?UTF-8?q?2024-5-13=20=E5=9F=BA=E7=A1=80=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E7=AE=A1=E7=90=86-=E4=BA=A7=E5=93=81-=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E6=8A=A5=E5=B7=A5=E6=B1=87=E7=8E=87=EF=BC=88=E5=8F=AF?= =?UTF-8?q?=E4=BB=A50=E5=8F=AF=E4=BB=A5=E7=A9=BA=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/wms/BaseProductMapper.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/op-modules/op-wms/src/main/resources/mapper/wms/BaseProductMapper.xml b/op-modules/op-wms/src/main/resources/mapper/wms/BaseProductMapper.xml index 7d06eb2b..fce5f508 100644 --- a/op-modules/op-wms/src/main/resources/mapper/wms/BaseProductMapper.xml +++ b/op-modules/op-wms/src/main/resources/mapper/wms/BaseProductMapper.xml @@ -232,7 +232,7 @@ append_flag, append_percent, mtart, - report_rate, + report_rate, #{productId}, @@ -278,7 +278,7 @@ #{appendFlag}, #{appendPercent}, #{mtart}, - #{reportRate}, + #{reportRate},