mes/nalinv-mes
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修正下料入库的某些字段存储

Browse Source
This commit is contained in:
彭枝刚 2024-11-25 17:04:33 +08:00
parent fa9b4f4996
commit 1d8fb1e3f1
5 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
mes-api/src/main/java/com/foreverwin/iep/wip/dto/LotMaterialDTO.java
View File

@ -52,4 +52,5 @@ public class LotMaterialDTO extends LotMaterial {
private String resrce;
private String fabNo;
private String workCenter;
private String unitAuxiliary;
}

4
mes-core/src/main/java/com/foreverwin/iep/prd/service/impl/ZLotMaterialConsumptionTransactionServiceImpl.java
View File

@ -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());

2
mes-core/src/main/java/com/foreverwin/iep/wip/service/impl/LotMaterialServiceImpl.java
View File

@ -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());
}
}

2
mes-db/src/main/java/com/foreverwin/iep/wip/mapper/LotMaterialMapper.java
View File

@ -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);
}

4
mes-db/src/main/resources/mapper/wip/LotMaterialMapper.xml
View File

@ -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