diff --git a/op-api/op-api-system/src/main/java/com/op/system/api/domain/dto/MesPrepareDetailDTO.java b/op-api/op-api-system/src/main/java/com/op/system/api/domain/dto/MesPrepareDetailDTO.java
index 6f566e3c..01d2da62 100644
--- a/op-api/op-api-system/src/main/java/com/op/system/api/domain/dto/MesPrepareDetailDTO.java
+++ b/op-api/op-api-system/src/main/java/com/op/system/api/domain/dto/MesPrepareDetailDTO.java
@@ -84,6 +84,26 @@ public class MesPrepareDetailDTO extends BaseEntity {
private String recoil;
private String buyFlag;
private String parentWorkOrder;
+ //以输入单位计的数量
+ private String erfmg;
+ //条目单位
+ private String erfme;
+
+ public String getErfmg() {
+ return erfmg;
+ }
+
+ public void setErfmg(String erfmg) {
+ this.erfmg = erfmg;
+ }
+
+ public String getErfme() {
+ return erfme;
+ }
+
+ public void setErfme(String erfme) {
+ this.erfme = erfme;
+ }
public String getParentWorkOrder() {
return parentWorkOrder;
diff --git a/op-api/op-api-system/src/main/java/com/op/system/api/domain/sap/SapMaterialPreparation.java b/op-api/op-api-system/src/main/java/com/op/system/api/domain/sap/SapMaterialPreparation.java
index c9aef40b..be0a7734 100644
--- a/op-api/op-api-system/src/main/java/com/op/system/api/domain/sap/SapMaterialPreparation.java
+++ b/op-api/op-api-system/src/main/java/com/op/system/api/domain/sap/SapMaterialPreparation.java
@@ -29,6 +29,26 @@ public class SapMaterialPreparation {
private String RGEKZ;
//直接采购标识
private String DBSKZ;
+ //以输入单位计的数量
+ private String ERFMG;
+ //条目单位
+ private String ERFME;
+
+ public String getERFMG() {
+ return ERFMG;
+ }
+
+ public void setERFMG(String ERFMG) {
+ this.ERFMG = ERFMG;
+ }
+
+ public String getERFME() {
+ return ERFME;
+ }
+
+ public void setERFME(String ERFME) {
+ this.ERFME = ERFME;
+ }
public String getAUFNR() {
return AUFNR;
diff --git a/op-modules/op-mes/src/main/java/com/op/mes/domain/MesReportWorkConsume.java b/op-modules/op-mes/src/main/java/com/op/mes/domain/MesReportWorkConsume.java
index c2de7b11..a75a09c4 100644
--- a/op-modules/op-mes/src/main/java/com/op/mes/domain/MesReportWorkConsume.java
+++ b/op-modules/op-mes/src/main/java/com/op/mes/domain/MesReportWorkConsume.java
@@ -114,6 +114,24 @@ public class MesReportWorkConsume extends BaseEntity {
private String planQuantity;
private String machineCode;
private String rspos;//sap物料项目编号
+ private String erfmg;
+ private String erfme;
+
+ public String getErfmg() {
+ return erfmg;
+ }
+
+ public void setErfmg(String erfmg) {
+ this.erfmg = erfmg;
+ }
+
+ public String getErfme() {
+ return erfme;
+ }
+
+ public void setErfme(String erfme) {
+ this.erfme = erfme;
+ }
public String getRspos() {
return rspos;
diff --git a/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkConsumeMapper.xml b/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkConsumeMapper.xml
index 0c98d05d..2c9f01f2 100644
--- a/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkConsumeMapper.xml
+++ b/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkConsumeMapper.xml
@@ -114,7 +114,7 @@
pow.workorder_code_sap workorderCodeSap,
mrwc.attr1,
mrwc.warehouse_code warehouseCode,
- mpd.quantity planQuantity,
+ mpd.quantity planQuantity,mpd.erfmg,mpd.erfme,
mrwc.parent_order parentOrder,mrwc.report_code reportCode,
mrwc.rspos
from mes_report_work_consume mrwc
diff --git a/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderWorkorderServiceImpl.java b/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderWorkorderServiceImpl.java
index 9e869f28..1377de7a 100644
--- a/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderWorkorderServiceImpl.java
+++ b/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderWorkorderServiceImpl.java
@@ -488,11 +488,14 @@ public class ProOrderWorkorderServiceImpl implements IProOrderWorkorderService {
detail.setCreateBy(SecurityUtils.getUsername());
detail.setCreateTime(createDate);
detail.setParentWorkOrder(workOrders.get(0));
+ detail.setErfmg(sap.getERFMG());//以输入单位计的数量
+ detail.setErfme(sap.getERFME());//条目单位
details.add(detail);
logger.info("领料单内容detail：" + sap.getRSPOS() + "," + sap.getMATNR() + "," +
sap.getMAKTX() + "," + sap.getWERKS() + "," + sap.getLGORT() + "," +
sap.getBDTER() + "," + sap.getBDMNG() + "," + sap.getZQLSL() + "," +
- sap.getMEINS() + "," + sap.getRGEKZ() + "," + sap.getDBSKZ()
+ sap.getMEINS() + "," + sap.getRGEKZ() + "," + sap.getDBSKZ()+ "," +
+ sap.getERFMG() + "," + sap.getERFME()
);
}
if (!CollectionUtils.isEmpty(details)) {
diff --git a/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderWorkorderMapper.xml b/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderWorkorderMapper.xml
index 044983b3..1b34d814 100644
--- a/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderWorkorderMapper.xml
+++ b/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderWorkorderMapper.xml
@@ -764,14 +764,15 @@
INSERT INTO mes_prepare_detail (
record_id,prepare_id,material_code,material_name,unit,
quantity,create_by,create_time,factory_code,status,
- locator,need_date,recoil,fund_quanlity,buy_flag,parent_work_order,attr1
+ locator,need_date,recoil,fund_quanlity,buy_flag,parent_work_order,attr1,
+ erfmg,erfme
)VALUES
<foreach collection="list" item="d" index="index" separator=",">
(
#{d.recordId},#{d.prepareId},#{d.materialCode},#{d.materailName},#{d.unit},
#{d.quantity},#{d.createBy},#{d.createTime},#{d.factoryCode},#{d.status},
#{d.locator},#{d.needDate},#{d.recoil},#{d.fundQuanlity},#{d.buyFlag},#{d.parentWorkOrder},
- #{d.attr1}
+ #{d.attr1},#{d.erfmg},#{d.erfme}
)
</foreach>
diff --git a/op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapMaterialPreparationServiceImpl.java b/op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapMaterialPreparationServiceImpl.java
index a17bdfdb..5efb9c9a 100644
--- a/op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapMaterialPreparationServiceImpl.java
+++ b/op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapMaterialPreparationServiceImpl.java
@@ -67,6 +67,10 @@ public class SapMaterialPreparationServiceImpl implements SapMaterialPreparation
String BDMNG = maraTable.getString("BDMNG");
String ZQLSL = maraTable.getString("ZQLSL");
String MEINS = maraTable.getString("MEINS");
+
+ String ERFMG = maraTable.getString("ERFMG");
+ String ERFME = maraTable.getString("ERFME");
+
String RGEKZ = maraTable.getString("RGEKZ");
String DBSKZ = maraTable.getString("DBSKZ");
log.info("备料单输出------" + "订单号：" + AUFNR
@@ -79,20 +83,10 @@ public class SapMaterialPreparationServiceImpl implements SapMaterialPreparation
" - 需求量：" + BDMNG +
" - 欠料数量：" + ZQLSL +
" - 基本计量单位：" + MEINS +
+ " - 以输入单位计的数量：" + ERFMG +
+ " - 条目单位：" + ERFME +
" - 标识：反冲：" + RGEKZ +
" - 直接采购标识：" + DBSKZ);
-// System.out.println("订单号：" + AUFNR
-// + " - 预留/相关需求的项目编号：" + RSPOS +
-// " - 物料号：" + MATNR +
-// " - 物料描述（短文本）：" + MAKTX +
-// " - 工厂：" + WERKS +
-// " - 库存地点：" + LGORT +
-// " - 组件的需求日期 ：" + BDTER +
-// " - 需求量：" + BDMNG +
-// " - 欠料数量：" + ZQLSL +
-// " - 基本计量单位：" + MEINS +
-// " - 标识：反冲：" + RGEKZ +
-// " - 直接采购标识：" + DBSKZ );
SapMaterialPreparation sapMaterialPreparation = new SapMaterialPreparation();
sapMaterialPreparation.setAUFNR(AUFNR);
sapMaterialPreparation.setBDMNG(BDMNG);
@@ -106,6 +100,10 @@ public class SapMaterialPreparationServiceImpl implements SapMaterialPreparation
sapMaterialPreparation.setRSPOS(RSPOS);
sapMaterialPreparation.setWERKS(WERKS);
sapMaterialPreparation.setZQLSL(ZQLSL);
+
+ sapMaterialPreparation.setERFMG(ERFMG);
+ sapMaterialPreparation.setERFME(ERFME);
+
sapMaterialPreparationList.add(sapMaterialPreparation);
}
String MSG = func.getExportParameterList().getString("MSG");