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] =?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 0a1484eb6..e28f8a3ed 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 528f9c5f6..5d34d5a77 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 30cc9f60f..eca17bf1c 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 47a472516..e433c71ad 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 750a91098..e420965fd 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} +