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] =?UTF-8?q?=E6=88=90=E5=93=81=E8=BF=87=E8=B4=A6=E4=BF=AE?= =?UTF-8?q?=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 d3cc95c66..505a679f5 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 fb35345e8..9f2a95af6 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 42eba63f6..0ef49bdb2 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} +