修改字段净重和规格

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

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

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;

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;

mhd_oms/src/main/resources/mapper/documentPushMaterialRecord/DocumentPushMaterialRecordMapper.xml

@@ -10,12 +10,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="materialBaseInfoId"    column="material_base_info_id"    />
         <result property="materialCode"    column="material_code"    />
         <result property="materialName"    column="material_name"    />
-        <result property="specificationModel"    column="specification_model"    />
+        <result property="packName"    column="pack_name"    />
         <result property="declarationUnit"    column="declaration_unit"    />
         <result property="cargoNum"    column="cargo_num"    />
         <result property="currency"    column="currency"    />
         <result property="unitPrice"    column="unit_price"    />
-        <result property="netWeight"    column="net_weight"    />
+        <result property="weightLimit"    column="weight_limit"    />
         <result property="grossWeight"    column="gross_weight"    />
         <result property="goodsType"    column="goods_type"    />
         <result property="pushTime"    column="push_time"    />

mhd_oms/src/main/resources/mapper/materialPushRecord/MaterialPushRecordMapper.xml

@@ -9,12 +9,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="materialBaseInfoId"    column="material_base_info_id"    />
         <result property="materialCode"    column="material_code"    />
         <result property="materialName"    column="material_name"    />
-        <result property="specificationModel"    column="specification_model"    />
+        <result property="packName"    column="pack_name"    />
         <result property="declarationUnit"    column="declaration_unit"    />
         <result property="cargoNum"    column="cargo_num"    />
         <result property="currency"    column="currency"    />
         <result property="unitPrice"    column="unit_price"    />
-        <result property="netWeight"    column="net_weight"    />
+        <result property="weightLimit"    column="weight_limit"    />
         <result property="grossWeight"    column="gross_weight"    />
         <result property="goodsType"    column="goods_type"    />
         <result property="pushTime"    column="push_time"    />