修改内转建议

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

@@ -72,6 +72,8 @@ public class TmstruckMeasureCommissionController extends BaseRESTfulController {
             return success("委托撤回成功！");
         }else if(i == 4){
             return failed("还有物资未计量完成！不允许继续发送委托");
+        }else if(i == 5){
+            return failed("请及时更新APP!");
         }
         return success("委托发送成功");
     }

src/main/java/com/steerinfo/dil/feign/OmsFeign.java

@@ -46,4 +46,7 @@ public interface OmsFeign {
     @PostMapping("api/v1/oms/utilscontroller/addPurInwardOrder")
     Map<String,Object> addPurInwardOrder(@RequestParam BigDecimal orderId);
 
+    @PostMapping("api/v1/oms/omstruckorderseparates/closeInwardOrder")
+    Map<String,Object> closeInwardOrder(@RequestParam Integer orderId);
+
 }

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

@@ -475,28 +475,8 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
     @Override
     @Transactional
     public int sendMeasureCommssion(Map<String, Object> map){
-        if(map.get("deletedCommission") != null){
-            //在计量实绩中查询是否有计量数据，如果有则代表已经计量过了不允许撤回
-            List<Integer> commission = tmstruckMeasureCommissionMapper.checkoutWeightCommission(map);
-            if(commission.size() != 0){
-                return 2;
-            }
-        }else {
-            //查询最后发送委托的物资
-            Integer alreadySentMaterialId = tmstruckMeasureCommissionMapper.getAlreadySentMaterialId(map);
-            if(alreadySentMaterialId != null){
-                map.put("checkMaterialId", alreadySentMaterialId);
-                //判断当前订单是否有已经发送过委托 但是还未计量完成的物资
-                Map<String, Object> checkoutMesMap = tmstruckMeasureCommissionMapper.checkoutWeightCommission2(map);
-                if(checkoutMesMap == null){ // 为空则是这个物资还没有计量
-                    return 4;
-                }else {
-                    //如果不为空, 判断是否有净重 如果有净重则是计量完成 否则 没有
-                    if(checkoutMesMap.get("resultNetWeight") == null){
-                        return 4;
-                    }
-                }
-            }
+        if(map.get("asd") == null){ //预防司机没更新APP点击发送委托
+            return 5;
         }
         int i=0;
         //获取订单类型
@@ -529,22 +509,48 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
             case 6:
             case 7:
             case 8:
-//            case 9:
             case 10:
             case 11:
             case 17:
             case 18:
                 i+=addMaoMeasureCommission(map);
         }
-        if(i == 1 && orderType.intValue() == 11){
-            //发送委托成功后修改订单物资表
-            tmstruckMeasureCommissionMapper.updateOmsTruckMaterial(map);
-            if(map.get("deletedCommission") != null){
-                i = 3;
+        return i;
+    }
+
+    /* 手动发送委托稽核代码
+   if(map.get("deletedCommission") != null){
+            //在计量实绩中查询是否有计量数据，如果有则代表已经计量过了不允许撤回
+            List<Integer> commission = tmstruckMeasureCommissionMapper.checkoutWeightCommission(map);
+            if(commission.size() != 0){
+                return 2;
+            }
+        }else {
+            //查询最后发送委托的物资
+            Integer alreadySentMaterialId = tmstruckMeasureCommissionMapper.getAlreadySentMaterialId(map);
+            if(alreadySentMaterialId != null){
+                map.put("checkMaterialId", alreadySentMaterialId);
+                //判断当前订单是否有已经发送过委托 但是还未计量完成的物资
+                Map<String, Object> checkoutMesMap = tmstruckMeasureCommissionMapper.checkoutWeightCommission2(map);
+                if(checkoutMesMap == null){ // 为空则是这个物资还没有计量
+                    return 4;
+                }else {
+                    //如果不为空, 判断是否有净重 如果有净重则是计量完成 否则 没有
+                    if(checkoutMesMap.get("resultNetWeight") == null){
+                        return 4;
+                    }
+                }
             }
         }
-        return i;
+
+    if(i == 1 && orderType.intValue() == 11){
+        //发送委托成功后修改订单物资表
+        tmstruckMeasureCommissionMapper.updateOmsTruckMaterial(map);
+        if(map.get("deletedCommission") != null){
+            i = 3;
+        }
     }
+     **/
 
     /**
      * 发送留皮委托

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

@@ -130,12 +130,6 @@ public class TmstruckUnloadResultServiceImpl implements ITmstruckUnloadResultSer
 
     /**
      * 更新卸货实绩内容 扫码人员扫码后获取信息传输数据给接口
-     * 1：销售订单；2：焦炭发运计划；3：水渣发运计划；4：内转到异地库；5：采购辅料订单；6：采购老区燃料订单；
-     * 7：采购新区燃料订单；8：采购进口矿(万州-厂内)；9：采购内转(达州-厂内)；10：采购内转(老区-厂内)； 11：厂内内转
-     *{
-     *     "orderNumber": "WYSDD2021112800000765",
-     *     "warehouseId": 1
-     * }
      * @param map
      * @return
      */
@@ -161,6 +155,8 @@ public class TmstruckUnloadResultServiceImpl implements ITmstruckUnloadResultSer
             //更新路段顺序号
             mesMap.put("orderLineSequence",sqe);
             i += utilsService.updateOrderLineSqeByOrderNumber(mesMap);
+            //内转只要是卸货都直接关闭订单
+            omsFeign.closeInwardOrder(DataChange.dataToBigDecimal(mesMap.get("orderId")).intValue());
             //卸货成功后推送消息给websocket
             utilsService.pushMesToWebsocket((String) map.get("capacityNumber"), "卸货");
             return i;
@@ -190,9 +186,6 @@ public class TmstruckUnloadResultServiceImpl implements ITmstruckUnloadResultSer
             case 20:
                 i += tmstruckReceiptResultService.addReceiptResult(map); //新增完卸车实绩后新增一条收货实绩
                 break;
-            case 11:
-                //判断出厂路段顺序号是否为最后一个
-                i += utilsService.closeOrderNormally(map);
             case 12:
                 //判断是否还有物资，如果还有物资就执行发送计量委托
 //                materialIdIsNorWeight(map);

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

@@ -180,11 +180,14 @@
     </select>
     <select id="getOrderMesByOrderId" resultType="java.util.Map">
         select OO.ORDER_TYPE "orderTypee",
-               TTR.RESULT_TOTAL_ID  "resultTotalId"
+               TTR.RESULT_TOTAL_ID  "resultTotalId",
+               OOM.MATERIAL_ID  "materialId"
         from OMSTRUCK_ORDER OO
         left join TMSTRUCK_TOTAL_RESULT TTR
             on OO.ORDER_ID = TTR.ORDER_ID
-        where  OO.ORDER_ID=#{orderId}
+        left join OMSTRUCK_ORDER_MATERIAL OOM
+            on OOM.ORDER_ID = OO.ORDER_ID
+        where  OO.ORDER_ID=#{orderId} and rownum = 1
     </select>
      <!-- 根据运输订单id查找是否有多个物资 -->
     <select id="countMaterialByOrderId" parameterType="java.math.BigDecimal" resultType="java.util.Map">