修改委托

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

@@ -62,14 +62,12 @@ public class TmstruckMeasureCommissionController extends BaseRESTfulController {
             @ApiImplicitParam(name = "resultId", value = "装车作业实绩ID", required = false, dataType = "Integer"),
     })
     @PostMapping("/sendMeasureCommission")
-    public RESTfulResult sendMeasureCommission(@RequestBody(required = false) Map<String, Object> map) throws Exception {
-        int i = 0;
-        try {
-            i = tmstruckMeasureCommissionService.sendMeasureCommssion(map);
-        } catch (Exception e) {
-            e.getMessage();
+    public RESTfulResult sendMeasureCommission(@RequestBody(required = false) Map<String, Object> map){
+        int i = tmstruckMeasureCommissionService.sendMeasureCommssion(map);
+        if(i == 0){
+            return failed("委托发送失败！请联系管理员");
         }
-        return success(i);
+        return success("委托发送成功");
     }
 
 

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

@@ -45,7 +45,7 @@ public interface UtilsMapper {
     //查询当前路段顺序号通过订单Id
     Integer getLineSequenceByOrderId(@Param("orderId") BigDecimal orderId);
 
-    //通过订单号查询订单实绩
+    //通过订单号查询订单路段顺序号
     Integer getLineSequenceByOrderNumber(String orderNumber);
 
     //查询订单跟订单物资中间表 查询是否有多个物资Id

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

@@ -29,6 +29,6 @@ public interface ITmstruckMeasureCommissionService{
     int addMaoMeasureCommission(Map<String, Object> map);
 
     //发送计量委托
-    int sendMeasureCommssion(Map<String,Object> map) throws Exception;
+    int sendMeasureCommssion(Map<String,Object> map);
 
 }

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

@@ -226,10 +226,9 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
      * @param map orderTypee 订单类型  type 计皮0还是计毛1类型  orderId  订单ID
      */
     public int sendMeasureCommissionMes(Map<String, Object> map){
-        Map<String, Object> measureCommission = new HashMap<>();
+        Map<String, Object> measureCommission = null;
         //查询计量委托
         Integer orderType = DataChange.dataToBigDecimal(map.get("orderTypee")).intValue();
-        BigDecimal orderId=DataChange.dataToBigDecimal(map.get("orderId"));
         switch (orderType){
             case 1:
                 break;
@@ -239,24 +238,6 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
                 break;
             case 10:
                 break;
-            case 11://纯内转发送计量委托
-                 //查找是否是多拼
-                 Integer materialNu = utilsMapper.countMaterialByOrderId(orderId);
-                 if (materialNu > 1){
-                     List<Map<String, Object>> inwardCommission = tmstruckMeasureCommissionMapper.getMaterialIdAndCalculateId(map);
-                 }else {
-                     measureCommission = tmstruckMeasureCommissionMapper.purchaseNzMeasure(map);
-                 }
-                 measureCommission.put("isRelationEAS", false);
-                 measureCommission.put("flowTo", "进厂");
-                 measureCommission.put("isDel", false);
-                 measureCommission.put("isInsert", true);
-                 measureCommission.put("IsAssembly", false);
-                 measureCommission.put("deliveryMethod", "磅重交货");
-                 measureCommission.put("packagesNum", 0);
-                 measureCommission.put("ReceivUnit","四川省达州钢铁集团有限责任公司");
-                 measureCommission.put("sendUnit","四川省达州钢铁集团有限责任公司");
-                 break;
             case 4:
                 break;
             case 5:
@@ -265,6 +246,9 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
             case 8:
 //            case 9:
                 measureCommission =  tmstruckMeasureCommissionMapper.purchaseMeasure(map);
+                if(measureCommission == null){
+                    return 0;
+                }
                 if(orderType == 6){
                     measureCommission.put("isRelationEAS", false);
                 }else {
@@ -277,11 +261,35 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
                 measureCommission.put("deliveryMethod", "磅重交货");
                 measureCommission.put("packagesNum", 0);
                 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("ReceivUnit","四川省达州钢铁集团有限责任公司");
+                measureCommission.put("sendUnit","四川省达州钢铁集团有限责任公司");
+                break;
             case 12:
             case 13:
                  //内转零星进厂（老厂区）
                 //零星计量委托(老厂区)
                 measureCommission = tmstruckMeasureCommissionMapper.sproadicMeasure(map);
+                if(measureCommission == null){
+                    return 0;
+                }
                 measureCommission.put("isRelationEAS",false);
                 measureCommission.put("flowTo","进厂");
                 measureCommission.put("isDel", false);
@@ -294,6 +302,9 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
             case 16:
                 //零星计量委托(老厂区)  会有多拼
                 measureCommission = tmstruckMeasureCommissionMapper.sproadicMeasure(map);
+                if(measureCommission == null){
+                    return 0;
+                }
                 measureCommission.put("isRelationEAS",false);
                 measureCommission.put("flowTo","出厂");
                 measureCommission.put("isDel", false);
@@ -303,6 +314,9 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
                 break;
             case 20://采购内转委托总厂区
                 measureCommission=tmstruckMeasureCommissionMapper.purchaseXqCgNzMeasure(map);
+                if(measureCommission == null){
+                    return 0;
+                }
                 measureCommission.put("isRelationEAS",false);
                 measureCommission.put("flowTo","进厂");
                 measureCommission.put("isDel",false);
@@ -312,6 +326,7 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
 
         }
         /*访问接口发送数据*/
+        System.out.println(measureCommission == null ? "没有查询出委托" : measureCommission);
         return 1;
 //        return sendMesToMeasure(measureCommission);
 
@@ -465,7 +480,7 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
     //发送计量委托
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public int sendMeasureCommssion(Map<String, Object> map)  throws Exception {
+    public int sendMeasureCommssion(Map<String, Object> map){
         int i=0;
         //获取订单类型
         BigDecimal orderId = DataChange.dataToBigDecimal(map.get("orderId"));
@@ -500,15 +515,26 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
 //            case 9:
             case 10:
             case 11:
+                i += addNZMeasureCommission(map);
+                break;
 //            case 17:
             case 18:
-                //通过订单ID查询物资Id
                 i+=addMaoMeasureCommission(map);
         }
-        if (i==0){
-            throw new Exception("委托发送失败");
-        }
         return i;
     }
 
+    /**
+     * 添加内转委托
+     * @Author TXF
+     * @Date 2022/2/19 12:23
+     * @param map
+     * @return
+     **/
+    public int addNZMeasureCommission(Map<String, Object> map){
+        int i = 0;
+        addMeasureCommission(map); // 添加计毛委托
+        i += sendMeasureCommissionMes(map); //往老厂区发送委托
+        return i;
+    }
 }

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

@@ -1142,45 +1142,28 @@
         WHERE
             ROWNUM = 1
     </select>
+
+<!--  查询内转计量委托  -->
     <select id="purchaseNzMeasure" resultType="java.util.Map" parameterType="java.util.Map">
-        SELECT
-            *
-        FROM
-            (
-                SELECT
-                    OO.ORDER_NUMBER "transportNum",
-                    RC.CAPACITY_NUMBER "carNum",
-                    APO.PURCHASE_ORDER_NO "purchaseOrder",
-                    RW.WAREHOUSE_NAME "unloadPlace",
-                    TWR.INSERT_UPDATE_REMARK "demo",
-                    RM.MATERIAL_ID "materialId",
-                    RM.MATERIAL_NAME "materiaName",
-                    concat( RM.MATERIAL_SPECIFICATION, RM.MATERIAL_MODEL ) "goodsType",
-                    RTC.TRUCK_CALCULATE_NUMBER "steelyardNum"
-                FROM
-                    OMSTRUCK_ORDER OO
-                        LEFT JOIN RMS_CAPACITY RC ON RC.CAPACITY_ID = OO.CAPACITY_ID
-                        LEFT JOIN AMSTRUCK_INWARD_PLAN AIP ON AIP.PLAN_ID = OO.ORDER_PLAN_ID
-                        LEFT JOIN AMSTRUCK_REQUIREMENT_PLAN ARP ON ARP.PLAN_ID = AIP.PLAN_ID
-                        LEFT JOIN AMSTRUCK_INWARD_REQUIREMENT AIR ON AIR.REQUIREMENT_ID = ARP.REQUIREMENT_ID
-                        LEFT JOIN AMS_PURCHASE_ORDER APO ON APO.PURCHASE_ORDER_ID = AIR.PURCHASE_ORDER_ID
-                        LEFT JOIN RMS_SUPPLIER RS ON RS.SUPPLIER_ID = APO.SUPPLIER_UNIT_ID
-                        LEFT JOIN RMS_CONSIGNEE RCE ON RCE.CONSIGNEE_ID = APO.RECEIVE_UNIT_ID
-                        LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR ON TTR.ORDER_ID = OO.ORDER_ID
-                        LEFT JOIN TMSTRUCK_UNLOAD_RESULT TUR ON TUR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
-                        LEFT JOIN RMS_WAREHOUSE RW ON RW.WAREHOUSE_ID = AIR.REQUIREMENT_UNLOAD_UNIT_ID
-                        LEFT JOIN TMSTRUCK_WEIGHT_RESULT TWR ON TWR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
-                        LEFT JOIN OMSTRUCK_ORDER_MATERIAL OOM ON OOM.ORDER_ID = OO.ORDER_ID
-                        LEFT JOIN RMS_MATERIAL RM ON RM.MATERIAL_ID = OOM.MATERIAL_ID
-                        LEFT JOIN RMS_TRUCK_CALCULATE RTC ON RTC.TRUCK_CALCULATE_ID = TWR.RESULT_TARE_PLACE_ID
-                WHERE
-                    OO.ORDER_ID = #{orderId}
-                ORDER BY
-                    TWR.TARE_SEGMENT_SQE DESC,
-                    OOM.MATERIAL_PRIORITY DESC
-            )
-        WHERE
-            ROWNUM = 1
+       select OO.ORDER_NUMBER       "transportNum",
+              RC.CAPACITY_NUMBER    "carNum",
+              RM.MATERIAL_NAME      "materiaName",
+              CONCAT(RM.MATERIAL_SPECIFICATION, RM.MATERIAL_MODEL) "goodsType",
+              OO.INSERT_UPDATE_REMARK   "demo",
+              RM.MATERIAL_ID          "materialId",
+              RW.WAREHOUSE_NAME       "unloadPlace"
+       from OMSTRUCK_ORDER OO
+        left join AMSTRUCK_INWARD_PLAN  AIP on OO.ORDER_PLAN_ID = AIP.PLAN_ID
+        left join AMSTRUCK_REQUIREMENT_PLAN ARP on ARP.PLAN_ID = AIP.PLAN_ID
+        left join AMSTRUCK_INWARD_REQUIREMENT AIR ON AIR.REQUIREMENT_ID = ARP.REQUIREMENT_ID
+        LEFT JOIN AMSTRUCK_REQUIREMENT_MATERIAL ARM ON ARM.REQUIREMENT_ID = AIR.REQUIREMENT_ID
+        LEFT JOIN RMS_WAREHOUSE RW on RW.WAREHOUSE_ID = ARM.REQUIREMENT_UNLOAD_UNIT_ID
+        left join OMSTRUCK_ORDER_MATERIAL OOM  on OO.ORDER_ID = OOM.ORDER_ID
+        left join RMS_MATERIAL  RM on OOM.MATERIAL_ID = RM.MATERIAL_ID
+        left join RMS_CAPACITY  RC on OO.CAPACITY_ID = RC.CAPACITY_ID
+        where OOM.ORDER_ID = #{orderId}
+              and OOM.MATERIAL_ID = #{materialId}
+              AND ARM.MATERIAL_ID = #{materialId}
     </select>
 
 <!--  查找未计量完成的物资  -->