Merge remote-tracking branch 'origin/master'

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

@@ -229,8 +229,13 @@ public class OmstruckOrderSeparateServiceImpl implements IOmstruckOrderSeparateS
         HashMap<Object, Object> sendMap = new HashMap<>();
         //将消息实体放入list中存到map中
         sendMap.put("messages", list);
-        String s = imFeign.sendToUser(sendMap);
-        System.out.println(s);
+        String s = null;
+        try {
+            s = imFeign.sendToUser(sendMap);
+            System.out.println(s);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
         return s;
     }
 

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

@@ -534,8 +534,12 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
         HashMap<Object, Object> sendMap = new HashMap<>();
         //将消息实体放入list中存到map中
         sendMap.put("messages", list);
-        String s = imFeign.sendToUser(sendMap);
-        System.out.println(s);
+        try {
+            String s = imFeign.sendToUser(sendMap);
+            System.out.println(s);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
     }
 
     @Override//判断一车多单是否还有订单，如果又就再推送消息给他

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

@@ -3955,7 +3955,8 @@
         TTR.RESULT_TOTAL_ID "resultTotalId",
         OO.CAN_WORK "canWork",
         OO.ORDER_STATUS "orderStatus",
-        ASO.SALE_ORDER_ID   "saleOrderId"
+        ASO.SALE_ORDER_ID   "saleOrderId",
+        OO.DELETED  "orderDeleted"
         FROM
         OMSTRUCK_ORDER OO
         LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM ON ASOM.SALE_ORDER_MATERIAL_ID = OO.ORDER_PLAN_ID

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

@@ -339,7 +339,7 @@
     </set>
     where ORDER_MATERIAL_ID = #{orderMaterialId,jdbcType=DECIMAL}
   </update>
-  <select id="selectByPrimaryKey" parameterType="DECIMAL" resultMap="BaseResultMap">
+  <select id="selectByPrimaryKey" parameterType="java.math.BigDecimal" resultMap="BaseResultMap">
     <include refid="select" />
     where ORDER_MATERIAL_ID = #{orderMaterialId,jdbcType=DECIMAL}
   </select>

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

@@ -836,12 +836,17 @@
                TWR.TARE_SEGMENT_SQE         "segmenSqe",
                '计皮'                        "linkName",
                TWR.RESULT_TARE_WEIGHT       "weight",
-               RM.MATERIAL_NAME             "materialName"
+               RM.MATERIAL_NAME             "materialName",
+               OO.ORDER_TYPE                "orderType"
         from TMSTRUCK_WEIGHT_RESULT TWR
                  left join RMS_TRUCK_CALCULATE RTC
                            on RTC.TRUCK_CALCULATE_ID = TWR.RESULT_TARE_PLACE_ID
                  left join RMS_MATERIAL RM
                            on TWR.MATERIAL_ID = RM.MATERIAL_ID
+                 left join tmstruck_total_result ttr
+                           on ttr.result_total_id = twr.result_total_id
+                 left join omstruck_order oo
+                           on oo.order_id = ttr.order_id
         where TWR.RESULT_TOTAL_ID = #{resultTotalId}
         UNION
         select RTC.TRUCK_CALCULATE_NUMBER   "pointName",
@@ -849,12 +854,17 @@
                TWR.GROSS_SEGMENT_SQE         "segmenSqe",
                '计毛'                        "linkName",
                TWR.RESULT_GROSS_WEIGHT     "weight",
-               RM.MATERIAL_NAME            "materialName"
+               RM.MATERIAL_NAME            "materialName",
+               OO.ORDER_TYPE                "orderType"
         from TMSTRUCK_WEIGHT_RESULT TWR
                  left join RMS_TRUCK_CALCULATE RTC
                            on RTC.TRUCK_CALCULATE_ID = TWR.RESULT_GROSS_PLACE_ID
                  left join RMS_MATERIAL RM
                            on TWR.MATERIAL_ID = RM.MATERIAL_ID
+                 left join tmstruck_total_result ttr
+                           on ttr.result_total_id = twr.result_total_id
+                 left join omstruck_order oo
+                            on oo.order_id = ttr.order_id
         where TWR.RESULT_TOTAL_ID = #{resultTotalId}
     </select>