Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU2/DAI_DAZHOU-OMS

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,7 +399,7 @@ 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) {
@@ -402,7 +408,9 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
                 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

@@ -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}
@@ -1197,7 +1197,7 @@
                RM.MATERIAL_NAME          "materialName",
                OO.ORDER_ENTRY_TIME       "orderEntryTime",
                OO.ORDER_TYPE             "orderType",
-               RW.WAREHOUSE_NAME         " ",
+               RW.WAREHOUSE_NAME         "warehouseName",
                OOM.ORDER_MATERIAL_NUMBER "orderMaterialNumber",
                OOM.ORDER_MATERIAL_WEIGHT "orderMaterialWeight"
         FROM OMSTRUCK_ORDER OO