港存库修改

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

@@ -90,10 +90,12 @@ public class WmshGridMaterialServiceImpl implements IWmshGridMaterialService {
         wmshGridMaterial.setGmId(gmId);
         BigDecimal gmsTonnage;
         if (status.intValue() == 0) {
-            gmsTonnage = new BigDecimal(oldGmsTonnage.doubleValue() - tonnage.doubleValue());
+            //gmsTonnage = new BigDecimal(oldGmsTonnage.doubleValue() - tonnage.doubleValue());
+            gmsTonnage = oldGmsTonnage.subtract(tonnage);
         }
         else {
-            gmsTonnage = new BigDecimal(tonnage.doubleValue() + oldGmsTonnage.doubleValue());
+            //gmsTonnage = new BigDecimal(tonnage.doubleValue() + oldGmsTonnage.doubleValue());
+            gmsTonnage = tonnage.add(oldGmsTonnage);
         }
         if (gmsTonnage.intValue()>=0) {
             wmshGridMaterial.setGmTonnage(gmsTonnage);

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

@@ -60,6 +60,9 @@ public class WmshOutboundResultServiceImpl implements IWmshOutboundResultService
         String ckNum = DataChange.generateEightDigitsNumber("GCKD", id);
         wmshOutboundResult.setResultNumber(ckNum);
         //添加出库物资吨位、批次ID
+        if (map.get("resultMaterialNumber")!=null){
+            map.put("resultTonnage",map.get("resultMaterialNumber"));
+        }
         wmshOutboundResult.setResultTonnage(DataChange.dataToBigDecimal(map.get("resultTonnage")));
         wmshOutboundResult.setBatchId(DataChange.dataToBigDecimal(map.get("batchId")));
         //添加港口ID、是否清场、出库时间

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

@@ -390,10 +390,8 @@
                   WIR.INSERT_USERNAME         "insertUsername",
                   WIR.INSERT_TIME             "insertTime"
            from WMSH_INBOUND_RESULT WIR
-           left join DIL_BATCH_INFACOTRY DBI
-           ON WIR.BATCH_ID=DBI.BATCH_INFACOTRY_ID
-           join DIL_BATCH DB
-           on DBI.BATCH_ID = DB.BATCH_ID
+           left join DIL_BATCH DB
+           on WIR.BATCH_ID = DB.BATCH_ID
            left join RMS_MATERIAL RM
            on RM.MATERIAL_ID = DB.MATERIAL_ID
            Left join RMS_PORT RP

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

@@ -386,10 +386,8 @@
     WOR.RESULT_CLEARING         "resultClearing",
     WOR.INSERT_TIME             "insertTime"
     from WMSH_OUTBOUND_RESULT WOR
-    LEFT JOIN DIL_BATCH_INFACOTRY DBI
-    ON WOR.BATCH_ID=DBI.BATCH_INFACOTRY_ID
     left join DIL_BATCH DB
-    on DB.BATCH_ID = DBI.BATCH_ID
+    on DB.BATCH_ID = WOR.BATCH_ID
     left join RMS_MATERIAL RM
     on RM.MATERIAL_ID = DB.MATERIAL_ID
     left join RMS_PORT RP