修改

src/main/java/com/steerinfo/dil/controller/TmstruckReturnResultController.java

@@ -2,9 +2,10 @@ package com.steerinfo.dil.controller;
 
 import com.steerinfo.dil.feign.ESFeign;
 import com.steerinfo.dil.service.ITmstruckReturnResultService;
+import com.steerinfo.dil.util.BaseRESTfulController;
 import com.steerinfo.dil.util.ColumnDataUtil;
 import com.steerinfo.dil.util.PageListAdd;
-import com.steerinfo.framework.controller.BaseRESTfulController;
+
 import com.steerinfo.framework.controller.RESTfulResult;
 import com.steerinfo.framework.service.pagehelper.PageHelper;
 import io.swagger.annotations.ApiImplicitParam;

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

@@ -73,7 +73,9 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
 
     /**
      * 添加计毛委托 并发送计毛委托
-     * @param map {orderTypee: 订单类型  resultTotalId：总实绩ID orderNumber：运输订单号}
+     * @param map {orderTypee: 订单类型
+     *            resultTotalId：总实绩ID  orderId: 订单ID
+     *            总实绩ID orderNumber：运输订单号}
      * @return
      */
     public int addMaoMeasureCommission(Map<String, Object> map){
@@ -86,7 +88,8 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
 
     /**
      * 添加计皮委托 并发送计皮委托
-     * @param map {orderTypee: 订单类型  resultTotalId：总实绩ID  orderNumber：运输订单号}
+     * @param map {orderTypee: 订单类型  resultTotalId：总实绩ID  orderId: 订单ID
+     *            orderNumber：运输订单号}
      * @return
      */
     public int addPiMeasureCommission(Map<String, Object> map){
@@ -130,7 +133,7 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
      * 查询计量委托并向计量系统发送数据  调用他们接口
      * 1：销售订单；2：焦炭发运计划；3：水渣发运计划；4：内转到异地库；5：采购辅料订单；6：采购老区燃料订单；
      * 7：采购新区燃料订单；8：采购进口矿(万州-厂内)；9：采购内转(达州-厂内)；10：采购内转(老区-厂内)； 11：厂内内转
-     * @param map orderTypee 订单类型  type 计皮0还是计毛1类型  resultTotalId  总实绩ID
+     * @param map orderTypee 订单类型  type 计皮0还是计毛1类型  orderId  订单ID
      */
     public int sendMeasureCommissionMes(Map<String, Object> map){
         Map<String, Object> measureCommission = null;
@@ -184,7 +187,8 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
                 }
         }
         /*访问接口发送数据*/
-        return sendMesToMeasure(measureCommission);
+//        sendMesToMeasure(measureCommission);
+        return 0;
     }
 
     /**

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

@@ -3,6 +3,7 @@ package com.steerinfo.dil.service.impl;
 import com.steerinfo.dil.feign.OmsFeign;
 import com.steerinfo.dil.mapper.TmstruckReturnResultMapper;
 import com.steerinfo.dil.mapper.TmstruckTotalResultMapper;
+import com.steerinfo.dil.mapper.UtilsMapper;
 import com.steerinfo.dil.model.TmstruckReturnResult;
 import com.steerinfo.dil.model.TmstruckTotalResult;
 
@@ -43,6 +44,9 @@ public class TmstruckReturnResultServiceImpl implements ITmstruckReturnResultSer
     @Autowired
     private OmsFeign omsFeign;
 
+    @Autowired
+    UtilsMapper utilsMapper;
+
     @Autowired
     private TmstruckTotalResultMapper tmstruckTotalResultMapper;
 
@@ -53,6 +57,8 @@ public class TmstruckReturnResultServiceImpl implements ITmstruckReturnResultSer
     @Autowired
     private TmstruckWeightResultServiceImpl tmstruckWeightResultService;
 
+    @Autowired
+    TmstruckMeasureCommissionServiceImpl tmstruckMeasureCommissionService;
 
 
     /**
@@ -75,23 +81,45 @@ public class TmstruckReturnResultServiceImpl implements ITmstruckReturnResultSer
         //生成主键
         BigDecimal maxId = tmstruckReturnResultMapper.selectMaxId();
         tmstruckReturnResult.setResultId(maxId);
-//        //通过运输订单号获得 运输订单ID
-//        map.putAll(tmstruckReturnResultMapper.getResultTotalIdByOrderNumber((String) map.get("orderNumber")));
         tmstruckReturnResult.setResultTotalId(DataChange.dataToBigDecimal(map.get("resultTotalId")));
-//        BigDecimal orderId = DataChange.dataToBigDecimal(map.get("orderId"));
-//        //调用更新退货实绩接口
-//        omsFeign.updateOmsTruckOrder(map);
-//        //设置首次新增时的常规字段
+        tmstruckReturnResult.setInsertUpdateRemark((String) map.get("returnReason"));
         addRegularField(tmstruckReturnResult);
         //新增退货实绩
         int i = tmstruckReturnResultMapper.insertSelective(tmstruckReturnResult);
-//        //逻辑删除运单
-//        int i1 = utilsService.updateOrderStatus(map, 7);
-//        //重新新增销售运输订单
-//        int i2 = addNewOrder(orderId);
+        i += utilsService.updateOrderLineSequence(map); //当前新订单路段顺序号 + 1
+        //通过运输订单ID查询物资ID
+        List<Integer> orderIdList = utilsMapper.getMaterialIdByOrderId(DataChange.dataToBigDecimal(map.get("orderId")));
+        Integer materialId = orderIdList.get(0);
+        map.put("materialId", materialId);
+        //通过物资ID匹配汽车衡 --遗留问题
+        map.put("grossPlaceId", 6);
+        //发送计量委托
+        i += tmstruckMeasureCommissionService.addMaoMeasureCommission(map);
         return i;
     }
 
+    /*
+     TmstruckReturnResult tmstruckReturnResult = new TmstruckReturnResult();
+        //生成主键
+        BigDecimal maxId = tmstruckReturnResultMapper.selectMaxId();
+        tmstruckReturnResult.setResultId(maxId);
+        //通过运输订单号获得 运输订单ID
+        map.putAll(tmstruckReturnResultMapper.getResultTotalIdByOrderNumber((String) map.get("orderNumber")));
+        tmstruckReturnResult.setResultTotalId(DataChange.dataToBigDecimal(map.get("resultTotalId")));
+        BigDecimal orderId = DataChange.dataToBigDecimal(map.get("orderId"));
+        //调用更新退货实绩接口
+        omsFeign.updateOmsTruckOrder(map);
+        //设置首次新增时的常规字段
+        addRegularField(tmstruckReturnResult);
+        //新增退货实绩
+        int i = tmstruckReturnResultMapper.insertSelective(tmstruckReturnResult);
+        //逻辑删除运单
+        int i1 = utilsService.updateOrderStatus(map, 7);
+        //重新新增销售运输订单
+        int i2 = addNewOrder(orderId);
+        return i;
+     */
+
     /**
      * 查询退货实绩
      * @param map

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

@@ -148,10 +148,10 @@ public class TmstruckUnloadResultServiceImpl implements ITmstruckUnloadResultSer
                 //计算计皮汽车衡 (当前无法计算汽车衡)
                 map.put("tarePlaceId", 6);
                 i += tmstruckWeightResultService.updateWeightResult(map);
-                //通过物资ID查询物资Id
-                List<Integer> materialIdList = utilsMapper.getMaterialIdByOrderId(DataChange.dataToBigDecimal(map.get("orderId")));
-                map.put("materialId", materialIdList.get(0));
-                i += tmstruckMeasureCommissionService.addPiMeasureCommission(map); //卸货完成后新增一条计皮委托 并发送计皮委托
+                //通过订单ID查询物资Id
+//                List<Integer> materialIdList = utilsMapper.getMaterialIdByOrderId(DataChange.dataToBigDecimal(map.get("orderId")));
+//                map.put("materialId", materialIdList.get(0));
+//                i += tmstruckMeasureCommissionService.addPiMeasureCommission(map); //卸货完成后新增一条计皮委托 并发送计皮委托
                 i += tmstruckReceiptResultService.addReceiptResult(map); //新增完卸车实绩后新增一条收货实绩
                 //计皮委托发送后更新出厂门岗
                 BigDecimal resultTotalId = DataChange.dataToBigDecimal(map.get("resultTotalId"));

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

@@ -784,4 +784,6 @@
             on RW.WAREHOUSE_ID = TUR.RESULT_UNLOAD_PLACE_ID
         where OO.ORDER_ID = #{orderId}
     </select>
+
+<!--  内转采购计量委托  -->
 </mapper>

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

@@ -707,7 +707,8 @@
         TWR.RESULT_GROSS_WEIGHT_TIME "resultGrossWeightTime",
         RS.SUPPLIER_NAME "supplierName",
         RCON. CONSIGNEE_COMPANY_NAME "consigneeCompanyName",
-        OO.ORDER_ID "orderId"
+        OO.ORDER_ID "orderId",
+        OO.ORDER_STATUS "orderStatus"
         from TMSTRUCK_WEIGHT_RESULT TWR
         left join TMSTRUCK_TOTAL_RESULT TTR
         on TWR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
@@ -789,19 +790,19 @@
         select *
         from (
         select
-        TWR.WEIGHT_TASK_RESULT_ID "weightTaskResultId",
-        APO.PURCHASE_ORDER_NO "purchaseOrderNo",
-        RM.MATERIAL_NAME "materialName",
-        OO.ORDER_NUMBER "orderNumber",
-        RC.CAPACITY_NUMBER "capacityNumber",
-        RTC.TRUCK_CALCULATE_NUMBER "truckCalculateNumber",
-        TWR.RESULT_GROSS_WEIGHT "resultGrossWeight",
-        TWR.RESULT_GROSS_WEIGHT_TIME "resultGrossWeightTime",
-        DB.RESULT_FOREIGN_SHIP_NAME "resultForeignShipName",
-        TWR.RESULT_TARE_WEIGHT "resultTareWeight",
-        TWR.RESULT_TARE_WEIGHT_TIME "resultTareWeightTime",
-        TWR.RESULT_NET_WEIGHT "resultNetWeight",
-        TWR.RESULT_POUND_NO "resultPoundNo"
+            TWR.WEIGHT_TASK_RESULT_ID "weightTaskResultId",
+            APO.PURCHASE_ORDER_NO "purchaseOrderNo",
+            RM.MATERIAL_NAME "materialName",
+            OO.ORDER_NUMBER "orderNumber",
+            RC.CAPACITY_NUMBER "capacityNumber",
+            RTC.TRUCK_CALCULATE_NUMBER "truckCalculateNumber",
+            TWR.RESULT_GROSS_WEIGHT "resultGrossWeight",
+            TWR.RESULT_GROSS_WEIGHT_TIME "resultGrossWeightTime",
+            DB.RESULT_FOREIGN_SHIP_NAME "resultForeignShipName",
+            TWR.RESULT_TARE_WEIGHT "resultTareWeight",
+            TWR.RESULT_TARE_WEIGHT_TIME "resultTareWeightTime",
+            TWR.RESULT_NET_WEIGHT "resultNetWeight",
+            TWR.RESULT_POUND_NO "resultPoundNo"
         from TMSTRUCK_WEIGHT_RESULT TWR
         left join TMSTRUCK_TOTAL_RESULT TTR
         on TWR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID