wangh
/
aucma-benchmarking-factory
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source 
# Conflicts:
#	ruoyi-admin/src/main/resources/static/js/board/orderVisualization.js
master
夜笙歌 4 years ago
parent dd6db435b0 a80c2f3188
commit 1587b6e25d
14 changed files with 144 additions and 11 deletions
Show Stats Download Patch File Download Diff File

2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/broad/BeforeLibraryController.java
Unescape Escape View File

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

10
ruoyi-admin/src/main/java/com/ruoyi/web/controller/broad/MTKController.java
Unescape Escape View File

@ -29,9 +29,15 @@ public class MTKController {
private IBaseTeamService baseTeamService;
@PostMapping("/team6s")
public String list(BaseTeam baseTeam) {
List<BaseTeam> list = baseTeamService.selectBaseTeamList(baseTeam);
@ApiOperation("班组6S查询")
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());
}
}

6
ruoyi-admin/src/main/resources/static/js/board/finalAssemblyProductionData.js
Unescape Escape View File

@ -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: 54.3%;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: 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)
}

8
ruoyi-admin/src/main/resources/static/js/board/orderVisualization.js
Unescape Escape View File

@ -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">第 周现场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: 73.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">成品入库数量统计</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)

5
ruoyi-system/src/main/java/com/ruoyi/system/controller/BaseTeamController.java
Unescape Escape View File

@ -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();
}
}

5
ruoyi-system/src/main/java/com/ruoyi/system/mapper/BaseTeamMapper.java
Unescape Escape View File

@ -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();
}

10
ruoyi-system/src/main/java/com/ruoyi/system/mapper/BroadDataMapper.java
Unescape Escape View File

@ -1,6 +1,7 @@
package com.ruoyi.system.mapper;
import com.ruoyi.system.domain.*;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
import java.util.List;
@ -48,6 +49,15 @@ public interface BroadDataMapper {
BoxPlanCompletion selectFpOrderInfo();
List<BoxOutput> mtk_selectInStore3d();
BoxOutput selectNowXkOutPut();
int selectXK_H_QTY();
int selectNowXkOutPut1();
void insertXK_H_QTY(@Param("name") String name,@Param("nowOut") int nowOut,@Param("cha") int cha,@Param("zs") int zsQty);
///////////////////////////////////////////////////////////////////////////
// 6

2
ruoyi-system/src/main/java/com/ruoyi/system/service/IBaseTeamService.java
Unescape Escape View File

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

2
ruoyi-system/src/main/java/com/ruoyi/system/service/IBroadDataService.java
Unescape Escape View File

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

5
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BaseTeamServiceImpl.java
Unescape Escape View File

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

8
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BroadDataServiceImpl.java
Unescape Escape View File

@ -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();
}
}

11
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BroadDruidServiceImpl.java
Unescape Escape View File

@ -1,8 +1,10 @@
package com.ruoyi.system.service.impl;
import com.ruoyi.system.domain.BoxOutput;
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 +12,16 @@ 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(){
BoxOutput boxOutput=mapper.selectNowXkOutPut();
int nowOut=boxOutput.getQty();
int qty=mapper.selectXK_H_QTY();
int zsQty=mapper.selectNowXkOutPut1();
mapper.insertXK_H_QTY(boxOutput.getName(),nowOut,nowOut-qty,zsQty);
}
}

11
ruoyi-system/src/main/resources/mapper/system/BaseTeamMapper.xml
Unescape Escape View File

@ -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>

70
ruoyi-system/src/main/resources/mapper/system/BroadDataMapper.xml
Unescape Escape View File

@ -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 &lt;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,72 @@ group by MATERIAL_NAME
where ROUND(TO_NUMBER(t1.day - t2.day) * 24 * 60 * 60) - 20 &gt; 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>
<select id="selectNowXkOutPut" resultType="com.ruoyi.system.domain.BoxOutput">
select (TO_CHAR(SYSDATE, 'hh24') || ':30') as name,
nvl(sum(actual_qty), 0) as qty
from IMOS.IMOS_PR_PLAN
where plan_date is not null
and process_code = 1002
and delete_flag = '0'
and (to_char(plan_date, 'yyyy-MM-dd') = to_char(sysdate, 'yyyy-MM-dd') or
to_char(plan_date, 'yyyy-MM-dd') = to_char(sysdate-1, 'yyyy-MM-dd'))
</select>
<select id="selectNowXkOutPut1" resultType="int">
select nvl(sum(actual_qty), 0)
from IMOS.IMOS_PR_PLAN
where plan_date is not null
and process_code = 1002
and delete_flag = '0'
-- and to_char(plan_date, 'yyyy-MM-dd') = to_char(sysdate, 'yyyy-MM-dd')
and CREATION_DATE &gt;
case
when to_char(sysdate, 'hh24') &gt; 7 and to_char(sysdate, 'hh24') &lt; 20 then to_date(
to_char(SYSDATE, 'yyyy-MM-dd') || '07:30:00',
'yyyy-MM-dd hh24:mi:ss')
when to_char(sysdate, 'hh24') &lt; 7 then to_date(to_char(SYSDATE - 1, 'yyyy-MM-dd') || '19:30:00',
'yyyy-MM-dd hh24:mi:ss')
else to_date(to_char(SYSDATE - 1, 'yyyy-MM-dd') || '19:30:00', 'yyyy-MM-dd hh24:mi:ss')
end
and CREATION_DATE &lt;
case
when to_char(sysdate, 'hh24') &gt; 7 and to_char(sysdate, 'hh24') &lt; 20 then to_date(
to_char(SYSDATE, 'yyyy-MM-dd') || '19:30:00',
'yyyy-MM-dd hh24:mi:ss')
when to_char(sysdate, 'hh24') &lt; 7 then to_date(to_char(SYSDATE, 'yyyy-MM-dd') || '07:30:00',
'yyyy-MM-dd hh24:mi:ss')
else to_date(to_char(SYSDATE, 'yyyy-MM-dd') || '24:00:00', 'yyyy-MM-dd hh24:mi:ss')
end
</select>
<select id="selectXK_H_QTY" resultType="int">
select * from ( select nvl(QTY, 0) from XK_H_QTY order by CREATE_TIME desc) where ROWNUM=1
</select>
<insert id="insertXK_H_QTY">
insert into XK_H_QTY(H_NAME, QTY, QTY_C,ZS_C)
values (#{name},#{nowOut},#{cha},#{zs})
</insert>
</mapper>
Write Preview
Loading…
Cancel
Save