From eae3aba05942b59bea3195d9e0247509e00309db Mon Sep 17 00:00:00 2001 From: mengjiao <3338049200@qq,com> Date: Wed, 18 Sep 2024 13:56:00 +0800 Subject: [PATCH] =?UTF-8?q?wms=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/op/wms/domain/OdsProcureOutOrder.java | 10 ++++++++++ .../op/wms/mapper/OdsProcureOutOrderMapper.java | 2 ++ .../service/impl/OdsProcureOrderServiceImpl.java | 11 +++++++---- .../impl/OdsProcureOutOrderServiceImpl.java | 11 +++++++++++ .../mapper/wms/OdsProcureOutOrderMapper.xml | 16 +++++++++++++--- .../mapper/wms/WmsOdsMateStorageNewsSnMapper.xml | 3 ++- .../mapper/wms/WmsProductPutRecordsMapper.xml | 3 ++- 7 files changed, 47 insertions(+), 9 deletions(-) diff --git a/op-modules/op-wms/src/main/java/com/op/wms/domain/OdsProcureOutOrder.java b/op-modules/op-wms/src/main/java/com/op/wms/domain/OdsProcureOutOrder.java index 5d17b96a..61bc0075 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/domain/OdsProcureOutOrder.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/domain/OdsProcureOutOrder.java @@ -172,6 +172,16 @@ public class OdsProcureOutOrder extends BaseEntity { */ @Excel(name = "已出库数量") private BigDecimal outNumber; + @Excel(name = "报工数量") + private BigDecimal BGNumber; + + public BigDecimal getBGNumber() { + return BGNumber; + } + + public void setBGNumber(BigDecimal BGNumber) { + this.BGNumber = BGNumber; + } /** * 库位编号 diff --git a/op-modules/op-wms/src/main/java/com/op/wms/mapper/OdsProcureOutOrderMapper.java b/op-modules/op-wms/src/main/java/com/op/wms/mapper/OdsProcureOutOrderMapper.java index 21f1d408..d5f90ef5 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/mapper/OdsProcureOutOrderMapper.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/mapper/OdsProcureOutOrderMapper.java @@ -127,4 +127,6 @@ public interface OdsProcureOutOrderMapper { public List selectPreDetailHzList(OdsProcureOutOrder odsProcureOutOrder); public List selectWmsOdsProcureOutOrderByOrderStatus(OdsProcureOutOrder order); + + String selectMesReportWorkConsume(OdsProcureOutOrder order); } 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 7f235470..2452f8b5 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 @@ -1176,10 +1176,12 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService { }else{ dtos.addAll(dtos0); } -// for (OdsProcureOrder order1: -// dtos ) { -// -// } + for (OdsProcureOrder order1: + dtos ) { + String materialCode= order1.getMaterialCode();//000000040000004873 + materialCode = materialCode.replaceFirst("^0{7}", ""); // 只替换开头的7个0 + order1.setMaterialCode(materialCode); + } String msg= dayin(dtos); return msg; } @@ -1700,6 +1702,7 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService { sapBackflushMPQuery.setPlant(odsProcureOutOrder.getSiteCode()); //工厂 String lgort = baseWarehouseMapper.selectByCode(odsProcureOutOrder.getLocCode()); sapBackflushMPQuery.setLgort(lgort);//库存地点 + sapBackflushMPQuery.setUmlgo("0013"); sapBackflushMPQuery.setMatnr(odsProcureOutOrder.getMaterialCode());//物料号 sapBackflushMPQuery.setQuantity(odsProcureOutOrder.getOutNumber().toString()); //数量 sapBackflushMPQuery.setMeins(odsProcureOutOrder.getUnit()); //基本计量单位 diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOutOrderServiceImpl.java b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOutOrderServiceImpl.java index 95df0c70..f79579c4 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOutOrderServiceImpl.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOutOrderServiceImpl.java @@ -1,5 +1,6 @@ package com.op.wms.service.impl; +import java.math.BigDecimal; import java.util.ArrayList; import java.util.List; @@ -136,6 +137,16 @@ public class OdsProcureOutOrderServiceImpl implements IOdsProcureOutOrderService @DS("#header.poolName") public List selectOdsProcureOutOrderListZC(OdsProcureOutOrder odsProcureOutOrder) { List orderList = odsProcureOutOrderMapper.selectOdsProcureOutOrderListZC(odsProcureOutOrder); + for (OdsProcureOutOrder order: + orderList) { + if (order.getUserDefined4().length()>10){ + String tem= odsProcureOutOrderMapper.selectMesReportWorkConsume(order); + order.setBGNumber(new BigDecimal(tem)); + }else { + + } + } + return orderList; } } 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 60c54b15..9947a776 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 @@ -647,7 +647,8 @@ and Site_code = #{siteCode} and Produce_Code = #{produceCode} - and Material_Code = #{materialCode} + and Material_Code like concat('%', #{materialCode}, + '%') and Material_Desc = #{materialDesc} and Plan_Date = #{planDate} and Plan_Number = #{planNumber} @@ -806,7 +807,7 @@ wms_ods_procure_out_order LEFT JOIN wms_raw_mission_out ON wms_raw_mission_out.prd_order = wms_ods_procure_out_order.Produce_Code AND wms_raw_mission_out.material_code = wms_ods_procure_out_order.Material_Code - where wms_ods_procure_out_order.ID + where wms_ods_procure_out_order.ID IN #{odsProcureOutOrder.ID} @@ -1057,7 +1058,7 @@ wms_raw_mission_out WHERE prd_order=#{produceCode} AND - material_code=#{Material_Code} + material_code=#{materialCode} + diff --git a/op-modules/op-wms/src/main/resources/mapper/wms/WmsOdsMateStorageNewsSnMapper.xml b/op-modules/op-wms/src/main/resources/mapper/wms/WmsOdsMateStorageNewsSnMapper.xml index bf2a85d0..f0656dc2 100644 --- a/op-modules/op-wms/src/main/resources/mapper/wms/WmsOdsMateStorageNewsSnMapper.xml +++ b/op-modules/op-wms/src/main/resources/mapper/wms/WmsOdsMateStorageNewsSnMapper.xml @@ -50,7 +50,8 @@ and order_no = #{orderNo} and po_no = #{poNo} and po_line = #{poLine} - and material_code = #{materialCode} + and material_code like concat('%', #{materialCode}, + '%') and material_desc = #{materialDesc} and sn = #{sn} and bar_code = #{barCode} diff --git a/op-modules/op-wms/src/main/resources/mapper/wms/WmsProductPutRecordsMapper.xml b/op-modules/op-wms/src/main/resources/mapper/wms/WmsProductPutRecordsMapper.xml index 8e2b4d5d..e97cfc36 100644 --- a/op-modules/op-wms/src/main/resources/mapper/wms/WmsProductPutRecordsMapper.xml +++ b/op-modules/op-wms/src/main/resources/mapper/wms/WmsProductPutRecordsMapper.xml @@ -35,7 +35,8 @@ and work_order = #{workOrder} - and product_order = #{productOrder} + and product_order like concat('%', #{productOrder} , + '%') and product_name like concat('%', #{productName}, '%')