修改 门体库

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

@@ -46,7 +46,7 @@ public class BeforeLibraryController {
     }
 
     @PostMapping("/selectQualityItem")
-    @ApiOperation("泡前库-成品质量类型统计")
+    @ApiOperation("泡前库-质量统计")
     @ResponseBody
     public String pqk_selectQualityItem(){
         return JSONArray.toJSONString(service.pqk_selectQualityItem());

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

@@ -29,9 +29,15 @@ public class MTKController {
     private IBaseTeamService baseTeamService;
 
     @PostMapping("/team6s")
-    public String list(BaseTeam baseTeam) {
+    @ApiOperation("班组6S查询")
-        List<BaseTeam> list = baseTeamService.selectBaseTeamList(baseTeam);
+    public String list() {
+        List<BaseTeam> list = baseTeamService.selectBaseTeamList(null);
         return JSONArray.toJSONString(list);
     }
+    @PostMapping("/inStore3d")
+    @ApiOperation("3天入库量查询")
+    public String mtk_inStore3d() {
 
+        return JSONArray.toJSONString(service.mtk_selectInStore3d());
+    }
 }

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

@@ -38,10 +38,10 @@ const LOSS = () => {
 const moduleTitle = () => {
     const html = `
     <span style="position: absolute;top: 0.9%;left: 50%;color: #fff;font-size: 1.3vw;transform: translateX(-50%);letter-spacing: 0.3vw">总装生产数据及质量数据</span>
-    <span style="position: absolute;top: 10%;left: 5.5%;color: #CFD2D0;font-size: 1.0vw">产量</span>
+    <span style="position: absolute;top: 10%;left: 5.5%;color: #CFD2D0;font-size: 1.0vw">入库量</span>
-    <span style="position: absolute;top: 54.3%;left: 5.5%;color: #CFD2D0;font-size: 1.0vw">一次装配不合格率</span>
+    <span style="position: absolute;top: 54.3%;left: 5.5%;color: #CFD2D0;font-size: 1.0vw">外观检测</span>
     <span style="position: absolute;top: 24.8%;left: 53%;color: #CFD2D0;font-size: 1.0vw">LOSS分类</span>
-    <span style="position: absolute;top: 54.3%;left: 53%;color: #CFD2D0;font-size: 1.0vw">追踪事件</span>
+    <span style="position: absolute;top: 54.3%;left: 53%;color: #CFD2D0;font-size: 1.0vw">外观质量问题</span>
     `
     $('body').append(html)
 }

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

@@ -41,11 +41,11 @@ $(() => {
 const moduleTitle = () => {
     const html = `
     <span style="position: absolute;top: 0.9%;left: 50%;color: #fff;font-size: 1.3vw;transform: translateX(-50%);letter-spacing: 0.3vw">订单可视化、6S 及安全生产看板</span>
-    <span style="position: absolute;top: 10%;left: 5.5%;color: #CFD2D0;font-size: 1.0vw">每日人力出勤</span>
+    <span style="position: absolute;top: 10%;left: 5.5%;color: #CFD2D0;font-size: 1.0vw">班组生产6S</span>
-    <span style="position: absolute;top: 10%;left: 32%;color: #CFD2D0;font-size: 1.0vw">IQC检测明细</span>
+    <span style="position: absolute;top: 10%;left: 32%;color: #CFD2D0;font-size: 1.0vw">成品入库数量统计</span>
-    <span style="position: absolute;top: 10%;left: 73.5%;color: #CFD2D0;font-size: 1.0vw">碱生产效率</span>
+    <span style="position: absolute;top: 10%;left: 73.5%;color: #CFD2D0;font-size: 1.0vw"> </span>
     <span style="position: absolute;top: 54.5%;left: 5.5%;color: #CFD2D0;font-size: 1.0vw">成品入库统计</span>
-    <span style="position: absolute;top: 54.5%;left: 32%;color: #CFD2D0;font-size: 1.0vw">设备功率</span>
+    <span style="position: absolute;top: 54.5%;left: 32%;color: #CFD2D0;font-size: 1.0vw">问题</span>
     <span style="position: absolute;top: 54.5%;left: 73.6%;color: #CFD2D0;font-size: 1.0vw">安全生产</span>
     `
     $('body').append(html)

ruoyi-system/src/main/java/com/ruoyi/system/controller/BaseTeamController.java

@@ -9,6 +9,7 @@ import com.ruoyi.common.utils.file.FileUploadUtils;
 import com.ruoyi.common.config.Global;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -34,6 +35,7 @@ import org.springframework.web.multipart.MultipartFile;
  */
 @Controller
 @RequestMapping("/system/base_team")
+@Component("BaseTeamController")
 public class BaseTeamController extends BaseController
 {
     private String prefix = "system/base_team";
@@ -147,4 +149,7 @@ public class BaseTeamController extends BaseController
     {
         return toAjax(baseTeamService.deleteBaseTeamByIds(ids));
     }
+    public void createTeamDay(){
+        baseTeamService.createTeamDay();
+    }
 }

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

@@ -3,12 +3,15 @@ package com.ruoyi.system.mapper;
 import java.util.List;
 import com.ruoyi.system.domain.BaseTeam;
 
+import javax.annotation.PreDestroy;
+
 /**
  * 班组6S统计维护Mapper接口
  * 
  * @author ruoyi
  * @date 2022-07-20
  */
+
 public interface BaseTeamMapper 
 {
     /**
@@ -58,4 +61,6 @@ public interface BaseTeamMapper
      * @return 结果
      */
     public int deleteBaseTeamByIds(String[] ids);
+
+    void createTeamDay();
 }

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

@@ -48,6 +48,8 @@ public interface BroadDataMapper {
 
     BoxPlanCompletion selectFpOrderInfo();
 
+    List<BoxOutput> mtk_selectInStore3d();
+
 
     ///////////////////////////////////////////////////////////////////////////
     // 6

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

@@ -58,4 +58,6 @@ public interface IBaseTeamService
      * @return 结果
      */
     public int deleteBaseTeamById(Long id);
+
+    void createTeamDay();
 }

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

@@ -47,4 +47,6 @@ public interface IBroadDataService {
     List<BoxOutput> selectFpStock();
 
     BoxPlanCompletion selectFpOrderInfo();
+
+    List<BoxOutput> mtk_selectInStore3d();
 }

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

@@ -93,4 +93,9 @@ public class BaseTeamServiceImpl implements IBaseTeamService
     {
         return baseTeamMapper.deleteBaseTeamById(id);
     }
+
+    @Override
+    public void createTeamDay() {
+         baseTeamMapper.createTeamDay();
+    }
 }

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

@@ -104,4 +104,12 @@ public class BroadDataServiceImpl implements IBroadDataService
     public List<QualityInfo> pqk_selectQualityInfo() {
         return mapper.pqk_selectQualityInfo();
     }
+    ///////////////////////////////////////////////////////////////////////////
+    // 门体库
+    ///////////////////////////////////////////////////////////////////////////
+
+    @Override
+    public List<BoxOutput> mtk_selectInStore3d() {
+        return mapper.mtk_selectInStore3d();
+    }
 }

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

@@ -3,6 +3,7 @@ package com.ruoyi.system.service.impl;
 import com.ruoyi.system.mapper.BroadDataMapper;
 import com.ruoyi.system.service.IBroadDruidService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
 import org.springframework.stereotype.Service;
 
 /**
@@ -10,7 +11,12 @@ import org.springframework.stereotype.Service;
  * @date 2022/7/18  15:25
  */
 @Service
+@Component("BroadDruidServiceImpl")
 public class BroadDruidServiceImpl implements IBroadDruidService {
     @Autowired
     private BroadDataMapper mapper;
+
+    public void createWork(){
+
+    }
 }

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

@@ -69,4 +69,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{id}
         </foreach>
     </delete>
+
+    <insert id="createTeamDay">
+        insert into BASE_DAY_WBTIME(CREATE_DAY,
+                                    W_START,
+                                    W_END,
+                                    B_END)
+        values (to_char(sysdate, 'yyyy-MM-dd'),
+                to_date(to_char(SYSDATE, 'yyyy-MM-dd') || '07:30:00', 'yyyy-MM-dd hh24:mi:ss'),
+                to_date(to_char(SYSDATE, 'yyyy-MM-dd') || '19:30:00', 'yyyy-MM-dd hh24:mi:ss'),
+                to_date(to_char(SYSDATE+1, 'yyyy-MM-dd') || '07:30:00', 'yyyy-MM-dd hh24:mi:ss') )
+    </insert>
 </mapper>

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

@@ -280,7 +280,7 @@ group by MATERIAL_NAME
         select count(1)             as qty,
                QUALITY_DEFECTS_DESC as name
         from IMOS_QA_PRODUCT_QUALITY
-        where ITEM_CODE in (1006, 1001)
+        where ITEM_CODE in (1006, 1001) and ROWNUM <6
                   and to_char(CREATION_DATE, 'yyyy-MM-dd') = to_char(sysdate, 'yyyy-MM-dd')
 --           and to_char(CREATION_DATE, 'yyyy-MM-dd') between to_char(sysdate - 1, 'yyyy-mm-dd') and to_char(sysdate + 1, 'yyyy-mm-dd')
         group by QUALITY_DEFECTS_DESC
@@ -383,4 +383,24 @@ group by MATERIAL_NAME
         where ROUND(TO_NUMBER(t1.day - t2.day) * 24 * 60 * 60) - 20 > 600
     </select>
 
+    <select id="mtk_selectInStore3d" resultType="com.ruoyi.system.domain.BoxOutput">
+        select
+        substr(MATERIAL_NAME,
+              case
+                  when instr(MATERIAL_NAME, '-', 1, 1) = 0 then 1
+                  else instr(MATERIAL_NAME, '-', 1, 1) + 1
+                  end,
+              instr(MATERIAL_NAME, ',', 1, 1)
+                  -
+              case
+                  when instr(MATERIAL_NAME, '-', 1, 1) = 0 then 1
+                  else instr(MATERIAL_NAME, '-', 1, 1) + 1
+                  end) as name,
+        sum(IN_QTY )         as qty
+        from IMOS_PR_PRODUCT_IN
+        where CREATION_DATE
+                  between to_date(to_char(SYSDATE-2, 'yyyy-MM-dd') || '00:00:00', 'yyyy-MM-dd hh24:mi:ss')
+                  and to_date(to_char(SYSDATE, 'yyyy-MM-dd') || '00:00:00', 'yyyy-MM-dd hh24:mi:ss')
+        group by MATERIAL_NAME
+    </select>
 </mapper>