diff --git a/mhd_oms/src/main/java/com/mhd/oms/application/service/businessDocumentOrder/BusinessDocumentOrderApplicationService.java b/mhd_oms/src/main/java/com/mhd/oms/application/service/businessDocumentOrder/BusinessDocumentOrderApplicationService.java
index b5f63591f..8d7aae772 100644
--- a/mhd_oms/src/main/java/com/mhd/oms/application/service/businessDocumentOrder/BusinessDocumentOrderApplicationService.java
+++ b/mhd_oms/src/main/java/com/mhd/oms/application/service/businessDocumentOrder/BusinessDocumentOrderApplicationService.java
@@ -346,11 +346,11 @@ public class BusinessDocumentOrderApplicationService {
docRecord.setMaterialCode(material.getMaterialCode());
docRecord.setMaterialName(material.getMaterialName());
docRecord.setGoodsType(material.getGoodsType());
- docRecord.setSpecificationModel(material.getSpecificationModel());
+ docRecord.setPackName(material.getPackName());
docRecord.setDeclarationUnit(material.getDeclarationUnit());
docRecord.setCurrency(material.getCurrency());
docRecord.setUnitPrice(material.getUnitPrice());
- docRecord.setNetWeight(material.getWeightLimit());
+ docRecord.setWeightLimit(material.getWeightLimit());
docRecord.setGrossWeight(material.getGrossWeight());
}
}
diff --git a/mhd_oms/src/main/java/com/mhd/oms/application/service/materialInfo/MaterialInfoApplicationService.java b/mhd_oms/src/main/java/com/mhd/oms/application/service/materialInfo/MaterialInfoApplicationService.java
index 670916107..3d48174d1 100644
--- a/mhd_oms/src/main/java/com/mhd/oms/application/service/materialInfo/MaterialInfoApplicationService.java
+++ b/mhd_oms/src/main/java/com/mhd/oms/application/service/materialInfo/MaterialInfoApplicationService.java
@@ -204,11 +204,11 @@ public class MaterialInfoApplicationService {
record.setMaterialCode(material.getMaterialCode());
record.setMaterialName(material.getMaterialName());
record.setGoodsType(material.getGoodsType());
- record.setSpecificationModel(material.getSpecificationModel());
+ record.setPackName(material.getPackName());
record.setDeclarationUnit(material.getDeclarationUnit());
record.setCurrency(material.getCurrency());
record.setUnitPrice(material.getUnitPrice());
- record.setNetWeight(material.getWeightLimit());
+ record.setWeightLimit(material.getWeightLimit());
record.setGrossWeight(material.getGrossWeight());
record.setPushTime(now);
record.setDelFlag(1);
diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/documentPushMaterialRecord/entity/DocumentPushMaterialRecord.java b/mhd_oms/src/main/java/com/mhd/oms/domain/documentPushMaterialRecord/entity/DocumentPushMaterialRecord.java
index 3d1052082..de05502d3 100644
--- a/mhd_oms/src/main/java/com/mhd/oms/domain/documentPushMaterialRecord/entity/DocumentPushMaterialRecord.java
+++ b/mhd_oms/src/main/java/com/mhd/oms/domain/documentPushMaterialRecord/entity/DocumentPushMaterialRecord.java
@@ -34,7 +34,7 @@ public class DocumentPushMaterialRecord implements Serializable {
private String materialName;
@ApiModelProperty("规格型号")
- private String specificationModel;
+ private String packName;
@ApiModelProperty("申报单位")
private String declarationUnit;
@@ -49,7 +49,7 @@ public class DocumentPushMaterialRecord implements Serializable {
private BigDecimal unitPrice;
@ApiModelProperty("净重(kg)")
- private BigDecimal netWeight;
+ private BigDecimal weightLimit;
@ApiModelProperty("毛重(kg)")
private BigDecimal grossWeight;
diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/materialPushRecord/entity/MaterialPushRecord.java b/mhd_oms/src/main/java/com/mhd/oms/domain/materialPushRecord/entity/MaterialPushRecord.java
index 6ea91988f..01196e594 100644
--- a/mhd_oms/src/main/java/com/mhd/oms/domain/materialPushRecord/entity/MaterialPushRecord.java
+++ b/mhd_oms/src/main/java/com/mhd/oms/domain/materialPushRecord/entity/MaterialPushRecord.java
@@ -34,7 +34,7 @@ public class MaterialPushRecord implements Serializable {
private String materialName;
@ApiModelProperty("规格型号")
- private String specificationModel;
+ private String packName;
@ApiModelProperty("申报单位")
private String declarationUnit;
@@ -49,7 +49,7 @@ public class MaterialPushRecord implements Serializable {
private BigDecimal unitPrice;
@ApiModelProperty("净重(kg)")
- private BigDecimal netWeight;
+ private BigDecimal weightLimit;
@ApiModelProperty("毛重(kg)")
private BigDecimal grossWeight;
diff --git a/mhd_oms/src/main/resources/mapper/documentPushMaterialRecord/DocumentPushMaterialRecordMapper.xml b/mhd_oms/src/main/resources/mapper/documentPushMaterialRecord/DocumentPushMaterialRecordMapper.xml
index 32f4dd43f..0a8c78170 100644
--- a/mhd_oms/src/main/resources/mapper/documentPushMaterialRecord/DocumentPushMaterialRecordMapper.xml
+++ b/mhd_oms/src/main/resources/mapper/documentPushMaterialRecord/DocumentPushMaterialRecordMapper.xml
@@ -10,12 +10,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-
+
-
+
diff --git a/mhd_oms/src/main/resources/mapper/materialPushRecord/MaterialPushRecordMapper.xml b/mhd_oms/src/main/resources/mapper/materialPushRecord/MaterialPushRecordMapper.xml
index 2df87e3bb..56084525e 100644
--- a/mhd_oms/src/main/resources/mapper/materialPushRecord/MaterialPushRecordMapper.xml
+++ b/mhd_oms/src/main/resources/mapper/materialPushRecord/MaterialPushRecordMapper.xml
@@ -9,12 +9,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-
+
-
+