Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU1/DAL-TMS-TRUCK-API

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

@@ -66,4 +66,6 @@ public interface UtilsMapper {
     //通过订单ID查询物资ID（针对单拼）
     List<Integer> getMaterialIdByOrderId(BigDecimal orderId);
 
+    //查询订单ID查询第一个计量的物资Id（物资子表）
+    Integer getLxFirstMaterialId(BigDecimal orderId);
 }

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

@@ -227,25 +227,15 @@ public class TmstruckEnfactoryResultServiceImpl implements ITmstruckEnfactoryRes
                 }
                 break;
             case 11:
-            case 12:
-                //更新计量实绩
-                map.put("grossPlaceId", 5);
-                i += tmstruckWeightResultService.updateWeightResult(map);
-                //发送计量委托
-                List<Integer> materialIdByOrderId = utilsMapper.getMaterialIdByOrderId(DataChange.dataToBigDecimal(map.get("orderId")));
-                map.put("materialId", materialIdByOrderId.get(0));
-                //默认收货单位为新厂区
-                checkMeasureCommission += tmstruckMeasureCommissionService.addLXMeasureCommission(map);
                 break;
+            case 12:
             case 13:
-                //更新计量实绩
-                map.put("grossPlaceId", 5);
-                i += tmstruckWeightResultService.updateWeightResult(map);
+                //无法确定汽车衡
                 //发送计量委托
-                List<Integer> materialIdByOrderId1 = utilsMapper.getMaterialIdByOrderId(DataChange.dataToBigDecimal(map.get("orderId")));
-                map.put("materialId", materialIdByOrderId1.get(0));
+                Integer materialId = utilsMapper.getLxFirstMaterialId(DataChange.dataToBigDecimal(map.get("orderId")));
+                map.put("materialId", materialId);
                 //默认收货单位为新厂区
-                checkMeasureCommission += tmstruckMeasureCommissionService.addLXMeasureCommission(map);
+                 checkMeasureCommission += tmstruckMeasureCommissionService.addLXMeasureCommission(map);
 
         }
         if(checkMeasureCommission == 0){

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

@@ -190,10 +190,8 @@ public class TmstruckLeaveFactoryResultServiceImpl implements ITmstruckLeaveFact
             case 11:
                 break;
             case 12:
-                //判断出厂路段顺序号是否为最后一个 采购订单关闭订单
-                i += utilsService.closeOrderNormally(map);
-            case  13:
-                //判断出厂路段顺序是否为最后一个采购订单关闭订单
+            case 13:
+                //判断出厂路段顺序是否为最后一个零星订单关闭订单
                 i += utilsService.closeOrderNormally(map);
         }
         utilsService.pushMesToWebsocket((String) map.get("capacityNumber"), "出厂");

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

@@ -218,6 +218,8 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
             case 2:
             case 3:
                 measureCommission = tmstruckMeasureCommissionMapper.saleDXMeasure(map); //订单ID  物资ID  计量实绩ID
+                if(measureCommission == null)
+                    return 0;
                 measureCommission.put("deliveryType", "计重");
                 measureCommission.put("billType", "1");
                 measureCommission.put("crname", "admin");
@@ -230,6 +232,8 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
             case 7:
             case 8:
                 measureCommission =  tmstruckMeasureCommissionMapper.purchaseDXMeasure(map);
+                if(measureCommission == null)
+                    return 0;
                 measureCommission.put("deliveryType", "计重");
                 measureCommission.put("billType", "0");
                 measureCommission.put("crname", "admin");
@@ -239,6 +243,8 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
             case 10:
                 //新区采购内转
                 measureCommission = tmstruckMeasureCommissionMapper.purchaseXqCgNzDXMeasure(map);
+                if(measureCommission == null)
+                    return 0;
                 measureCommission.put("deliveryType", "计重");
                 measureCommission.put("billType", "0");
                 measureCommission.put("crname", "admin");
@@ -253,9 +259,13 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
                 measureCommission.put("ended", "0");
                 break;
             case 11:
+                break;
             case 12:
+            case 13:
                 measureCommission = tmstruckMeasureCommissionMapper.sporadicDXMeasure(map);
-                measureCommission.put("regionName", " "); //无法确定汽车衡
+                if(measureCommission == null)
+                    return 0;
+                measureCommission.put("regionName", "无法确定汽车衡"); //无法确定汽车衡
                 measureCommission.put("deliveryType", "计重");
                 measureCommission.put("billType", "2");
                 measureCommission.put("planQuantity", "0");
@@ -263,10 +273,7 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
                 measureCommission.put("orderSource", "0");
                 measureCommission.put("ended", "0");
                 break;
-            case 13:
             case 14:
-
-
         }
         /*访问接口发送数据*/
         return sendMesToDXMeasure(measureCommission);

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

@@ -912,33 +912,24 @@
 
 <!--  零星物资进厂计量委托  -->
     <select id="sporadicDXMeasure" parameterType="map" resultType="java.util.Map">
-        select oo.order_number            "orderId",
-               oom.material_id            "item",
-               rc.capacity_number         "carNumber",
-               rm.material_code           "goodsNo",
-               rm.material_name           "goodsName",
-               rs.supplier_name           "provider",
-               (case
-                    when RS.SUPPLIER_DUTY_PARAGRAPH is null
-                        then ' '
-                    else RS.SUPPLIER_DUTY_PARAGRAPH
-                   end
-                   )                      "providerNo",
-               rce.consignee_company_name "receiver",
-               rce.CONSIGNEE_CODE          "receiverNo"
-        from omstruck_order oo
-                 left join omstruck_order_material oom
-                           on oom.order_id = oo.order_id
-                 left join rms_capacity rc
-                           on rc.capacity_id = oo.capacity_id
-                 left join rms_material rm
-                           on rm.material_id = oom.material_id
-                 left join amstruck_sporadic_order aso
-                           on aso.sporadic_order_id = oo.order_plan_id
-                 left join rms_supplier rs
-                           on rs.supplier_id = aso.send_unit_id
-                 left join rms_consignee rce
-                           on rce.consignee_id = aso.receive_unit_id
+        SELECT
+            oo.order_number "orderId",
+            oom.material_id "item",
+            rc.capacity_number "carNumber",
+            rm.material_code "goodsNo",
+            rm.material_name "goodsName",
+            rs.supplier_name "provider",
+            ( CASE WHEN RS.SUPPLIER_DUTY_PARAGRAPH IS NULL THEN ' ' ELSE RS.SUPPLIER_DUTY_PARAGRAPH END ) "providerNo",
+            rce.consignee_company_name "receiver",
+            rce.CONSIGNEE_CODE "receiverNo"
+        FROM
+            omstruck_order oo
+                LEFT JOIN omstruck_order_material oom ON oom.order_id = oo.order_id
+                LEFT JOIN rms_capacity rc ON rc.capacity_id = oo.capacity_id
+                LEFT JOIN rms_material rm ON rm.material_id = oom.material_id
+                LEFT JOIN amstruck_sporadic_order aso ON aso.sporadic_order_id = oo.order_plan_id
+                LEFT JOIN rms_supplier rs ON rs.supplier_id = aso.send_unit_id
+                LEFT JOIN rms_consignee rce ON rce.consignee_id = aso.receive_unit_id
         where oo.order_id = #{orderId} and oom.material_id = #{materialId}
     </select>
     <select id="getReceiveIdByRequirementOrderId" resultType="java.lang.Integer" parameterType="java.math.BigDecimal">

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

@@ -142,4 +142,16 @@
         from OMSTRUCK_ORDER_MATERIAL OOM
         where OOM.ORDER_ID = #{orderId}
     </select>
+
+<!--  通过订单ID查询零星物资第一个计量的物资  -->
+    <select id="getLxFirstMaterialId" parameterType="java.math.BigDecimal" resultType="java.lang.Integer">
+        select *
+        from (
+                 select OOM.MATERIAL_ID
+                 from OMSTRUCK_ORDER_MATERIAL OOM
+                 where OOM.ORDER_ID = #{orderId}
+                 order by OOM.MATERIAL_DIRECTION
+             )
+        where rownum = 1
+    </select>
 </mapper>