Yangwl
/
mesnac_mes
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 1f3e67c8b0 00517d55d3
commit 88f40558cb
4 changed files with 54 additions and 8 deletions
Show Stats Download Patch File Download Diff File

10
dispatch/src/main/resources/mapper/CallItemMapper.xml
Unescape Escape View File

@ -989,15 +989,15 @@
SUM(ZCI.REQUIRED_QTY) REQUIRED_QTY
FROM Z_CALL_ITEM ZCI
INNER JOIN Z_SFC_DISPATCH ZSD ON ZSD.HANDLE = ZCI.SFC_DISPATCH_BO
INNER JOIN SHOP_ORDER SO ON SO.SITE = ZCI.SITE AND SO.SHOP_ORDER = ZCI.SHOP_ORDER
INNER JOIN SHOP_ORDER SO ON SO.SHOP_ORDER = ZCI.SHOP_ORDER AND SO.SITE = ZCI.SITE
LEFT JOIN CUSTOM_FIELDS CF ON CF.HANDLE = SO.HANDLE AND CF."ATTRIBUTE" = 'WORK_ORDER'
INNER JOIN WORK_CENTER WC ON WC.HANDLE = SO.PLANNED_WORK_CENTER_BO
INNER JOIN WORK_CENTER WC ON WC.WORK_CENTER = ZSD.WORK_CENTER AND WC.SITE = ZCI.SITE
INNER JOIN WORK_CENTER_T WCT ON WCT.WORK_CENTER_BO = WC.HANDLE
INNER JOIN ITEM IM ON IM.HANDLE = SO.ITEM_BO
INNER JOIN ITEM_T IT ON IT.ITEM_BO = IM.HANDLE AND IT.LOCALE = #{local}
INNER JOIN ITEM_T IT ON IT.ITEM_BO = IM.HANDLE
INNER JOIN ITEM CP ON CP.HANDLE = ZCI.COMPONENT_BO
INNER JOIN ITEM_T ITT ON ITT.ITEM_BO = CP.HANDLE AND ITT.LOCALE = #{local}
WHERE ZCI.SITE = #{site}
INNER JOIN ITEM_T ITT ON ITT.ITEM_BO = CP.HANDLE
WHERE ZCI.SITE = #{site} AND WCT.LOCALE = #{local} AND IT.LOCALE = #{local} AND ITT.LOCALE = #{local}
<if test="callItem.callType != null and callItem.callType != ''">
AND ZCI.CALL_TYPE = #{callItem.callType}
</if>

35
equip/src/main/java/com/foreverwin/mesnac/equip/model/ResourceRepairTask.java
Unescape Escape View File

@ -302,6 +302,41 @@ public class ResourceRepairTask extends Model<ResourceRepairTask> {
*/
@TableField(exist = false)
private String reportUserName;
/**
* 取消代码描述
*/
@TableField(exist = false)
private String cancelCodeDescription;
/**取消用户名称**/
@TableField(exist = false)
private String cancelUserName;
/**不良代码名称**/
@TableField(exist = false)
private String ncCodeNoDescription;
public String getNcCodeNoDescription() {
return ncCodeNoDescription;
}
public void setNcCodeNoDescription(String ncCodeNoDescription) {
this.ncCodeNoDescription = ncCodeNoDescription;
}
public String getCancelUserName() {
return cancelUserName;
}
public void setCancelUserName(String cancelUserName) {
this.cancelUserName = cancelUserName;
}
public String getCancelCodeDescription() {
return cancelCodeDescription;
}
public void setCancelCodeDescription(String cancelCodeDescription) {
this.cancelCodeDescription = cancelCodeDescription;
}
public String getReportUserName() {
return reportUserName;

4
equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceRepairTaskServiceImpl.java
Unescape Escape View File

@ -209,7 +209,9 @@ public class ResourceRepairTaskServiceImpl extends ServiceImpl<ResourceRepairTas
repairTask.setCancelCode(resourceRepairTask.getCancelCode());
repairTask.setCancelDescription(resourceRepairTask.getCancelDescription());
repairTask.setCancelDate(LocalDateTime.now());
repairTask.setCancelUser(CommonMethods.getUser());
repairTask.setCancelUser(user);
NwaUser userByUserName = nwaUserService.findUserByUserName(user);
repairTask.setCancelUserName(userByUserName.getFullName());
break;
case "502":
if (repairTask.getWaitStartDate() != null){

13
equip/src/main/resources/mapper/ResourceRepairTaskMapper.xml
Unescape Escape View File

@ -883,11 +883,14 @@
<!--批量获取维修任务-->
<select id="findResourceRepairTaskList" resultType="com.foreverwin.mesnac.equip.model.ResourceRepairTask">
SELECT DISTINCT RRT.*, ZNU.FULL_NAME AS REPORT_USER_NAME, R.DESCRIPTION AS RESOURCE_DESCRIPTION,R.RESRCE AS RESOURCE_NO,
WCMA.WORK_CENTER_BO AS WORK_CENTER_BO,
WCMA.WORK_CENTER_BO AS WORK_CENTER_BO,NCT.DESCRIPTION AS CANCEL_CODE_DESCRIPTION, ZNU2.FULL_NAME AS CANCEL_USER_NAME,
WCT.DESCRIPTION AS WORK_CENTER_DESCRIPTION
FROM
WIP.Z_RESOURCE_REPAIR_TASK RRT
LEFT JOIN Z_NWA_USER ZNU ON ZNU.USER_NAME = RRT.REPORT_USER
LEFT JOIN NC_CODE NC ON NC.NC_CODE = RRT.CANCEL_CODE
LEFT JOIN NC_CODE_T NCT ON NCT.NC_CODE_BO = NC.HANDLE
LEFT JOIN Z_NWA_USER ZNU2 ON ZNU2.USER_NAME = RRT.CANCEL_USER
INNER JOIN WIP.RESRCE R ON RRT.SITE = R.SITE AND R.RESRCE = RRT.RESOURCE_NO
LEFT JOIN WIP.WORK_CENTER_MEMBER WCM ON WCM.WORK_CENTER_OR_RESOURCE_GBO = R.HANDLE
LEFT JOIN WIP.WORK_CENTER_MEMBER WCMA ON WCMA.WORK_CENTER_OR_RESOURCE_GBO = WCM.WORK_CENTER_BO
@ -921,14 +924,20 @@
<if test="compareEndDate != null and compareEndDate != ''">
AND RRT.PLAN_START_DATE &lt;= (TO_DATE( #{compareEndDate},'yyyy-MM-dd hh24:mi-ss' ) - 8/24 )
</if>
ORDER BY PLAN_START_DATE , ACTUAL_START_DATE
</select>
<!--根据维修任务HANDLE获取维修任务详细数据-->
<select id="findResourceRepairTaskByHandleAndSite" resultType="com.foreverwin.mesnac.equip.model.ResourceRepairTask">
SELECT DISTINCT RRT.*,R.DESCRIPTION AS RESOURCE_DESCRIPTION,R.RESRCE AS RESOURCE_NO,
SELECT DISTINCT RRT.*,R.DESCRIPTION AS RESOURCE_DESCRIPTION,R.RESRCE AS RESOURCE_NO, NCT.DESCRIPTION AS CANCEL_CODE_DESCRIPTION,
ZNU.FULL_NAME AS REPORT_USER_NAME, ZNU2.FULL_NAME AS CANCEL_USER_NAME ,
WCMA.WORK_CENTER_BO AS WORK_CENTER_BO,WCT.DESCRIPTION AS WORK_CENTER_DESCRIPTION
FROM
WIP.Z_RESOURCE_REPAIR_TASK RRT
LEFT JOIN WIP.RESRCE R ON R.RESRCE = RRT.RESOURCE_NO AND R.SITE = RRT.SITE
LEFT JOIN NC_CODE NC ON NC.NC_CODE = RRT.CANCEL_CODE
LEFT JOIN NC_CODE_T NCT ON NCT.NC_CODE_BO = NC.HANDLE
LEFT JOIN WIP.Z_NWA_USER ZNU ON ZNU.USER_NAME = RRT.REPORT_USER
LEFT JOIN WIP.Z_NWA_USER ZNU2 ON ZNU2.USER_NAME = RRT.CANCEL_USER
LEFT JOIN WIP.WORK_CENTER_MEMBER WCM ON WCM.WORK_CENTER_OR_RESOURCE_GBO = R.HANDLE
LEFT JOIN WIP.WORK_CENTER_MEMBER WCMA ON WCMA.WORK_CENTER_OR_RESOURCE_GBO = WCM.WORK_CENTER_BO
LEFT JOIN WIP.WORK_CENTER_T WCT ON WCT.WORK_CENTER_BO = WCMA.WORK_CENTER_BO

Write Preview
Loading…
Cancel
Save