Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU1/DAL-QMS-API

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

@@ -9,6 +9,7 @@ import com.steerinfo.framework.service.pagehelper.PageHelper;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
+import org.apache.xmlbeans.impl.xb.xsdschema.Public;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -48,8 +49,6 @@ public class QmsQueueListController extends BaseRESTfulController {
         int i = qmsQueueListService.addQueueList(new BigDecimal(resultId));
         if(i == 0){
             return failed("该车已有排队！");
-        }else if(i == 1){
-            return failed("钢材未轧，暂时无法排队，请等待！");
         }
         return success(i);
     }
@@ -162,6 +161,13 @@ public class QmsQueueListController extends BaseRESTfulController {
         return success(qmsQueueListService.ctrlZQueueAllow(map));
     }
 
+    @ApiOperation(value = "测试")
+    @GetMapping("/ceshi")
+    public RESTfulResult ceshi(){
+        qmsQueueListService.sendDataToLargeCreen();
+        return success();
+    }
+
 //    @ApiOperation(value="排队转移-->新增排队链表:实绩Id、门岗或月台、转移原因")
 //    @ApiImplicitParams({
 //            @ApiImplicitParam(name = "mapValue", value = "实绩Id、门岗或月台、转移原因", required = false, dataType = "Map"),

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

@@ -15,7 +15,7 @@ public interface QmsModelUnrooledMapper extends IBaseMapper<QmsModelUnrooled, Bi
     BigDecimal selectMaxId();
 
     //查询所有规格
-    List<String> getAllModel(Map<String,Object> map);
+    List<Map<String,Object>> getAllModel(Map<String,Object> map);
 
     //查询所有未轧规格
     List<Map<String, Object>> getAllModelUnrolled(Map<String, Object> map);

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

@@ -153,4 +153,28 @@ public interface QmsQueueResultMapper extends IBaseMapper<QmsQueueResult, BigDec
     List<Map<String,Object>> getMaterialId(BigDecimal orderId);
 
     List<Map<String,Object>> getStoreQueueList();
+
+    /**
+     * @author:zyf
+     * @version:1.0
+     * @Date:2022-09-27
+     * @Description:查询已派车数量（钢材）
+     */
+    int querySentCarNumber();
+
+    /**
+     * @author:zyf
+     * @version:1.0
+     * @Date:2022-09-27
+     * @Description:查询已进厂数量（钢材）
+     */
+    int queryIntoFactoryNumber();
+
+    /**
+     * @author:zyf
+     * @version:1.0
+     * @Date:2022-09-27
+     * @Description:查询已出厂数量（钢材）
+     */
+    int queryLeaveFactoryNumber();
 }

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

@@ -23,4 +23,7 @@ public interface QmsQueueSpellingListMapper extends IBaseMapper<QmsQueueSpelling
     Integer existsCapacity(Object capacityId);
 
     int updateOOMLoadWarehouse(Map<String, Object> mesMap);
+
+
+
 }

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

@@ -113,16 +113,6 @@ public class QmsQueueListServiceImpl implements IQmsQueueListService {
         //通过订单查询有几种物资
         Map<String, Object> mesMap = qmsQueueListMapper.getMaterialNumByOrderId(resultId);
         int materialNum = DataChange.dataToBigDecimal(mesMap.get("materialNum")).intValue();
-//        Map<String,Object> isUnrolled=null;
-//        try{
-//            isUnrolled=qmsModelUnrooledMapper.existUnrolled(mesMap);
-//        }catch (Exception e){
-//            System.out.println("查询未轧规格出现异常，不抛出异常，允许继续排队。");
-//        }
-//        if(isUnrolled!=null){
-//            //存在未轧钢材，不允许排队
-//            return 1;
-//        }
         if(materialNum == 1){
             //单拼进入链表
             //判断单拼链表中是否有已存在此辆车正在排队
@@ -453,13 +443,16 @@ public class QmsQueueListServiceImpl implements IQmsQueueListService {
      * @Date:
      * @Description:做一个定时任务向两块大屏赋予值
      */
-    //@Scheduled(cron = "*/60 * * * * ?")
+    @Scheduled(cron = "*/60 * * * * ?")
     //@Scheduled(cron = "0 0/5 * * * ?")
     public void sendDataToLargeCreen(){
         Map<String,Object> mapValue=new HashMap<>();
         List<Map<String, Object>> datalist =new ArrayList<>();
         List<Map<String, Object>> queueListByQueueUp = qmsQueueResultService.getQueueListByQueueUp(mapValue);
         List<Map<String, Object>> queueListByQueueUpSpelling = qmsQueueResultService.getQueueListByQueueUpSpelling(mapValue);
+        //求出所有的数据
+        Map<String, Object> getnumber = qmsQueueResultService.getnumber();
+        datalist.add(getnumber);
         HashSet<Map<String,Object>> set=new HashSet<>(queueListByQueueUpSpelling);
         //queueListByQueueUp=queueListByQueueUp.stream().distinct().collect(Collectors.toList());
         datalist.addAll(queueListByQueueUp);

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

@@ -222,7 +222,26 @@ public class QmsQueueResultServiceImpl implements IQmsQueueResultService {
         return  qmsQueueResultMapper.getQueueListByQueueUpSpelling(map);
     }
 
-
+    /**
+     * @author:zyf
+     * @version:1.0
+     * @Date:2022-09-27
+     * @Description:查询出来所有的数据
+    */
+    public Map<String,Object> getnumber(){
+        Map<String,Object> map=new HashMap<>();
+        //查询出销售钢材的派车数
+        int SentCarNumber = qmsQueueResultMapper.querySentCarNumber();
+        //查询出销售钢材的进厂数
+        int IntoFactoryNumber=qmsQueueResultMapper.queryIntoFactoryNumber();
+        //查询出销售钢材的出厂数
+        int LeaveFactoryNumber=qmsQueueResultMapper.queryLeaveFactoryNumber();
+        map.put("sentCarNumber",SentCarNumber);
+        map.put("intoFactoryNumber",IntoFactoryNumber);
+        map.put("leaveFactoryNumber",LeaveFactoryNumber);
+        map.put("waitIntoFactoryNumber",SentCarNumber-IntoFactoryNumber);
+        return map;
+    }
 
 
     /**

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

@@ -135,9 +135,10 @@
   <select id="selectMaxId" resultType="java.math.BigDecimal">
     select SEQ_QMS_MODEL.nextval from dual
   </select>
-    <select id="getAllModel" resultType="java.lang.String">
+    <select id="getAllModel" resultType="java.util.Map">
     SELECT DISTINCT
-    MATERIAL_SPECIFICATION || MATERIAL_MODEL
+    MATERIAL_ID "materialId",
+    MATERIAL_NAME || MATERIAL_MODEL || '(' || MATERIAL_SPECIFICATION ||')' "materialName"
     from RMS_MATERIAL
     where MATERIAL_SPECIFICATION like 'Φ%'
     <if test="index !=null and index!=''.toString()">
@@ -145,12 +146,15 @@
     </if>
     </select>
   <select id="getAllModelUnrolled" resultType="java.util.Map">
-    select RESULT_ID "resultId",
-           SPECTIONS_MODEL "spectionsModel"
-    from QMS_MODEL_UNROOLED
+    select QMU.RESULT_ID "resultId",
+    RM.MATERIAL_ID "materialId",
+    RM.MATERIAL_NAME "materialName",
+    RM.MATERIAL_MODEL || '(' || RM.MATERIAL_SPECIFICATION ||')'		"spectionsModel"
+    from QMS_MODEL_UNROOLED QMU,RMS_MATERIAL RM
     <where>
+      RM.MATERIAL_ID||''=QMU.SPECTIONS_MODEL
       <if test="index !=null and index!=''.toString()">
-        MATERIAL_SPECIFICATION || MATERIAL_MODEL like CONCAT(CONCAT('%',#{index}),'%')
+      and  RM.MATERIAL_NAME || RM.MATERIAL_SPECIFICATION || RM.MATERIAL_MODEL like CONCAT(CONCAT('%',#{index}),'%')
       </if>
     </where>
   </select>

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

@@ -891,7 +891,7 @@
         ON ASM.SALE_MATERIAL_ID = ASTM.MATERIAL_ID
         where oo.ORDER_STATUS = 5
         AND ASO.SALE_ORDER_STATUS = 4
-        AND RM.MATERIAL_SPECIFICATION || RM.MATERIAL_MODEL NOT IN (SELECT DISTINCT SPECTIONS_MODEL FROM QMS_MODEL_UNROOLED)
+        AND RM.MATERIAL_ID||'' NOT IN (SELECT DISTINCT SPECTIONS_MODEL FROM QMS_MODEL_UNROOLED)
         <if test="capacityNumber != null">
             and instr(RC.CAPACITY_NUMBER, #{capacityNumber}) > 0
         </if>
@@ -912,6 +912,51 @@
 
     </select>
 
+    <!--查询已派车车数-->
+    <select id="querySentCarNumber" resultType="java.lang.Integer">
+       select
+       count(*) ORDER_ID
+       from OMSTRUCK_ORDER OO
+       where OO.ORDER_TYPE=1
+       and to_char(OO.INSERT_TIME,'yyyy-mm-dd hh24:mi:ss')
+       between to_char(trunc(sysdate,'dd'),'yyyy-mm-dd hh24:mi:ss')
+       and to_char(trunc(sysdate,'dd')+23/24+59/24/60+59/24/60/60,'yyyy-mm-dd hh24:mi:ss')
+    </select>
+    <!--查询已扫码进厂车数-->
+    <select id="queryIntoFactoryNumber" resultType="java.lang.Integer">
+       select COUNT(*) RESULT_ID
+       from OMSTRUCK_ORDER OO
+       LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR
+       ON TTR.ORDER_ID=OO.ORDER_ID
+       LEFT JOIN TMSTRUCK_ENFACTORY_RESULT TER
+       ON TER.RESULT_TOTAL_ID=TTR.RESULT_TOTAL_ID
+       LEFT JOIN TMSTRUCK_LEAVE_FACTORY_RESULT TLFR
+       ON TLFR.RESULT_TOTAL_ID=TTR.RESULT_TOTAL_ID
+       where OO.ORDER_TYPE =1
+       and TER.INSERT_TIME IS NOT NULL
+       and to_char(OO.INSERT_TIME,'yyyy-mm-dd hh24:mi:ss')
+       between to_char(trunc(sysdate,'dd'),'yyyy-mm-dd hh24:mi:ss')
+       and to_char(trunc(sysdate,'dd')+23/24+59/24/60+59/24/60/60,'yyyy-mm-dd hh24:mi:ss')
+    </select>
+    <!--查询已扫码出厂车数-->
+    <select id="queryLeaveFactoryNumber" resultType="java.lang.Integer">
+       select COUNT(*) RESULT_ID
+       from OMSTRUCK_ORDER OO
+       LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR
+       ON TTR.ORDER_ID=OO.ORDER_ID
+       LEFT JOIN TMSTRUCK_ENFACTORY_RESULT TER
+       ON TER.RESULT_TOTAL_ID=TTR.RESULT_TOTAL_ID
+       LEFT JOIN TMSTRUCK_LEAVE_FACTORY_RESULT TLFR
+       ON TLFR.RESULT_TOTAL_ID=TTR.RESULT_TOTAL_ID
+       where OO.ORDER_TYPE =1
+       and TER.INSERT_TIME IS NOT NULL
+       and TLFR.INSERT_TIME IS NOT NULL
+       and to_char(OO.INSERT_TIME,'yyyy-mm-dd hh24:mi:ss')
+       between to_char(trunc(sysdate,'dd'),'yyyy-mm-dd hh24:mi:ss')
+       and to_char(trunc(sysdate,'dd')+23/24+59/24/60+59/24/60/60,'yyyy-mm-dd hh24:mi:ss')
+    </select>
+
+    <!--查询待进厂车数-->
     <update id="updateCancelResult" parameterType="com.steerinfo.dil.model.QmsQueueResult">
         update QMS_QUEUE_RESULT
         set RESULT_CANCEL_TIME   = SYSDATE,
@@ -959,7 +1004,14 @@
             LEFT JOIN RMS_CONSIGNEE RCE ON RCE.CONSIGNEE_ID = ASO.RECEIVE_ID
             where oo.ORDER_STATUS = 5
               AND ASO.SALE_ORDER_STATUS = 4
-              AND RM.MATERIAL_SPECIFICATION || RM.MATERIAL_MODEL NOT IN (SELECT DISTINCT SPECTIONS_MODEL FROM QMS_MODEL_UNROOLED)
+              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>