修改委托

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

@@ -171,6 +171,8 @@ public class TmstruckLoadResultController extends BaseRESTfulController {
                 return failed("请勿重复装车");
             }else if( i == -6){
                 return failed("请通知司机完成前序操作再来装货！");
+            }else if(i == -7){
+                return failed("委托发送失败");
             }else {
                 return failed("装货异常，请联系管理员！");
             }

src/main/java/com/steerinfo/dil/mapper/UtilsMapper.java

@@ -133,4 +133,7 @@ public interface UtilsMapper {
 
     BigDecimal getTotalIdByOrderId(BigDecimal orderId);
 
+    //通过仓库id
+    String queryWarehouseName(BigDecimal warehouseId);
+
 }

src/main/java/com/steerinfo/dil/service/ITmstruckMeasureCommissionService.java

@@ -28,6 +28,9 @@ public interface ITmstruckMeasureCommissionService{
     //添加计毛委托
     int addMaoMeasureCommission(Map<String, Object> map);
 
+    //在新委托添加装货点
+    int addMeasureCommissionForLoding(Map<String,Object> map);
+
     //发送计量委托
     int sendMeasureCommssion(Map<String,Object> map);
 

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

@@ -181,6 +181,8 @@ public class TmstruckLoadResultServiceImpl implements ITmstruckLoadResultService
         if(i == 0){
             return i;
         }
+
+
         tmstruckLoadResultMapper.updateByPrimaryKeySelective(tmstruckLoadResult);
         //更新路段顺序号
         utilsService.updateOrderLineSequence(steelMesMap); //orderId segmentSqe
@@ -302,6 +304,18 @@ public class TmstruckLoadResultServiceImpl implements ITmstruckLoadResultService
         tmstruckLoadResultMapper.updateByPrimaryKeySelective(tmstruckLoadResult);
         //推送消息到websocket
         utilsService.pushMesToWebsocket(capacityNumber, "装货");
+        //发送计量委托
+        if (map.get("warehouseId")==null){
+          map.put("warehouseName",null);
+        }else {
+            //根据id查找装货点名称
+            String warehouseName = utilsMapper.queryWarehouseName(DataChange.dataToBigDecimal(map.get("warehouseId")));
+            map.put("warehouseName",warehouseName);
+        }
+        int i = tmstruckMeasureCommissionService.addMeasureCommissionForLoding(map);
+        if (i!=1){
+         return  -7;
+        }
         return 1;
     }
 

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

@@ -90,6 +90,134 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
     }
 
 
+    //添加装货点发送委托给计量
+    @Override
+    public int addMeasureCommissionForLoding(Map<String, Object> map){
+        Map<String, Object> measureCommission = null;
+        //查询计量委托
+        int orderType = DataChange.dataToBigDecimal(map.get("orderTypee")).intValue();
+        String warehouseName =(String) map.get("warehouseName");
+        switch (orderType){
+            case 1:
+                break;
+            case 2:
+                measureCommission=tmstruckMeasureCommissionMapper.selectXsMeasuresion(map);
+                if(measureCommission == null){
+                    return 0;
+                }
+                measureCommission.put("isRelationEAS",true);
+                measureCommission.put("flowTo","出厂");
+                measureCommission.put("isDel", false);
+                measureCommission.put("isInsert", true);
+                measureCommission.put("IsAssembly", false);
+                measureCommission.put("deliveryMethod", "磅重交货");
+                measureCommission.put("packagesNum", 0);
+                measureCommission.put("loadPlace",warehouseName);
+                if(map.get("isDG") != null){
+                    measureCommission.put("factory", "dg");
+                }
+                break;
+            case 5:
+            case 6:
+            case 8:
+            case 17:
+                measureCommission =  tmstruckMeasureCommissionMapper.purchaseMeasure(map);
+                if(measureCommission == null){
+                    return 0;
+                }
+                measureCommission.put("isRelationEAS", true);
+                measureCommission.put("flowTo", "进厂");
+                measureCommission.put("isDel", false);
+                measureCommission.put("isInsert", true);
+                measureCommission.put("IsAssembly", false);
+                measureCommission.put("deliveryMethod", "磅重交货");
+                measureCommission.put("packagesNum", 0);
+                measureCommission.put("loadPlace",warehouseName);
+                break;
+            case 11:
+                //纯内转发送计量委托
+                measureCommission = tmstruckMeasureCommissionMapper.purchaseNzMeasure(map);
+                if(measureCommission == null){
+                    return 0;
+                }
+                if(map.get("deletedCommission") != null){
+                    measureCommission.put("isDel", true);
+                    measureCommission.put("isInsert", false);
+                }else {
+                    measureCommission.put("isDel", false);
+                    measureCommission.put("isInsert", true);
+                }
+                measureCommission.put("isRelationEAS", false);
+                measureCommission.put("flowTo", "中转");
+                measureCommission.put("IsAssembly", false);
+                measureCommission.put("deliveryMethod", "磅重交货");
+                measureCommission.put("packagesNum", 0);
+                measureCommission.put("loadPlace",warehouseName);
+                System.out.println(measureCommission);
+                break;
+            case 12:
+            case 13:     //零星进厂、出厂
+            case 14:
+            case 19:
+                measureCommission = tmstruckMeasureCommissionMapper.sproadicMeasure(map);
+                if(measureCommission == null){
+                    return 0;
+                }
+                measureCommission.put("steelyardNum", "null");
+                measureCommission.put("demo", "无");
+                measureCommission.put("isRelationEAS",false);
+                if(orderType == 12){
+                    measureCommission.put("flowTo","进厂");
+
+                }else if(orderType == 13){
+                    measureCommission.put("flowTo","出厂");
+
+                }else if(orderType == 14){
+                    //查询还有几次未计量实绩
+                    BigDecimal resultTotalId = DataChange.dataToBigDecimal(map.get("resultTotalId"));
+                    Integer count = tmstruckMeasureCommissionMapper.selectNoNetWeightResult(resultTotalId);
+                    if(count > 1){ //第一次进厂
+                        measureCommission.put("materiaName", measureCommission.get("materiaName") + "(出)");
+                    }else { //第二次进厂
+                        measureCommission.put("materiaName", measureCommission.get("materiaName") + "(入)");
+                    }
+                    measureCommission.put("flowTo","中转");
+                }else{
+                    measureCommission.put("flowTo","退货");
+                }
+                measureCommission.put("isDel", false);
+                measureCommission.put("isInsert", true);
+                measureCommission.put("deliveryMethod", "磅重交货");
+                measureCommission.put("packagesNum", 0);
+                measureCommission.put("loadPlace",warehouseName);
+                break;
+            case 20://采购内转委托总厂区
+            case 15:
+            case 16:
+                measureCommission=tmstruckMeasureCommissionMapper.purchaseXqCgNzMeasure(map);
+                if(measureCommission == null){
+                    return 0;
+                }
+                if(orderType == 16){
+                    measureCommission.put("factory","dg");
+                }
+                measureCommission.put("isRelationEAS",false);
+                measureCommission.put("flowTo","进厂");
+                measureCommission.put("isDel",false);
+                measureCommission.put("isInsert",true);
+                measureCommission.put("deliveryMethod", "磅重交货");
+                measureCommission.put("packagesNum", 0);
+                measureCommission.put("loadPlace",warehouseName);
+        }
+        if(measureCommission != null){
+            map.put("materialId", measureCommission.get("materialId"));
+        }
+        addMeasureCommission(map); // 添加计量委托
+        /*访问接口发送数据*/
+        System.out.println(measureCommission);
+        return sendMesToMeasure(measureCommission);
+    }
+
     /**
      * 查询计量委托 0 ：计皮     1：计毛
      * @param map orderTypee 订单类型   type 是计皮还是计毛

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

@@ -371,4 +371,9 @@
         ON TTR.RESULT_TOTAL_ID=TLR.RESULT_TOTAL_ID
         WHERE OO.ORDER_NUMBER=#{orderNumber} and TLR.CAPACITY_REMARK =#{capacityName}
     </select>
+    <select id="queryWarehouseName" resultType="java.lang.String" parameterType="java.math.BigDecimal">
+       select rw.WAREHOUSE_NAME "warehouseName"
+       from RMS_WAREHOUSE rw
+       where  rw.WAREHOUSE_ID=#{warehouseId}
+    </select>
 </mapper>