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
master
夜笙歌 4 years ago
parent 5c9572f8e3 7f2540d8a1
commit 19a1157608
6 changed files with 153 additions and 28 deletions
Show Stats Download Patch File Download Diff File

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

@ -3,8 +3,11 @@ package com.ruoyi.web.controller.broad;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.ruoyi.system.domain.BoxOutput;
import com.ruoyi.system.domain.OrderInfo;
import com.ruoyi.system.domain.QualityInfo;
import com.ruoyi.system.service.IBroadDataService;
import io.swagger.annotations.ApiOperation;
import oracle.jdbc.proxy.annotation.Post;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.*;
@ -14,11 +17,11 @@ import java.util.ArrayList;
import java.util.List;
/**
* @author wanghao
* @date 2022/7/7 13:31
*
*/
@Controller
@RequestMapping("/broad/beforeLibrary")
@ApiOperation("泡前库")
public class BeforeLibraryController {
@Autowired
@ -29,4 +32,37 @@ public class BeforeLibraryController {
return "broad/beforeLibrary";
}
@PostMapping("/selectProductInStore")
@ApiOperation("泡前库 成品入库")
@ResponseBody
public String pqk_selectProductInStore() {
List<BoxOutput> list = service.pqk_selectProductInStore();
return JSONArray.toJSONString(list);
}
@PostMapping("/selectOrderInfo")
@ApiOperation("泡前库 订单情况、完成率")
@ResponseBody
public String pqk_selectOrderInfo() {
List<OrderInfo> list = service.pqk_selectOrderInfo();
return JSONArray.toJSONString(list);
}
@PostMapping("/selectQualityItem")
@ApiOperation("泡前库-成品质量类型统计")
@ResponseBody
public String pqk_selectQualityItem(){
return JSONArray.toJSONString(service.pqk_selectQualityItem());
}
@PostMapping("/selectQualityInfo")
@ApiOperation("泡前库-成品质检详情")
@ResponseBody
public String pqk_selectQualityInfo(){
List<QualityInfo> list=service.pqk_selectQualityInfo();
return JSONArray.toJSONString(list);
}
}

53
ruoyi-system/src/main/java/com/ruoyi/system/domain/QualityInfo.java
Unescape Escape View File

@ -0,0 +1,53 @@
package com.ruoyi.system.domain;
/**
* @author wanghao
* @date 2022/7/14 9:30
*/
public class QualityInfo {
private String code;
private String qa;
private String item;
private String day;
private String state;
public String getCode() {
return code;
}
public void setCode(String code) {
this.code = code;
}
public String getQa() {
return qa;
}
public void setQa(String qa) {
this.qa = qa;
}
public String getItem() {
return item;
}
public void setItem(String item) {
this.item = item;
}
public String getDay() {
return day;
}
public void setDay(String day) {
this.day = day;
}
public String getState() {
return state;
}
public void setState(String state) {
this.state = state;
}
}

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

@ -1,9 +1,6 @@
package com.ruoyi.system.mapper;
import com.ruoyi.system.domain.BoxOutput;
import com.ruoyi.system.domain.BoxPlanCompletion;
import com.ruoyi.system.domain.BoxStock;
import com.ruoyi.system.domain.OrderInfo;
import com.ruoyi.system.domain.*;
import org.springframework.stereotype.Repository;
import java.util.List;
@ -37,4 +34,8 @@ public interface BroadDataMapper {
List<BoxOutput> pqk_selectProductInStore();
List<OrderInfo> pqk_selectOrderInfo();
List<BoxOutput> pqk_selectQualityItem();
List<QualityInfo> pqk_selectQualityInfo();
}

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

@ -33,4 +33,7 @@ public interface IBroadDataService {
List<OrderInfo> pqk_selectOrderInfo();
List<BoxOutput> pqk_selectQualityItem();
List<QualityInfo> pqk_selectQualityInfo();
}

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

@ -74,4 +74,14 @@ public class BroadDataServiceImpl implements IBroadDataService
public List<OrderInfo> pqk_selectOrderInfo() {
return mapper.pqk_selectOrderInfo();
}
@Override
public List<BoxOutput> pqk_selectQualityItem() {
return mapper.pqk_selectQualityItem();
}
@Override
public List<QualityInfo> pqk_selectQualityInfo() {
return mapper.pqk_selectQualityInfo();
}
}

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

@ -1,16 +1,16 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.system.mapper.BroadDataMapper">
<resultMap type="com.ruoyi.system.domain.BoxPlanCompletion" id="selectplanCompletion">
<result property="plan_shift" column="config_name" />
<result property="planned_number" column="planned_number" />
<result property="quantity_number" column="config_value" />
<result property="plan_shift" column="config_name"/>
<result property="planned_number" column="planned_number"/>
<result property="quantity_number" column="config_value"/>
</resultMap>
<select id="selectplanCompletion" resultType="com.ruoyi.system.domain.BoxPlanCompletion">
select nvl(sum(PLAN_QTY), 0) planned_number,
nvl(sum(actual_qty), 0) quantity_number,
@ -49,7 +49,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
group by material_name, Store_Code
order by material_name
</select>
<select id="selectOutputByType" resultType="com.ruoyi.system.domain.BoxOutput">
select substr(MATERIAL_NAME,
case
@ -72,7 +72,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
group by MATERIAL_NAME
</select>
<select id="getUHullPlanInfo" resultType="com.ruoyi.system.domain.OrderInfo">
<select id="getUHullPlanInfo" resultType="com.ruoyi.system.domain.OrderInfo">
select PLAN_NO as plan_code,
SUM(PLAN_QTY) as plan_number,
SUM(ACTUAL_QTY) as actual_number,
@ -95,7 +95,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</select>
<select id="fp_selectOrderInfo" resultType="com.ruoyi.system.domain.OrderInfo">
<select id="fp_selectOrderInfo" resultType="com.ruoyi.system.domain.OrderInfo">
select substr(MATERIAL_NAME,
case
when instr(MATERIAL_NAME, '/', 1, 1) = 0 then instr(MATERIAL_NAME, ',', 1, 1) + 1
@ -121,8 +121,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</select>
<select id="pqk_selectProductInStore" resultType="com.ruoyi.system.domain.BoxOutput">
select MATERIAL_NAME as name ,
IN_QTY as qty
@ -150,14 +148,38 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
)
order by rate desc
</select>
<!-- 通过入库查订单 select ORDER_NO as name,
round(SUM(ACTUAL_QTY) / sum(PLAN_QTY) * 100, 2) as qty
from IMOS_PR_PLAN
where ORDER_NO in (
select IMOS_PR_PRODUCT_IN.ORDER_NO
from IMOS_PR_PRODUCT_IN
where TO_CHAR(CREATION_DATE, 'YYYY-MM-DD') = TO_CHAR(SYSDATE, 'YYYY-MM-DD')
)
group by ORDER_NO
order by plan_number desc-->
<!-- 通过入库查订单 select ORDER_NO as name,
round(SUM(ACTUAL_QTY) / sum(PLAN_QTY) * 100, 2) as qty
from IMOS_PR_PLAN
where ORDER_NO in (
select IMOS_PR_PRODUCT_IN.ORDER_NO
from IMOS_PR_PRODUCT_IN
where TO_CHAR(CREATION_DATE, 'YYYY-MM-DD') = TO_CHAR(SYSDATE, 'YYYY-MM-DD')
)
group by ORDER_NO
order by plan_number desc-->
<select id="pqk_selectQualityItem" resultType="com.ruoyi.system.domain.BoxOutput">
select count(1) as qty,
QUALITY_DEFECTS_DESC as name
from IMOS_QA_PRODUCT_QUALITY
where ITEM_CODE in (1006, 1001)
-- 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
order by qty desc
</select>
<select id="pqk_selectQualityInfo" resultType="com.ruoyi.system.domain.QualityInfo">
select PRODUCT_BARCODE as code,
QUALITY_DEFECTS_DESC as qa,
base.ITEM_NAME as item,
to_char(record.CREATION_DATE, 'yyyy-MM-dd') as day,
case when ALLOW_FLAG = 0 then '不放行' else '放行' end as state
from IMOS_QA_PRODUCT_QUALITY record
left join IMOS_QA_QUALITY_ITEM base on record.ITEM_CODE = base.ITEM_CODE
where record.ITEM_CODE in (1006, 1001)
and to_char(record.CREATION_DATE, 'yyyy-MM-dd') between to_char(sysdate-1,'yyyy-mm-dd') and to_char(sysdate+1,'yyyy-mm-dd')
order by record.CREATION_DATE desc
</select>
</mapper>
Write Preview
Loading…
Cancel
Save