Переглянути джерело

内转水渣出厂关单。

xiaosonghong 3 місяців тому
батько
коміт
255e1db5e0

+ 3 - 0
src/main/java/com/steerinfo/dil/mapper/UtilsMapper.java

@@ -46,6 +46,9 @@ public interface UtilsMapper {
     //查询当前路段顺序号通过订单Id
     Integer getLineSequenceByOrderId(@Param("orderId") BigDecimal orderId);
 
+
+    String getOrderMaterialByOrderId(String orderId);
+
     //通过订单号查询订单路段顺序号
     Integer getLineSequenceByOrderNumber(String orderNumber);
 

+ 9 - 0
src/main/java/com/steerinfo/dil/service/impl/TmstruckLeaveFactoryResultServiceImpl.java

@@ -219,6 +219,9 @@ public class TmstruckLeaveFactoryResultServiceImpl implements ITmstruckLeaveFact
         Map<String, Object> mesMap = utilsMapper.getOrderTypeByOrderNumber(orderNumber);
         int orderType = DataChange.dataToBigDecimal(mesMap.get("orderType")).intValue();
         String capacityNumber = (String) mesMap.get("capacityNumber");
+        String thisOrderId = (String) mesMap.get("orderId");
+        String materialName = utilsMapper.getOrderMaterialByOrderId(thisOrderId);
+        mesMap.put("materialName", materialName);
         if(orderType == 11 || orderType == 15 || orderType == 16){
            return orderType11Use(map, mesMap,capacityNumber);
         }else if(orderType == 21){
@@ -523,6 +526,12 @@ public class TmstruckLeaveFactoryResultServiceImpl implements ITmstruckLeaveFact
         mesMap.put("orderLineSequence",sqe);
         utilsService.updateOrderLineSqeByOrderNumber(mesMap);
         utilsService.pushMesToWebsocket(capacityNumber, "出厂");
+        if(mesMap.get("materialName") != null && "粒化高炉矿渣".equals(mesMap.get("materialName")) && mesMap.get("orderId") != null){
+            Map updateMap = new HashMap();
+            updateMap.put("orderId", mesMap.get("orderId"));
+            updateMap.put("orderStatus", 2);
+            utilsMapper.updateOrderStatusByOrderIdOrNum(updateMap);
+        }
         return 1;
     }
 

+ 8 - 0
src/main/resources/com/steerinfo/dil/mapper/UtilsMapper.xml

@@ -222,6 +222,14 @@
         where  OO.order_Number=#{orderNumber} AND OO.ORDER_STATUS=5
     </select>
 
+    <select id="getOrderMaterialByOrderId" parameterType="string" resultType="string">
+        SELECT t3.MATERIAL_NAME AS materialName FROM OMSTRUCK_ORDER t
+            LEFT JOIN AMSTRUCK_REQUIREMENT_PLAN t1 ON t1.PLAN_ID = t.ORDER_PLAN_ID
+            LEFT JOIN AMSTRUCK_REQUIREMENT_MATERIAL t2 ON t2.REQUIREMENT_ID = T1.REQUIREMENT_ID
+            LEFT JOIN RMS_MATERIAL t3 ON t3.MATERIAL_ID = t2.MATERIAL_ID
+        WHERE t.ORDER_ID = #{orderId}
+    </select>
+
     <select id="getLineSequenceByOrderNumber" parameterType="string" resultType="java.lang.Integer">
         select OO.ORDER_LINE_SEQUENCE
         from OMSTRUCK_ORDER OO