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

Z_ABNORMAL_BILL表结构修改,增加工作令和项目号

Browse Source
master
赵嘉伟 3 years ago
parent 92dfc6aa20
commit e175a92e32
5 changed files with 154 additions and 39 deletions
Show Stats Download Patch File Download Diff File

10
anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/AbnormalBillController.java
Unescape Escape View File

@ -12,7 +12,6 @@ import com.foreverwin.mesnac.common.service.SfcDispatchCommonService;
import com.foreverwin.mesnac.meapi.service.NcCodeService;
import com.foreverwin.modular.core.util.FrontPage;
import com.foreverwin.modular.core.util.R;
import com.sap.me.frame.service.CommonMethods;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@ -24,7 +23,7 @@ import java.util.Map;
/**
*
* @author zjw
* @since 2021-08-16
* @since 2021-09-15
*/
@RestController
@RequestMapping("/Z-ABNORMAL-BILL")
@ -80,7 +79,6 @@ public class AbnormalBillController {
public R page(FrontPage<AbnormalBill> frontPage, AbnormalBill abnormalBill){
IPage result;
QueryWrapper<AbnormalBill> queryWrapper = new QueryWrapper<>();
abnormalBill.setSite(CommonMethods.getSite());
queryWrapper.setEntity(abnormalBill);
if (frontPage.getGlobalQuery() != null && !"".equals(frontPage.getGlobalQuery().trim())) {
//TODO modify global query
@ -120,6 +118,10 @@ public class AbnormalBillController {
.or().like(AbnormalBill::getCancelSendUserGroup, frontPage.getGlobalQuery())
.or().like(AbnormalBill::getCreatedUser, frontPage.getGlobalQuery())
.or().like(AbnormalBill::getModifiedUser, frontPage.getGlobalQuery())
.or().like(AbnormalBill::getProductCategory, frontPage.getGlobalQuery())
.or().like(AbnormalBill::getStepId, frontPage.getGlobalQuery())
.or().like(AbnormalBill::getWorkOrder, frontPage.getGlobalQuery())
.or().like(AbnormalBill::getItemNumber, frontPage.getGlobalQuery())
);
}
result = abnormalBillService.page(frontPage.getPagePlus(), queryWrapper);
@ -168,7 +170,6 @@ public class AbnormalBillController {
return R.ok(abnormalBillService.removeByIds(ids));
}
/**
* 拆分弹出框
*
@ -423,5 +424,4 @@ public class AbnormalBillController {
return R.ok(ncCodeService.findNcCodeDescriptionByNcCode(ncCode));
}
}

110
anomaly/src/main/java/com/foreverwin/mesnac/anomaly/model/AbnormalBill.java
Unescape Escape View File

@ -14,8 +14,8 @@ import java.time.LocalDateTime;
* 异常单
* </p>
*
* @author Philip
* @since 2021-09-01
* @author zjw
* @since 2021-09-15
*/
@TableName("Z_ABNORMAL_BILL")
@ -229,11 +229,21 @@ public class AbnormalBill extends Model<AbnormalBill> {
*/
@TableField("PRODUCT_CATEGORY")
private String productCategory;
/**
* 工步
*/
/**
* 工步
*/
@TableField("STEP_ID")
private String stepId;
/**
* 工作令
*/
@TableField("WORK_ORDER")
private String workOrder;
/**
* 项目号
*/
@TableField("ITEM_NUMBER")
private String itemNumber;
@TableField(exist = false)
private String filePath;
@ -245,6 +255,8 @@ public class AbnormalBill extends Model<AbnormalBill> {
private String fileNum;
public String getHandle() {
return handle;
}
@ -573,6 +585,30 @@ public class AbnormalBill extends Model<AbnormalBill> {
this.productCategory = productCategory;
}
public String getStepId() {
return stepId;
}
public void setStepId(String stepId) {
this.stepId = stepId;
}
public String getWorkOrder() {
return workOrder;
}
public void setWorkOrder(String workOrder) {
this.workOrder = workOrder;
}
public String getItemNumber() {
return itemNumber;
}
public void setItemNumber(String itemNumber) {
this.itemNumber = itemNumber;
}
public String getFilePath() {
return filePath;
}
@ -597,14 +633,6 @@ public class AbnormalBill extends Model<AbnormalBill> {
this.fileNum = fileNum;
}
public String getStepId() {
return stepId;
}
public void setStepId(String stepId) {
this.stepId = stepId;
}
public static final String HANDLE = "HANDLE";
public static final String SITE = "SITE";
@ -685,6 +713,13 @@ public static final String MODIFIED_USER = "MODIFIED_USER";
public static final String MODIFIED_DATE_TIME = "MODIFIED_DATE_TIME";
public static final String PRODUCT_CATEGORY = "PRODUCT_CATEGORY";
public static final String STEP_ID = "STEP_ID";
public static final String WORK_ORDER = "WORK_ORDER";
public static final String ITEM_NUMBER = "ITEM_NUMBER";
@Override
@ -692,4 +727,53 @@ public static final String MODIFIED_DATE_TIME = "MODIFIED_DATE_TIME";
return this.handle;
}
@Override
public String toString() {
return "AbnormalBill{" +
"handle = " + handle +
", site = " + site +
", abnormalNo = " + abnormalNo +
", status = " + status +
", correction = " + correction +
", program = " + program +
", type = " + type +
", itemBo = " + itemBo +
", sfc = " + sfc +
", operation = " + operation +
", workCenter = " + workCenter +
", shopOrder = " + shopOrder +
", messageType = " + messageType +
", resrce = " + resrce +
", ncCode = " + ncCode +
", shutDown = " + shutDown +
", responseUser = " + responseUser +
", responseDateTime = " + responseDateTime +
", pbDescription = " + pbDescription +
", ncQty = " + ncQty +
", pbGrade = " + pbGrade +
", pbUser = " + pbUser +
", pbQty = " + pbQty +
", repairDateTime = " + repairDateTime +
", discover = " + discover +
", inspector = " + inspector +
", entityLocation = " + entityLocation +
", reportFrom = " + reportFrom +
", objectBo = " + objectBo +
", pbPhotoshop = " + pbPhotoshop +
", cancelCode = " + cancelCode +
", cancelReason = " + cancelReason +
", cancelDateTime = " + cancelDateTime +
", cancelUser = " + cancelUser +
", reportSendUserGroup = " + reportSendUserGroup +
", cancelSendUserGroup = " + cancelSendUserGroup +
", createdUser = " + createdUser +
", createdDateTime = " + createdDateTime +
", modifiedUser = " + modifiedUser +
", modifiedDateTime = " + modifiedDateTime +
", productCategory = " + productCategory +
", stepId = " + stepId +
", workOrder = " + workOrder +
", itemNumber = " + itemNumber +
"}";
}
}

2
anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/AbnormalBillService.java
Unescape Escape View File

@ -134,7 +134,7 @@ public interface AbnormalBillService extends IService<AbnormalBill> {
/**
* 异常发送消息
*/
boolean anomalyCreatedAndSendMessage(AbnormalBill abnormalBill,AbnormalBillDispose abnormalBillDispose);
boolean anomalyCreatedAndSendMessage(AbnormalBill abnormalBill, AbnormalBillDispose abnormalBillDispose);
/**
* 格式化消息

2
anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalBillServiceImpl.java
Unescape Escape View File

@ -1143,7 +1143,7 @@ public class AbnormalBillServiceImpl extends ServiceImpl<AbnormalBillMapper, Abn
return true;
}
@Override
public String formatMessage(AbnormalBill abnormalBill,String messageType, String site) {
public String formatMessage(AbnormalBill abnormalBill, String messageType, String site) {
//找到消息内容
MessageType messageTypeEntity = new MessageType();
messageTypeEntity.setSite(site);

69
anomaly/src/main/resources/mapper/AbnormalBillMapper.xml
Unescape Escape View File

@ -46,9 +46,10 @@
<result column="MODIFIED_DATE_TIME" property="modifiedDateTime" />
<result column="PRODUCT_CATEGORY" property="productCategory" />
<result column="STEP_ID" property="stepId" />
<result column="WORK_ORDER" property="workOrder" />
<result column="ITEM_NUMBER" property="itemNumber" />
</resultMap>
<resultMap id="abnormalBillDto" type="com.foreverwin.mesnac.anomaly.dto.AbnormalBillDto" extends="BaseResultMap">
<result column="SEQ" property="seq"/>
<result column="ITEM_DESCRIPTION" property="itemDescription"/>
@ -79,7 +80,7 @@
<!-- 通用查询结果列 -->
<sql id="Base_Column_List">
HANDLE, SITE, ABNORMAL_NO, STATUS, CORRECTION, PROGRAM, TYPE, ITEM_BO, SFC, OPERATION, WORK_CENTER, SHOP_ORDER, MESSAGE_TYPE, RESRCE, NC_CODE, SHUT_DOWN, RESPONSE_USER, RESPONSE_DATE_TIME, PB_DESCRIPTION, NC_QTY, PB_GRADE, PB_USER, PB_QTY, REPAIR_DATE_TIME, DISCOVER, INSPECTOR, ENTITY_LOCATION, REPORT_FROM, OBJECT_BO, PB_PHOTOSHOP, CANCEL_CODE, CANCEL_REASON, CANCEL_DATE_TIME, CANCEL_USER, REPORT_SEND_USER_GROUP, CANCEL_SEND_USER_GROUP, CREATED_USER, CREATED_DATE_TIME, MODIFIED_USER, MODIFIED_DATE_TIME, PRODUCT_CATEGORY, STEP_ID
HANDLE, SITE, ABNORMAL_NO, STATUS, CORRECTION, PROGRAM, TYPE, ITEM_BO, SFC, OPERATION, WORK_CENTER, SHOP_ORDER, MESSAGE_TYPE, RESRCE, NC_CODE, SHUT_DOWN, RESPONSE_USER, RESPONSE_DATE_TIME, PB_DESCRIPTION, NC_QTY, PB_GRADE, PB_USER, PB_QTY, REPAIR_DATE_TIME, DISCOVER, INSPECTOR, ENTITY_LOCATION, REPORT_FROM, OBJECT_BO, PB_PHOTOSHOP, CANCEL_CODE, CANCEL_REASON, CANCEL_DATE_TIME, CANCEL_USER, REPORT_SEND_USER_GROUP, CANCEL_SEND_USER_GROUP, CREATED_USER, CREATED_DATE_TIME, MODIFIED_USER, MODIFIED_DATE_TIME, PRODUCT_CATEGORY, STEP_ID, WORK_ORDER, ITEM_NUMBER
</sql>
<!-- BaseMapper标准查询/修改/删除 -->
@ -155,6 +156,8 @@
<if test="ew.entity.modifiedDateTime!=null"> AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime}</if>
<if test="ew.entity.productCategory!=null"> AND PRODUCT_CATEGORY=#{ew.entity.productCategory}</if>
<if test="ew.entity.stepId!=null"> AND STEP_ID=#{ew.entity.stepId}</if>
<if test="ew.entity.workOrder!=null"> AND WORK_ORDER=#{ew.entity.workOrder}</if>
<if test="ew.entity.itemNumber!=null"> AND ITEM_NUMBER=#{ew.entity.itemNumber}</if>
</where>
</select>
@ -207,6 +210,8 @@
<if test="ew.entity.modifiedDateTime!=null"> AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime}</if>
<if test="ew.entity.productCategory!=null"> AND PRODUCT_CATEGORY=#{ew.entity.productCategory}</if>
<if test="ew.entity.stepId!=null"> AND STEP_ID=#{ew.entity.stepId}</if>
<if test="ew.entity.workOrder!=null"> AND WORK_ORDER=#{ew.entity.workOrder}</if>
<if test="ew.entity.itemNumber!=null"> AND ITEM_NUMBER=#{ew.entity.itemNumber}</if>
</if>
<if test="ew!=null and ew.sqlSegment!=null and ew.nonEmptyOfWhere">
${ew.sqlSegment}
@ -267,6 +272,8 @@
<if test="ew.entity.modifiedDateTime!=null"> AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime}</if>
<if test="ew.entity.productCategory!=null"> AND PRODUCT_CATEGORY=#{ew.entity.productCategory}</if>
<if test="ew.entity.stepId!=null"> AND STEP_ID=#{ew.entity.stepId}</if>
<if test="ew.entity.workOrder!=null"> AND WORK_ORDER=#{ew.entity.workOrder}</if>
<if test="ew.entity.itemNumber!=null"> AND ITEM_NUMBER=#{ew.entity.itemNumber}</if>
</if>
<if test="ew!=null and ew.sqlSegment!=null and ew.nonEmptyOfWhere">
${ew.sqlSegment}
@ -327,6 +334,8 @@
<if test="ew.entity.modifiedDateTime!=null"> AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime}</if>
<if test="ew.entity.productCategory!=null"> AND PRODUCT_CATEGORY=#{ew.entity.productCategory}</if>
<if test="ew.entity.stepId!=null"> AND STEP_ID=#{ew.entity.stepId}</if>
<if test="ew.entity.workOrder!=null"> AND WORK_ORDER=#{ew.entity.workOrder}</if>
<if test="ew.entity.itemNumber!=null"> AND ITEM_NUMBER=#{ew.entity.itemNumber}</if>
</if>
<if test="ew!=null and ew.sqlSegment!=null and ew.nonEmptyOfWhere">
${ew.sqlSegment}
@ -387,6 +396,8 @@
<if test="ew.entity.modifiedDateTime!=null"> AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime}</if>
<if test="ew.entity.productCategory!=null"> AND PRODUCT_CATEGORY=#{ew.entity.productCategory}</if>
<if test="ew.entity.stepId!=null"> AND STEP_ID=#{ew.entity.stepId}</if>
<if test="ew.entity.workOrder!=null"> AND WORK_ORDER=#{ew.entity.workOrder}</if>
<if test="ew.entity.itemNumber!=null"> AND ITEM_NUMBER=#{ew.entity.itemNumber}</if>
</if>
<if test="ew!=null and ew.sqlSegment!=null and ew.nonEmptyOfWhere">
${ew.sqlSegment}
@ -447,14 +458,16 @@
<if test="ew.entity.modifiedDateTime!=null"> AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime}</if>
<if test="ew.entity.productCategory!=null"> AND PRODUCT_CATEGORY=#{ew.entity.productCategory}</if>
<if test="ew.entity.stepId!=null"> AND STEP_ID=#{ew.entity.stepId}</if>
<if test="ew.entity.workOrder!=null"> AND WORK_ORDER=#{ew.entity.workOrder}</if>
<if test="ew.entity.itemNumber!=null"> AND ITEM_NUMBER=#{ew.entity.itemNumber}</if>
</if>
<if test="ew!=null and ew.sqlSegment!=null and ew.nonEmptyOfWhere">
AND ${ew.sqlSegment}
${ew.sqlSegment}
</if>
</if>
</where>
<if test="ew!=null and ew.sqlSegment!=null and ew.emptyOfWhere">
AND ${ew.sqlSegment}
${ew.sqlSegment}
</if>
</select>
@ -507,6 +520,8 @@
<if test="ew.entity.modifiedDateTime!=null"> AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime}</if>
<if test="ew.entity.productCategory!=null"> AND PRODUCT_CATEGORY=#{ew.entity.productCategory}</if>
<if test="ew.entity.stepId!=null"> AND STEP_ID=#{ew.entity.stepId}</if>
<if test="ew.entity.workOrder!=null"> AND WORK_ORDER=#{ew.entity.workOrder}</if>
<if test="ew.entity.itemNumber!=null"> AND ITEM_NUMBER=#{ew.entity.itemNumber}</if>
</if>
<if test="ew!=null and ew.sqlSegment!=null and ew.nonEmptyOfWhere">
${ew.sqlSegment}
@ -563,6 +578,8 @@
<if test="modifiedDateTime!=null">MODIFIED_DATE_TIME,</if>
<if test="productCategory!=null">PRODUCT_CATEGORY,</if>
<if test="stepId!=null">STEP_ID,</if>
<if test="workOrder!=null">WORK_ORDER,</if>
<if test="itemNumber!=null">ITEM_NUMBER,</if>
</trim> VALUES
<trim prefix="(" suffix=")" suffixOverrides=",">
#{handle},
@ -607,6 +624,8 @@
<if test="modifiedDateTime!=null">#{modifiedDateTime},</if>
<if test="productCategory!=null">#{productCategory},</if>
<if test="stepId!=null">#{stepId},</if>
<if test="workOrder!=null">#{workOrder},</if>
<if test="itemNumber!=null">#{itemNumber},</if>
</trim>
</insert>
@ -658,6 +677,8 @@
#{modifiedDateTime},
#{productCategory},
#{stepId},
#{workOrder},
#{itemNumber},
</trim>
</insert>
@ -705,6 +726,8 @@
<if test="et.modifiedDateTime!=null">MODIFIED_DATE_TIME=#{et.modifiedDateTime},</if>
<if test="et.productCategory!=null">PRODUCT_CATEGORY=#{et.productCategory},</if>
<if test="et.stepId!=null">STEP_ID=#{et.stepId},</if>
<if test="et.workOrder!=null">WORK_ORDER=#{et.workOrder},</if>
<if test="et.itemNumber!=null">ITEM_NUMBER=#{et.itemNumber},</if>
</trim> WHERE HANDLE=#{et.handle} <if test="et instanceof java.util.Map"><if test="et.MP_OPTLOCK_VERSION_ORIGINAL!=null">and ${et.MP_OPTLOCK_VERSION_COLUMN}=#{et.MP_OPTLOCK_VERSION_ORIGINAL}</if></if>
</update>
@ -752,6 +775,8 @@
MODIFIED_DATE_TIME=#{et.modifiedDateTime},
PRODUCT_CATEGORY=#{et.productCategory},
STEP_ID=#{et.stepId},
WORK_ORDER=#{et.workOrder},
ITEM_NUMBER=#{et.itemNumber},
</trim> WHERE HANDLE=#{et.handle} <if test="et instanceof java.util.Map"><if test="et.MP_OPTLOCK_VERSION_ORIGINAL!=null">and ${et.MP_OPTLOCK_VERSION_COLUMN}=#{et.MP_OPTLOCK_VERSION_ORIGINAL}</if></if>
</update>
@ -799,6 +824,8 @@
<if test="et.modifiedDateTime!=null">MODIFIED_DATE_TIME=#{et.modifiedDateTime},</if>
<if test="et.productCategory!=null">PRODUCT_CATEGORY=#{et.productCategory},</if>
<if test="et.stepId!=null">STEP_ID=#{et.stepId},</if>
<if test="et.workOrder!=null">WORK_ORDER=#{et.workOrder},</if>
<if test="et.itemNumber!=null">ITEM_NUMBER=#{et.itemNumber},</if>
</trim>
<where>
<if test="ew!=null">
@ -845,6 +872,8 @@
<if test="ew.entity.modifiedDateTime!=null"> AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime}</if>
<if test="ew.entity.productCategory!=null"> AND PRODUCT_CATEGORY=#{ew.entity.productCategory}</if>
<if test="ew.entity.stepId!=null"> AND STEP_ID=#{ew.entity.stepId}</if>
<if test="ew.entity.workOrder!=null"> AND WORK_ORDER=#{ew.entity.workOrder}</if>
<if test="ew.entity.itemNumber!=null"> AND ITEM_NUMBER=#{ew.entity.itemNumber}</if>
</if>
<if test="ew!=null and ew.sqlSegment!=null and ew.nonEmptyOfWhere">
${ew.sqlSegment}
@ -922,6 +951,8 @@
<if test="ew.entity.modifiedDateTime!=null"> AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime}</if>
<if test="ew.entity.productCategory!=null"> AND PRODUCT_CATEGORY=#{ew.entity.productCategory}</if>
<if test="ew.entity.stepId!=null"> AND STEP_ID=#{ew.entity.stepId}</if>
<if test="ew.entity.workOrder!=null"> AND WORK_ORDER=#{ew.entity.workOrder}</if>
<if test="ew.entity.itemNumber!=null"> AND ITEM_NUMBER=#{ew.entity.itemNumber}</if>
</if>
<if test="ew!=null and ew.sqlSegment!=null and ew.nonEmptyOfWhere">
${ew.sqlSegment}
@ -940,7 +971,6 @@
</delete>
<!-- BaseMapper标准查询/修改/删除 -->
<select id="backLog" resultMap="abnormalBillDto">
SELECT ROW_NUMBER() OVER(ORDER BY ZAB.ABNORMAL_NO ASC) SEQ,ZAB.ABNORMAL_NO ABNORMAL_NO,
ZAB.STATUS STATUS, IT.DESCRIPTION ITEM_DESCRIPTION, ZAB.CREATED_DATE_TIME CREATED_DATE_TIME,
@ -1222,23 +1252,23 @@
<select id="findReplaceMessageByAbnoraml" resultType="java.util.HashMap">
SELECT wct.DESCRIPTION WORKCENTER,so.SHOP_ORDER SHOPORDER ,item.VALUE PROJECT,it.DESCRIPTION ITEM,
LISTAGG(nct.DESCRIPTION , ',') WITHIN GROUP(ORDER BY zab.ABNORMAL_NO) NC,
r.DESCRIPTION "RESOURCE",r2.DESCRIPTION WORKCENTER_LIN
LISTAGG(nct.DESCRIPTION , ',') WITHIN GROUP(ORDER BY zab.ABNORMAL_NO) NC,
r.DESCRIPTION "RESOURCE",r2.DESCRIPTION WORKCENTER_LIN
FROM Z_ABNORMAL_BILL zab
INNER JOIN ITEM i ON i.HANDLE = zab.ITEM_BO
LEFT JOIN RESRCE r ON r.RESRCE = zab.RESRCE AND r.SITE = zab.SITE
LEFT JOIN Z_ABNORMAL_BILL_DISPOSE zabd ON zabd.ABNORMAL_BILL_BO = zab.HANDLE
LEFT JOIN Z_ABNORMAL_NC_CODE zanc ON zanc.ABNORMAL_BILL_BO = zab.HANDLE
LEFT JOIN NC_CODE_T nct ON nct.NC_CODE_BO = 'NCCodeBO:'|| zanc.SITE || ',' || zanc.NC_CODE AND nct.LOCALE = 'zh'
LEFT JOIN ITEM_T it ON it.ITEM_BO = i.HANDLE AND it.LOCALE = 'zh'
LEFT JOIN WORK_CENTER wc ON wc.WORK_CENTER = zab.WORK_CENTER AND wc.SITE = zab.SITE
LEFT JOIN WORK_CENTER_T wct ON wct.WORK_CENTER_BO = wc.HANDLE AND wct.LOCALE = 'zh'
LEFT JOIN SHOP_ORDER so ON so.SHOP_ORDER = zab.SHOP_ORDER AND so.SITE = zab.SITE
LEFT JOIN CUSTOM_FIELDS item ON item.HANDLE = so.HANDLE AND item."ATTRIBUTE" = 'ITEM_NUMBER'
LEFT JOIN ROUTER r2 ON r2.HANDLE = so.PLANNED_ROUTER_BO
INNER JOIN ITEM i ON i.HANDLE = zab.ITEM_BO
LEFT JOIN RESRCE r ON r.RESRCE = zab.RESRCE AND r.SITE = zab.SITE
LEFT JOIN Z_ABNORMAL_BILL_DISPOSE zabd ON zabd.ABNORMAL_BILL_BO = zab.HANDLE
LEFT JOIN Z_ABNORMAL_NC_CODE zanc ON zanc.ABNORMAL_BILL_BO = zab.HANDLE
LEFT JOIN NC_CODE_T nct ON nct.NC_CODE_BO = 'NCCodeBO:'|| zanc.SITE || ',' || zanc.NC_CODE AND nct.LOCALE = 'zh'
LEFT JOIN ITEM_T it ON it.ITEM_BO = i.HANDLE AND it.LOCALE = 'zh'
LEFT JOIN WORK_CENTER wc ON wc.WORK_CENTER = zab.WORK_CENTER AND wc.SITE = zab.SITE
LEFT JOIN WORK_CENTER_T wct ON wct.WORK_CENTER_BO = wc.HANDLE AND wct.LOCALE = 'zh'
LEFT JOIN SHOP_ORDER so ON so.SHOP_ORDER = zab.SHOP_ORDER AND so.SITE = zab.SITE
LEFT JOIN CUSTOM_FIELDS item ON item.HANDLE = so.HANDLE AND item."ATTRIBUTE" = 'ITEM_NUMBER'
LEFT JOIN ROUTER r2 ON r2.HANDLE = so.PLANNED_ROUTER_BO
<where>
<if test="abnormalBill != null">
zab.SITE = #{abnormalBill.site}
zab.SITE = #{abnormalBill.site}
<if test="abnormalBill.abnormalNo != null and abnormalBill.abnormalNo != ''">
AND zab.ABNORMAL_NO = #{abnormalBill.abnormalNo}
</if>
@ -1249,4 +1279,5 @@
</where>
GROUP BY wct.DESCRIPTION ,so.SHOP_ORDER ,item.VALUE ,it.DESCRIPTION,r.DESCRIPTION,r2.DESCRIPTION
</select>
</mapper>

Write Preview
Loading…
Cancel
Save