From 2988145f8792582f89ddcf0dc5650a1c906f23df Mon Sep 17 00:00:00 2001 From: mengjiao <3338049200@qq,com> Date: Wed, 21 May 2025 17:58:47 +0800 Subject: [PATCH] =?UTF-8?q?wms=E6=8A=A5=E9=94=99=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/op/mes/domain/MesReportWork.java | 12 +++++++++++- .../java/com/op/mes/mapper/MesReportWorkMapper.java | 2 ++ .../mes/service/impl/MesReportWorkServiceImpl.java | 4 ++++ .../resources/mapper/mes/MesReportWorkMapper.xml | 9 +++++++++ .../op/wms/controller/WmsToWCSmissionController.java | 4 ++-- .../com/op/wms/mapper/OdsProcureOrderMapper.java | 2 +- .../java/com/op/wms/mapper/WmsRawOrderInMapper.java | 7 ++++--- .../com/op/wms/service/IOdsProcureOrderService.java | 2 +- .../wms/service/impl/OdsProcureOrderServiceImpl.java | 10 +++++----- 9 files changed, 39 insertions(+), 13 deletions(-) diff --git a/op-modules/op-mes/src/main/java/com/op/mes/domain/MesReportWork.java b/op-modules/op-mes/src/main/java/com/op/mes/domain/MesReportWork.java index c606e6b34..347786051 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/domain/MesReportWork.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/domain/MesReportWork.java @@ -81,7 +81,9 @@ public class MesReportWork extends BaseEntity { /** 物料消耗数量 */ @Excel(name = "物料消耗数量") private BigDecimal quantity; - + /** 物料消耗数量 */ + @Excel(name = "入库数量") + private BigDecimal RKquantity; /** 物料消耗数量 */ @Excel(name = "物料消耗单位") private String materialNameUnit; @@ -218,6 +220,14 @@ public class MesReportWork extends BaseEntity { return checkResult; } + public BigDecimal getRKquantity() { + return RKquantity; + } + + public void setRKquantity(BigDecimal RKquantity) { + this.RKquantity = RKquantity; + } + public void setCheckResult(String checkResult) { this.checkResult = checkResult; } diff --git a/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesReportWorkMapper.java b/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesReportWorkMapper.java index 6112afc88..3ce5e9651 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesReportWorkMapper.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesReportWorkMapper.java @@ -246,4 +246,6 @@ public interface MesReportWorkMapper { int deleteConsume(@Param("list") List list); List getClearConsum(String workorderCode); + + BigDecimal selectWmsProductPut(MesReportWork mesReportWork1); } diff --git a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesReportWorkServiceImpl.java b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesReportWorkServiceImpl.java index d9fdb886d..b1c4a962f 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesReportWorkServiceImpl.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesReportWorkServiceImpl.java @@ -161,6 +161,10 @@ public class MesReportWorkServiceImpl implements IMesReportWorkService { @DS("#header.poolName") public List getReportWorkHzList(MesReportWork mesReportWork) { List dtos = mesReportWorkMapper.getReportWorkHzList(mesReportWork); + for (MesReportWork mesReportWork1:dtos){ + BigDecimal RK= mesReportWorkMapper.selectWmsProductPut(mesReportWork1); + mesReportWork1.setRKquantity(RK); + } return dtos; } diff --git a/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkMapper.xml b/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkMapper.xml index 342ae6fc8..a9b93f9bc 100644 --- a/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkMapper.xml +++ b/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkMapper.xml @@ -1765,4 +1765,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" create_time = #{item.attr2} + diff --git a/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsToWCSmissionController.java b/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsToWCSmissionController.java index ddc69d80b..d344411ce 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsToWCSmissionController.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsToWCSmissionController.java @@ -913,8 +913,8 @@ public class WmsToWCSmissionController { //用于一键退货入库--入参procureCode @PostMapping("/selectOrderCardTLTWO") public AjaxResult selectOrderCardTLTWO(@RequestBody OdsProcureOrder odsProcureOrder) { - OdsProcureOrder odsProcureOrder1 = odsProcureOrderService.selectOrderCardTLTWO(odsProcureOrder); - return success(odsProcureOrder1); + List orderList = odsProcureOrderService.selectOrderCardTLTWO(odsProcureOrder); + return success(orderList); } // @PostMapping("/addOrderCard") diff --git a/op-modules/op-wms/src/main/java/com/op/wms/mapper/OdsProcureOrderMapper.java b/op-modules/op-wms/src/main/java/com/op/wms/mapper/OdsProcureOrderMapper.java index 838aa536a..8026d2f26 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/mapper/OdsProcureOrderMapper.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/mapper/OdsProcureOrderMapper.java @@ -128,5 +128,5 @@ public interface OdsProcureOrderMapper { public List selectOdsProcureOrderListT(OdsProcureOrder odsProcureOrder); - public OdsProcureOrder selectOdsProcureOrderCardTLTWO(OdsProcureOrder odsProcureOrder); + public List selectOdsProcureOrderCardTLTWO(OdsProcureOrder odsProcureOrder); } diff --git a/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsRawOrderInMapper.java b/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsRawOrderInMapper.java index 1be2d1645..3d61ff11a 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsRawOrderInMapper.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsRawOrderInMapper.java @@ -4,9 +4,10 @@ import java.util.List; import com.op.wms.domain.WmsRawOrderIn; import com.op.wms.domain.WmsToWCSDTO; +import org.apache.ibatis.annotations.Param; /** - * 包材到货单Mapper接口 + * 包材到货单Mapper接口s * * @author Open Platform * @date 2023-08-30 @@ -66,11 +67,11 @@ public interface WmsRawOrderInMapper { List finishedProductRequestInboundsn(WmsToWCSDTO wcsdto); - WmsRawOrderIn selectWmsRawOrderInByRawOrderInIdTWO(String rawOrderInId); + WmsRawOrderIn selectWmsRawOrderInByRawOrderInIdTWO(@Param("ID")String rawOrderInId); String selectQcCheckTask(WmsRawOrderIn wmsRawOrderIn1); - WmsRawOrderIn selectWmsRawOrderInByRawOrderInIdThress(String id); + WmsRawOrderIn selectWmsRawOrderInByRawOrderInIdThress(@Param("rawOrderInId")String id); List listInspectionReport(WmsRawOrderIn wmsRawOrderIn); } diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/IOdsProcureOrderService.java b/op-modules/op-wms/src/main/java/com/op/wms/service/IOdsProcureOrderService.java index 9ae074e1a..0050ecd50 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/service/IOdsProcureOrderService.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/service/IOdsProcureOrderService.java @@ -161,5 +161,5 @@ public interface IOdsProcureOrderService { List PurchaseOrderPdaT(OdsProcureOrder odsProcureOrder); - OdsProcureOrder selectOrderCardTLTWO(OdsProcureOrder odsProcureOrder); + List selectOrderCardTLTWO(OdsProcureOrder odsProcureOrder); } diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOrderServiceImpl.java b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOrderServiceImpl.java index 5f871c2f7..c74f126f3 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOrderServiceImpl.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOrderServiceImpl.java @@ -1791,11 +1791,11 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService { } @Override - public OdsProcureOrder selectOrderCardTLTWO(OdsProcureOrder odsProcureOrder) { + public List selectOrderCardTLTWO(OdsProcureOrder odsProcureOrder) { //送货单，采购单，行项目，物料编码，物料名称，工厂号，托盘，状态，实际收货 DynamicDataSourceContextHolder.push("ds_" + odsProcureOrder.getFactoryCode()); - OdsProcureOrder order= odsProcureOrderMapper.selectOdsProcureOrderCardTLTWO(odsProcureOrder); - return order; + List orderList= odsProcureOrderMapper.selectOdsProcureOrderCardTLTWO(odsProcureOrder); + return orderList; } @@ -2096,7 +2096,7 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService { wmsOdsMateStorageNews.setStorageAmount(wmsRawOrderInSn1.getAmount()); wmsOdsMateStorageNewsMapper.updateWmsOdsMateStorageNewsUpdateStorageAmount(wmsOdsMateStorageNews); } - wmsRawOrderIn.setOrderStatus("0"); + wmsRawOrderIn.setOrderStatus("1"); wmsRawOrderIn.setAccountingTime(new Date()); wmsRawOrderIn.setAccountingMessage(result2.getMsg()); wmsRawOrderIn.setUserDefined4(MATERIALDOCUMENT); @@ -3336,7 +3336,7 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService { wmsOdsMateStorageNews.setStorageAmount(wmsRawOrderInSn1.getAmount()); wmsOdsMateStorageNewsMapper.updateWmsOdsMateStorageNewsUpdateStorageAmountFC(wmsOdsMateStorageNews); } - wmsRawOrderIn.setOrderStatus("1"); + wmsRawOrderIn.setOrderStatus("0"); wmsRawOrderIn.setAccountingTime(new Date()); wmsRawOrderIn.setUserDefined10(result2.getMsg()); // wmsRawOrderIn.setUserDefined4(MATERIALDOCUMENT);