修改

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

@@ -879,7 +879,7 @@ public class TmstrainLoadingResultServiceImpl implements ITmstrainLoadingResultS
     @Override
     @Transactional(rollbackFor = {Exception.class})
     public int updateWarehouseResult(Map<String, Object> map) throws Exception {
-        String userId =(String) map.get("userId");
+        String userId =map.get("userId").toString();
         BigDecimal outResultId =DataChange.dataToBigDecimal(map.get("OutResultId"));
         String purchaseOrderNoOld=null;
         String wagonNoOld=null;
@@ -898,11 +898,11 @@ public class TmstrainLoadingResultServiceImpl implements ITmstrainLoadingResultS
         List<Map<String, Object>> mapList = tmstrainLoadingTempMapper.getWareHouseOutresult(loadingTempId);
         for (Map<String,Object> map1:mapList){
              purchaseOrderNoOld =(String) map1.get("purchaseOrderNo");
-             wagonNoOld = (String) map1.get("wagonNo");
+             wagonNoOld =  map1.get("wagonNo").toString();
              batchIdOld =DataChange.dataToBigDecimal(map1.get("batchId"));
              tonnage = DataChange.dataToBigDecimal(map1.get("resultTonnage"));
         }
-        String wagonNoNew = (String)map.get("wagonNew");
+        String wagonNoNew = map.get("wagonNew").toString();
         //判断原来的车皮标重以及现在的车皮标重
         //判断如果采购订单号不修改
         if (purchaseOrderNoNew!=null&&purchaseOrderNoNew.equals(purchaseOrderNoOld)){
@@ -925,11 +925,11 @@ public class TmstrainLoadingResultServiceImpl implements ITmstrainLoadingResultS
                     map.put("batchId",batchIdOld);
                     Map<String, Object> stringObjectMap = wmshBoundFeign.addResult(map);
                     BigDecimal code = DataChange.dataToBigDecimal(stringObjectMap.get("code"));
-                    if (code.equals(200)){
+                    if (code.intValue()==200){
                          data =DataChange.dataToBigDecimal(stringObjectMap.get("data"));
                          tmstrainLoadingTempMapper.updateTonnage(outResultId,tonnage.intValue()+TotalTonnage);
                     }else {
-                        String message =(String) stringObjectMap.get("data");
+                        String message = stringObjectMap.get("data").toString();
                         throw new Exception(message);
                     }
                 }else {
@@ -962,7 +962,7 @@ public class TmstrainLoadingResultServiceImpl implements ITmstrainLoadingResultS
                     map.put("batchId",batchIdNew);
                     Map<String, Object> stringObjectMap = wmshBoundFeign.addResult(map);
                     BigDecimal code = DataChange.dataToBigDecimal(stringObjectMap.get("code"));
-                    if (code.equals(200)){
+                    if (code.intValue() == 200){
                         data =DataChange.dataToBigDecimal(stringObjectMap.get("data"));
                         tmstrainLoadingTempMapper.updateTonnage(outResultId,tonnage.intValue()+TotalTonnage);
                     }else {
@@ -981,11 +981,11 @@ public class TmstrainLoadingResultServiceImpl implements ITmstrainLoadingResultS
         }
         tmstrainLoadingTemp.setResultId(loadingTempId);
         tmstrainLoadingTemp.setResultWagonNo(wagonNoNew);
-        if (data!=null){
-            tmstrainLoadingTemp.setOutbountId(data);
-        }
         if (purchaseOrderNoNew!=null){
             tmstrainLoadingTemp.setPurchaseOrderNo(purchaseOrderNoNew);
+            if (data!=null){
+                tmstrainLoadingTemp.setOutbountId(data);
+            }
         }
         tmstrainLoadingTemp.setResultBillableTonnage(new  BigDecimal(wagonWeightNew));
         tmstrainLoadingTemp.setUpdateUsername(userId);