修改计量委托

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

@@ -29,6 +29,9 @@ public interface TmstruckMeasureCommissionMapper extends IBaseMapper<TmstruckMea
      * from zhangXuan
      */
 
+    //通过订单ID查询发货单位ID
+    Integer getSupplierIdByOrderId(BigDecimal orderId);
+
     //销售查询计毛
     Map<String, Object> selectMakesureGrossForSaleByOrderNumber(Map<String, Object> map);
 
@@ -47,12 +50,15 @@ public interface TmstruckMeasureCommissionMapper extends IBaseMapper<TmstruckMea
     //采购查询计毛
     Map<String, Object> selectMakesureTareForPurchase(Map<String, Object> map);
 
-    //采购辅料计量委托
-    Map<String, Object> purchaseFLMeasure(Map<String, Object> map);
+    //采购计量委托
+    Map<String, Object> purchaseMeasure(Map<String, Object> map);
 
-    //采购辅料计量委托
-    Map<String, Object> purchaseFLDXMeasure(Map<String, Object> map);
+    //采购计量委托（达兴）
+    Map<String, Object> purchaseDXMeasure(Map<String, Object> map);
 
-    //通过订单ID查询发货单位ID
-    Integer getSupplierIdByOrderId(BigDecimal orderId);
+    //销售计量委托
+    Map<String, Object> saleMeasure(Map<String, Object> map);
+
+    //销售计量委托（达兴）
+    Map<String, Object> saleDXMeasure(Map<String, Object> map);
 }

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

@@ -23,7 +23,7 @@ public interface ITmstruckMeasureCommissionService{
     List<Map<String, Object>> getAllMeasureCommission(Map<String, Object> map);
 
     //新增计量委托实绩 当进厂作业完成后
-    int addMeasureCommission(Map<String, Object> map, Integer type);
+    int addMeasureCommission(Map<String, Object> map);
 
     //添加计毛委托
     int addMaoMeasureCommission(Map<String, Object> map);

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

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

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

@@ -79,8 +79,8 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
      * @return
      */
     public int addMaoMeasureCommission(Map<String, Object> map){
-        int i = addMeasureCommission(map, 2); // 添加计毛委托
-        //发送数据给计量系统 必要数据 orderTypee：订单类型  type： 1：计毛 |0：计皮 resultTotalId： 总实绩Id   orderId
+        int i = addMeasureCommission(map); // 添加计毛委托
+        //发送数据给计量系统 必要数据 orderTypee：订单类型  resultTotalId： 总实绩Id   orderId
         //获取当前订单是属于哪个厂区订单
         Integer receiveId = tmstruckMeasureCommissionMapper.getSupplierIdByOrderId(DataChange.dataToBigDecimal(map.get("orderId")));
         if(receiveId == 1){
@@ -100,7 +100,7 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
      * @return
      */
     @Override
-    public int addMeasureCommission(Map<String, Object> map, Integer type) {
+    public int addMeasureCommission(Map<String, Object> map) {
         TmstruckMeasureCommission tmstruckMeasureCommission = new TmstruckMeasureCommission();
         //生成主键Id
         tmstruckMeasureCommission.setCommssionId(tmstruckMeasureCommissionMapper.selectMaxId());
@@ -115,8 +115,6 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
         }
         //添加实绩总表Id
         tmstruckMeasureCommission.setResultTotalId(DataChange.dataToBigDecimal(map.get("resultTotalId")));
-        //添加计量类型
-        tmstruckMeasureCommission.setCommssionType(new BigDecimal(type));
         tmstruckMeasureCommission.setInsertTime(new Date());
         tmstruckMeasureCommission.setInsertUsername("admin");
         return tmstruckMeasureCommissionMapper.insertSelective(tmstruckMeasureCommission);
@@ -133,14 +131,9 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
         Map<String, Object> measureCommission = null;
         //查询计量委托
         BigDecimal orderType = DataChange.dataToBigDecimal(map.get("orderTypee"));
-        Integer type = (Integer) map.get("type");
         switch (orderType.intValue()){
             case 1:
-                if(type == 0) {
-//                    measureCommission =  tmstruckMeasureCommissionMapper.selectMakesureTareForSaleByOrderNumber(map);
-                }else {
-//                    measureCommission =  tmstruckMeasureCommissionMapper.selectMakesureGrossForSaleByOrderNumber(map);
-                }
+
                 break;
             case 2:
                 break;
@@ -149,18 +142,14 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
             case 10:
             case 11:
             case 4:
-                if(type == 0) {
-                    measureCommission =  tmstruckMeasureCommissionMapper.selectMakesureTareForConvertedByOrderNumber(map);
-                }else {
-                    measureCommission =  tmstruckMeasureCommissionMapper.selectMakesureGrossForConvertedByOrderNumber(map);
-                }
+
                 break;
             case 5:
             case 6:
             case 7:
             case 8:
             case 9:
-                measureCommission =  tmstruckMeasureCommissionMapper.purchaseFLMeasure(map);
+                measureCommission =  tmstruckMeasureCommissionMapper.purchaseMeasure(map);
                 measureCommission.put("isRelationEAS", true);
                 measureCommission.put("flowTo", "进厂");
                 measureCommission.put("isDel", false);
@@ -186,13 +175,15 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
         BigDecimal orderType = DataChange.dataToBigDecimal(map.get("orderTypee"));
         switch (orderType.intValue()){
             case 1:
-                break;
             case 2:
-                break;
             case 3:
+                measureCommission = tmstruckMeasureCommissionMapper.saleDXMeasure(map); //订单ID  物资ID  计量实绩ID
+                measureCommission.put("deliveryType", "计重");
+                measureCommission.put("billType", "1");
+                measureCommission.put("crname", "admin");
+                measureCommission.put("orderSource", "1");
+                measureCommission.put("ended", "0");
                 break;
-            case 10:
-            case 11:
             case 4:
                 break;
             case 5:
@@ -200,12 +191,14 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
             case 7:
             case 8:
             case 9:
-                measureCommission =  tmstruckMeasureCommissionMapper.purchaseFLDXMeasure(map);
+                measureCommission =  tmstruckMeasureCommissionMapper.purchaseDXMeasure(map);
                 measureCommission.put("deliveryType", "计重");
                 measureCommission.put("billType", "0");
                 measureCommission.put("crname", "admin");
-                measureCommission.put("orderSource", "0");
+                measureCommission.put("orderSource", "1");
                 measureCommission.put("ended", "0");
+            case 10:
+            case 11:
         }
         /*访问接口发送数据*/
         return sendMesToDXMeasure(measureCommission);

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

@@ -743,7 +743,7 @@
     </select>
     
 <!--  采购辅料计量委托  -->
-    <select id="purchaseFLMeasure" parameterType="map" resultType="java.util.Map">
+    <select id="purchaseMeasure" parameterType="map" resultType="java.util.Map">
         select
             APO.PURCHASE_ORDER_NO   "purchaseOrder",
             OO.ORDER_NUMBER         "transportNum",
@@ -786,8 +786,9 @@
     </select>
 
 <!--   采购辅料查询计量委托(达兴) -->
-    <select id="purchaseFLDXMeasure" parameterType="map" resultType="java.util.Map">
-        select APO.PURCHASE_ORDER_NO                                                          "purchaseOrder",
+    <select id="purchaseDXMeasure" parameterType="map" resultType="java.util.Map">
+        select APO.PURCHASE_ORDER_NO                                                          "psOrder",
+               APO.EAS_ENTRY_ID                                                               "easPrimaryId",
                OO.ORDER_NUMBER                                                                "orderId",
                RC.CAPACITY_NUMBER                                                             "carNumber",
                RTC.TRUCK_CALCULATE_NUMBER                                                     "regionName",
@@ -842,5 +843,62 @@
         where OO.ORDER_ID = #{orderId}
     </select>
 
-    <!--  内转采购计量委托  -->
+    <!--  销售计量委托（达兴）  -->
+    <select id="saleDXMeasure" parameterType="map" resultType="map">
+        select
+               OO.ORDER_NUMBER          "orderId",
+               ASM.MATERIAL_ID          "item",
+               RTC.TRUCK_CALCULATE_NUMBER                                                     "regionName",
+               RC.CAPACITY_NUMBER                                                             "carNumber",
+               RM.MATERIAL_ID || ''                                                           "item",
+               RM.MATERIAL_CODE                                                               "goodsNo",
+               CONCAT(RM.MATERIAL_NAME, CONCAT(RM.MATERIAL_SPECIFICATION, RM.MATERIAL_MODEL)) "goodsName",
+               (case
+                    when ASM.MATERIAL_WEIGHT  is null
+                        then 0
+                    else ASM.MATERIAL_WEIGHT
+                   end
+                   )             || ''                                                         "planQuantity",
+               RS.SHIPPER_NAME                                                                 "provider",
+               (case
+                    when RS.SHIPPER_PARTITION_CODE is null
+                        then ' '
+                    else RS.SHIPPER_PARTITION_CODE
+                   end
+                   )                                                                           "providerNo",
+               RCON.CONSIGNEE_COMPANY_NAME                                                      "receiver",
+               RCON.CONSIGNEE_CODE                                                              "receiverNo",
+               ASM.EAS_PRIMARY_ID                                                               "easPrimaryId"
+
+        from OMSTRUCK_ORDER OO
+        left join AMS_SALE_ORDER_MATERIAL ASOM
+            on ASOM.SALE_ORDER_MATERIAL_ID = OO.ORDER_ID
+        left join AMS_SALE_ORDER ASO
+            on ASO.SALE_ORDER_ID = ASOM.SALE_ORDER_ID
+        left join AMS_SALE_TRUCKNO_MATERIAL ASTM            --获得分路主键ID
+            on ASTM.SALE_ORDER_MATERIAL_ID = ASOM.SALE_ORDER_MATERIAL_ID
+        left join AMS_SALE_MATERIAL ASM
+            on ASM.SALE_MATERIAL_ID = ASTM.MATERIAL_ID
+        left join RMS_MATERIAL RM
+            on RM.MATERIAL_ID = ASM.MATERIAL_ID
+        left join TMSTRUCK_TOTAL_RESULT TTR         --获取汽车衡以及车牌号
+            on TTR.ORDER_ID = OO.ORDER_ID
+        left join TMSTRUCK_WEIGHT_RESULT TWR
+            on TWR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+        left join RMS_TRUCK_CALCULATE RTC
+            on RTC.TRUCK_CALCULATE_ID = TWR.RESULT_TARE_PLACE_ID
+        left join RMS_CAPACITY RC
+            on RC.CAPACITY_ID = OO.CAPACITY_ID
+        left join RMS_SHIPPER RS                --获取收发单位
+            on RS.SHIPPER_ID = ASO.SHIPPER_ID
+        left join RMS_CONSIGNEE RCON
+            on RCON.CONSIGNEE_ID = ASO.RECEIVE_ID
+        where
+                OO.ORDER_ID = #{orderId}
+                <if test="weightTaskResultId != null">
+                    and TWR.WEIGHT_TASK_RESULT_ID = #{weightTaskResultId}
+                </if>
+                and ASM.MATERIAL_ID = TWR.MATERIAL_ID
+                and rownum = 1
+    </select>
 </mapper>