Yangwl
/
mesnac_mes
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1.问题清单305，306，307，308，309，313

Browse Source 
2.操作者加工报表
master
赵嘉伟 3 years ago
parent bfe27ab5ef
commit 6e91cd476c
15 changed files with 196 additions and 38 deletions
Show Stats Download Patch File Download Diff File

9
anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/ReportController.java
Unescape Escape View File

@ -136,4 +136,13 @@ public class ReportController {
return R.failed(e.getMessage());
}
}
@GetMapping("/findOperatorScheduleReport")
public R findOperatorScheduleReport(@RequestParam(required = false) Map paramMap){
try{
return R.ok(reportService.findOperatorScheduleReport(paramMap));
}catch (Exception e){
return R.failed(e.getMessage());
}
}
}

7
anomaly/src/main/java/com/foreverwin/mesnac/anomaly/mapper/ReportMapper.java
Unescape Escape View File

@ -43,4 +43,11 @@ public interface ReportMapper {
* @return
*/
List<Map<String,Object>> shopOrderSchedule(Map paramMap);
/**
* 操作者加工进度表
* @param paramMap 参数
* @return 返回值
*/
List<Map<String,Object>> findOperatorScheduleReport(Map paramMap);
}

7
anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/ReportService.java
Unescape Escape View File

@ -47,4 +47,11 @@ public interface ReportService {
* @return
*/
List<Map<String, Object>> shopOrderSchedule(Map paramMap);
/**
* 操作者加工进度表
* @param paramMap 参数
* @return 返回值
*/
List<Map<String, Object>> findOperatorScheduleReport(Map paramMap);
}

3
anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalBillLogServiceImpl.java
Unescape Escape View File

@ -124,8 +124,6 @@ public class AbnormalBillLogServiceImpl extends ServiceImpl<AbnormalBillLogMappe
if (abnormalBillLogMapper.selectById(abnormalBillLog.getHandle()) == null) {
//根据abnormalNo找到不合格代码组
StringBuilder ncGroup = new StringBuilder();
AbnormalNcCode abnormalNcCode = new AbnormalNcCode();
abnormalNcCode.setAbnormalBillBo(abnormalBillLog.getHandle());
QueryWrapper<AbnormalNcCode> abnormalNcCodeQueryWrapper = new QueryWrapper<>();
abnormalNcCodeQueryWrapper.eq("ABNORMAL_BILL_BO", abnormalBillLog.getHandle());
@ -166,7 +164,6 @@ public class AbnormalBillLogServiceImpl extends ServiceImpl<AbnormalBillLogMappe
abnormalBillLog.setModifiedDateTime(now);
this.save(abnormalBillLog);
;
}

8
anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/ReportServiceImpl.java
Unescape Escape View File

@ -305,6 +305,14 @@ public class ReportServiceImpl implements ReportService {
paramMap.put("locale",LocaleContextHolder.getLocale().getLanguage());
return reportMapper.shopOrderSchedule(paramMap);
}
@Override
public List<Map<String, Object>> findOperatorScheduleReport(Map paramMap) {
String site = CommonMethods.getSite();
paramMap.put("site",site);
paramMap.put("locale",LocaleContextHolder.getLocale().getLanguage());
return reportMapper.findOperatorScheduleReport(paramMap);
}
}

96
anomaly/src/main/resources/mapper/ReportMapper.xml
Unescape Escape View File

@ -84,7 +84,7 @@
BOM_COMPONENT bc
INNER JOIN ITEM i ON i.HANDLE = bc.COMPONENT_GBO
INNER JOIN SHOP_ORDER so2 ON so2.ITEM_BO = i.HANDLE
INNER JOIN CUSTOM_FIELDS cf2 ON cf2.HANDLE = so2.HANDLE AND cf2."ATTRIBUTE" = 'WORK_ORDER' AND cf2.VALUE =
LEFT JOIN CUSTOM_FIELDS cf2 ON cf2.HANDLE = so2.HANDLE AND cf2."ATTRIBUTE" = 'WORK_ORDER' AND cf2.VALUE =
cf.VALUE
INNER JOIN Z_SFC_DISPATCH zsd2 ON zsd2.SHOP_ORDER = so2.SHOP_ORDER AND zsd2.SITE = zsd.SITE
WHERE cf2.VALUE IS NOT NULL AND bc.BOM_BO = so.BOM_BO
@ -115,10 +115,10 @@
LEFT JOIN Z_SFC_DISPATCH zsd4 ON zsd4.HANDLE = zsd3.HANDLE AND zsd4.DISPATCH_STATUS != 'COMPLETE' AND
zsd4.DISPATCH_STATUS != 'CANCEL'
<!-- LEFT JOIN Z_SFC_DISPATCH zsd4 ON zsd4.HANDLE-->
<!-- = (-->
<!-- SELECT zsd2.HANDLE FROM Z_SFC_DISPATCH zsd2-->
<!-- WHERE zsd2.DISPATCH_STATUS != 'COMPLETE' AND zsd4.DISPATCH_STATUS != 'CANCEL' AND zsd2.HANDLE = zsd3.HANDLE AND ROWNUM < 2-->
<!-- )-->
<!-- = (-->
<!-- SELECT zsd2.HANDLE FROM Z_SFC_DISPATCH zsd2-->
<!-- WHERE zsd2.DISPATCH_STATUS != 'COMPLETE' AND zsd4.DISPATCH_STATUS != 'CANCEL' AND zsd2.HANDLE = zsd3.HANDLE AND ROWNUM < 2-->
<!-- )-->
<where>
zsd.SITE = #{param.site} AND cf.VALUE = #{param.workOrder}
<if test="param.itemNumber != null and param.itemNumber != ''">
@ -280,39 +280,39 @@
INNER JOIN RESRCE RS ON RS.SITE = ZT.SITE AND RS.RESRCE = ZT.RESRCE
LEFT JOIN Z_NWA_USER ZNU ON ZNU.SITE = ZT.SITE AND ZNU.USER_NAME = ZT.CREATE_USER
WHERE ZT.SITE = #{site}
<if test="workCenter != null and workCenter != ''" >
<if test="workCenter != null and workCenter != ''">
AND (WC.WORK_CENTER = #{workCenter} OR WT.DESCRIPTION = #{workCenter})
</if>
<if test="category != null and category != ''" >
<if test="category != null and category != ''">
AND ZT.CATEGORY = #{category}
</if>
<if test="itemNumber != null and itemNumber != ''" >
<if test="itemNumber != null and itemNumber != ''">
AND C2.VALUE LIKE '%'||#{itemNumber}||'%'
</if>
<if test="model != null and model != ''" >
<if test="model != null and model != ''">
AND C3.VALUE LIKE '%'||#{model}||'%'
</if>
<if test="shopOrder != null and shopOrder != ''">
AND SO.SHOP_ORDER = #{shopOrder}
</if>
<if test="operation != null and operation != ''" >
<if test="operation != null and operation != ''">
AND ZT.OPERATION = #{operation}
</if>
<if test="resrce != null and resrce != ''" >
<if test="resrce != null and resrce != ''">
AND ZT.RESRCE = #{resrce}
</if>
<if test="result != null and result != ''" >
<if test="result != null and result != ''">
AND ZT.RESULT = #{result}
</if>
<if test="startFromDate != null and startFromDate != ''" >
<if test="startFromDate != null and startFromDate != ''">
AND ZT.MODIFIED_DATE_TIME >= TO_DATE(#{startFromDate}, 'YYYY-MM-DD') - 8/24
</if>
<if test="startToDate != null and startToDate != ''" >
<if test="startToDate != null and startToDate != ''">
AND ZT.MODIFIED_DATE_TIME &lt;= TO_DATE(#{startToDate}|| '23:59:59', 'YYYY-MM-DD HH24:MI:SS')
</if>
</select>
<select id="findQualityInspectionReport" parameterType="java.util.HashMap" resultType="java.util.HashMap">
<select id="findQualityInspectionReport" parameterType="java.util.HashMap" resultType="java.util.HashMap">
SELECT zab.CREATED_DATE_TIME,zab.ABNORMAL_NO ABNORMAL_NO,
dflt.DATA_TAG PRODUCT_CATEGORY,
dflt2.DATA_TAG DISCOVER,
@ -602,4 +602,70 @@
</where>
ORDER BY zsd.SFC DESC,zsd.STEP_ID) S
</select>
<select id="findOperatorScheduleReport" parameterType="java.util.HashMap" resultType="java.util.HashMap">
SELECT cf.VALUE ITEM_NUMBER,
so.SHOP_ORDER,
i.ITEM,
it.DESCRIPTION ITEM_DESCRIPTION,
zsd.DISPATCH_QTY,
cf2.VALUE WORK_ORDER,
zsd.SFC,
wct.DESCRIPTION WORK_CENTER_DESCRIPTION,
zsd.OPERATION,
ot.DESCRIPTION OPERATION_DESCRIPTION,
zsd.RESRCE,
CASE
WHEN zab.NC_QTY IS NOT NULL THEN zsd.DISPATCH_QTY - TO_NUMBER(zab.NC_QTY)
ELSE zsd.DISPATCH_QTY END QUALIFIED_NUM,
zsd.PROD_HOURS,
zsd.ACTUAL_PROD_HOURS,
zsd.EMPLOYEE_DESCRIPTION,
zsd.ACTUAL_START_DATE,
zsd.ACTUAL_COMPLETE_DATE,
zsd.REMARK
FROM Z_SFC_DISPATCH zsd
INNER JOIN SHOP_ORDER so ON so.SHOP_ORDER = zsd.SHOP_ORDER AND so.SITE = zsd.SITE
LEFT JOIN CUSTOM_FIELDS cf ON cf.HANDLE = so.HANDLE AND cf."ATTRIBUTE" = 'ITEM_NUMBER'
LEFT JOIN CUSTOM_FIELDS cf2 ON cf2.HANDLE = so.HANDLE AND cf2."ATTRIBUTE" = 'WORK_ORDER'
INNER JOIN ITEM i ON i.HANDLE = so.ITEM_BO
LEFT JOIN ITEM_T it ON it.ITEM_BO = i.HANDLE AND it.LOCALE = 'zh'
INNER JOIN WORK_CENTER wc ON wc.WORK_CENTER = zsd.WORK_CENTER AND wc.SITE = zsd.SITE
LEFT JOIN WORK_CENTER_T wct ON wct.WORK_CENTER_BO = wc.HANDLE AND wct.LOCALE = 'zh'
INNER JOIN OPERATION o
ON o.OPERATION = zsd.OPERATION AND o.CURRENT_REVISION = 'true' AND o.SITE = zsd.SITE
LEFT JOIN OPERATION_T ot ON ot.OPERATION_BO = o.HANDLE AND ot.LOCALE = 'zh'
LEFT JOIN Z_INSPECTION_TASK zit ON zit.SFC_DISPATCH_BO = zsd.HANDLE
LEFT JOIN Z_ABNORMAL_BILL zab ON zab.OBJECT_BO = zit.HANDLE
<where>
zsd.SITE = #{site}
<if test="workCenter != null and workCenter != ''">
AND (wc.WORK_CENTER = #{workCenter} OR wct.DESCRIPTION = #{workCenter})
</if>
<if test="shopOrder != null and shopOrder != ''">
AND zsd.SHOP_ORDER = #{shopOrder}
</if>
<if test="workOrder != null and workOrder != ''">
AND cf2.VALUE = #{workOrder}
</if>
<if test="itemNumber != null and itemNumber != ''">
AND cf.VALUE = #{itemNumber}
</if>
<if test="operator != null and operator != ''">
AND zsd.EMPLOYEE_DESCRIPTION LIKE '%${operator}%'
</if>
<if test="startDateTime != null and startDateTime != ''">
AND zsd.ACTUAL_START_DATE &gt;= TO_DATE(#{startDateTime},'YYYY-MM-DD')-8/24
</if>
<if test="endDateTime != null and endDateTime != ''">
AND zsd.ACTUAL_START_DATE &lt;= TO_DATE(#{endDateTime}|| '15:59:59','YYYY-MM-DD HH24:MI:SS')
</if>
<if test="completeStartDateTime != null and completeStartDateTime != ''">
AND zsd.ACTUAL_COMPLETE_DATE &gt;= TO_DATE(#{completeStartDateTime},'YYYY-MM-DD')-8/24
</if>
<if test="completeEndDateTime != null and completeEndDateTime != ''">
AND zsd.ACTUAL_COMPLETE_DATE &lt;= TO_DATE(#{completeEndDateTime}|| '15:59:59','YYYY-MM-DD HH24:MI:SS')
</if>
</where>
</select>
</mapper>

21
common/src/main/resources/mapper/ReportDataMapper.xml
Unescape Escape View File

@ -8,7 +8,9 @@
ZT."RESULT", ZT.CREATE_USER, ZNU.FULL_NAME, ZT.MODIFIED_DATE_TIME, ROWNUM SEQ,
CASE WHEN ZT."RESULT" = 'OK' THEN N'合格' WHEN ZT."RESULT" = 'NG' THEN N'不合格' ELSE N'--' END RESULT_DESC,
CASE WHEN ZT.CATEGORY = 'S' THEN N'首检' WHEN ZT.CATEGORY = 'Z' THEN N'自检'
WHEN ZT.CATEGORY = 'H' THEN N'互检' WHEN ZT.CATEGORY = 'P' THEN N'专检' ELSE N'--' END CATEGORY_DESC
WHEN ZT.CATEGORY = 'H' THEN N'互检' WHEN ZT.CATEGORY = 'P' THEN N'专检' ELSE N'--' END CATEGORY_DESC,
CASE WHEN ZT."RESULT" = 'NG' THEN TO_CHAR(zab.NC_QTY) ELSE '' END NG_QTY,
zsd.DISPATCH_QTY ,zsd.EMPLOYEE_DESCRIPTION
FROM Z_INSPECTION_TASK ZT
LEFT JOIN WORK_CENTER WC ON WC.SITE = ZT.SITE AND WC.WORK_CENTER = ZT.WORK_CENTER
LEFT JOIN WORK_CENTER_T WT ON WT.WORK_CENTER_BO = WC.HANDLE AND WT.LOCALE = 'zh'
@ -22,6 +24,8 @@
LEFT JOIN OPERATION_T OT ON OT.OPERATION_BO = OP.HANDLE AND OT.LOCALE = 'zh'
INNER JOIN RESRCE RS ON RS.SITE = ZT.SITE AND RS.RESRCE = ZT.RESRCE
LEFT JOIN Z_NWA_USER ZNU ON ZNU.USER_NAME = ZT.CREATE_USER
INNER JOIN Z_SFC_DISPATCH zsd ON zsd.HANDLE = ZT.SFC_DISPATCH_BO
LEFT JOIN Z_ABNORMAL_BILL zab ON zab.OBJECT_BO = ZT.HANDLE
WHERE ZT.SITE = #{site}
<if test="workCenter != null and workCenter != ''" >
AND (WC.WORK_CENTER = #{workCenter} OR WT.DESCRIPTION = #{workCenter})
@ -419,7 +423,7 @@
<if test="actualStartToDate != null and actualStartToDate != ''" >
AND ZSD.ACTUAL_COMPLETE_DATE &lt;= TO_DATE(#{actualStartToDate}|| '15:59:59', 'YYYY-MM-DD HH24:MI:SS')
</if>
ORDER BY CFA.VALUE, CFB.VALUE, ZSD.SHOP_ORDER, I.ITEM
ORDER BY CFA.VALUE, ZSD.SHOP_ORDER,ZSD.STEP_ID
</select>
@ -575,7 +579,7 @@
</select>
<select id="findInspectionDetailPassRate" resultType="java.util.HashMap" parameterType="java.util.HashMap">
SELECT DATE_TIME,sum(NG_QTY) NC_QTY, sum(OK_QTY) OK_QTY,sum(CHECK_QTY) CHECK_QTY,sum(DISPATCH_QTY) DISPATCH_QTY,FULL_NAME,DUTY_USER,DUTY_DEPART,WORK_ORDER,ITEM_NUMBER,ITEM,ITEM_DESC,OPERATION_DESC,CATEGORY,EMPLOYEE_DESCRIPTION,COMMENTS,DESCRIPTION WORK_CENTER_DESCRIPTION,SHOP_ORDER FROM
SELECT DATE_TIME,sum(NG_QTY) NC_QTY, sum(OK_QTY) OK_QTY,sum(CHECK_QTY) CHECK_QTY,sum(DISPATCH_QTY) DISPATCH_QTY,FULL_NAME,DUTY_USER,DUTY_DEPART,WORK_ORDER,ITEM_NUMBER,ITEM,ITEM_DESC,OPERATION_DESC,CATEGORY,EMPLOYEE_DESCRIPTION,COMMENTS,DESCRIPTION WORK_CENTER_DESCRIPTION,SHOP_ORDER,ABNORMAL_NO FROM
(
SELECT CASE WHEN ROW_NUMBER() OVER(PARTITION BY zit.sfc ,zit.OPERATION,zit.STEP_ID ORDER BY zit.CREATED_DATE_TIME ASC)=1 AND zit."RESULT"='OK' THEN 0
WHEN ROW_NUMBER() OVER(PARTITION BY zit.sfc ,zit.OPERATION,zit.STEP_ID ORDER BY zit.CREATED_DATE_TIME ASC)=1 AND zit."RESULT"='NG' THEN TO_NUMBER(zab.NC_QTY)
@ -584,7 +588,7 @@
CASE WHEN ROW_NUMBER() OVER(PARTITION BY zit.sfc ,zit.OPERATION,zit.STEP_ID ORDER BY zit.CREATED_DATE_TIME ASC)=1 AND zit."RESULT"='OK' THEN zsd.DISPATCH_QTY
WHEN ROW_NUMBER() OVER(PARTITION BY zit.sfc ,zit.OPERATION,zit.STEP_ID ORDER BY zit.CREATED_DATE_TIME ASC)=1 AND zit."RESULT"='NG' THEN 0
ELSE 0 END OK_QTY,
zit."RESULT",COUNT(ZIT.HANDLE) check_qty, zit.sfc ,zit.STEP_ID,zit.CATEGORY,zit.COMMENTS,ZABD.PRINCIPAL_USER DUTY_USER,ZABD.DUTY_DEPART,SO.SHOP_ORDER,zsd.DISPATCH_QTY
zit."RESULT",COUNT(ZIT.HANDLE) check_qty, zit.sfc ,zit.STEP_ID,zit.CATEGORY,zit.COMMENTS,ZABD.PRINCIPAL_USER DUTY_USER,ZABD.DUTY_DEPART,SO.SHOP_ORDER,zsd.DISPATCH_QTY,zab.ABNORMAL_NO
FROM Z_INSPECTION_TASK zit
JOIN OPERATION O ON O.OPERATION = zit.OPERATION AND O.SITE = zit.SITE AND o.CURRENT_REVISION='true'
LEFT JOIN OPERATION_T OT ON OT.OPERATION_BO = O.HANDLE AND OT.LOCALE = 'zh'
@ -597,7 +601,7 @@
JOIN Z_SFC_DISPATCH ZSD ON ZSD.SFC=zit.SFC AND ZSD.SITE=zit.SITE AND zit.STEP_ID=ZSD.STEP_ID
JOIN WORK_CENTER WC ON WC.SITE = zit.SITE AND WC.WORK_CENTER = zit.WORK_CENTER
LEFT JOIN WORK_CENTER_T WT ON WT.WORK_CENTER_BO = WC.HANDLE AND WT.LOCALE = 'zh'
LEFT JOIN Z_ABNORMAL_BILL ZAB ON zit.SFC=ZAB.SFC AND zit.SITE=ZAB.SITE AND zit.STEP_ID=ZAB.STEP_ID AND zab."TYPE"='Z'
LEFT JOIN Z_ABNORMAL_BILL ZAB ON ZAB.OBJECT_BO = zit.HANDLE
LEFT JOIN Z_ABNORMAL_BILL_DISPOSE ZABD ON ZAB.HANDLE=ZABD.ABNORMAL_BILL_BO
LEFT JOIN Z_NWA_USER ZNU ON ZNU.SITE = ZIT.SITE AND ZNU.USER_NAME = ZIT.MODIFY_USER
WHERE zit.SITE= #{site} AND (zit.CATEGORY='P' OR zit.CATEGORY='S') AND zit.STATUS='COMPLETE'
@ -619,10 +623,13 @@
<if test="shopOrder != null and shopOrder != ''" >
AND SO.SHOP_ORDER = #{shopOrder}
</if>
GROUP BY ZABD.PRINCIPAL_USER,zsd.DISPATCH_QTY,ZABD.DUTY_DEPART,zit."RESULT",zit.sfc ,zit.OPERATION,zit.STEP_ID,CFA.VALUE,CFB.VALUE, zit.CREATED_DATE_TIME,zit.RESRCE,zab.NC_QTY,zit.CREATED_DATE_TIME, ZNU.FULL_NAME,WT.DESCRIPTION,I.ITEM,IT.DESCRIPTION,O.OPERATION,OT.DESCRIPTION,ZSD.EMPLOYEE,ZSD.EMPLOYEE_DESCRIPTION,zit.COMMENTS,zit.CATEGORY,SO.SHOP_ORDER
<if test="abnormalNo != null and abnormalNo != ''" >
AND zab.ABNORMAL_NO = #{abnormalNo}
</if>
GROUP BY ZABD.PRINCIPAL_USER,zsd.DISPATCH_QTY,ZABD.DUTY_DEPART,zit."RESULT",zit.sfc ,zit.OPERATION,zit.STEP_ID,CFA.VALUE,CFB.VALUE, zit.CREATED_DATE_TIME,zit.RESRCE,zab.NC_QTY,zit.CREATED_DATE_TIME, ZNU.FULL_NAME,WT.DESCRIPTION,I.ITEM,IT.DESCRIPTION,O.OPERATION,OT.DESCRIPTION,ZSD.EMPLOYEE,ZSD.EMPLOYEE_DESCRIPTION,zit.COMMENTS,zit.CATEGORY,SO.SHOP_ORDER,zab.ABNORMAL_NO
)
WHERE SEQ='1'
GROUP BY DATE_TIME,DESCRIPTION,FULL_NAME,DUTY_USER,DUTY_DEPART,WORK_ORDER,ITEM_NUMBER,ITEM,ITEM_DESC,OPERATION,OPERATION_DESC,CATEGORY,EMPLOYEE,EMPLOYEE_DESCRIPTION,COMMENTS,SHOP_ORDER
GROUP BY DATE_TIME,DESCRIPTION,FULL_NAME,DUTY_USER,DUTY_DEPART,WORK_ORDER,ITEM_NUMBER,ITEM,ITEM_DESC,OPERATION,OPERATION_DESC,CATEGORY,EMPLOYEE,EMPLOYEE_DESCRIPTION,COMMENTS,SHOP_ORDER,ABNORMAL_NO
</select>
<select id="findSectionPassRate" resultType="java.util.HashMap" parameterType="java.util.HashMap">
SELECT "SECTION","MONTH",sum(NG_QTY) NC_QTY, sum(OK_QTY) OK_QTY,sum(CHECK_QTY) CHECK_QTY,sum(DISPATCH_QTY) DISPATCH_QTY,round(sum(OK_QTY)*100/sum(DISPATCH_QTY),2)||'% ' OK_RATE FROM

7
meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/NwaUserController.java
Unescape Escape View File

@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.foreverwin.mesnac.meapi.model.NwaUser;
import com.foreverwin.mesnac.meapi.service.NwaUserService;
import com.foreverwin.mesnac.meapi.util.StringUtils;
import com.foreverwin.modular.core.util.CommonMethods;
import com.foreverwin.modular.core.util.FrontPage;
import com.foreverwin.modular.core.util.R;
@ -49,12 +48,6 @@ public class NwaUserController {
public R getNwaUserList(NwaUser nwaUser){
List<NwaUser> result;
QueryWrapper<NwaUser> queryWrapper = new QueryWrapper<>();
String site = CommonMethods.getSite();
nwaUser.setSite(site);
if(!StringUtils.isBlank(nwaUser.getUserName())){
queryWrapper.ne("USER_NAME",nwaUser.getUserName());
nwaUser.setUserName(null);
}
queryWrapper.setEntity(nwaUser);
result = nwaUserService.list(queryWrapper);
return R.ok(result);

18
meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/ResrceController.java
Unescape Escape View File

@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.foreverwin.mesnac.meapi.model.Resrce;
import com.foreverwin.mesnac.meapi.service.ResrceService;
import com.foreverwin.mesnac.meapi.util.StringUtils;
import com.foreverwin.modular.core.util.CommonMethods;
import com.foreverwin.modular.core.util.FrontPage;
import com.foreverwin.modular.core.util.R;
@ -186,4 +185,21 @@ public class ResrceController {
return R.ok(result);
}
/**
* 功能1 1. 找到设备下面的某个字段，弹出框的不分页查询，并且自定义字段的值不能为空
* 功能2 2. 根据设备找到它的某个字段的值
* @param resource 资源名
* @param customField 字段名
* @return
*/
@GetMapping("/findResourceCustomList")
public R findResourceCustomList(String resource,String customField){
try{
return R.ok(resrceService.findResourceCustomList(resource,customField));
}catch (Exception e){
return R.failed(e.getMessage());
}
}
}

9
meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/ResrceMapper.java
Unescape Escape View File

@ -46,7 +46,14 @@ public interface ResrceMapper extends BaseMapper<Resrce> {
String findCustomFieldByResrce(@Param("site")String site,@Param("resrce")String resrce,@Param("customField")String customField);
/**
* 通过设备找到它的自定义字段，并且自定义字段的值不能为空
* @param site 站点
* @param resource 设备 可以为空
* @param customField 自定义字段名，不能为空
* @return 返回 设备、设备描述、自定义字段
*/
List<Resrce> findCustomFieldsList(@Param("site")String site,@Param("resource")String resource,@Param("customField")String customField);
}

12
meapi/src/main/java/com/foreverwin/mesnac/meapi/model/Resrce.java
Unescape Escape View File

@ -68,6 +68,8 @@ public class Resrce extends Model<Resrce> {
private Long erpInternalId;
@TableField("ERP_CAPACITY_CATEGORY")
private String erpCapacityCategory;
@TableField(exist = false)
private String customField;
public String getHandle() {
@ -254,7 +256,15 @@ public class Resrce extends Model<Resrce> {
this.erpCapacityCategory = erpCapacityCategory;
}
public static final String HANDLE = "HANDLE";
public String getCustomField() {
return customField;
}
public void setCustomField(String customField) {
this.customField = customField;
}
public static final String HANDLE = "HANDLE";
public static final String CHANGE_STAMP = "CHANGE_STAMP";

9
meapi/src/main/java/com/foreverwin/mesnac/meapi/service/ResrceService.java
Unescape Escape View File

@ -87,4 +87,13 @@ public interface ResrceService extends IService<Resrce> {
* @return
*/
List<Resrce> getResourceListByUT(String site, String resourceType, String[] userList);
/**
* 功能1 1. 找到设备下面的某个字段，弹出框的不分页查询，并且自定义字段的值不能为空
* 功能2 2. 根据设备找到它的某个字段的值
* @param resource 资源名 ,可以为空
* @param customField 字段名
* @return 返回字段 设备，设备描述，字段名
*/
List<Resrce> findResourceCustomList(String resource,String customField);
}

6
meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/ResrceServiceImpl.java
Unescape Escape View File

@ -100,5 +100,11 @@ public class ResrceServiceImpl extends ServiceImpl<ResrceMapper, Resrce> impleme
return resrceMapper.selectResourceListByUT(site, resourceType, userList);
}
@Override
public List<Resrce> findResourceCustomList(String resource, String customField) {
String site = CommonMethods.getSite();
return resrceMapper.findCustomFieldsList(site,resource,customField);
}
}

16
meapi/src/main/resources/mapper/ResrceMapper.xml
Unescape Escape View File

@ -27,6 +27,7 @@
<result column="ERP_EQUIPMENT_NUMBER" property="erpEquipmentNumber" />
<result column="ERP_INTERNAL_ID" property="erpInternalId" />
<result column="ERP_CAPACITY_CATEGORY" property="erpCapacityCategory" />
<result column="CUSTOM_FIELD" property="customField" />
</resultMap>
<!-- 通用查询结果列 -->
@ -628,8 +629,21 @@
<!--根据设备找到设备上的自定义字段-->
<select id="findCustomFieldByResrce" resultType="java.lang.String">
SELECT CF.VALUE FROM RESRCE R
SELECT CF.VALUE
FROM RESRCE R
LEFT JOIN CUSTOM_FIELDS CF ON CF.HANDLE = R.HANDLE AND CF."ATTRIBUTE" = #{customField}
WHERE R.RESRCE = #{resrce} AND R.SITE = #{site}
</select>
<select id="findCustomFieldsList" resultMap="BaseResultMap">
SELECT R.RESRCE,R.DESCRIPTION,CF.VALUE CUSTOM_FIELD
FROM RESRCE R
LEFT JOIN CUSTOM_FIELDS CF ON CF.HANDLE = R.HANDLE AND CF."ATTRIBUTE" = #{customField}
<where>
R.SITE = #{site} AND CF.VALUE IS NOT NULL
<if test="resource != null and resource != ''">
AND R.RESRCE = #{resource}
</if>
</where>
</select>
</mapper>

6
quality/src/main/resources/mapper/InspectionTaskManageMapper.xml
Unescape Escape View File

@ -30,14 +30,13 @@
<result column="RESRCE_DESCRIPTION" property="resrceDescription"/>
<result column="SFC_QTY" property="sfcQty" />
<result column="DISPATCH_USER" property="dispatchUser"/>
</resultMap>
<select id="findInspectionTask" resultMap="BaseResultMap">
SELECT B.HANDLE, B.SITE, B.CATEGORY, B.TASK_NO, B.DESCRIPTION, B.STATUS, B.INSPECTION_ITEM_BO, B.WORK_CENTER, B.SHOP_ORDER, B.SFC, B.OPERATION, B.STEP_ID, B.RESRCE, B.RESULT, B.COMMENTS, B.CREATE_USER, B.CREATED_DATE_TIME, B.MODIFY_USER, B.MODIFIED_DATE_TIME,
M.ITEM, Z.DESCRIPTION ITEM_DESCRIPTION,ZNU.FULL_NAME FULL_NAME,RS.DESCRIPTION RESRCE_DESCRIPTION,
O.OPERATION OPERATION,OT.DESCRIPTION OPERATION_DESCRIPTION,S.QTY SFC_QTY,B.COMMENTS COMMENTS,
ZSD.EMPLOYEE_DESCRIPTION DISPATCH_USER
ZSD.EMPLOYEE_DESCRIPTION DISPATCH_USER,P.SHOP_ORDER
FROM Z_INSPECTION_TASK B
INNER JOIN RESRCE RS ON B.SITE = RS.SITE AND RS.RESRCE = B.RESRCE
INNER JOIN OPERATION O ON O.OPERATION = B.OPERATION AND O.SITE = B.SITE
@ -89,6 +88,9 @@
<if test="stepId != null and stepId != ''">
AND B.STEP_ID = #{stepId}
</if>
<if test="shopOrder != null and shopOrder != ''">
AND P.SHOP_ORDER = #{shopOrder}
</if>
<if test="dateFrom != null">
AND B.CREATED_DATE_TIME >= #{dateFrom}
</if>

Write Preview
Loading…
Cancel
Save