提交代码

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

@@ -153,7 +153,27 @@ public class QmsQueueResultController extends BaseRESTfulController {
                 }
             }
             return success(queueListByQueueUpSpelling);
-        }else {
+        }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);
+                    }
+                }
+            }
+            return success(queueListByQueueUpSpellingNew);
+        }
+        else {
             //单拼
             return success(qmsQueueResultService.getQueueListByQueueUp(mapValue));
         }

src/main/java/com/steerinfo/dil/feign/DaZhouFeign.java

@@ -1,25 +0,0 @@
-package com.steerinfo.dil.feign;
-
-import com.steerinfo.framework.controller.RESTfulResult;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestParam;
-
-import java.util.Map;
-
-/**
- * @ author    :TXF
- * @ time      :2021/10/8 19:07
- */
-
-
-@FeignClient(value = "DIL-DAZHOU-API-DEV", url = "${openfeign.DaZhouFeign.url}")
-public interface DaZhouFeign {
-
-    @GetMapping("/api/v1/uc/getSteelOrderNum")
-    RESTfulResult getSteelOrderNum();
-
-
-}

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

@@ -150,6 +150,8 @@ public interface QmsQueueResultMapper extends IBaseMapper<QmsQueueResult, BigDec
 
     List<Map<String, Object>> getQueueListByQueueUpSpelling(Map<String, Object> map);
 
+    List<Map<String, Object>> getQueueListByQueueUpSpellingNew(Map<String, Object> map);
+
     List<Map<String,Object>> getMaterialId(BigDecimal orderId);
 
     List<Map<String,Object>> getStoreQueueList();

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

@@ -241,6 +241,10 @@ public class QmsQueueResultServiceImpl implements IQmsQueueResultService {
         return  qmsQueueResultMapper.getQueueListByQueueUpSpelling(map);
     }
 
+    public List<Map<String, Object>> getQueueListByQueueUpSpellingNew(Map<String, Object> map) {
+        return  qmsQueueResultMapper.getQueueListByQueueUpSpellingNew(map);
+    }
+
     /**
      * @author:zyf
      * @version:1.0

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

@@ -1006,6 +1006,7 @@
         LEFT JOIN RMS_CONSIGNEE RCE ON RCE.CONSIGNEE_ID = ASO.RECEIVE_ID
         where oo.ORDER_STATUS = 5
         AND ASO.SALE_ORDER_STATUS = 4
+        and QQSL.SPELILING_NUM not in (1,2)
         AND OO.ORDER_ID NOT IN (
         select OO.ORDER_ID
         from OMSTRUCK_ORDER OO
@@ -1029,13 +1030,83 @@
             </if>
             <if test="locationId != null">
                 and QQSL.SPELILING_NUM  = #{locationId}
-                ORDER BY QQSL.ENTRY_SURE_TIME ASC NULLS FIRST ,QQSL.IS_VIP DESC NULLS LAST,"listNodeOrder"
+                ORDER BY "listNodeOrder",QQSL.ENTRY_SURE_TIME ASC NULLS FIRST ,QQSL.IS_VIP DESC NULLS LAST,OO.ORDER_ID
             </if>
             <if test="locationId == null">
-                ORDER BY QQSL.ENTRY_SURE_TIME ASC NULLS FIRST ,QQSL.IS_VIP DESC NULLS LAST,"listNodeOrder"
+                ORDER BY "listNodeOrder",QQSL.ENTRY_SURE_TIME ASC NULLS FIRST ,QQSL.IS_VIP DESC NULLS LAST,OO.ORDER_ID
             </if>
     </select>
 
+    <select id="getQueueListByQueueUpSpellingNew" parameterType="map" resultType="java.util.LinkedHashMap">
+        select QQR.RESULT_ID "resultId",
+        QQR.RESULT_TOTAL_ID "resultTotalId",
+        QQR.RESULT_START_TIME "resultStartTime",
+        RC.CAPACITY_NUMBER "capacityNumber",
+        QQSL.SPELILING_NUM "grid",
+        QQSL.SPELLING_RESULT_ID "spellingResultId",
+        RM.MATERIAL_ID "materialId",
+        RM.MATERIAL_NAME "materialName",
+        RM.MATERIAL_SPECIFICATION||'('||RM.MATERIAL_MODEL||')' "materialSpecification",
+        RC.CAPACITY_ID "capacityId",
+        RM.MATERIAL_MODEL "materialModel",
+        QQSL.ENTRY_SURE_TIME "sureTime",
+        OOM.ORDER_MATERIAL_NUMBER "materialNumber",
+        OOM.MATERIAL_PRIORITY "id",
+        OO.DRIVER_TEL "driverTel",
+        OO.ORDER_ID "orderId",
+        RG.GATEPOST_NAME "gatepostName",
+        RCE.CONSIGNEE_COMPANY_NAME "consigneeName",
+        QQSL.IS_VIP "resultInsertTime",
+        (
+        select count(QQSL2.SPELLING_RESULT_ID) from QMS_QUEUE_SPELLING_LIST QQSL2
+        where QQSL.SPELILING_NUM = QQSL2.SPELILING_NUM
+        and QQSL.SPELLING_SURE_TIME &lt;= QQSL2.SPELLING_SURE_TIME
+
+        ) "listNodeOrder"
+        from QMS_QUEUE_SPELLING_LIST QQSL
+        left join QMS_QUEUE_RESULT QQR ON QQSL.QUEUE_RESULT_ID = QQR.RESULT_ID
+        left join RMS_CAPACITY RC ON QQR.CAPACITY_ID = RC.CAPACITY_ID
+        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 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
+        LEFT JOIN AMS_SALE_ORDER ASO ON ASO.SALE_ORDER_ID = ASOM.SALE_ORDER_ID
+        LEFT JOIN RMS_CONSIGNEE RCE ON RCE.CONSIGNEE_ID = ASO.RECEIVE_ID
+        where oo.ORDER_STATUS = 5
+        AND ASO.SALE_ORDER_STATUS = 4
+        and QQSL.SPELILING_NUM =2
+        AND OO.ORDER_ID NOT IN (
+        select OO.ORDER_ID
+        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=5 and
+        RM.MATERIAL_ID||'' in (select SPECTIONS_MODEL from QMS_MODEL_UNROOLED)
+        )
+        <if test="capacityNumber != null">and instr(RC.CAPACITY_NUMBER, #{capacityNumber}) > 0
+        </if>
+        <if test="
+        materialList != null">and
+            EXISTS (
+            SELECT OO2.ORDER_ID
+            from OMSTRUCK_ORDER OO2 left join OMSTRUCK_ORDER_MATERIAL OOM2 on OO2.ORDER_ID = OOM2.ORDER_ID
+            where OO2.ORDER_ID = OO.ORDER_ID and OOM2.MATERIAL_ID in
+            <foreach collection="materialList" item="item" open="(" separator="," close=")">
+                ${item}
+            </foreach>
+            )
+        </if>
+        <if test="locationId != null">
+            and QQSL.SPELILING_NUM  = #{locationId}
+            ORDER BY "listNodeOrder",QQSL.ENTRY_SURE_TIME ASC NULLS FIRST ,QQSL.IS_VIP DESC NULLS LAST,OO.ORDER_ID
+        </if>
+        <if test="locationId == null">
+            ORDER BY "listNodeOrder",QQSL.ENTRY_SURE_TIME ASC NULLS FIRST ,QQSL.IS_VIP DESC NULLS LAST,OO.ORDER_ID
+        </if>
+    </select>
+
     <select id="getMaterialId" resultType="java.util.Map">
         select
         distinct