From 96671e9717bb5f5b600ea16b51a96c86b71ef17d Mon Sep 17 00:00:00 2001 From: mengjiao <3338049200@qq,com> Date: Wed, 4 Sep 2024 11:42:00 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E6=88=90=E5=93=81=E8=BF=87=E8=B4=A6?= =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/op/wms/mapper/WmsProductPutMapper.java | 2 ++ .../wms/service/impl/WmsProductPutServiceImpl.java | 13 +++++++------ .../resources/mapper/wms/WmsProductPutMapper.xml | 8 ++++++++ 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsProductPutMapper.java b/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsProductPutMapper.java index d3cc95c6..505a679f 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsProductPutMapper.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsProductPutMapper.java @@ -88,6 +88,8 @@ public interface WmsProductPutMapper { void updateProOrderWorkorderBatchPallet(@Param("palletCode")String sn); + void updateWmsProductStatus(WmsProductPut wmsProductPut2); + // String selectProOrderWorkorder(WmsProductPut 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 fb35345e..9f2a95af 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 @@ -1152,18 +1152,19 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService { WmsProductPut wmsProductPut2= wmsProductPutLists.get(0); BigDecimal planQuantity= wmsProductPut2.getPlanQuantity(); BigDecimal putQuantity= wmsProductPut2.getPutQuantity(); - if (planQuantity.equals(putQuantity.add(new BigDecimal(wmsProductPut1.getNumber())))){ - wmsProductPutk.setStatus("1"); - }else { - wmsProductPutk.setStatus("2"); - } +// if (planQuantity.equals(putQuantity.add(new BigDecimal(wmsProductPut1.getNumber())))){ +// wmsProductPutk.setStatus("1"); +// }else { +// wmsProductPutk.setStatus("2"); +// } BigDecimal putQuantityT=putQuantity.add(new BigDecimal(wmsProductPut1.getNumber()));//入库数量 wmsProductPut2.setPutQuantity(putQuantityT); wmsProductPut2.setUpdateTime(new Date()); wmsProductPut2.setUpdateBy(wmsProductPut.getCreateBy()); wmsProductPutMapper.updateWmsProductPut(wmsProductPut2); + wmsProductPutMapper.updateWmsProductStatus(wmsProductPut2);//修改订单 }else { - wmsProductPutk.setStatus("2"); + wmsProductPutk.setStatus("2");// wmsProductPutk.setSapStatus("0"); wmsProductPutk.setAttr3(formattedDate);// if (wmsProductPutk.getBatchNumber().length()==24){ 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 42eba63f..0ef49bdb 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 @@ -469,4 +469,12 @@ SET attr1 = '1' where pallet_code = #{palletCode} + + + UPDATE wms_product_put + SET status = '1' + WHERE plan_quantity = put_quantity + AND status != '1'; -- 添加条件以避免不必要的更新 + and id = #{id} + From 79d0a701e6bce8d18c74097d6ac59855ab908758 Mon Sep 17 00:00:00 2001 From: mengjiao <3338049200@qq,com> Date: Wed, 4 Sep 2024 11:52:52 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E6=88=90=E5=93=81=E8=BF=87=E8=B4=A6?= =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../op/wms/mapper/WmsProductPutMapper.java | 2 + .../impl/WmsProductPutServiceImpl.java | 2 +- .../mapper/wms/WmsProductPutMapper.xml | 42 ++++++++++++++++++- 3 files changed, 44 insertions(+), 2 deletions(-) diff --git a/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsProductPutMapper.java b/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsProductPutMapper.java index 505a679f..15bfb926 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsProductPutMapper.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsProductPutMapper.java @@ -90,6 +90,8 @@ public interface WmsProductPutMapper { void updateWmsProductStatus(WmsProductPut wmsProductPut2); + List selectWmsProductPutSAPByIds(String productOrder); + // String selectProOrderWorkorder(WmsProductPut 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 9f2a95af..82106f15 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 @@ -280,7 +280,7 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService { wmsProductPut) { WmsProductPut wmsProductPutSAPById = wmsProductPutMapper.selectWmsProductPutSAPById(wmsProductPut1.getId()); if (wmsProductPutSAPById != null) { - List wmsProductPut2 = wmsProductPutMapper.selectWmsProductPutSAPByProDuct(wmsProductPutSAPById.getProductOrder()); + List wmsProductPut2 = wmsProductPutMapper.selectWmsProductPutSAPByIds(wmsProductPutSAPById.getProductOrder()); if (wmsProductPut2.size() > 0) { List> mapList = new ArrayList<>(); Map map = new HashMap<>(); 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 0ef49bdb..ef8e5c2c 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 @@ -294,7 +294,6 @@ wms_product_put LEFT JOIN pro_order_workorder ON pro_order_workorder.order_code=wms_product_put.product_order WHERE wms_product_put.id = #{id} - AND wms_product_put.status= '1' AND wms_product_put.SAP_status IN ( 0, 2 ) + SELECT DISTINCT + wms_product_put.id, + wms_product_put.work_order, + wms_product_put.factory_code, + wms_product_put.product_order, + wms_product_put.wh_code, + wms_product_put.wa_code, + wms_product_put.wl_code, + wms_product_put.product_name, + wms_product_put.product_code, + wms_product_put.product_sort, + wms_product_put.specification, + wms_product_put.unit_of_measure, + wms_product_put.plan_quantity, + wms_product_put.put_quantity, + wms_product_put.status, + wms_product_put.SAP_status, + wms_product_put.SAP_proof, + wms_product_put.SAP_message, + wms_product_put.put_date, + wms_product_put.batch_number, + wms_product_put.attr3, + wms_product_put.attr4, + wms_product_put.attr5, + wms_product_put.attr6, + wms_product_put.attr7, + wms_product_put.attr8, + wms_product_put.attr9, + wms_product_put.attr10, + wms_product_put.create_by, + wms_product_put.create_time, + wms_product_put.update_by, + wms_product_put.update_time , + pro_order_workorder.product_date + FROM + wms_product_put + LEFT JOIN pro_order_workorder ON pro_order_workorder.workorder_code_sap=wms_product_put.product_order + WHERE wms_product_put.id = #{id} + AND wms_product_put.SAP_status IN ( 0, 2 ) + From 2ee57da594d87099bd2f785d0eb9f126b027e527 Mon Sep 17 00:00:00 2001 From: mengjiao <3338049200@qq,com> Date: Wed, 4 Sep 2024 13:34:32 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E6=88=90=E5=93=81=E6=A8=A1=E7=B3=8A?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/wms/WmsFpStorageNewsMapper.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/op-modules/op-wms/src/main/resources/mapper/wms/WmsFpStorageNewsMapper.xml b/op-modules/op-wms/src/main/resources/mapper/wms/WmsFpStorageNewsMapper.xml index 745e4c1f..a03ec3f1 100644 --- a/op-modules/op-wms/src/main/resources/mapper/wms/WmsFpStorageNewsMapper.xml +++ b/op-modules/op-wms/src/main/resources/mapper/wms/WmsFpStorageNewsMapper.xml @@ -53,7 +53,8 @@ and wa_code = #{waCode} and storage_type = #{storageType} and wl_code = #{wlCode} - and product_code = #{productCode} + and product_code like concat('%', #{productCode}, + '%') and product_name like concat('%', #{productName}, '%') @@ -82,6 +83,7 @@ and sap_factory_code = #{sapFactoryCode} and wl_name like concat('%', #{wlName}, '%') + ORDER BY gmt_create DESC SELECT DISTINCT From 4dc9b4cb80c2f65af665a7ef1c51eb91df2c1e3e Mon Sep 17 00:00:00 2001 From: mengjiao <3338049200@qq,com> Date: Wed, 4 Sep 2024 14:51:09 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E6=88=90=E5=93=81=E8=BF=87=E8=B4=A6?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/op/wms/service/impl/WmsProductPutServiceImpl.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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 82106f15..7a5568c2 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 @@ -64,6 +64,8 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService { private WmsSellOutEmbryoMapper wmsSellOutEmbryoMapper; @Autowired private WmsRuturnPutEmbryoMapper wmsRuturnPutEmbryoMapper; + @Autowired + private BaseWarehouseMapper baseWarehouseMapper; /** * 查询成品生产入库 @@ -286,9 +288,10 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService { Map map = new HashMap<>(); for (WmsProductPut wmsProductPut3 : wmsProductPut2) { + String lgort = baseWarehouseMapper.selectByCode(wmsProductPut3.getWhCode()); map.put("AUFNR", wmsProductPut3.getProductOrder()); map.put("WERKS", wmsProductPut3.getFactoryCode()); - map.put("LGORT", wmsProductPut3.getWhCode()); + map.put("LGORT", lgort); map.put("QUANTITY", wmsProductPut3.getPutQuantity()); map.put("ERFME", wmsProductPut3.getUnitOfMeasure()); map.put("BATCH", wmsProductPut3.getAttr4());