修改

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

@@ -384,4 +384,8 @@ public interface OmstruckOrderMapper extends IBaseMapper<OmstruckOrder, BigDecim
 
     String getPrintFlag();
 
+    List<Map<String, Object>> materialMesNewContinue(BigDecimal orderId, String steelJudge);
+
+    List<BigDecimal> selectContinueOrderId(BigDecimal orderId);
+
 }

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

@@ -598,7 +598,7 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
             throw new Exception("已过磅，撤单失败！");
         }
         //如果是老区已进场或者内转，则删除计量委托
-        if(omstruckOrderSeparateMapper.countEnFactory(orderId) > 0 || orderType==11 || orderType == 21 || orderType == 15 || orderType == 16){
+        if(omstruckOrderSeparateMapper.countEnFactory(orderId) > 0 || orderType==11 || orderType == 15 || orderType == 16){
             //获取运输订单号
             String orderNumber = (String) mesMap.get("orderNumber");
             //撤销订单的同时删除计量数据
@@ -2156,6 +2156,12 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
         }
         if (orderType.compareTo(1)==0){
             List<Map<String, Object>> materialMesNew = omstruckOrderMapper.getMaterialMes(orderId, steelJudge);
+            //查询继续装的订单
+            List<BigDecimal> continueOrderIds = omstruckOrderMapper.selectContinueOrderId(orderId);
+            for (BigDecimal continueOrderId : continueOrderIds) {
+                List<Map<String, Object>> materialMesNewContinue = omstruckOrderMapper.materialMesNewContinue(continueOrderId, steelJudge);
+                materialMesNew.addAll(materialMesNewContinue);
+            }
             List<Map<String, Object>> materialId = omstruckOrderMapper.getMaterialId(orderId);
             for (Map<String, Object> stringObjectMap : materialMesNew) {
                 for (Map<String, Object> objectMap : materialId) {
@@ -2177,12 +2183,6 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
             mesMap.put("materialMesList",materialMesNew);
         } else {
             mesMap.put("materialMesList", omstruckOrderMapper.getMaterialMes(orderId, steelJudge));
-        }
-        try{
-            //尝试查询内转需求备注
-            mesMap.put("insertUpdateRemark", omstruckOrderMapper.getInwardOrderMap(orderId).get("insertUpdateRemark"));
-        }catch (Exception e){
-
         }
         return mesMap;
     }

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

@@ -2787,7 +2787,7 @@
         LEFT JOIN  RMS_WAREHOUSE RW1
         ON RW1.WAREHOUSE_ID = ARM.REQUIREMENT_PLATFORM_ID
         WHERE AIP.DELETED = 0
-        AND OO.ORDER_TYPE = 11
+        AND OO.ORDER_TYPE in (11,21,25)
         <if test="carrierId != null">
             AND AIP.CARRIER_ID = (select rc.carrier_id from rms_carrier rc
             where rc.carrier_sso_id =  #{carrierId})
@@ -3688,6 +3688,7 @@
         AIR.REQUIREMENT_ID     "requirementId",
         AIR.DUE_DATE             "saleDateOfReceipt",
         AIR.REQUIREMENT_TRUCK_TIME "requirementTruckTime",
+        AIR.INSERT_UPDATE_REMARK "insertUpdateRemark",
         RW1.WAREHOUSE_NAME       "shipperName",
         RW1.WAREHOUSE_NAME       "loadName",
         RW.WAREHOUSE_NAME        "unloadName",
@@ -3804,6 +3805,7 @@
         RW1.WAREHOUSE_NAME       "loadName",
         RW.WAREHOUSE_NAME        "unloadName",
         RW.WAREHOUSE_NAME        "consigneeCompanyName",
+        AIR.INSERT_UPDATE_REMARK "insertUpdateRemark",
         (
         SELECT TTTR2.RESULT_TIME
         FROM TMSTRUCK_TIME_TASK_RESULT TTTR2
@@ -4385,4 +4387,61 @@
         SELECT DILV.VERSION_VALUE FROM DIL_VERSION DILV
         WHERE DILV.VERSION_ID = 7
     </select>
+    <select id="materialMesNewContinue" resultType="java.util.Map">
+        SELECT
+        RM.MATERIAL_NAME
+        <if test="steelJudge != null">
+            || '   ' || RW.WAREHOUSE_NAME
+        </if>
+        "materialName",
+        RM.MATERIAL_ID   "materialId",
+        OOM.MATERIAL_PRIORITY "materialPriority",
+        CONCAT(CONCAT(RM.MATERIAL_MODEL, '('), CONCAT(MATERIAL_SPECIFICATION, ')')) "materialMC",
+        (case
+        when OOM.ORDER_MATERIAL_NUMBER is not null
+        then OOM.ORDER_MATERIAL_NUMBER || '件/支'
+        end
+        ) || (
+        case
+        when OOM.ORDER_MATERIAL_WEIGHT is not null
+        then '-'||OOM.ORDER_MATERIAL_WEIGHT  || '吨'
+        end
+        ) ||  '-(八点前装的)'
+        AS                                                                   "weightNum",
+        (   SELECT
+        LISTAGG ( TWR.RESULT_NET_WEIGHT, '、' ) within GROUP ( ORDER BY TWR.GROSS_SEGMENT_SQE )
+        FROM TMSTRUCK_WEIGHT_RESULT TWR
+        JOIN TMSTRUCK_TOTAL_RESULT TTR
+        ON TTR.RESULT_TOTAL_ID = TWR.RESULT_TOTAL_ID
+        WHERE TTR.ORDER_ID = #{orderId} and TWR.MATERIAL_ID = OOM.MATERIAL_ID
+        )                                                                    "netWeight"
+        FROM OMSTRUCK_ORDER_MATERIAL OOM
+        LEFT JOIN OMSTRUCK_ORDER OO
+        ON OO.ORDER_ID = OOM.ORDER_ID
+        LEFT JOIN RMS_MATERIAL RM
+        ON RM.MATERIAL_ID = OOM.MATERIAL_ID
+        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 oom.material_id = twr.material_id
+        or oom.sale_material_id is not null and oom.sale_material_id = twr.sale_material_id
+        <if test="steelJudge != null">
+            LEFT JOIN RMS_WAREHOUSE RW
+            ON OOM.MATERIAL_PRIORITY = RW.WAREHOUSE_ID
+        </if>
+        WHERE
+        OO.ORDER_STATUS = 2
+        and twr.result_net_weight is not null
+        and  OO.order_ID  = #{orderId}
+        ORDER BY RM.MATERIAL_NAME
+    </select>
+    <select id="selectContinueOrderId" resultType="java.math.BigDecimal" parameterType="java.math.BigDecimal">
+        SELECT OO.ORDER_ID FROM OMSTRUCK_ORDER OO
+        WHERE
+        OO.ORDER_STATUS = 2
+        AND OO.ORDER_NUMBER = (SELECT OO.ORDER_NUMBER FROM OMSTRUCK_ORDER OO
+        WHERE OO.ORDER_ID = #{orderId})
+
+    </select>
 </mapper>

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

@@ -605,6 +605,7 @@
         SET OO.ORDER_STATUS = 2,
             OO.INSERT_UPDATE_REMARK = '内转钢材到异地库关闭订单'
         WHERE OO.ORDER_ID = #{orderId}
+        and OO.ORDER_TYPE = 4
     </update>
 
   <update id="updateContinueStaus">