对接进取计量接口

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

@@ -47,4 +47,14 @@ public class TmstruckMeasureCommissionController extends BaseRESTfulController {
         List<Map<String, Object>> allMeasureCommission = tmstruckMeasureCommissionService.getAllMeasureCommission(mapValue);
         return success(allMeasureCommission);
     }
+
+    @ApiOperation(value="查询计量委托 ")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "resultId", value = "装车作业实绩ID", required = false, dataType = "Integer"),
+    })
+    @PostMapping("/sendMesToDXMeasure")
+    public RESTfulResult sendMesToDXMeasure(@RequestBody(required = false) Map<String, Object> map){
+        int i = tmstruckMeasureCommissionService.addMaoMeasureCommission(map);
+        return success(i);
+    }
 }

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

@@ -48,5 +48,11 @@ public interface TmstruckMeasureCommissionMapper extends IBaseMapper<TmstruckMea
     Map<String, Object> selectMakesureTareForPurchase(Map<String, Object> map);
 
     //采购辅料计量委托
-    Map<String, Object> purchaseMaoMeasure(Map<String, Object> map);
+    Map<String, Object> purchaseFLMeasure(Map<String, Object> map);
+
+    //采购辅料计量委托
+    Map<String, Object> purchaseFLDXMeasure(Map<String, Object> map);
+
+    //通过订单ID查询发货单位ID
+    Integer getSupplierIdByOrderId(BigDecimal orderId);
 }

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

@@ -28,6 +28,4 @@ public interface ITmstruckMeasureCommissionService{
     //添加计毛委托
     int addMaoMeasureCommission(Map<String, Object> map);
 
-    //添加计皮委托
-    int addPiMeasureCommission(Map<String, Object> map);
 }

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

@@ -186,7 +186,7 @@ public class TmstruckEnfactoryResultServiceImpl implements ITmstruckEnfactoryRes
                 //计算计皮汽车衡并更新计量实绩
                 i += tmstruckWeightResultService.calculateTruckCalculateByOne(map, 1);
                 //焦炭 水渣 等只会有一种物资
-                i += tmstruckMeasureCommissionService.addPiMeasureCommission(map); //添加计皮委托
+//                i += tmstruckMeasureCommissionService.addPiMeasureCommission(map); //添加计皮委托
                 break;
             case 5:
             case 6:
@@ -228,7 +228,7 @@ public class TmstruckEnfactoryResultServiceImpl implements ITmstruckEnfactoryRes
             case 1:
             case 4:
                 i += updateEnFactoryResultByMJ(map); //添加进厂实绩
-                i += tmstruckMeasureCommissionService.addPiMeasureCommission(map); //添加计皮委托
+//                i += tmstruckMeasureCommissionService.addPiMeasureCommission(map); //添加计皮委托
                 break;
             case 2:
                 break;

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

@@ -72,31 +72,25 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
     }
 
     /**
-     * 添加计毛委托 并发送计毛委托
+     * 添加计量委托 并发送计量委托
      * @param map {orderTypee: 订单类型
      *            resultTotalId：总实绩ID  orderId: 订单ID
-     *            总实绩ID orderNumber：运输订单号}
+     *            总实绩ID }
      * @return
      */
     public int addMaoMeasureCommission(Map<String, Object> map){
-        int i = addMeasureCommission(map, 1); // 添加计毛委托
-        //发送数据给计量系统 必要数据 orderTypee：订单类型  type： 1：计毛 |0：计皮 resultTotalId： 总实绩Id
-        map.put("type", 1);
-        i += sendMeasureCommissionMes(map);
-        return i;
-    }
-
-    /**
-     * 添加计皮委托 并发送计皮委托
-     * @param map {orderTypee: 订单类型  resultTotalId：总实绩ID  orderId: 订单ID
-     *            orderNumber：运输订单号}
-     * @return
-     */
-    public int addPiMeasureCommission(Map<String, Object> map){
-        int i = addMeasureCommission(map, 0); // 添加计皮委托
-        //发送数据给计量系统 必要数据 orderTypee：订单类型  type： 1：计毛 |0：计皮 resultTotalId： 总实绩Id
-        map.put("type", 0);
-        i += sendMeasureCommissionMes(map);
+        int i = addMeasureCommission(map, 2); // 添加计毛委托
+        //发送数据给计量系统 必要数据 orderTypee：订单类型  type： 1：计毛 |0：计皮 resultTotalId： 总实绩Id   orderId
+        //获取当前订单是属于哪个厂区订单
+        Integer receiveId = tmstruckMeasureCommissionMapper.getSupplierIdByOrderId(DataChange.dataToBigDecimal(map.get("orderId")));
+        if(receiveId == 1){
+            //发送委托给达州钢铁
+            i += sendMeasureCommissionMes(map);
+        }
+        if(receiveId == 2) {
+            //发送委托给达兴能源
+            i += sendDXMeasureCommissionMes(map);
+        }
         return i;
     }
 
@@ -166,33 +160,60 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
             case 7:
             case 8:
             case 9:
-                if(type == 0) {
-                    measureCommission =  tmstruckMeasureCommissionMapper.purchaseMaoMeasure(map);
-                    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);
-                }else {
-                    measureCommission =  tmstruckMeasureCommissionMapper.purchaseMaoMeasure(map);
-                    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 =  tmstruckMeasureCommissionMapper.purchaseFLMeasure(map);
+                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);
         }
         /*访问接口发送数据*/
 //        sendMesToMeasure(measureCommission);
         return 1;
     }
 
+
+    /**
+     * 发送计量委托给达兴能源 计量
+     * @param map
+     * @return
+     */
+    public int sendDXMeasureCommissionMes(Map<String, Object> map){
+        Map<String, Object> measureCommission = null;
+        //查询计量委托
+        BigDecimal orderType = DataChange.dataToBigDecimal(map.get("orderTypee"));
+        switch (orderType.intValue()){
+            case 1:
+                break;
+            case 2:
+                break;
+            case 3:
+                break;
+            case 10:
+            case 11:
+            case 4:
+                break;
+            case 5:
+            case 6:
+            case 7:
+            case 8:
+            case 9:
+                measureCommission =  tmstruckMeasureCommissionMapper.purchaseFLDXMeasure(map);
+                measureCommission.put("deliveryType", "计重");
+                measureCommission.put("billType", "0");
+                measureCommission.put("planQuantity", 0);
+                measureCommission.put("crname", "admin");
+                measureCommission.put("orderSource", 1);
+                measureCommission.put("ended", 0);
+        }
+        /*访问接口发送数据*/
+        return sendMesToDXMeasure(measureCommission);
+    }
+
     /**
-     * 访问计量接口方法
+     * 访问老厂区计量接口方法
      * @param map
      * @return
      */
@@ -220,4 +241,33 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
         }
         return 0;
     }
+
+
+    /**
+     * 访问新厂区达兴能源计量接口方法
+     * @param map
+     * @return
+     */
+    public int sendMesToDXMeasure(Map<String, Object> map){
+        JSONObject jsonObject = new JSONObject();
+        jsonObject.put("data", map);
+
+        String url = "http://223.85.163.87:8121/daXingWeight/orderBusiness.do?addOrder";
+        String jsonData = null;
+        try {
+            jsonData = HTTPRequestUtils.send(url, jsonObject, "utf-8");
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        if(!"null".equals(jsonData)){
+            System.out.println(jsonData);
+            HashMap hashMap = JSON.parseObject(jsonData, HashMap.class);
+            String code =(String) map.get("code");
+            System.out.println(hashMap.get("msg"));
+            if("0".equals(code)){
+                return 1;
+            }
+        }
+        return 0;
+    }
 }

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

@@ -743,7 +743,7 @@
     </select>
     
 <!--  采购辅料计量委托  -->
-    <select id="purchaseMaoMeasure" parameterType="map" resultType="java.util.Map">
+    <select id="purchaseFLMeasure" parameterType="map" resultType="java.util.Map">
         select
             APO.PURCHASE_ORDER_NO   "purchaseOrder",
             OO.ORDER_NUMBER         "transportNum",
@@ -785,5 +785,52 @@
         where OO.ORDER_ID = #{orderId}
     </select>
 
-<!--  内转采购计量委托  -->
+<!--   采购辅料查询计量委托(达兴) -->
+    <select id="purchaseFLDXMeasure" parameterType="map" resultType="java.util.Map">
+        select
+            APO.PURCHASE_ORDER_NO   "purchaseOrder",
+            OO.ORDER_NUMBER         "orderId",
+            RC.CAPACITY_NUMBER      "carNumber",
+            RTC.TRUCK_CALCULATE_NUMBER "regionName",
+            RS.SUPPLIER_NAME            "sendUnit",
+            RS.SUPPLIER_DUTY_PARAGRAPH   "providerNo",
+            RSH.SHIPPER_NAME            "receiver",
+            RSH.SHIPPER_PARTITION_CODE  "receiverNo",
+            RM.MATERIAL_ID              "item",
+            RM.MATERIAL_CODE            "goodsNo",
+            CONCAT(RM.MATERIAL_NAME ,CONCAT(RM.MATERIAL_SPECIFICATION, RM.MATERIAL_MODEL)) "goodsName"
+        from OMSTRUCK_ORDER OO
+                 left join TMSTRUCK_TOTAL_RESULT TTR
+                           on TTR.ORDER_ID = OO.ORDER_ID
+                 left join AMS_PURCHASE_ORDER APO
+                           on APO.PURCHASE_ORDER_ID = OO.ORDER_PLAN_ID
+                 left join RMS_SUPPLIER RS
+                           on RS.SUPPLIER_ID = APO.SUPPLIER_UNIT_ID
+                 left join RMS_SHIPPER RSH
+                           on RSH.SHIPPER_ID = APO.RECEIVE_UNIT_ID
+                 left join OMSTRUCK_ORDER_MATERIAL OOM
+                           on OO.ORDER_ID = OOM.ORDER_ID
+                 left join RMS_MATERIAL RM
+                           on RM.MATERIAL_ID = OOM.MATERIAL_ID
+                 left join RMS_CAPACITY RC
+                           on RC.CAPACITY_ID = OO.CAPACITY_ID
+                 left join TMSTRUCK_WEIGHT_RESULT TWR
+                           on TTR.RESULT_TOTAL_ID = TWR.RESULT_TOTAL_ID
+                 left join RMS_TRUCK_CALCULATE RTC
+                           on RTC.TRUCK_CALCULATE_ID = TWR.RESULT_GROSS_PLACE_ID
+                 left join TMSTRUCK_UNLOAD_RESULT TUR
+                           on TUR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+        where OO.ORDER_ID = #{orderId}
+    </select>
+
+<!--   通过订单ID查询发货单位ID -->
+    <select id="getSupplierIdByOrderId" parameterType="java.math.BigDecimal" resultType="java.lang.Integer">
+        select APO.RECEIVE_UNIT_ID
+        from OMSTRUCK_ORDER OO
+        left join AMS_PURCHASE_ORDER APO
+            on APO.PURCHASE_ORDER_ID = OO.ORDER_PLAN_ID
+        where OO.ORDER_ID = #{orderId}
+    </select>
+
+    <!--  内转采购计量委托  -->
 </mapper>