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 1/3] =?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 @@ - + From 818d395e3d1f5b080d536ef37fa8d876cdaf3129 Mon Sep 17 00:00:00 2001 From: mengjiao <3338049200@qq,com> Date: Mon, 21 Oct 2024 14:01:34 +0800 Subject: [PATCH 2/3] =?UTF-8?q?wms=E9=83=A8=E5=88=86=E4=BF=AE=E6=94=B92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WmsSellOutEmbryoController.java | 9 ++ .../com/op/wms/domain/WmsSellOutEmbryo.java | 10 +++ .../wms/mapper/WmsFpStorageNewsSnMapper.java | 2 + .../op/wms/mapper/WmsSellOutEmbryoMapper.java | 2 + .../impl/WmsProductPutServiceImpl.java | 18 ++++ .../impl/WmsSellOutEmbryoServiceImpl.java | 6 +- .../mapper/wms/WmsFpStorageNewsSnMapper.xml | 71 ++++++++++++++-- .../mapper/wms/WmsSellOutEmbryoMapper.xml | 85 ++++++++++++++++++- 8 files changed, 196 insertions(+), 7 deletions(-) diff --git a/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsSellOutEmbryoController.java b/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsSellOutEmbryoController.java index cd1e0d8ca..c9a37c696 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsSellOutEmbryoController.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsSellOutEmbryoController.java @@ -46,7 +46,16 @@ public class WmsSellOutEmbryoController extends BaseController { List list = wmsSellOutEmbryoService.selectWmsSellOutEmbryoList(wmsSellOutEmbryo); return getDataTable(list); } + /** + * 查询成品销售出库列表 + */ + @GetMapping("/listRE") + public TableDataInfo listRE(WmsSellOutEmbryo wmsSellOutEmbryo) { + startPage(); + List list = wmsSellOutEmbryoService.selectWmsSellOutEmbryoREList(wmsSellOutEmbryo); + return getDataTable(list); + } /** * 导出成品销售出库列表 */ diff --git a/op-modules/op-wms/src/main/java/com/op/wms/domain/WmsSellOutEmbryo.java b/op-modules/op-wms/src/main/java/com/op/wms/domain/WmsSellOutEmbryo.java index b39f2893c..73285102b 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/domain/WmsSellOutEmbryo.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/domain/WmsSellOutEmbryo.java @@ -54,6 +54,16 @@ public class WmsSellOutEmbryo extends BaseEntity { @Excel(name = "库区编码") private String waCode; + private String stockOrder; + + public String getStockOrder() { + return stockOrder; + } + + public void setStockOrder(String stockOrder) { + this.stockOrder = stockOrder; + } + /** * 库位编码 */ 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 9305c1f52..e222a3785 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 @@ -91,4 +91,6 @@ public interface WmsFpStorageNewsSnMapper { public List selectBSKList(WmsFpStorageNewsSn proOrderWorkorder); List selectWmsFpStorageNewsSnSTList(WmsFpStorageNewsSn wmsFpStorageNewsSn); + + public void insertWmsFpStorageNewsSnRecords(WmsFpStorageNewsSn wmsFpStorageNewsSn3); } diff --git a/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsSellOutEmbryoMapper.java b/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsSellOutEmbryoMapper.java index 314427897..b78de1f44 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsSellOutEmbryoMapper.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsSellOutEmbryoMapper.java @@ -85,4 +85,6 @@ public interface WmsSellOutEmbryoMapper { void updateWmsAllocationOutEmbryo(WmsAllocationOutEmbryo wmsAllocationOutEmbryo); void updateWmsSellOutEmbryotwo(WmsSellOutEmbryo wmsSellOutEmbryoUpdate); + + List selectWmsSellOutEmbryoREList(WmsSellOutEmbryo wmsSellOutEmbryo); } 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 911d0af38..286cf0de7 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 @@ -857,6 +857,24 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService { wmsFpStorageNewsSn1.setProductCode(wmsSellOutEmbryo1.getProductCode()); wmsFpStorageNewsSnMapper.updateWmsFpStorageNewsSnOut(wmsFpStorageNewsSn1); WmsFpStorageNewsSn wmsFpStorageNewsSn2= wmsFpStorageNewsSnMapper.selectWmsFpStorageNewsSnByStorageId(wmsFpStorageNewsSn.getStorageId()); + WmsFpStorageNewsSn wmsFpStorageNewsSn3=new WmsFpStorageNewsSn(); + wmsFpStorageNewsSn3.setStorageId(IdUtils.fastSimpleUUID()); + wmsFpStorageNewsSn3.setWhCode(wmsFpStorageNewsSn2.getWhCode()); + wmsFpStorageNewsSn3.setWaCode(wmsFpStorageNewsSn2.getWaCode()); + wmsFpStorageNewsSn3.setWlCode(wmsFpStorageNewsSn2.getWlCode()); + wmsFpStorageNewsSn3.setOrderNo(wmsFpStorageNewsSn2.getOrderNo()); + wmsFpStorageNewsSn3.setProductCode(wmsFpStorageNewsSn2.getProductCode()); + wmsFpStorageNewsSn3.setProductName(wmsFpStorageNewsSn2.getProductName()); + wmsFpStorageNewsSn3.setSn(wmsFpStorageNewsSn2.getSn()); + wmsFpStorageNewsSn3.setBatchNumber(wmsFpStorageNewsSn2.getBatchNumber()); + wmsFpStorageNewsSn3.setUserDefined3(wmsFpStorageNewsSn2.getUserDefined3()); + wmsFpStorageNewsSn3.setCreateTime(new Date()); + wmsFpStorageNewsSn3.setCreateBy(wmsFpStorageNewsSn2.getCreateBy()); + wmsFpStorageNewsSn3.setActiveFlag(wmsFpStorageNewsSn2.getActiveFlag()); + wmsFpStorageNewsSn3.setAmount(wmsFpStorageNewsSn.getAmount()); + wmsFpStorageNewsSn3.setBarCode(wmsSellOutEmbryo.getId()); + wmsFpStorageNewsSn3.setFactoryCode(wmsSellOutEmbryo.getFactoryCode()); + wmsFpStorageNewsSnMapper.insertWmsFpStorageNewsSnRecords(wmsFpStorageNewsSn3); WmsFpStorageNews wmsFpStorageNews=new WmsFpStorageNews(); wmsFpStorageNews.setActiveFlag("1"); wmsFpStorageNews.setWlCode(wmsFpStorageNewsSn2.getWlCode()); diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsSellOutEmbryoServiceImpl.java b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsSellOutEmbryoServiceImpl.java index bd6ff541a..9888fb8a8 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsSellOutEmbryoServiceImpl.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsSellOutEmbryoServiceImpl.java @@ -155,7 +155,11 @@ public class WmsSellOutEmbryoServiceImpl implements IWmsSellOutEmbryoService { List wmsSellOutEmbryoList= dayin(); } - + @Override + @DS("#header.poolName") + public List selectWmsSellOutEmbryoREList(WmsSellOutEmbryo wmsSellOutEmbryo) { + return wmsSellOutEmbryoMapper.selectWmsSellOutEmbryoREList(wmsSellOutEmbryo); + } public List dayin( ) { 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 79d716b03..d5c54a27c 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 @@ -268,7 +268,67 @@ #{sapFactoryCode}, - + + insert into wms_fp_storage_news_sn_records + + storage_id, + wh_code, + wa_code, + wl_code, + order_no, + product_name, + product_code, + sn, + bar_code, + amount, + batch_number, + user_defined2, + user_defined3, + user_defined4, + user_defined5, + user_defined6, + user_defined7, + user_defined8, + user_defined9, + user_defined10, + create_by, + gmt_create, + last_modified_by, + gmt_modified, + active_flag, + factory_code, + sap_factory_code, + + + #{storageId}, + #{whCode}, + #{waCode}, + #{wlCode}, + #{orderNo}, + #{productName}, + #{productCode}, + #{sn}, + #{barCode}, + #{amount}, + #{batchNumber}, + #{userDefined2}, + #{userDefined3}, + #{userDefined4}, + #{userDefined5}, + #{userDefined6}, + #{userDefined7}, + #{userDefined8}, + #{userDefined9}, + #{userDefined10}, + #{createBy}, + #{gmtCreate}, + #{lastModifiedBy}, + #{gmtModified}, + #{activeFlag}, + #{factoryCode}, + #{sapFactoryCode}, + + update wms_fp_storage_news_sn @@ -313,9 +373,10 @@ - update wms_fp_storage_news_sn - set user_defined2 =user_defined2+ #{userDefined2} - where storage_id=#{storageId} and active_flag='1' + UPDATE wms_fp_storage_news_sn + SET user_defined2 = COALESCE(user_defined2, 0) + #{userDefined2} -- 如果user_defined2为NULL，则先将其设置为0再进行加法 + WHERE storage_id = #{storageId} + AND active_flag = '1'; - +