2024-02-21 物料修改2

src/main/java/com/spring/modules/part/entity/PartInformationEntity.java

@@ -157,7 +157,7 @@ public class PartInformationEntity extends QueryPage implements Serializable {
     /**
      * 原产地
      **/
-    private String isoCountry;
+    private String countryOfOrigin;
     /**
      * 制造提前期
      **/

src/main/java/com/spring/modules/part/service/impl/PartInformationServiceImpl.java

@@ -197,7 +197,7 @@ public class PartInformationServiceImpl extends ServiceImpl<PartInformationMappe
         String assetClass = inData.getAssetClass();
         String partStatus = inData.getPartStatus();
         String abcClass = inData.getAbcClass();
-        String isoCountry = inData.getIsoCountry();
+        String countryOfOrigin = inData.getCountryOfOrigin();
         String regionOfOrigin = inData.getRegionOfOrigin();
         String customsStarNo = inData.getCustomsStarNo();
         String partCostGroupId = inData.getPartCostGroupId();
@@ -218,7 +218,7 @@ public class PartInformationServiceImpl extends ServiceImpl<PartInformationMappe
         params.add(assetClass);
         params.add(partStatus);
         params.add(abcClass);
-        params.add(isoCountry);
+        params.add(countryOfOrigin);
         params.add(regionOfOrigin);
         params.add(customsStarNo);
         params.add(partCostGroupId);
@@ -305,7 +305,7 @@ public class PartInformationServiceImpl extends ServiceImpl<PartInformationMappe
         String assetClass = inData.getAssetClass();
         String partStatus = inData.getPartStatus();
         String abcClass = inData.getAbcClass();
-        String isoCountry = inData.getIsoCountry();
+        String countryOfOrigin = inData.getCountryOfOrigin();
         String regionOfOrigin = inData.getRegionOfOrigin();
         String customsStarNo = inData.getCustomsStarNo();
         String partCostGroupId = inData.getPartCostGroupId();
@@ -326,7 +326,7 @@ public class PartInformationServiceImpl extends ServiceImpl<PartInformationMappe
         params.add(assetClass);
         params.add(partStatus);
         params.add(abcClass);
-        params.add(isoCountry);
+        params.add(countryOfOrigin);
         params.add(regionOfOrigin);
         params.add(customsStarNo);
         params.add(partCostGroupId);

src/main/java/com/spring/modules/part/vo/PartInformationVo.java

@@ -96,7 +96,7 @@ public class PartInformationVo extends PartInformationEntity {
     /**
      * 原产地名称
      **/
-    private String isoCountryDesc;
+    private String countryOfOriginDesc;
     /**
      * 地区名称
      **/

src/main/resources/mapper/part/PartInformationMapper.xml

@@ -48,8 +48,8 @@
             dbo.get_abcClass_name(site, abc_class) as abcClassDesc,
             frequency_class,
             lifecycle_stage,
-            iso_country,
-            dbo.get_iso_country_name(site, iso_country) as isoCountryDesc,
+            country_of_origin,
+            dbo.get_country_of_origin_name(site, country_of_origin) as countryOfOriginDesc,
             manufacturing_lead_time,
             expected_lead_time,
             region_of_origin,
@@ -708,8 +708,8 @@
         dbo.get_abcClass_name(site, abc_class) as abcClassDesc,
         frequency_class,
         lifecycle_stage,
-        iso_country,
-        dbo.get_iso_country_name(site, iso_country) as isoCountryDesc,
+        country_of_origin,
+        dbo.get_country_of_origin_name(site, country_of_origin) as countryOfOriginDesc,
         manufacturing_lead_time,
         expected_lead_time,
         region_of_origin,