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

生产报工加传ERP物料号的存储

Browse Source
This commit is contained in:
彭枝刚 2024-11-25 13:41:40 +08:00
parent 2f6b5deaf3
commit 6acb0fe8c5
6 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mes-api/src/main/java/com/foreverwin/iep/prd/entity/ZLotMaterialCompleteTransaction.java
View File

@ -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;
/**
* 物料主单位
*/

3
mes-api/src/main/java/com/foreverwin/iep/prd/entity/ZLotMaterialConsumptionTransaction.java
View File

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

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

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

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

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

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

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

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

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