From 707130bbae5911f1dd3ae8fcabb4d2d783467e1d Mon Sep 17 00:00:00 2001 From: mengjiao <3338049200@qq,com> Date: Mon, 21 Oct 2024 09:37:30 +0800 Subject: [PATCH] =?UTF-8?q?wms=E9=83=A8=E5=88=86=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wms/mapper/WmsFpStorageNewsSnMapper.java | 2 + .../impl/WmsProductPutServiceImpl.java | 56 +++------------- .../mapper/wms/OdsProcureOutOrderMapper.xml | 3 +- .../mapper/wms/WmsFpStorageNewsMapper.xml | 4 +- .../mapper/wms/WmsFpStorageNewsSnMapper.xml | 67 ++++++++++++++++++- 5 files changed, 79 insertions(+), 53 deletions(-) diff --git a/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsFpStorageNewsSnMapper.java b/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsFpStorageNewsSnMapper.java index 32d512d25..9305c1f52 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsFpStorageNewsSnMapper.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsFpStorageNewsSnMapper.java @@ -89,4 +89,6 @@ public interface WmsFpStorageNewsSnMapper { public void addBatchPallet(@Param("list")List dtos); public List selectBSKList(WmsFpStorageNewsSn proOrderWorkorder); + + List selectWmsFpStorageNewsSnSTList(WmsFpStorageNewsSn wmsFpStorageNewsSn); } 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 28939138d..911d0af38 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 @@ -856,58 +856,18 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService { wmsFpStorageNewsSn1.setActiveFlag("1"); wmsFpStorageNewsSn1.setProductCode(wmsSellOutEmbryo1.getProductCode()); wmsFpStorageNewsSnMapper.updateWmsFpStorageNewsSnOut(wmsFpStorageNewsSn1); - } - - - - - - //成品销售出库--确认接口---修改出库单，--出库库存 - WmsSellOutEmbryo wmsSellOutEmbryo1 = wmsSellOutEmbryoMapper.selectWmsSellOutEmbryoById(wmsSellOutEmbryo.getId()); - Integer tem= wmsProductPutTrayCodeList.size(); - BigDecimal OutQuantity= wmsSellOutEmbryo1.getOutQuantity().add(new BigDecimal(tem));//2 - int result = wmsSellOutEmbryo1.getPlanQuantity().compareTo(OutQuantity); - WmsSellOutEmbryo wmsSellOutEmbryoUpdate=new WmsSellOutEmbryo(); - if (result == 0){//出库完 - wmsSellOutEmbryoUpdate.setStatus("1"); - }else { - wmsSellOutEmbryoUpdate.setStatus("0"); - } - wmsSellOutEmbryoUpdate.setId(wmsSellOutEmbryo.getId()); - wmsSellOutEmbryoUpdate.setOutQuantity(OutQuantity); - wmsSellOutEmbryoMapper.updateWmsSellOutEmbryo(wmsSellOutEmbryoUpdate); - //订单修改完成 - for(WmsProductPutTrayCode wmsProductPutTrayCode: wmsProductPutTrayCodeList){//库存修改 - //解除绑定 - wmsProductPutTrayCode.setRelatStatus("0"); - wmsProductPutTrayCodeMapper.updateWmsProductPutTrayCode(wmsProductPutTrayCode); - //改明细 - WmsFpStorageNewsSn wmsFpStorageNewsSn=new WmsFpStorageNewsSn(); - wmsFpStorageNewsSn.setSn(wmsProductPutTrayCode.getSn()); - wmsFpStorageNewsSn.setWlCode(wmsProductPutTrayCode.getWlCode()); - wmsFpStorageNewsSn.setActiveFlag("1"); - wmsFpStorageNewsSn.setProductCode(wmsSellOutEmbryo1.getProductCode()); - wmsFpStorageNewsSnMapper.updateWmsFpStorageNewsSnOut(wmsFpStorageNewsSn); - //判断如果托盘数据被出完，就关闭这个明细 -// List wmsFpStorageNewsSns= wmsFpStorageNewsSnMapper.selectWmsFpStorageNewsSnList(wmsFpStorageNewsSn); - if (wmsFpStorageNewsSns.size()>0){ - WmsFpStorageNewsSn wmsFpStorageNewsSn1= wmsFpStorageNewsSns.get(0); - - BigDecimal ken= new BigDecimal(wmsFpStorageNewsSn1.getUserDefined2()); - int comparisonResult = ken.compareTo(wmsFpStorageNewsSn1.getAmount()); - if (comparisonResult == 0) { - // ken和amount相等 - wmsFpStorageNewsSn1.setActiveFlag("0"); - wmsFpStorageNewsSnMapper.updateWmsFpStorageNewsSn(wmsFpStorageNewsSn1); - } - } - //改主表 + WmsFpStorageNewsSn wmsFpStorageNewsSn2= wmsFpStorageNewsSnMapper.selectWmsFpStorageNewsSnByStorageId(wmsFpStorageNewsSn.getStorageId()); WmsFpStorageNews wmsFpStorageNews=new WmsFpStorageNews(); wmsFpStorageNews.setActiveFlag("1"); - wmsFpStorageNews.setWlCode(wmsProductPutTrayCode.getWlCode()); + wmsFpStorageNews.setWlCode(wmsFpStorageNewsSn2.getWlCode()); wmsFpStorageNews.setProductCode(wmsSellOutEmbryo1.getProductCode()); + wmsFpStorageNews.setProductBatch(wmsFpStorageNewsSn2.getBatchNumber()); + wmsFpStorageNews.setAmount(wmsFpStorageNewsSn.getAmount()); + wmsFpStorageNews.setWhCode(wmsFpStorageNewsSn2.getWhCode()); + wmsFpStorageNews.setWaCode(wmsFpStorageNewsSn2.getWaCode()); wmsFpStorageNewsMapper.updateWmsFpStorageNewsOut(wmsFpStorageNews); } + return result1; } @@ -919,7 +879,7 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService { WmsFpStorageNewsSn wmsFpStorageNewsSn=new WmsFpStorageNewsSn(); wmsFpStorageNewsSn.setSn(wmsProductPutTrayCode.getSn()); wmsFpStorageNewsSn.setActiveFlag("1"); - List wmsFpStorageNewsSns= wmsFpStorageNewsSnMapper.selectWmsFpStorageNewsSnList(wmsFpStorageNewsSn); + List wmsFpStorageNewsSns= wmsFpStorageNewsSnMapper.selectWmsFpStorageNewsSnSTList(wmsFpStorageNewsSn); return wmsFpStorageNewsSns; } diff --git a/op-modules/op-wms/src/main/resources/mapper/wms/OdsProcureOutOrderMapper.xml b/op-modules/op-wms/src/main/resources/mapper/wms/OdsProcureOutOrderMapper.xml index 88f323924..bad947c4a 100644 --- a/op-modules/op-wms/src/main/resources/mapper/wms/OdsProcureOutOrderMapper.xml +++ b/op-modules/op-wms/src/main/resources/mapper/wms/OdsProcureOutOrderMapper.xml @@ -621,7 +621,8 @@ product_date Plan_Date, prod_type User_Defined1 FROM mes_prepare - WHERE workorder_name LIKE CONCAT('%', #{produceCode}, '%'); + WHERE workorder_name LIKE CONCAT('%', #{produceCode}, '%') + and del_flag='0' @@ -437,5 +438,67 @@ - +