Merge branch 'master' into dev

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

@@ -359,6 +359,13 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
         //修改运输订单运力ID
         OmstruckOrder omstruckOrder = new OmstruckOrder();
         BigDecimal orderId = DataChange.dataToBigDecimal(map.get("orderId"));
+        BigDecimal orderType;
+        if(map.get("orderType") == null){
+            //查询订单类型
+            orderType = new BigDecimal(omstruckOrderMapper.getOrderTypeByOrderNumber(orderId));
+        }else{
+            orderType = DataChange.dataToBigDecimal(map.get("orderType"));
+        }
         omstruckOrder.setOrderId(orderId);
         if (map.get("unloadPointId") != null) {
             omstruckOrder.setUnloadPointId(DataChange.dataToBigDecimal(map.get("unloadPointId")));
@@ -372,8 +379,7 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
         if(map.get("unloadPointId")!=null || map.get("capacityId") != null || map.get("orderEntryTime") != null){
             omstruckOrderMapper.updateByPrimaryKeySelective(omstruckOrder);
         }
-        Integer orderType = (Integer) map.get("orderType");
-        switch (orderType) {
+        switch (orderType.intValue()) {
             case 1:
                 break;
             case 2:
@@ -393,16 +399,18 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
                 omstruckOrderMaterial.setOrderMaterialId(orderMaterialId);
                 if (map.get("orderMaterialWeight") != null) {
                     omstruckOrderMaterial.setOrderMaterialWeight(DataChange.dataToBigDecimal(map.get("orderMaterialWeight")));
-                    if(orderType == 8)
+                    if(orderType.intValue() == 8)
                         amsFeign.updateMaterial(map);//修改运输计划子表 已分配未分配重量
                 }
                 if(map.get("orderMaterialNumber") != null) {
                     omstruckOrderMaterial.setOrderMaterialNumber(DataChange.dataToBigDecimal(map.get("orderMaterialNumber")));
                 }
-                    if (map.get("materialId") != null) {
+                if (map.get("materialId") != null) {
                     omstruckOrderMaterial.setMaterialId(DataChange.dataToBigDecimal(map.get("materialId")));
                 }
-                omstruckOrderMaterialMapper.updateByPrimaryKeySelective(omstruckOrderMaterial);
+                if(map.get("orderMaterialWeight") != null || map.get("orderMaterialNumber") != null || map.get("materialId") != null){
+                    omstruckOrderMaterialMapper.updateByPrimaryKeySelective(omstruckOrderMaterial);
+                }
                 break;
             case 9:
                 break;

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

@@ -646,7 +646,7 @@
                 APO.PURCHASE_ORDER_ID "purchaseOrderId",
                 APO.PURCHASE_ORDER_NO "purchaseOrderNo",
                 RM.MATERIAL_NAME "materialName",
-            <if test="orderTypee = 8">
+            <if test="orderTypee == 8">
                 AP.PLAN_NO "planNo",
                 AP.PLAN_ID "planId",
                 to_char(AP.PLAN_TRUCK_TIME, 'yyyy-mm-dd')"planTruckTime",
@@ -661,13 +661,13 @@
                 RW.WAREHOUSE_NAME "warehouseName", --卸货点
                 to_char(OO.ORDER_ENTRY_TIME, 'yyyy-mm-dd') "orderEntryTime", --进厂时间
                 RS.SUPPLIER_NAME "supplierName", --发货单位
-                RCSE.CONSIGNEE_COMPANY_NAME "consigneeCompanyName", --收货单位,
+                RCSE.CONSIGNEE_COMPANY_NAME "consigneeCompanyName", --收货单位
                 OO.ORDER_ISSUE_TIME "orderIssueTime"
 
         from OMSTRUCK_ORDER OO
         left join AMS_PURCHASE_ORDER APO
         on OO.ORDER_PLAN_ID = APO.PURCHASE_ORDER_ID
-        <if test="orderTypee = 8">
+        <if test="orderTypee == 8">
             left join AMSTRUCK_PURPLAN AP
             on AP.BATCH_ID = APO.BATCH_ID and AP.PLAN_STATUS != 3
         </if>
@@ -685,12 +685,12 @@
         on APO.RECEIVE_UNIT_ID = RCSE.CONSIGNEE_ID
         <where>
             <choose>
-                <when test="orderStatus != 8">
+                <when test="orderStatus != 111">
                     and OO.ORDER_STATUS = #{orderStatus}
                 </when>
-                <otherwise>
+                <when test="orderStatus == 111">
                     and OO.ORDER_STATUS in (0, 1, 2, 4, 5, 6)
-                </otherwise>
+                </when>
             </choose>
             <if test="planId != null ">
                 and AP.PLAN_ID = #{planId}
@@ -1189,7 +1189,7 @@
         WHERE OO.ORDER_ID = #{orderId}
     </select>
 
-    <!--  通过运输订单ID查询运输订单相关信息 -->
+    <!--  通过运输订单ID查询运输订单相关信息 仅限单拼 -->
     <select id="getOrderByOrderId" parameterType="java.math.BigDecimal" resultType="java.util.Map">
         SELECT APO.PURCHASE_ORDER_NO     "purchaseOrderNo",
                RC.CAPACITY_NUMBER        "capacityNumber",