diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/broad/BeforeLibraryController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/broad/BeforeLibraryController.java index f75665d..9b3a4b8 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/broad/BeforeLibraryController.java +++ b/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()); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/broad/MTKController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/broad/MTKController.java index 7136af2..94cffb8 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/broad/MTKController.java +++ b/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) { - List list = baseTeamService.selectBaseTeamList(baseTeam); + @ApiOperation("班组6S查询") + public String list() { + List list = baseTeamService.selectBaseTeamList(null); return JSONArray.toJSONString(list); } + @PostMapping("/inStore3d") + @ApiOperation("3天入库量查询") + public String mtk_inStore3d() { + return JSONArray.toJSONString(service.mtk_selectInStore3d()); + } } diff --git a/ruoyi-admin/src/main/resources/static/js/board/finalAssemblyProductionData.js b/ruoyi-admin/src/main/resources/static/js/board/finalAssemblyProductionData.js index 005ba69..d90a042 100644 --- a/ruoyi-admin/src/main/resources/static/js/board/finalAssemblyProductionData.js +++ b/ruoyi-admin/src/main/resources/static/js/board/finalAssemblyProductionData.js @@ -38,10 +38,10 @@ const LOSS = () => { const moduleTitle = () => { const html = ` 总装生产数据及质量数据 - 产量 - 一次装配不合格率 + 入库量 + 外观检测 LOSS分类 - 追踪事件 + 外观质量问题 ` $('body').append(html) } \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/static/js/board/orderVisualization.js b/ruoyi-admin/src/main/resources/static/js/board/orderVisualization.js index e723f6b..93d19af 100644 --- a/ruoyi-admin/src/main/resources/static/js/board/orderVisualization.js +++ b/ruoyi-admin/src/main/resources/static/js/board/orderVisualization.js @@ -41,11 +41,11 @@ $(() => { const moduleTitle = () => { const html = ` 订单可视化、6S 及安全生产看板 - 每日人力出勤 - IQC检测明细 - 碱生产效率 + 班组生产6S + 成品入库数量统计 + 成品入库统计 - 设备功率 + 问题 安全生产 ` $('body').append(html) diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/controller/BaseTeamController.java b/ruoyi-system/src/main/java/com/ruoyi/system/controller/BaseTeamController.java index 629e930..9b1582b 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/controller/BaseTeamController.java +++ b/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(); + } } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/BaseTeamMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/BaseTeamMapper.java index 6a7c9ed..09ff2e6 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/BaseTeamMapper.java +++ b/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(); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/BroadDataMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/BroadDataMapper.java index e9df33f..215e904 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/BroadDataMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/BroadDataMapper.java @@ -48,6 +48,8 @@ public interface BroadDataMapper { BoxPlanCompletion selectFpOrderInfo(); + List mtk_selectInStore3d(); + /////////////////////////////////////////////////////////////////////////// // 6 diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/IBaseTeamService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/IBaseTeamService.java index d762ea5..cf6bce6 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/IBaseTeamService.java +++ b/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(); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/IBroadDataService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/IBroadDataService.java index cc59a4f..ac7f5d4 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/IBroadDataService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/IBroadDataService.java @@ -47,4 +47,6 @@ public interface IBroadDataService { List selectFpStock(); BoxPlanCompletion selectFpOrderInfo(); + + List mtk_selectInStore3d(); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BaseTeamServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BaseTeamServiceImpl.java index 67c4051..2b1abeb 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BaseTeamServiceImpl.java +++ b/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(); + } } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BroadDataServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BroadDataServiceImpl.java index 6f6f9b5..610d730 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BroadDataServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BroadDataServiceImpl.java @@ -104,4 +104,12 @@ public class BroadDataServiceImpl implements IBroadDataService public List pqk_selectQualityInfo() { return mapper.pqk_selectQualityInfo(); } + /////////////////////////////////////////////////////////////////////////// + // 门体库 + /////////////////////////////////////////////////////////////////////////// + + @Override + public List mtk_selectInStore3d() { + return mapper.mtk_selectInStore3d(); + } } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BroadDruidServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BroadDruidServiceImpl.java index c790e4b..aa4f4cf 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BroadDruidServiceImpl.java +++ b/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(){ + + } } diff --git a/ruoyi-system/src/main/resources/mapper/system/BaseTeamMapper.xml b/ruoyi-system/src/main/resources/mapper/system/BaseTeamMapper.xml index a5ed9db..20fb65e 100644 --- a/ruoyi-system/src/main/resources/mapper/system/BaseTeamMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/BaseTeamMapper.xml @@ -69,4 +69,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{id} + + + 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') ) + \ No newline at end of file diff --git a/ruoyi-system/src/main/resources/mapper/system/BroadDataMapper.xml b/ruoyi-system/src/main/resources/mapper/system/BroadDataMapper.xml index 4ec1037..8b67065 100644 --- a/ruoyi-system/src/main/resources/mapper/system/BroadDataMapper.xml +++ b/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 + \ No newline at end of file