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 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 { @Param("operation") String operation, @Param("lotNoList") List lotNoList); - List selectLotMaterialByLotBasisBo(@Param("lotBasisBo") String lotBasisBo); + List 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 @@ + 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