From 1d8fb1e3f11c98a038ea9adf6d3a5e9177c5e094 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 17:04:33 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E4=B8=8B=E6=96=99=E5=85=A5?=
 =?UTF-8?q?=E5=BA=93=E7=9A=84=E6=9F=90=E4=BA=9B=E5=AD=97=E6=AE=B5=E5=AD=98?=
 =?UTF-8?q?=E5=82=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/foreverwin/iep/wip/dto/LotMaterialDTO.java  | 1 +
 .../impl/ZLotMaterialConsumptionTransactionServiceImpl.java   | 4 ++--
 .../iep/wip/service/impl/LotMaterialServiceImpl.java          | 2 +-
 .../java/com/foreverwin/iep/wip/mapper/LotMaterialMapper.java | 2 +-
 mes-db/src/main/resources/mapper/wip/LotMaterialMapper.xml    | 4 +++-
 5 files changed, 8 insertions(+), 5 deletions(-)

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 d6c46fbf..b904a41e 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
@@ -52,4 +52,5 @@ public class LotMaterialDTO extends LotMaterial {
     private String resrce;
     private String fabNo;
     private String workCenter;
+    private String unitAuxiliary;
 }
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 631aceb1..62d49308 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
@@ -51,8 +51,8 @@ public class ZLotMaterialConsumptionTransactionServiceImpl extends ServiceImpl<Z
                 mtrConTran.setErpItem(dto.getErpItem());
                 mtrConTran.setMainUom(dto.getUom());
                 mtrConTran.setMainQty(dto.getConsumeQty());
-                mtrConTran.setSubUom(resultZLotMaterialCompleteTransaction.getSubUom());
-                mtrConTran.setSubQty(resultZLotMaterialCompleteTransaction.getSubQty());
+                mtrConTran.setSubUom(dto.getUnitAuxiliary());
+                // mtrConTran.setSubQty(resultZLotMaterialCompleteTransaction.getSubQty());
                 mtrConTran.setWarehouseCode(dto.getWarehouse());
                 mtrConTran.setStorageLocation(dto.getStorageLocation());
                 mtrConTran.setStorageBin(dto.getStorageBin());
diff --git a/mes-core/src/main/java/com/foreverwin/iep/wip/service/impl/LotMaterialServiceImpl.java b/mes-core/src/main/java/com/foreverwin/iep/wip/service/impl/LotMaterialServiceImpl.java
index f3aebe59..2bdb6177 100644
--- a/mes-core/src/main/java/com/foreverwin/iep/wip/service/impl/LotMaterialServiceImpl.java
+++ b/mes-core/src/main/java/com/foreverwin/iep/wip/service/impl/LotMaterialServiceImpl.java
@@ -99,6 +99,6 @@ public class LotMaterialServiceImpl extends ExpansionServiceImpl<LotMaterialMapp
 
     @Override
     public List<LotMaterialDTO> selectLotMaterialByLotBasisBo(String lotBasisBo) {
-        return this.baseMapper.selectLotMaterialByLotBasisBo(lotBasisBo);
+        return this.baseMapper.selectLotMaterialByLotBasisBo(lotBasisBo,TenantContextHolder.getTenantId());
     }
 }
diff --git a/mes-db/src/main/java/com/foreverwin/iep/wip/mapper/LotMaterialMapper.java b/mes-db/src/main/java/com/foreverwin/iep/wip/mapper/LotMaterialMapper.java
index 9a1a54dd..3c1b4f61 100644
--- a/mes-db/src/main/java/com/foreverwin/iep/wip/mapper/LotMaterialMapper.java
+++ b/mes-db/src/main/java/com/foreverwin/iep/wip/mapper/LotMaterialMapper.java
@@ -31,6 +31,6 @@ public interface LotMaterialMapper extends ExpansionBaseMapper<LotMaterial> {
                                                   @Param("operation") String operation,
                                                   @Param("lotNoList") List<String> lotNoList);
 
-    List<LotMaterialDTO> selectLotMaterialByLotBasisBo(@Param("lotBasisBo") String lotBasisBo);
+    List<LotMaterialDTO> selectLotMaterialByLotBasisBo(@Param("lotBasisBo") String lotBasisBo,@Param("site") String site);
 
 }
diff --git a/mes-db/src/main/resources/mapper/wip/LotMaterialMapper.xml b/mes-db/src/main/resources/mapper/wip/LotMaterialMapper.xml
index 0ef73d3f..18eedd89 100644
--- a/mes-db/src/main/resources/mapper/wip/LotMaterialMapper.xml
+++ b/mes-db/src/main/resources/mapper/wip/LotMaterialMapper.xml
@@ -41,6 +41,7 @@
 		<result property="resrce" column="RESRCE"/>
 		<result property="fabNo" column="FAB_NO"/>
 		<result property="workCenter" column="WORK_CENTER"/>
+		<result property="unitAuxiliary" column="UNIT_AUXILIARY"/>
 	</resultMap>
 	<select id="selectByMaterialLot" resultMap="lotMaterialMap">
 		select a.*
@@ -122,9 +123,10 @@
 	<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,i.ERP_ITEM,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,cf.FIELD_VALUE UNIT_AUXILIARY,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 custom_fields cf on cf.TABLE_NAME = 'ITEM' and cf.FIELD_NAME = 'UNIT_AUXILIARY' and i.HANDLE = cf.HANDLE
 				 left join shop_order so on so.HANDLE = lm.SHOP_ORDER_BO
 				 left join wms.wms_warehouse ww on ww.HANDLE = lm.WMS_WAREHOUSE_BO
 				 left join wms.wms_storage_bin wsb on wsb.HANDLE = lm.WMS_STORAGE_BIN_BO