修改

src/main/java/com/steerinfo/dil/service/impl/WmshGridMaterialServiceImpl.java

@@ -63,9 +63,13 @@ public class WmshGridMaterialServiceImpl implements IWmshGridMaterialService {
      */
     @Override
     public int updatePortStock(Map<String,Object> map) {
+        BigDecimal tonnage=null;
         BigDecimal portId = DataChange.dataToBigDecimal(map.get("portId"));
         BigDecimal batchId = DataChange.dataToBigDecimal(map.get("batchId"));
-        BigDecimal tonnage = DataChange.dataToBigDecimal(map.get("resultMaterialNumber"));
+        tonnage = DataChange.dataToBigDecimal(map.get("resultMaterialNumber"));
+        if (map.get("resultMaterialNumber")==null){
+            tonnage =DataChange.dataToBigDecimal(map.get("resultTonnage"));
+        }
         BigDecimal status = DataChange.dataToBigDecimal(map.get("status"));
         Map<String,Object> selectMap = new HashMap<>();
         selectMap.put("portId",portId);
@@ -85,7 +89,6 @@ public class WmshGridMaterialServiceImpl implements IWmshGridMaterialService {
         Map<String,Object> map1 = wmshGridMaterials.get(0);
         BigDecimal oldGmsTonnage = DataChange.dataToBigDecimal(map1.get("gmTonnage"));
         BigDecimal gmId =DataChange.dataToBigDecimal(map1.get("gmId"));
-
         WmshGridMaterial wmshGridMaterial=new WmshGridMaterial();
         wmshGridMaterial.setGmId(gmId);
         BigDecimal gmsTonnage;

src/main/resources/application-prod.yml

@@ -1,8 +1,8 @@
 spring:
   datasource:
     url: jdbc:oracle:thin:@172.16.33.163:1521:ilsdbpri
-    password: root123
-    username: dagang
+    password: Dil123789
+    username: dil
     driver-class-name: oracle.jdbc.OracleDriver
   application:
     name: dil-wmsh-api

src/main/resources/com/steerinfo/dil/mapper/WmshGridMaterialMapper.xml

@@ -471,7 +471,7 @@
 
 
     <select id="getUnLockPortStock" resultType="java.util.Map" parameterType="java.util.Map">
-        select WOR.RESULT_ID               "resultId",
+        select
                TLT.RESULT_WAGON_NO        "wagon",
                TLT.PURCHASE_ORDER_NO      "purchaseOrderNo",
                WOR.RESULT_NUMBER           "resultNumber",
@@ -481,7 +481,9 @@
                WOR.RESULT_TONNAGE          "resultTonnage",
                TLT.RESULT_BILLABLE_TONNAGE	"weight",
                WOR.RESULT_CLEARING         "resultClearing",
-               WOR.INSERT_TIME             "insertTime"
+               WOR.INSERT_TIME             "insertTime",
+        TLT.RESULT_ID                "resultId",
+        WOR.RESULT_ID               "outBoundId"
         from TMSTRAIN_LOADING_TEMP TLT
                  left join AMS_PURCHASE_ORDER APO
                            on TLT.PURCHASE_ORDER_NO = APO.PURCHASE_ORDER_NO