修改

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

@@ -411,4 +411,6 @@ public interface OmstruckOrderMapper extends IBaseMapper<OmstruckOrder, BigDecim
 
     String selectLineName(BigDecimal lineId);
 
+    int updateResultTotalId(Integer resultTotalId);
+
 }

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

@@ -85,6 +85,12 @@ public class OmstruckOrderSeparateServiceImpl implements IOmstruckOrderSeparateS
         List<Map<String, Object>> segmentList = omstruckOrderSeparateMapper.getLineMesByOrderId(lineId);
         Map<String,Object> totalIdMap = new HashMap<>();
         totalIdMap.put("resultTotalId",resultTotalId);
+        //更新总实绩运单状态
+        try {
+            omstruckOrderMapper.updateResultTotalId(resultTotalId);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
         totalIdMap.put("lineId", lineId);
         // 遍历路段顺序号子表
         int count = 0;

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

@@ -1014,7 +1014,7 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
         long min = time / (1000 * 60);
         omstruckOrder.setOrderCommunicationDuration(new BigDecimal(min));
         try {
-            if (orderType == 1 && "true".equals(omstruckOrderMapper.getFactoryFlag())) {
+            if (orderType == 4 && "true".equals(omstruckOrderMapper.getFactoryFlag())) {
                 //如果是钢材订单,判断两天有没有进厂
                 Date enFactoryTime = omstruckOrderMapper.selectCapacityTimesTwoDay((String) map.get("capacityNumber"));
                 if (enFactoryTime != null) {

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

@@ -578,6 +578,7 @@
                                    ASO.SALE_REMARK                                "orderType",
                                    OTO.ORDER_ID                                    "trainOrderId",
                                    RPG.GRID_ID                                      "gridId",
+                                   RPG.INSERT_UPDATE_REMARK                         "stackName",
                                    decode(wgm.DELETED,0,'入库',1,'出库','未入库')      "wgmDelete",
                                    R_CAPACITY.CAPACITY_NUMBER                       "capacityNum",
                                    RW.WAREHOUSE_NAME                                "unloadPoint",
@@ -586,7 +587,12 @@
                                    OO.ORDER_NUMBER                                  "number",
                                    OTO.WAREHOUSE_ID                                 "unloadPointId",
                                    decode(OTO."IS_ACCEPT",0,'未收货',1,'已收货')      "isAccept",
-                                   OTO.is_accept_time                               "isAcceptTime"
+                                   OTO.is_accept_time                               "isAcceptTime",
+                                   RP.PERSONNEL_NAME                                "inboundPersonnelName",
+                                   RPG.INSERT_TIME                                   "inboundTime",
+                                   RPG.UPDATE_TIME                                  "outboundTime",
+                                   RP2.PERSONNEL_NAME                               "outboundPersonnelName",
+                                   TWR.INSERT_UPDATE_REMARK                         "weightNo"
                    FROM AMS_SALE_ORDER ASO
                           LEFT JOIN RMS_CONSIGNEE RC ON RC.CONSIGNEE_ID = ASO.RECEIVE_ID
                           LEFT JOIN RMS_SHIPPER RS ON RS.SHIPPER_ID = ASO.SHIPPER_ID
@@ -605,11 +611,14 @@
                           LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR ON TTR.ORDER_ID = OO.ORDER_ID
                           LEFT JOIN TMSTRUCK_WEIGHT_RESULT TWR ON TWR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
                                     AND TWR.MATERIAL_ID = RM.MATERIAL_ID
+                                    AND TWR.SALE_MATERIAL_ID = ASM.SALE_MATERIAL_ID
                           LEFT JOIN TMSTRUCK_UNLOAD_RESULT  TUR ON TUR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
                                     AND TUR.MATERIAL_ID = RM.MATERIAL_ID
                           LEFT JOIN TMSTT_ORDER TTO ON TTO.TRUCK_ORDER_ID = OO.ORDER_ID
                           LEFT JOIN OMSTRAIN_ORDER OTO ON OTO.ORDER_ID = TTO.TRAIN_ORDER_ID
                           LEFT JOIN RMS_PWAREHOUSE_GRID RPG ON RPG.STACKING_ID = OO.ORDER_ID
+                          LEFT JOIN RMS_PERSONNEL RP ON RP.PERSONNEL_SSO_ID = RPG.INSERT_USERNAME
+                          LEFT JOIN RMS_PERSONNEL RP2 ON RP2.PERSONNEL_SSO_ID = RPG.UPDATE_USERNAME
                           LEFT JOIN WMSP_GRID_MATERIAL  WGM ON WGM.GRID_ID = RPG.GRID_ID
                                     and wgm.MATERIAL_ID = rm.MATERIAL_ID
                           LEFT JOIN RMS_WAREHOUSE   RW ON RW.WAREHOUSE_ID = OTO.WAREHOUSE_ID
@@ -634,7 +643,13 @@
                           <if test="sendStation != null">
                             and RAR.ARRIVAL_NAME  like #{sendStation}
                           </if>
-                        Order By OTO.ORDER_WAGON_NO,"OutStation"
+                          <if test="materialSpa != null">
+                            and RAR.ARRIVAL_NAME  like '%${materialSpa}'
+                          </if>
+                          <if test="materialName != null">
+                          and RAR.ARRIVAL_NAME  like '%${materialName}'
+                          </if>
+                        Order By "OutStation" desc,OTO.ORDER_WAGON_NO
                           )
   </select>
     <select id="getTrainOrderIds" resultType="java.math.BigDecimal" parameterType="decimal">

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

@@ -4281,14 +4281,21 @@
         OO.ORDER_LINE_SEQUENCE "orderLineSequence",
         OO.ORDER_NUMBER "orderNumber",
         OO.ARRIVAL_FLAG "arrivalFlag",
-        RC.CAPACITY_NUMBER "capacityNumber",
+        CASE
+        WHEN TEMP."orderId" IS NOT NULL
+        THEN RC.CAPACITY_NUMBER || '('|| decode(ASO.SALE_ORDER_STATUS,4,'订单已审核','订单未审核') || ':未轧' ||')'
+        WHEN TEMP."orderId" IS NULL
+        THEN RC.CAPACITY_NUMBER || '('|| decode(ASO.SALE_ORDER_STATUS,4,'订单已审核','订单未审核') || ':已轧' || ')'
+        END
+        "capacityNumber",
         RC.CAPACITY_TEL "capacityTel",
         RS.SHIPPER_NAME "shipperName",
         ASOM.SALE_ORDER_CONSIGNEE_TEL "consigneeTel",
         RC2.CONSIGNEE_COMPANY_NAME "consigneeCompanyNames",
         TTR.RESULT_TOTAL_ID "resultTotalId",
         OO.ORDER_STATUS "orderStatus",
-        RAS.ARRIVAL_NAME "sendStaionName"
+        RAS.ARRIVAL_NAME "sendStaionName",
+        RPG.INSERT_UPDATE_REMARK    "stackName"
         FROM
         OMSTRUCK_ORDER OO
         LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM ON ASOM.SALE_ORDER_MATERIAL_ID = OO.ORDER_PLAN_ID
@@ -4301,6 +4308,18 @@
         LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR ON OO.ORDER_ID = TTR.ORDER_ID
         LEFT JOIN TMSTRAIN_PLEASE_APPROVE_RESULT TPAR  ON TPAR.RAIL_PLAN_ID = ASO.SALE_ORDER_ID
         LEFT JOIN RMSTRAIN_ARRIVAL_SEND RAS  ON RAS.ARRIVAL_ID=TPAR.SEND_STATION_ID
+        LEFT JOIN (
+        select OO.ORDER_ID "orderId"
+        from OMSTRUCK_ORDER OO
+        left join OMSTRUCK_ORDER_MATERIAL OOM ON OO.ORDER_ID=OOM.ORDER_ID
+        left join RMS_MATERIAL RM ON OOM.MATERIAL_ID = RM.MATERIAL_ID
+        where OO.ORDER_STATUS between 4 and 5
+        and (OOM.MATERIAL_PRIORITY !=71 OR OOM.MATERIAL_PRIORITY is null)
+        and
+        RM.MATERIAL_ID||'' in (select SPECTIONS_MODEL from QMS_MODEL_UNROOLED)
+        ) TEMP ON TEMP."orderId"=OO.ORDER_ID
+        LEFT JOIN RMS_PWAREHOUSE_GRID RPG
+        ON RPG.STACKING_ID = OO.ORDER_ID
         WHERE
         OO.ORDER_ID = #{orderId}
         AND rownum =1
@@ -4558,4 +4577,9 @@
         SELECT RL.LINE_NAME FROM RMS_LINE RL
         WHERE RL.LINE_ID = #{lineId}
     </select>
+    <update id="updateResultTotalId">
+        UPDATE TMSTRUCK_TOTAL_RESULT TTR
+        SET TTR.ORDER_STATUS = '已接单'
+        where TTR.RESULT_TOTAL_ID = #{resultTotalId}
+    </update>
 </mapper>