From 2aaba3dde3a1c91628488221ac18ea501bb42c33 Mon Sep 17 00:00:00 2001 From: mengjiao <3338049200@qq,com> Date: Thu, 17 Apr 2025 17:16:19 +0800 Subject: [PATCH 1/3] =?UTF-8?q?wms=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/OdsProcureOutOrderServiceImpl.java | 2 +- .../mapper/wms/OdsProcureOrderMapper.xml | 106 +++++++++--------- 2 files changed, 54 insertions(+), 54 deletions(-) diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOutOrderServiceImpl.java b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOutOrderServiceImpl.java index 1c6732237..063e4bb7f 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOutOrderServiceImpl.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOutOrderServiceImpl.java @@ -342,7 +342,7 @@ public class OdsProcureOutOrderServiceImpl implements IOdsProcureOutOrderService order.setPlanNumber(amount); order.setLocCode(wmsOdsMateStorageNewsSn.getWaCode());//库区 order.setID(IdUtils.fastSimpleUUID()); - order.setUnit(wmsOdsMateStorageNewsSn.getUserDefined1()); + order.setUnit("PC"); order.setFactoryCode(factoryCode); order.setActive("1"); order.setCreateBy(createBy); diff --git a/op-modules/op-wms/src/main/resources/mapper/wms/OdsProcureOrderMapper.xml b/op-modules/op-wms/src/main/resources/mapper/wms/OdsProcureOrderMapper.xml index 02138b6c4..4bda5db5d 100644 --- a/op-modules/op-wms/src/main/resources/mapper/wms/OdsProcureOrderMapper.xml +++ b/op-modules/op-wms/src/main/resources/mapper/wms/OdsProcureOrderMapper.xml @@ -86,7 +86,7 @@ bpa.wa_code waCode FROM ods_procure_order opo - LEFT JOIN base_product_attached bpa on RIGHT ( opo.Material_Code, 11 ) = bpa.product_code + LEFT JOIN base_product_attached bpa on RIGHT ( opo.Material_Code, 11 ) = bpa.product_code insert into ods_procure_order @@ -331,8 +331,8 @@ - delete from ods_procure_order where ID = #{ID} - + delete from ods_procure_order where ID = #{ID} + delete from ods_procure_order where ID in @@ -341,15 +341,15 @@ - update ods_procure_order - SET Reality_Number = COALESCE(Reality_Number, 0) + #{planNumber}, - Order_Status=#{orderStatus} - where ID = #{ID} + update ods_procure_order + SET Reality_Number = COALESCE(Reality_Number, 0) + #{planNumber}, + Order_Status=#{orderStatus} + where ID = #{ID} - + + SELECT DISTINCT zh_desc FROM base_supplier WHERE supplier_code= #{supplierCode} + - and Site_code = #{siteCode} - and ID = #{ID} - and Procure_Code = #{procureCode} - and Material_Code like concat('%', #{materialCode}, + and opo.Site_code = #{siteCode} + and opo.ID = #{ID} + and opo.Procure_Code = #{procureCode} + and opo.Material_Code like concat('%', #{materialCode}, '%') - and Material_Desc = #{materialDesc} - and Plan_Date = #{planDate} - and Plan_Number = #{planNumber} - and Unit = #{Unit} - and Reality_Number = #{realityNumber} - and Order_Status = #{orderStatus} - and User_Defined1 = #{userDefined1} - and User_Defined2 = #{userDefined2} - and User_Defined3 = #{userDefined3} - and User_Defined4 = #{userDefined4} - and User_Defined5 = #{userDefined5} - and User_Defined6 = #{userDefined6} - and User_Defined7 = #{userDefined7} - and User_Defined8 = #{userDefined8} - and User_Defined9 = #{userDefined9} - and User_Defined10 = #{userDefined10} - and User_Defined11 = #{userDefined11} - and Supplier_Code = #{supplierCode} - and Supplier_Name like concat('%', #{supplierName}, + and opo.Material_Desc = #{materialDesc} + and opo.Plan_Date = #{planDate} + and opo.Plan_Number = #{planNumber} + and opo.Unit = #{Unit} + and opo.Reality_Number = #{realityNumber} + and opo.Order_Status = #{orderStatus} + and opo.User_Defined1 = #{userDefined1} + and opo.User_Defined2 = #{userDefined2} + and opo.User_Defined3 = #{userDefined3} + and opo.User_Defined4 = #{userDefined4} + and opo.User_Defined5 = #{userDefined5} + and opo.User_Defined6 = #{userDefined6} + and opo.User_Defined7 = #{userDefined7} + and opo.User_Defined8 = #{userDefined8} + and opo.User_Defined9 = #{userDefined9} + and opo.User_Defined10 = #{userDefined10} + and opo.User_Defined11 = #{userDefined11} + and opo.Supplier_Code = #{supplierCode} + and opo.Supplier_Name like concat('%', #{supplierName}, '%') - and Remark = #{Remark} - and Create_By = #{createBy} - and Create_Date = #{createDate} - and Last_Update_By = #{lastUpdateBy} - and Last_Update_Date = #{lastUpdateDate} - and Active = #{Active} - and Enterprise_Id = #{enterpriseId} - and Enterprise_Code = #{enterpriseCode} - and pallet_num = #{palletNum} + and opo.Remark = #{Remark} + and opo.Create_By = #{createBy} + and opo.Create_Date = #{createDate} + and opo.Last_Update_By = #{lastUpdateBy} + and opo.Last_Update_Date = #{lastUpdateDate} + and opo.Active = #{Active} + and opo.Enterprise_Id = #{enterpriseId} + and opo.Enterprise_Code = #{enterpriseCode} + and opo.pallet_num = #{palletNum} order by Create_Date desc @@ -352,7 +352,7 @@ update ods_procure_order @@ -363,13 +363,13 @@ - where User_Defined5= #{userDefined5} - AND (Plan_Number-COALESCE ( Operation_Number, 0 ))>0 - order by Create_Date desc + where opo.User_Defined5= #{userDefined5} + AND (opo.Plan_Number-COALESCE ( opo.Operation_Number, 0 ))>0 + order by opo.Create_Date desc update ods_procure_order From 33161fa9d448b2f1f4053b6d8072ea0ba1d8ef3b Mon Sep 17 00:00:00 2001 From: mengjiao <3338049200@qq,com> Date: Thu, 17 Apr 2025 18:23:40 +0800 Subject: [PATCH 3/3] =?UTF-8?q?wms=E7=89=B9=E6=AE=8A=E5=87=BA=E5=BA=93?= =?UTF-8?q?=E8=BF=87=E8=B4=A6=E6=9D=A1=E7=9B=AE=E5=8D=95=E4=BD=8D=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE=E4=B8=BAST?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/op/wms/service/impl/OdsProcureOrderServiceImpl.java | 4 ++-- .../op/wms/service/impl/OdsProcureOutOrderServiceImpl.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) 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 614e76ca7..1309448f2 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 @@ -1595,7 +1595,7 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService { paramMap.put("LGORT",lgort );//库存地点 paramMap.put("MATNR", order.getMaterialCode());//物料号 paramMap.put("QUANTITY", order.getPlanNumber());//数量 - paramMap.put("MEINS", order.getUnit());//条目单位 + paramMap.put("MEINS", "ST");//条目单位 paramMap.put("BATCH", order.getUserDefined1());//批号 paramMap.put("PROD_DATE", order.getPlanDate());//生产日期 paramMap.put("EXPIRYDATE", order.getUserDefined5());//货架寿命到期日 @@ -1655,7 +1655,7 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService { paramMap.put("LGORT",lgort );//库存地点 paramMap.put("MATNR", order.getMaterialCode());// paramMap.put("QUANTITY", order.getPlanNumber());// - paramMap.put("MEINS", order.getUnit());// + paramMap.put("MEINS", "ST");// paramMap.put("BATCH", order.getUserDefined1());// paramMap.put("PROD_DATE", order.getPlanDate());//生产日期 paramMap.put("EXPIRYDATE", order.getUserDefined5());//货架寿命到期日 diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOutOrderServiceImpl.java b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOutOrderServiceImpl.java index 063e4bb7f..ab5140513 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOutOrderServiceImpl.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOutOrderServiceImpl.java @@ -507,7 +507,7 @@ public class OdsProcureOutOrderServiceImpl implements IOdsProcureOutOrderService paramMap.put("LGORT",lgort );//库存地点 paramMap.put("MATNR", order.getMaterialCode());//物料号 paramMap.put("QUANTITY", order.getPlanNumber());//数量 - paramMap.put("MEINS", order.getUnit());//条目单位 + paramMap.put("MEINS", "ST");//条目单位 paramMap.put("BATCH", order.getUserDefined1());//批号 paramMap.put("PROD_DATE", order.getPlanDate());//生产日期 paramMap.put("EXPIRYDATE", order.getUserDefined5());//货架寿命到期日 @@ -567,7 +567,7 @@ public class OdsProcureOutOrderServiceImpl implements IOdsProcureOutOrderService paramMap.put("LGORT",lgort );//库存地点 paramMap.put("MATNR", order.getMaterialCode());// paramMap.put("QUANTITY", order.getPlanNumber());// - paramMap.put("MEINS", order.getUnit());// + paramMap.put("MEINS", "ST");// paramMap.put("BATCH", order.getUserDefined1());// paramMap.put("PROD_DATE", order.getPlanDate());//生产日期 paramMap.put("EXPIRYDATE", order.getUserDefined5());//货架寿命到期日