修改

src/main/java/com/steerinfo/dil/controller/QmsQueueResultController.java

@@ -137,40 +137,40 @@ public class QmsQueueResultController extends BaseRESTfulController {
         if(isSpelling == 1){
             //原多拼
             List<Map<String, Object>> queueListByQueueUpSpelling = qmsQueueResultService.getQueueListByQueueUpSpelling(mapValue);
-            //现多拼数据
-            for (Map<String, Object> stringObjectMap : queueListByQueueUpSpelling) {
-                BigDecimal orderId = (BigDecimal) stringObjectMap.get("orderId");
-                //米数
-                List<Map<String, Object>> materialId = qmsQueueResultMapper.getMaterialId(orderId);
-                for (Map<String, Object> objectMap : materialId) {
-                    BigDecimal materialId2 = DataChange.dataToBigDecimal(stringObjectMap.get("materialId"));
-                    BigDecimal materialId1 = (BigDecimal) objectMap.get("materialId");
-                    if (materialId2.compareTo(materialId1)==0){
-                        //钢材长度
-                        BigDecimal steelmeter = (BigDecimal) objectMap.get("steelmeter");
-                        stringObjectMap.put("steelMeter",steelmeter);
-                    }
-                }
-            }
+            ////现多拼数据
+            //for (Map<String, Object> stringObjectMap : queueListByQueueUpSpelling) {
+            //    BigDecimal orderId = (BigDecimal) stringObjectMap.get("orderId");
+            //    //米数
+            //    List<Map<String, Object>> materialId = qmsQueueResultMapper.getMaterialId(orderId);
+            //    for (Map<String, Object> objectMap : materialId) {
+            //        BigDecimal materialId2 = DataChange.dataToBigDecimal(stringObjectMap.get("materialId"));
+            //        BigDecimal materialId1 = (BigDecimal) objectMap.get("materialId");
+            //        if (materialId2.compareTo(materialId1)==0){
+            //            //钢材长度
+            //            BigDecimal steelmeter = (BigDecimal) objectMap.get("steelmeter");
+            //            stringObjectMap.put("steelMeter",steelmeter);
+            //        }
+            //    }
+            //}
             return success(queueListByQueueUpSpelling);
         }else if (isSpelling == 2){
             //两拼数据
             List<Map<String, Object>> queueListByQueueUpSpellingNew = qmsQueueResultService.getQueueListByQueueUpSpellingNew(mapValue);
-            //现多拼数据
-            for (Map<String, Object> stringObjectMap : queueListByQueueUpSpellingNew) {
-                BigDecimal orderId = (BigDecimal) stringObjectMap.get("orderId");
-                //米数
-                List<Map<String, Object>> materialId = qmsQueueResultMapper.getMaterialId(orderId);
-                for (Map<String, Object> objectMap : materialId) {
-                    BigDecimal materialId2 = DataChange.dataToBigDecimal(stringObjectMap.get("materialId"));
-                    BigDecimal materialId1 = (BigDecimal) objectMap.get("materialId");
-                    if (materialId2.compareTo(materialId1)==0){
-                        //钢材长度
-                        BigDecimal steelmeter = (BigDecimal) objectMap.get("steelmeter");
-                        stringObjectMap.put("steelMeter",steelmeter);
-                    }
-                }
-            }
+            ////现多拼数据
+            //for (Map<String, Object> stringObjectMap : queueListByQueueUpSpellingNew) {
+            //    BigDecimal orderId = (BigDecimal) stringObjectMap.get("orderId");
+            //    //米数
+            //    List<Map<String, Object>> materialId = qmsQueueResultMapper.getMaterialId(orderId);
+            //    for (Map<String, Object> objectMap : materialId) {
+            //        BigDecimal materialId2 = DataChange.dataToBigDecimal(stringObjectMap.get("materialId"));
+            //        BigDecimal materialId1 = (BigDecimal) objectMap.get("materialId");
+            //        if (materialId2.compareTo(materialId1)==0){
+            //            //钢材长度
+            //            BigDecimal steelmeter = (BigDecimal) objectMap.get("steelmeter");
+            //            stringObjectMap.put("steelMeter",steelmeter);
+            //        }
+            //    }
+            //}
             return success(queueListByQueueUpSpellingNew);
         }
         else {

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

@@ -913,6 +913,7 @@
         ON TER.RESULT_TOTAL_ID=TTR.RESULT_TOTAL_ID
         where oo.ORDER_STATUS = 5
         AND ASO.SALE_ORDER_STATUS = 4
+        and nvl(aso.DELETED,0) in (0,2)
         AND TER.RESULT_ENTRY_GATE_TIME IS NULL
         AND RM.MATERIAL_ID||'' NOT IN (SELECT DISTINCT SPECTIONS_MODEL FROM QMS_MODEL_UNROOLED)
         <if test="capacityNumber != null">
@@ -1008,6 +1009,7 @@
         OO.ORDER_ID "orderId",
         RG.GATEPOST_NAME "gatepostName",
         RCE.CONSIGNEE_COMPANY_NAME "consigneeName",
+        ASM.STEEL_METER "steelMeter",
         case
         when RC.CAPACITY_VIP = '是'
         then sysdate
@@ -1038,6 +1040,7 @@
         left join TMSTRUCK_TOTAL_RESULT TTR on QQR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
         left join OMSTRUCK_ORDER_MATERIAL OOM on TTR.ORDER_ID = OOM.ORDER_ID
         left join RMS_MATERIAL RM on OOM.MATERIAL_ID = RM.MATERIAL_ID
+        left join AMS_SALE_MATERIAL ASM ON ASM.SALE_MATERIAL_ID = OOM.SALE_MATERIAL_ID
         left join OMSTRUCK_ORDER OO on TTR.ORDER_ID = OO.ORDER_ID
         LEFT JOIN RMS_GATEPOST RG ON QQR.GATEPOST_ID = RG.GATEPOST_ID
         LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM ON ASOM.SALE_ORDER_MATERIAL_ID = OO.ORDER_PLAN_ID
@@ -1047,6 +1050,7 @@
         ON TER.RESULT_TOTAL_ID=TTR.RESULT_TOTAL_ID
         where oo.ORDER_STATUS = 5
         AND ASO.SALE_ORDER_STATUS = 4
+        and nvl(aso.DELETED,0) in (0,2)
         AND TER.RESULT_ENTRY_GATE_TIME IS NULL
         and QQSL.SPELILING_NUM not in (1,2)
         AND OO.ORDER_ID NOT IN (
@@ -1101,6 +1105,7 @@
         RM.MATERIAL_MODEL "materialModel",
         QQSL.ENTRY_SURE_TIME "sureTime",
         OOM.ORDER_MATERIAL_NUMBER "materialNumber",
+        ASM.STEEL_METER "steelMeter",
         OOM.MATERIAL_PRIORITY "id",
         OO.DRIVER_TEL "driverTel",
         OO.ORDER_ID "orderId",
@@ -1138,6 +1143,7 @@
         left join TMSTRUCK_TOTAL_RESULT TTR on QQR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
         left join OMSTRUCK_ORDER_MATERIAL OOM on TTR.ORDER_ID = OOM.ORDER_ID
         left join RMS_MATERIAL RM on OOM.MATERIAL_ID = RM.MATERIAL_ID
+        LEFT JOIN AMS_SALE_MATERIAL ASM ON ASM.SALE_MATERIAL_ID = OOM.SALE_MATERIAL_ID
         left join OMSTRUCK_ORDER OO on TTR.ORDER_ID = OO.ORDER_ID
         LEFT JOIN RMS_GATEPOST RG ON QQR.GATEPOST_ID = RG.GATEPOST_ID
         LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM ON ASOM.SALE_ORDER_MATERIAL_ID = OO.ORDER_PLAN_ID
@@ -1147,6 +1153,7 @@
         ON TER.RESULT_TOTAL_ID=TTR.RESULT_TOTAL_ID
         where oo.ORDER_STATUS = 5
         AND ASO.SALE_ORDER_STATUS = 4
+        and nvl(aso.DELETED,0) in (0,2)
         AND TER.RESULT_ENTRY_GATE_TIME IS NULL
         and QQSL.SPELILING_NUM =2
         AND OO.ORDER_ID NOT IN (