From b87576a1eb8ab673e3dd79e4df41d83d02041143 Mon Sep 17 00:00:00 2001 From: mengjiao <3338049200@qq,com> Date: Thu, 21 Mar 2024 10:57:03 +0800 Subject: [PATCH] =?UTF-8?q?wms=E6=88=90=E5=93=81=E5=87=BA=E5=BA=93?= =?UTF-8?q?=E9=83=A8=E5=88=86=E4=BB=A3=E7=A0=81=E4=BF=AE=E6=94=B917?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WmsSellOutTrayController.java | 4 +- .../com/op/wms/domain/WmsSellOutEmbryo.java | 25 ++++++--- .../op/wms/mapper/WmsFpStorageNewsMapper.java | 2 + .../wms/mapper/WmsFpStorageNewsSnMapper.java | 2 + .../op/wms/service/IWmsProductPutService.java | 5 +- .../impl/WmsProductPutServiceImpl.java | 51 ++++++++++++++++++- .../mapper/wms/WmsFpStorageNewsMapper.xml | 5 ++ .../mapper/wms/WmsFpStorageNewsSnMapper.xml | 5 ++ 8 files changed, 88 insertions(+), 11 deletions(-) diff --git a/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsSellOutTrayController.java b/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsSellOutTrayController.java index 52a91f9c5..50d030582 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsSellOutTrayController.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsSellOutTrayController.java @@ -107,7 +107,7 @@ public class WmsSellOutTrayController extends BaseController { /** - * 手持销售出库确认 + * 手持销售出库确认----不用 * * @param wmsSellOutTrays * @return @@ -118,7 +118,7 @@ public class WmsSellOutTrayController extends BaseController { String deliveryOrder = opsForValue.get("deliveryOrder"); String productCode = opsForValue.get("productCode"); WmsSellOutEmbryo wmsSellOutEmbryo = wmsSellOutEmbryoService.selectWmsSellOutEmbryoByOrderCodeAndProductCode(deliveryOrder, productCode); - wmsSellOutEmbryo.setOutQuantity(number); + // wmsSellOutEmbryo.setOutQuantity(number); wmsSellOutEmbryoService.updateWmsSellOutEmbryo(wmsSellOutEmbryo); return toAjax(wmsSellOutTrayService.handSellOut(wmsSellOutTrays)); } 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 5dca69149..d3ebfd06c 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 @@ -1,6 +1,8 @@ package com.op.wms.domain; +import java.math.BigDecimal; import java.util.Date; +import java.util.List; import com.fasterxml.jackson.annotation.JsonFormat; import org.apache.commons.lang3.builder.ToStringBuilder; @@ -104,16 +106,16 @@ public class WmsSellOutEmbryo extends BaseEntity { * 计划出库数量 */ @Excel(name = "计划出库数量") - private Long planQuantity; + private BigDecimal planQuantity; /** * 出库数量 */ @Excel(name = "出库数量") - private Long outQuantity; + private BigDecimal outQuantity; /** - * 出库状态 + * 出库状态--0进行，1完成 */ @Excel(name = "出库状态") private String status; @@ -207,6 +209,15 @@ public class WmsSellOutEmbryo extends BaseEntity { */ @Excel(name = "有效标记") private String activeFlag; + private List wmsProductPutTrayCodeList; + + public List getWmsProductPutTrayCodeList() { + return wmsProductPutTrayCodeList; + } + + public void setWmsProductPutTrayCodeList(List wmsProductPutTrayCodeList) { + this.wmsProductPutTrayCodeList = wmsProductPutTrayCodeList; + } public String getActiveFlag() { return activeFlag; @@ -328,19 +339,19 @@ public class WmsSellOutEmbryo extends BaseEntity { return lotNumber; } - public void setPlanQuantity(Long planQuantity) { + public void setPlanQuantity(BigDecimal planQuantity) { this.planQuantity = planQuantity; } - public Long getPlanQuantity() { + public BigDecimal getPlanQuantity() { return planQuantity; } - public void setOutQuantity(Long outQuantity) { + public void setOutQuantity(BigDecimal outQuantity) { this.outQuantity = outQuantity; } - public Long getOutQuantity() { + public BigDecimal getOutQuantity() { return outQuantity; } diff --git a/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsFpStorageNewsMapper.java b/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsFpStorageNewsMapper.java index 6eba004de..2ad378691 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsFpStorageNewsMapper.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsFpStorageNewsMapper.java @@ -73,4 +73,6 @@ public interface WmsFpStorageNewsMapper { * @return */ public WmsFpStorageNews selectWmsFpStorageNewsByProductCodeAndWlCode(@Param("productCode") String productCode, @Param("wlCode") String wlCode); + + void updateWmsFpStorageNewsOut(WmsFpStorageNews wmsFpStorageNews); } 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 cdf74704d..ef4f5d3a0 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 @@ -76,4 +76,6 @@ public interface WmsFpStorageNewsSnMapper { * @return */ public WmsFpStorageNewsSn selectWmsFpStorageNewsSnBySnAndProductCode(@Param("sn") String sn, @Param("productCode") String productCode); + + void updateWmsFpStorageNewsSnOut(WmsFpStorageNewsSn wmsFpStorageNewsSn); } diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/IWmsProductPutService.java b/op-modules/op-wms/src/main/java/com/op/wms/service/IWmsProductPutService.java index f6ec26b5b..807868122 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/service/IWmsProductPutService.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/service/IWmsProductPutService.java @@ -88,7 +88,10 @@ public interface IWmsProductPutService { String deletSnCorrelationBarcode(WmsProductPutTrayCode wmsProductPutTrayCode); List selectFinishedProductSales(WmsSellOutEmbryo wmsSellOutEmbryo); - + /** + * 成品销售出库--确认接口 + * + */ String confirmFinishedProductSales(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 e9cb38150..7599edef1 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 @@ -679,7 +679,56 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService { @Override public String confirmFinishedProductSales(WmsSellOutEmbryo wmsSellOutEmbryo) { - return null; + String result1="出库成功"; + DynamicDataSourceContextHolder.push("ds_" + wmsSellOutEmbryo.getFactoryCode()); + List wmsProductPutTrayCodeList= wmsSellOutEmbryo.getWmsProductPutTrayCodeList(); + //成品销售出库--确认接口---修改出库单，--出库库存 + WmsSellOutEmbryo wmsSellOutEmbryo1 = wmsSellOutEmbryoMapper.selectWmsSellOutEmbryoById(wmsSellOutEmbryo.getId()); + Integer tem= wmsProductPutTrayCodeList.size(); + BigDecimal OutQuantity= wmsSellOutEmbryo1.getOutQuantity().add(new BigDecimal(tem)); + 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(wmsSellOutEmbryo); + //订单修改完成 + 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); + } + } + //改主表 + WmsFpStorageNews wmsFpStorageNews=new WmsFpStorageNews(); + wmsFpStorageNews.setActiveFlag("1"); + wmsFpStorageNews.setWlCode(wmsProductPutTrayCode.getWlCode()); + wmsFpStorageNews.setProductCode(wmsSellOutEmbryo1.getProductCode()); + wmsFpStorageNewsMapper.updateWmsFpStorageNewsOut(wmsFpStorageNews); + } + return result1; } @Override 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 94ff200ab..745e4c1ff 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 @@ -290,4 +290,9 @@ #{storageId} + + update wms_fp_storage_news + set amount = COALESCE(amount, 0) - 1 + where product_code = #{productCode} and wl_code = #{wlCode} and active_flag='1' + 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 208e47042..9210d7152 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 @@ -248,4 +248,9 @@ #{storageId} + + update wms_fp_storage_news_sn + set user_defined2 = COALESCE(user_defined2, 0) + 1 + where sn=#{sn} and active_flag='1' +