修改

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

@@ -776,4 +776,42 @@ public class QmsQueueResultController extends BaseRESTfulController {
         return success(qmsModelUnrooledMapper.deleteByPrimaryKey(model.getResultId()));
     }
 
+
+    @ApiOperation(value="查排队开始")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId(128)", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "gridId", value = "仓储网格(筛选)", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "type", value = "类型3：采购、1|2：销售", required = false, dataType = "Integer"),
+
+    })
+    @PostMapping("/getOyeQueueListByQueueUp")
+    public RESTfulResult getOyeQueueListByQueueUp(@RequestBody(required=false) Map<String,Object> mapValue,
+                                               Integer locationId,
+                                               String capacityNumber,
+                                               Integer isSpelling
+    ){
+
+        if (locationId != null) {
+            mapValue.put("locationId", locationId);
+        }
+        if (capacityNumber != null && !"".equals(capacityNumber)) {
+            mapValue.put("capacityNumber", capacityNumber);
+        }
+        if(isSpelling == 1){
+            //原多拼
+            List<Map<String, Object>> queueListByQueueUpSpelling = qmsQueueResultService.getQueueListByQueueUpSpelling(mapValue);
+            return success(queueListByQueueUpSpelling);
+        }else if (isSpelling == 2){
+            //两拼数据
+            List<Map<String, Object>> queueListByQueueUpSpellingNew = qmsQueueResultService.getQueueListByQueueUpSpellingNew(mapValue);
+            return success(queueListByQueueUpSpellingNew);
+        }
+        else {
+            //单拼
+            return success(qmsQueueResultService.getQueueListByQueueUp(mapValue));
+        }
+    }
+
 }

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

@@ -681,10 +681,11 @@
     OO.ORDER_LINE_SEQUENCE "orderLineSequence",
     OO.ORDER_NUMBER "orderNumber",
     CASE
-    WHEN TEMP."orderId" IS NOT NULL
+    WHEN TEMP."orderId" IS NOT NULL AND ASO.SALE_TYPE = 1
     THEN '（'|| decode(ASO.SALE_ORDER_STATUS,4,'订单已审核','订单未审核') || ':未轧' ||'）'
-    WHEN TEMP."orderId" IS NULL
+    WHEN TEMP."orderId" IS NULL AND ASO.SALE_TYPE = 1
     THEN '（'|| decode(ASO.SALE_ORDER_STATUS,4,'订单已审核','订单未审核') || ':已轧' || '）'
+    ELSE ''
     END
     "capacityMessage",
     RC.CAPACITY_TEL "capacityTel",

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

@@ -914,8 +914,17 @@
         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="oYeFlag == null">
+            AND TER.RESULT_ENTRY_GATE_TIME IS NULL
+            AND ASO.SALE_TYPE = 1
+        </if>
+        <if test="oYeFlag != null">
+            AND TTR.ORDER_STATUS = '排队中'
+            AND ASO.SALE_TYPE = 50
+        </if>
+        <if test="oYeFlag == null">
+            AND RM.MATERIAL_ID||'' NOT IN (SELECT DISTINCT SPECTIONS_MODEL FROM QMS_MODEL_UNROOLED)
+        </if>
         <if test="capacityNumber != null">
             and instr(RC.CAPACITY_NUMBER, #{capacityNumber}) > 0
         </if>
@@ -1051,23 +1060,32 @@
         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
+        <if test="oYeFlag == null">
+            AND TER.RESULT_ENTRY_GATE_TIME IS NULL
+            AND ASO.SALE_TYPE = 1
+        </if>
+        <if test="oYeFlag != null">
+            AND TTR.ORDER_STATUS = '排队中'
+            AND ASO.SALE_TYPE = 50
+        </if>
         and QQSL.SPELILING_NUM not in (1,2)
-        AND OO.ORDER_ID NOT IN (
-        select
-        OO.ORDER_ID
-        from OMSTRUCK_ORDER OO
-        LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM
-        ON ASOM.SALE_ORDER_MATERIAL_ID=OO.ORDER_PLAN_ID
-        LEFT JOIN AMS_SALE_TRUCKNO_MATERIAL ASTM ON ASTM.SALE_ORDER_MATERIAL_ID = ASOM.SALE_ORDER_MATERIAL_ID
-        LEFT JOIN AMS_SALE_MATERIAL ASM ON ASM.SALE_MATERIAL_ID = ASTM.MATERIAL_ID
-        LEFT JOIN RMS_MATERIAL RM
-        ON RM.MATERIAL_ID=ASM.MATERIAL_ID
-        WHERE ASM.DELETED  != 0 or  ASM.DELETED is null
-        AND OO.ORDER_TYPE=1
-        AND OO.ORDER_STATUS=5
-        and RM.MATERIAL_ID||'' in (select SPECTIONS_MODEL from QMS_MODEL_UNROOLED)
-        )
+        <if test="oYeFlag == null">
+            AND OO.ORDER_ID NOT IN (
+            select
+            OO.ORDER_ID
+            from OMSTRUCK_ORDER OO
+            LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM
+            ON ASOM.SALE_ORDER_MATERIAL_ID=OO.ORDER_PLAN_ID
+            LEFT JOIN AMS_SALE_TRUCKNO_MATERIAL ASTM ON ASTM.SALE_ORDER_MATERIAL_ID = ASOM.SALE_ORDER_MATERIAL_ID
+            LEFT JOIN AMS_SALE_MATERIAL ASM ON ASM.SALE_MATERIAL_ID = ASTM.MATERIAL_ID
+            LEFT JOIN RMS_MATERIAL RM
+            ON RM.MATERIAL_ID=ASM.MATERIAL_ID
+            WHERE ASM.DELETED  != 0 or  ASM.DELETED is null
+            AND OO.ORDER_TYPE = 1
+            AND OO.ORDER_STATUS = 5
+            and RM.MATERIAL_ID||'' in (select SPECTIONS_MODEL from QMS_MODEL_UNROOLED)
+            )
+        </if>
         <if test="capacityNumber != null">and instr(RC.CAPACITY_NUMBER, #{capacityNumber}) > 0
         </if>
         <if test="
@@ -1154,23 +1172,32 @@
         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 (
-        select
-        OO.ORDER_ID
-        from OMSTRUCK_ORDER OO
-        LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM
-        ON ASOM.SALE_ORDER_MATERIAL_ID=OO.ORDER_PLAN_ID
-        LEFT JOIN AMS_SALE_TRUCKNO_MATERIAL ASTM ON ASTM.SALE_ORDER_MATERIAL_ID = ASOM.SALE_ORDER_MATERIAL_ID
-        LEFT JOIN AMS_SALE_MATERIAL ASM ON ASM.SALE_MATERIAL_ID = ASTM.MATERIAL_ID
-        LEFT JOIN RMS_MATERIAL RM
-        ON RM.MATERIAL_ID=ASM.MATERIAL_ID
-        WHERE ASM.DELETED  != 0 or  ASM.DELETED is null
-        AND OO.ORDER_TYPE=1
-        AND OO.ORDER_STATUS=5
-        and RM.MATERIAL_ID||'' in (select SPECTIONS_MODEL from QMS_MODEL_UNROOLED)
+        <if test="oYeFlag == null">
+            AND TER.RESULT_ENTRY_GATE_TIME IS NULL
+            AND ASO.SALE_TYPE = 1
+        </if>
+        <if test="oYeFlag != null">
+            AND TTR.ORDER_STATUS = '排队中'
+            AND ASO.SALE_TYPE = 50
+        </if>
+        and QQSL.SPELILING_NUM = 2
+        <if test="oYeFlag == null">
+            AND OO.ORDER_ID NOT IN (
+            select
+            OO.ORDER_ID
+            from OMSTRUCK_ORDER OO
+            LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM
+            ON ASOM.SALE_ORDER_MATERIAL_ID=OO.ORDER_PLAN_ID
+            LEFT JOIN AMS_SALE_TRUCKNO_MATERIAL ASTM ON ASTM.SALE_ORDER_MATERIAL_ID = ASOM.SALE_ORDER_MATERIAL_ID
+            LEFT JOIN AMS_SALE_MATERIAL ASM ON ASM.SALE_MATERIAL_ID = ASTM.MATERIAL_ID
+            LEFT JOIN RMS_MATERIAL RM
+            ON RM.MATERIAL_ID=ASM.MATERIAL_ID
+            WHERE ASM.DELETED != 0 or ASM.DELETED is null
+            AND OO.ORDER_TYPE = 1
+            AND OO.ORDER_STATUS = 5
+            and RM.MATERIAL_ID||'' in (select SPECTIONS_MODEL from QMS_MODEL_UNROOLED)
         )
+        </if>
         <if test="capacityNumber != null">and instr(RC.CAPACITY_NUMBER, #{capacityNumber}) > 0
         </if>
         <if test="

src/main/resources/log4j.properties

@@ -1,5 +1,5 @@
 ## LOG4J\u914D\u7F6E
-log4j.rootCategory=INFO, file, RUNNING,errorfile
+log4j.rootCategory=INFO, file, RUNNING,errorfile,stdout
 ## \u63A7\u5236\u53F0\u8F93\u51FA
 log4j.appender.stdout=org.apache.log4j.ConsoleAppender
 log4j.appender.stdout.layout=org.apache.log4j.PatternLayout