From 6acb0fe8c56eb6df3f4a723103dc1fda6881fad0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BD=AD=E6=9E=9D=E5=88=9A?= <snow_peng@semi-tech.com>
Date: Mon, 25 Nov 2024 13:41:40 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E6=8A=A5=E5=B7=A5=E5=8A=A0?=
 =?UTF-8?q?=E4=BC=A0ERP=E7=89=A9=E6=96=99=E5=8F=B7=E7=9A=84=E5=AD=98?=
 =?UTF-8?q?=E5=82=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../iep/prd/entity/ZLotMaterialCompleteTransaction.java        | 3 +++
 .../iep/prd/entity/ZLotMaterialConsumptionTransaction.java     | 3 +++
 .../main/java/com/foreverwin/iep/wip/dto/LotMaterialDTO.java   | 1 +
 .../impl/ZLotMaterialCompleteTransactionServiceImpl.java       | 1 +
 .../impl/ZLotMaterialConsumptionTransactionServiceImpl.java    | 1 +
 mes-db/src/main/resources/mapper/wip/LotMaterialMapper.xml     | 3 ++-
 6 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/mes-api/src/main/java/com/foreverwin/iep/prd/entity/ZLotMaterialCompleteTransaction.java b/mes-api/src/main/java/com/foreverwin/iep/prd/entity/ZLotMaterialCompleteTransaction.java
index 1f2671c9..ee6b3bd5 100644
--- a/mes-api/src/main/java/com/foreverwin/iep/prd/entity/ZLotMaterialCompleteTransaction.java
+++ b/mes-api/src/main/java/com/foreverwin/iep/prd/entity/ZLotMaterialCompleteTransaction.java
@@ -117,6 +117,9 @@ public class ZLotMaterialCompleteTransaction extends Model<ZLotMaterialCompleteT
     @ApiModelProperty(value="物料编号")
     private String item;
 
+    @ApiModelProperty(value="SAP的物料号MATNR,也就是ITEM的ERP_ITEM")
+    private String erpItem;
+
     /**
      * 物料主单位
      */
diff --git a/mes-api/src/main/java/com/foreverwin/iep/prd/entity/ZLotMaterialConsumptionTransaction.java b/mes-api/src/main/java/com/foreverwin/iep/prd/entity/ZLotMaterialConsumptionTransaction.java
index ea02c764..146b956a 100644
--- a/mes-api/src/main/java/com/foreverwin/iep/prd/entity/ZLotMaterialConsumptionTransaction.java
+++ b/mes-api/src/main/java/com/foreverwin/iep/prd/entity/ZLotMaterialConsumptionTransaction.java
@@ -96,6 +96,9 @@ public class ZLotMaterialConsumptionTransaction extends Model<ZLotMaterialConsum
     @ApiModelProperty(value="消耗组件物料编号")
     private String componentItem;
 
+    @ApiModelProperty(value="SAP的物料号MATNR,也就是ITEM的ERP_ITEM")
+    private String erpItem;
+
     @ApiModelProperty(value="班次")
     private String userWorkShift;
 
diff --git a/mes-api/src/main/java/com/foreverwin/iep/wip/dto/LotMaterialDTO.java b/mes-api/src/main/java/com/foreverwin/iep/wip/dto/LotMaterialDTO.java
index b7427a6b..d6c46fbf 100644
--- a/mes-api/src/main/java/com/foreverwin/iep/wip/dto/LotMaterialDTO.java
+++ b/mes-api/src/main/java/com/foreverwin/iep/wip/dto/LotMaterialDTO.java
@@ -18,6 +18,7 @@ public class LotMaterialDTO extends LotMaterial {
     private String lotNo;
     private String itemBo;
     private String item;
+    private String erpItem;
     private String itemDesc;
     private String itemType;
     private String inputSn;
diff --git a/mes-core/src/main/java/com/foreverwin/iep/prd/service/impl/ZLotMaterialCompleteTransactionServiceImpl.java b/mes-core/src/main/java/com/foreverwin/iep/prd/service/impl/ZLotMaterialCompleteTransactionServiceImpl.java
index 7aa3db34..b0a4c999 100644
--- a/mes-core/src/main/java/com/foreverwin/iep/prd/service/impl/ZLotMaterialCompleteTransactionServiceImpl.java
+++ b/mes-core/src/main/java/com/foreverwin/iep/prd/service/impl/ZLotMaterialCompleteTransactionServiceImpl.java
@@ -71,6 +71,7 @@ public class ZLotMaterialCompleteTransactionServiceImpl extends ServiceImpl<ZLot
         mtrComTrans.setLotSerial(resultZLotMaterialCompleteTransaction.getLotSerial());
         mtrComTrans.setQcGrade(resultZLotMaterialCompleteTransaction.getQcGrade());
         mtrComTrans.setItem(resultZLotMaterialCompleteTransaction.getItem());
+        mtrComTrans.setErpItem(item.getErpItem());
         mtrComTrans.setMainUom(resultZLotMaterialCompleteTransaction.getMainUom());
         mtrComTrans.setMainQty(resultZLotMaterialCompleteTransaction.getMainQty());
         mtrComTrans.setSubUom(resultZLotMaterialCompleteTransaction.getSubUom());
diff --git a/mes-core/src/main/java/com/foreverwin/iep/prd/service/impl/ZLotMaterialConsumptionTransactionServiceImpl.java b/mes-core/src/main/java/com/foreverwin/iep/prd/service/impl/ZLotMaterialConsumptionTransactionServiceImpl.java
index b93b7921..dfb6e718 100644
--- a/mes-core/src/main/java/com/foreverwin/iep/prd/service/impl/ZLotMaterialConsumptionTransactionServiceImpl.java
+++ b/mes-core/src/main/java/com/foreverwin/iep/prd/service/impl/ZLotMaterialConsumptionTransactionServiceImpl.java
@@ -52,6 +52,7 @@ public class ZLotMaterialConsumptionTransactionServiceImpl extends ServiceImpl<Z
                 mtrConTran.setLotSerial(dto.getLotSerial());
                 mtrConTran.setMaterialLot(dto.getMaterialLot());
                 mtrConTran.setComponentItem(dto.getItem());
+                mtrConTran.setErpItem(dto.getErpItem());
                 mtrConTran.setMainUom(dto.getUom());
                 mtrConTran.setMainQty(dto.getConsumeQty());
                 mtrConTran.setSubUom(resultZLotMaterialCompleteTransaction.getSubUom());
diff --git a/mes-db/src/main/resources/mapper/wip/LotMaterialMapper.xml b/mes-db/src/main/resources/mapper/wip/LotMaterialMapper.xml
index f0a158ad..0ef73d3f 100644
--- a/mes-db/src/main/resources/mapper/wip/LotMaterialMapper.xml
+++ b/mes-db/src/main/resources/mapper/wip/LotMaterialMapper.xml
@@ -27,6 +27,7 @@
 	<resultMap id="fullMap" type="com.foreverwin.iep.wip.dto.LotMaterialDTO" extends="lotMaterialMap">
 		<result property="itemBo" column="item_bo"/>
 		<result property="item" column="ITEM"/>
+		<result property="erpItem" column="ERP_ITEM"/>
 		<result property="itemDesc" column="ITEM_DESC"/>
 		<result property="itemType" column="ITEM_TYPE"/>
 		<result property="uom" column="UNIT_OF_MEASURE"/>
@@ -121,7 +122,7 @@
 	<select id="selectLotMaterialByLotBasisBo" resultMap="fullMap">
 		select lm.SID,lm.LOT_STATE_BO,lm.LOT_SERIAL,lm.ITEM_BO,lm.CONSUME_QTY,lm.MATERIAL_LOT,lm.RESERVED,lm.RESERVED_SEQ,
 			   lm.SUPPLIER_NO,lm.SUPPLIER_BATCH,lm.ERP_FLAG ,lm.SHOP_ORDER_BO,lm.WMS_WAREHOUSE_BO ,lm.WMS_STORAGE_BIN_BO,lm.DATE_CREATE,
-			   so.SHOP_ORDER,ww.WAREHOUSE,wsb.STORAGE_BIN,wsl.STORAGE_LOCATION,i.ITEM,i.UNIT_OF_MEASURE,r.RESRCE,fb.FAB_NO,wc.WORK_CENTER
+			   so.SHOP_ORDER,ww.WAREHOUSE,wsb.STORAGE_BIN,wsl.STORAGE_LOCATION,i.ITEM,i.UNIT_OF_MEASURE,i.ERP_ITEM,r.RESRCE,fb.FAB_NO,wc.WORK_CENTER
 		from lot_material lm
 				 left join item i on lm.ITEM_BO = i.HANDLE
 				 left join shop_order so on so.HANDLE = lm.SHOP_ORDER_BO