From 8e093d7a3059224a9656313e9fc1c83a00fdd88d Mon Sep 17 00:00:00 2001 From: mengjiao <3338049200@qq,com> Date: Mon, 6 Jan 2025 17:01:06 +0800 Subject: [PATCH] =?UTF-8?q?wms=E6=89=8B=E6=8C=81=E6=89=B9=E6=9D=A1?= =?UTF-8?q?=E4=BB=B6=E7=AD=9B=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../op/wms/controller/WmsToWCSmissionController.java | 11 ++++++++++- .../java/com/op/wms/domain/WmsProductPutTrayCode.java | 10 ++++++++++ .../wms/service/impl/OdsProcureOrderServiceImpl.java | 7 ++++++- .../op/wms/service/impl/WmsProductPutServiceImpl.java | 3 ++- .../resources/mapper/wms/WmsFpStorageNewsSnMapper.xml | 4 +++- 5 files changed, 31 insertions(+), 4 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 1b088f0f..fe7b24c8 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 @@ -498,7 +498,16 @@ public class WmsToWCSmissionController { */ @PostMapping("/ScanCodeWholePallet") public AjaxResult ScanCodeWholePallet(@RequestBody WmsProductPutTrayCode wmsProductPutTrayCode) { - return AjaxResult.success(wmsProductPutService.ScanCodeWholePallet(wmsProductPutTrayCode)); + List wmsFpStorageNewsSns= wmsProductPutService.ScanCodeWholePallet(wmsProductPutTrayCode); + if (wmsFpStorageNewsSns!=null&&wmsFpStorageNewsSns.size()>0){ + WmsFpStorageNewsSn wmsFpStorageNewsSn1= wmsFpStorageNewsSns.get(0); + if( wmsFpStorageNewsSn1.getBatchNumber().contains(wmsProductPutTrayCode.getBatchNumber())){ + return AjaxResult.success(wmsFpStorageNewsSns); + }else { + return AjaxResult.error("请查看批次是否与订单相同"); + } + } + return AjaxResult.success(wmsFpStorageNewsSns); } /** * 成品销售出库----单箱扫码 diff --git a/op-modules/op-wms/src/main/java/com/op/wms/domain/WmsProductPutTrayCode.java b/op-modules/op-wms/src/main/java/com/op/wms/domain/WmsProductPutTrayCode.java index 9f4dc49e..c18b2f70 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/domain/WmsProductPutTrayCode.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/domain/WmsProductPutTrayCode.java @@ -31,6 +31,16 @@ public class WmsProductPutTrayCode extends BaseEntity { */ @Excel(name = "箱码") private String barcode; + @Excel(name = "批次号") + private String batchNumber; + + public String getBatchNumber() { + return batchNumber; + } + + public void setBatchNumber(String batchNumber) { + this.batchNumber = batchNumber; + } /** * 库位 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 6993b06e..e53a2816 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 @@ -2102,7 +2102,8 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService { return result; } - public void OutboundPostingzcSAPGY(List orderList) { + public String OutboundPostingzcSAPGY(List orderList) { + String TEM="操作成功"; //先根据出库单获取 // * 退料的移动类型为 262 // * 领料的移动类型为 261-- and wms_ods_procure_out_order.Order_Status='3' @@ -2183,6 +2184,7 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService { order.setUserDefined10("3");//失败 odsProcureOutOrderMapper.updateWMSOdsProcureOutOrderByids(order, orderList2); } + TEM=msg; } if (sapMaterialPostingFCList.size() > 0) { //反冲过账 @@ -2218,11 +2220,14 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService { } } } else {// + order.setUserDefined9(""); order.setUserDefined10("3");//失败 odsProcureOutOrderMapper.updateWMSOdsProcureOutOrderByids(order, orderList2FC); } + TEM=msg; } + return TEM; } 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 baafad3c..146b19e3 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 @@ -913,7 +913,8 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService { WmsFpStorageNewsSn wmsFpStorageNewsSn=new WmsFpStorageNewsSn(); wmsFpStorageNewsSn.setSn(wmsProductPutTrayCode.getSn()); wmsFpStorageNewsSn.setActiveFlag("1"); - List wmsFpStorageNewsSns= wmsFpStorageNewsSnMapper.selectWmsFpStorageNewsSnSTList(wmsFpStorageNewsSn); + List wmsFpStorageNewsSns = wmsFpStorageNewsSnMapper.selectWmsFpStorageNewsSnSTList(wmsFpStorageNewsSn); + return wmsFpStorageNewsSns; } diff --git a/op-modules/op-wms/src/main/resources/mapper/wms/WmsFpStorageNewsSnMapper.xml b/op-modules/op-wms/src/main/resources/mapper/wms/WmsFpStorageNewsSnMapper.xml index d11b4c92..b72a035f 100644 --- a/op-modules/op-wms/src/main/resources/mapper/wms/WmsFpStorageNewsSnMapper.xml +++ b/op-modules/op-wms/src/main/resources/mapper/wms/WmsFpStorageNewsSnMapper.xml @@ -531,6 +531,7 @@ sap_factory_code FROM wms_fp_storage_news_sn + and wh_code = #{whCode} and wa_code = #{waCode} @@ -544,7 +545,8 @@ and sn = #{sn} and bar_code = #{barCode} and amount = #{amount} - and batch_number = #{batchNumber} + and batch_number like concat('%',#{batchNumber} , + '%') and user_defined2 = #{userDefined2} and user_defined3 = #{userDefined3} and user_defined4 = #{userDefined4}