修改 月

ruoyi-admin/src/main/java/com/ruoyi/web/controller/broad/BeforeLibraryController.java

@@ -48,13 +48,13 @@ public class BeforeLibraryController {
         return JSONArray.toJSONString(list);
     }
 
-//    @PostMapping("/selectProductInStore")
+    @PostMapping("/selectProductInStore")
-//    @ApiOperation("泡前库   成品入库")
+    @ApiOperation("成品入库统计")
-//    @ResponseBody
+    @ResponseBody
-//    public String pqk_selectProductInStore() {
+    public String pqk_selectProductInStore() {
-//        List<BoxOutput> list = service.pqk_selectProductInStore();
+        List<BoxOutput> list = service.pqk_selectProductInStore();
-//        return JSONArray.toJSONString(list);
+        return JSONArray.toJSONString(list);
-//    }
+    }
 
 
     //    @PostMapping("/selectQualityItem")

ruoyi-admin/src/main/resources/application-druid.yml

@@ -7,7 +7,9 @@ spring:
             # 主库数据源
             master:
                 url: jdbc:oracle:thin:@10.100.70.5:1521:aucma
+#                url: jdbc:oracle:thin:@124.70.0.226:1521:ORCL
                 username: haiwei
+#                username: C##USERNAME
                 password: 123456
             # 从库数据源
             slave:

ruoyi-admin/src/main/resources/static/js/board/beforeLibrary.js

@@ -94,7 +94,8 @@ $(() => {
     })
 
     //成品入库统计轮询
-    autoUpdate("/broad/mtk/selectInstoreNumByday", INTERVAL, data => {
+    // autoUpdate("/broad/mtk/selectInstoreNumByday", INTERVAL, data => {
+    autoUpdate("/broad/beforeLibrary/selectProductInStore", INTERVAL, data => {
         data.sort((a, b) => {
             return b.qty - a.qty
         })

ruoyi-system/src/main/java/com/ruoyi/system/mapper/BroadDataMapper.java

@@ -113,4 +113,6 @@ public interface BroadDataMapper {
 
 
     List<BoxOutput> yue_selectMonthQANumber();
+
+    List<BoxOutput> pqk_selectProductInStore();
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/IBroadDataService.java

@@ -97,4 +97,5 @@ public interface IBroadDataService {
     List<BoxOutput> yue_selectMonthQANumber();
 
 
+    List<BoxOutput> pqk_selectProductInStore();
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BroadDataServiceImpl.java

@@ -101,6 +101,11 @@ public class BroadDataServiceImpl implements IBroadDataService
 
     //    成品入库
 
+    @Override
+    public List<BoxOutput> pqk_selectProductInStore() {
+        return mapper.pqk_selectProductInStore();
+    }
+
     @Override
     public List<OrderInfo> pqk_selectOrderInfo() {
         return mapper.pqk_selectOrderInfo();

ruoyi-system/src/main/resources/mapper/system/BroadDataMapper.xml

@@ -941,6 +941,24 @@ where 600 < ROUND(TO_NUMBER(t1.day - t2.day) * 24 * 60 * 60) - t3.RHYTHM
 )
     </select>
 
+    <select id="pqk_selectProductInStore" resultType="com.ruoyi.system.domain.BoxOutput">
+        select nvl(count(1), 0)                                                                   as qty,
+        substr(
+        MATERIAL_NAME,
+        instr(MATERIAL_NAME, '-', 1, 1) + 1,
+        instr(MATERIAL_NAME, ',', 1, 1) - 2 - instr(MATERIAL_NAME, '-', 1, 1) + 1) as name
+        from IMOS_PR_PRODUCT_BARCODE ippb
+        left join (select * from (select * from haiwei.BASE_DAY_WBTIME order by CREATE_TIME desc) where ROWNUM = 1) wb
+        on 1 = 1
+        where ippb.SCAN_TIME between
+        case
+        when sysdate &lt;= wb.W_END then W_START
+        else W_END end
+        and case when sysdate &lt;= wb.W_END then W_END else B_END end
+        and DETIAL_TYPE_CODE = '1004'
+
+        group by MATERIAL_NAME
+    </select>
     <select id="mtk_selectInStore3d" resultType="com.ruoyi.system.domain.BoxOutput">
         select
         substr(MATERIAL_NAME,
@@ -1485,6 +1503,7 @@ where 600 &lt; ROUND(TO_NUMBER(t1.day - t2.day) * 24 * 60 * 60) - t3.RHYTHM
     <select id="zz_countNightProductIn" resultType="integer">
         select count(1)
         from IMOS.IMOS_PR_PRODUCT_BARCODE
+
         where PRODUCTION_DATE &gt; (
         select W_END + interval '5' MINUTE
         from (select * from haiwei.BASE_DAY_WBTIME order by CREATE_TIME desc )