ソースを参照

先提交一波代码

yi eason 1 ヶ月 前
親
コミット
323f7a2615

+ 1 - 1
pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>org.example</groupId>
     <artifactId>antai-wltms-api</artifactId>
-    <version>1.9</version>
+    <version>2.1</version>
 
     <parent>
         <groupId>org.springframework.boot</groupId>

+ 3 - 0
src/main/java/com/steerinfo/dil/service/impl/TmsUnloadResultServiceImpl.java

@@ -403,6 +403,9 @@ public class TmsUnloadResultServiceImpl {
                 params.put("outDoorTime",format2.format(unloadTime));
                 params.put("carNo",capacityId);
                 params.put("busiType","0");
+                //物料规格、型号(清洁能源平台字段:invSpec 规格、invModel 型号)
+                params.put("invSpec",item.get("materialSpecification") == null ? "" : item.get("materialSpecification").toString());
+                params.put("invModel",item.get("materialModel") == null ? "" : item.get("materialModel").toString());
                 paramList.add(params);
             }else{
                 //修改

+ 7 - 1
src/main/resources/com/steerinfo/dil/mapper/OmsTransOrderMapper.xml

@@ -4013,7 +4013,9 @@
     SELECT RMT .MATERIAL_TYPE_ID "materialTypeId",
     RMT.MATERIAL_TYPE_NAME   "materialTypeName",
     RM .MATERIAL_ID "materialId",
-    RM .MATERIAL_NAME "materialName"
+    RM .MATERIAL_NAME "materialName",
+    RM.MATERIAL_SPECIFICATION "materialSpecification",
+    RM.MATERIAL_MODEL "materialModel"
     FROM RMS_MATERIAL RM
     LEFT JOIN RMS_MATERIAL_TYPE RMT ON RMT.MATERIAL_TYPE_ID = RM.MATERIAL_TYPE_ID
     <where>
@@ -5143,6 +5145,8 @@
       to_number(TUR.ALTERNATE_FIELDS7) "weightQuantity",
       RM.MATERIAL_NAME "invName",
       RM.MATERIAL_CODE "invCode",
+      RM.MATERIAL_SPECIFICATION "invSpec",
+      RM.MATERIAL_MODEL "invModel",
       '0' "busiType"
       FROM
       TMS_UNLOAD_RESULT TUR
@@ -5177,6 +5181,8 @@
       END "weightQuantity",
       ooc.material_name "invName",
       ooc.material_code "invCode",
+      ooc.material_specification "invSpec",
+      ooc.material_model "invModel",
       '1' "busiType"
       FROM
       ams_trans_requirement atr