atsh

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

@@ -143,6 +143,12 @@ public class QmsQueueListController extends BaseRESTfulController {
     }
 
 
+    @ApiOperation(value = "撤销排队放行")
+    @PostMapping("/ctrlZQueueAllow")
+    public RESTfulResult ctrlZQueueAllow(@RequestBody(required = false) Map<String,Object> map){
+        return success(qmsQueueListService.ctrlZQueueAllow(map));
+    }
+
 //    @ApiOperation(value="排队转移-->新增排队链表:实绩Id、门岗或月台、转移原因")
 //    @ApiImplicitParams({
 //            @ApiImplicitParam(name = "mapValue", value = "实绩Id、门岗或月台、转移原因", required = false, dataType = "Map"),

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

@@ -67,4 +67,7 @@ public interface QueuingRulesMapper {
     List<Map<String, Object>> getAllNotSureEnFactorySpellingList();
 
     Integer checkoutQQR(Object resultTotalId);
+
+    int updateQRESULTEnsureTime(@Param("listId") BigDecimal listId);
+
 }

src/main/java/com/steerinfo/dil/service/IQmsQueueListService.java

@@ -1,5 +1,6 @@
 package com.steerinfo.dil.service;
 
+import com.steerinfo.framework.controller.RESTfulResult;
 import com.steerinfo.framework.service.IBaseService;
 import com.steerinfo.dil.model.QmsQueueList;
 import java.util.Date;
@@ -37,10 +38,7 @@ public interface IQmsQueueListService{
     //链表监控
     List<Map<String, Object>> listMonitor(Map<String, Object> map);
 
-
-
-
-
+    int ctrlZQueueAllow(Map<String, Object> map);
 
 
     //进厂排队转移(仓库排队转移) 新增一条链表 修改实绩链表Id

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

@@ -11,11 +11,13 @@ import com.steerinfo.dil.util.DataChange;
 import com.steerinfo.dil.model.QmsQueueList;
 import com.steerinfo.dil.mapper.QmsQueueListMapper;
 import com.steerinfo.dil.service.IQmsQueueListService;
+import com.steerinfo.framework.controller.RESTfulResult;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import javax.annotation.Resource;
 import java.text.SimpleDateFormat;
 import java.util.*;
 import java.math.BigDecimal;
@@ -58,6 +60,9 @@ public class QmsQueueListServiceImpl implements IQmsQueueListService {
     @Autowired
     LargeScreenFeign largeScreenFeign;
 
+
+
+
     private final SimpleDateFormat gatepostTimeSdf = new SimpleDateFormat("HHmmss");
 
     /**
@@ -429,7 +434,7 @@ public class QmsQueueListServiceImpl implements IQmsQueueListService {
      * @Date:
      * @Description:做一个定时任务向两块大屏赋予值
      */
-    @Scheduled(cron = "*/30 * * * * ?")
+    @Scheduled(cron = "*/60 * * * * ?")
     public void sendDataToLargeCreen(){
         Map<String,Object> mapValue=new HashMap<>();
         List<Map<String, Object>> datalist =new ArrayList<>();
@@ -453,6 +458,18 @@ public class QmsQueueListServiceImpl implements IQmsQueueListService {
         }
     }
 
+    @Override
+    public int ctrlZQueueAllow(Map<String, Object> map) {
+        //去除可进厂确认时间,和进厂时间里面的OK
+        int i = 0;
+        BigDecimal listId = DataChange.dataToBigDecimal(map.get("listId"));
+        //移除OK
+        i =+ queuingRulesMapper.updateEnFactory(DataChange.dataToBigDecimal(map.get("resultTotalId")));
+        //移除可进厂确认时间
+        i =+ queuingRulesMapper.updateQRESULTEnsureTime(listId);
+        return i;
+    }
+
 //    @Override
 //    public int queueCutInLine(Map<String, Object> map) {
 //        //通过实绩Id查出关联的链表Id

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

@@ -890,6 +890,7 @@
         LEFT JOIN AMS_SALE_MATERIAL ASM
         ON ASM.SALE_MATERIAL_ID = ASTM.MATERIAL_ID
         where oo.ORDER_STATUS = 5
+        AND ASO.SALE_ORDER_STATUS = 4
         <if test="capacityNumber != null">
             and instr(RC.CAPACITY_NUMBER, #{capacityNumber}) > 0
         </if>
@@ -956,6 +957,7 @@
             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
             <if test="capacityNumber != null">
                 and instr(RC.CAPACITY_NUMBER, #{capacityNumber}) > 0
             </if>
@@ -975,7 +977,7 @@
                 ORDER BY  QQSL.ENTRY_SURE_TIME DESC, QQSL.IS_VIP,  "listNodeOrder"
             </if>
             <if test="locationId == null">
-                order by  QQSL.ENTRY_SURE_TIME DESC, QQSL.IS_VIP, QQSL.SPELILING_NUM DESC, "listNodeOrder"
+                ORDER BY QQSL.ENTRY_SURE_TIME DESC, QQR.RESULT_START_TIME
             </if>
     </select>
 

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

@@ -196,6 +196,11 @@
             RESULT_ACCEPT_TIME = null
         where RESULT_ID = #{resultId}
     </update>
+    <update id="updateQRESULTEnsureTime">
+        UPDATE QMS_QUEUE_LIST QQL
+        SET QQL.ENTRY_SURE_TIME = null
+        where QQL.LIST_ID = #{listId}
+    </update>
 
     <select id="getAllNotSureEnFactoryList" resultType="java.util.Map">
         select QQL.LIST_ID  "listId",