修改

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

@@ -160,7 +160,7 @@ public class TmstrainLoadingResultServiceImpl implements ITmstrainLoadingResultS
     }
 
     /**
-     * 添加国产矿装车实绩
+     * 国产矿新增导入
      * @param list
      * @return
      */
@@ -171,6 +171,7 @@ public class TmstrainLoadingResultServiceImpl implements ITmstrainLoadingResultS
         List<TmstrainLoadingResult> loadingResults=new ArrayList<>();
         int i = 0;
         for(Map<String,Object> map:list){
+            //车皮号、发站、到站、发货单位、物资是必要数据
             TmstrainLoadingTemp temp=new TmstrainLoadingTemp();
             TmstrainLoadingResult result=new TmstrainLoadingResult();
             //设置序列号主键
@@ -231,7 +232,7 @@ public class TmstrainLoadingResultServiceImpl implements ITmstrainLoadingResultS
     }
 
     /**
-     * 补录采购订单信息
+     * 国产矿新增配单补录
      * @param map
      * @return
      */
@@ -258,9 +259,8 @@ public class TmstrainLoadingResultServiceImpl implements ITmstrainLoadingResultS
             tmstrainLoadingResult.setResultId(new BigDecimal(resultId)); //设置要补录的实绩主键
             count += tmstrainLoadingResultMapper.updateByPrimaryKeySelective(tmstrainLoadingResult);
         }
-        //全部补录成功，发送计量委托
+        //配单成功，发送计量委托
         if(resultIdList.size()-count==0){
-//            System.out.println("发送计量委托");
             Map<String, Object> map1 = new HashMap<>();
             List<Map<String,Object>> resultIdList1=new ArrayList<>();
             for(Integer resultId:resultIdList){
@@ -345,7 +345,7 @@ public class TmstrainLoadingResultServiceImpl implements ITmstrainLoadingResultS
     }
 
     /**
-     * 修改火运装车实绩
+     * 修改进口矿国产矿火运装车实绩
      * @param map
      * @return
      */

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

@@ -46,6 +46,9 @@ public class TmstrainWagonUnloadResultServiceImpl implements ITmstrainWagonUnloa
 
     @Autowired
     private TmstrainTruckTotalResultMapper tmstrainTruckTotalResultMapper;
+
+    @Autowired
+    private TmstrainLoadingResultMapper tmstrainLoadingResultMapper;
     /**
      * 查看所有卸车实绩
      * 1采购进口矿（万州港-达州站/万州港-老区轨道衡） 2采购进口矿（海港-老区轨道衡） 3采购国产矿  4内转
@@ -149,10 +152,10 @@ public class TmstrainWagonUnloadResultServiceImpl implements ITmstrainWagonUnloa
      */
     public int updateLoadingResult(Map<String, Object> map) throws Exception {
         //添加一条卸货实绩 修改装车状态为已卸车 2
-//        TmstrainLoadingResult tmstrainLoadingResult = new TmstrainLoadingResult();
-//        tmstrainLoadingResult.setResultId(DataChange.dataToBigDecimal(map.get("resultId")));
-        map.put("deleted",new BigDecimal(2));
-        return tmstrainLoadingResultService.updateTmstrainLoadingResult(map);
+        TmstrainLoadingResult tmstrainLoadingResult = new TmstrainLoadingResult();
+        tmstrainLoadingResult.setResultId(DataChange.dataToBigDecimal(map.get("resultId")));
+        tmstrainLoadingResult.setDeleted(new BigDecimal(2));
+        return tmstrainLoadingResultMapper.updateByPrimaryKeySelective(tmstrainLoadingResult);
     }
 
     /**