diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/AbnormalBillLogController.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/AbnormalBillLogController.java new file mode 100644 index 00000000..95a440dc --- /dev/null +++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/AbnormalBillLogController.java @@ -0,0 +1,175 @@ +package com.foreverwin.mesnac.anomaly.controller; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.foreverwin.mesnac.anomaly.model.AbnormalBill; +import com.foreverwin.mesnac.anomaly.model.AbnormalBillDispose; +import com.foreverwin.mesnac.anomaly.model.AbnormalBillLog; +import com.foreverwin.mesnac.anomaly.service.AbnormalBillLogService; +import com.foreverwin.modular.core.util.FrontPage; +import com.foreverwin.modular.core.util.R; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * + * @author 赵嘉伟 + * @since 2021-07-16 + */ +@RestController +@RequestMapping("/Z-ABNORMAL-BILL-LOG") +public class AbnormalBillLogController { + + @Autowired + public AbnormalBillLogService abnormalBillLogService; + + /** + * 根据id查询 + * + * @param id 主键 + * @return + */ + @ResponseBody + @GetMapping("/{id:.+}") + public R getAbnormalBillLogById(@PathVariable String id) { + return R.ok( abnormalBillLogService.getById(id)); + } + + /** + * 查询所有数据 + * + * @return + */ + @ResponseBody + @GetMapping("") + public R getAbnormalBillLogList(AbnormalBillLog abnormalBillLog){ + List result; + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.setEntity(abnormalBillLog); + result = abnormalBillLogService.list(queryWrapper); + return R.ok(result); + } + + /** + * 分页查询数据 + * + * @param frontPage 分页信息 + * @return + */ + @ResponseBody + @GetMapping("/page") + public R page(FrontPage frontPage, AbnormalBillLog abnormalBillLog){ + IPage result; + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.setEntity(abnormalBillLog); + if (frontPage.getGlobalQuery() != null && !"".equals(frontPage.getGlobalQuery().trim())) { + //TODO modify global query + queryWrapper.lambda().and(wrapper -> wrapper + .like(AbnormalBillLog::getHandle, frontPage.getGlobalQuery()) + .or().like(AbnormalBillLog::getSite, frontPage.getGlobalQuery()) + .or().like(AbnormalBillLog::getAbnormalNo, frontPage.getGlobalQuery()) + .or().like(AbnormalBillLog::getStatus, frontPage.getGlobalQuery()) + .or().like(AbnormalBillLog::getType, frontPage.getGlobalQuery()) + .or().like(AbnormalBillLog::getItemBo, frontPage.getGlobalQuery()) + .or().like(AbnormalBillLog::getSfc, frontPage.getGlobalQuery()) + .or().like(AbnormalBillLog::getOperation, frontPage.getGlobalQuery()) + .or().like(AbnormalBillLog::getWorkCenter, frontPage.getGlobalQuery()) + .or().like(AbnormalBillLog::getShopOrder, frontPage.getGlobalQuery()) + .or().like(AbnormalBillLog::getMessageType, frontPage.getGlobalQuery()) + .or().like(AbnormalBillLog::getResrce, frontPage.getGlobalQuery()) + .or().like(AbnormalBillLog::getNcCode, frontPage.getGlobalQuery()) + .or().like(AbnormalBillLog::getNcCodeGroup, frontPage.getGlobalQuery()) + .or().like(AbnormalBillLog::getShutDown, frontPage.getGlobalQuery()) + .or().like(AbnormalBillLog::getResponseUser, frontPage.getGlobalQuery()) + .or().like(AbnormalBillLog::getPbDescription, frontPage.getGlobalQuery()) + .or().like(AbnormalBillLog::getNcQty, frontPage.getGlobalQuery()) + .or().like(AbnormalBillLog::getPbGrade, frontPage.getGlobalQuery()) + .or().like(AbnormalBillLog::getPbUser, frontPage.getGlobalQuery()) + .or().like(AbnormalBillLog::getPbQty, frontPage.getGlobalQuery()) + .or().like(AbnormalBillLog::getDiscover, frontPage.getGlobalQuery()) + .or().like(AbnormalBillLog::getInspector, frontPage.getGlobalQuery()) + .or().like(AbnormalBillLog::getEntityLocation, frontPage.getGlobalQuery()) + .or().like(AbnormalBillLog::getReportFrom, frontPage.getGlobalQuery()) + .or().like(AbnormalBillLog::getObjectBo, frontPage.getGlobalQuery()) + .or().like(AbnormalBillLog::getPbPhotoshop, frontPage.getGlobalQuery()) + .or().like(AbnormalBillLog::getCancelCode, frontPage.getGlobalQuery()) + .or().like(AbnormalBillLog::getCancelReason, frontPage.getGlobalQuery()) + .or().like(AbnormalBillLog::getCancelUser, frontPage.getGlobalQuery()) + .or().like(AbnormalBillLog::getDutyUser, frontPage.getGlobalQuery()) + .or().like(AbnormalBillLog::getDutyDepart, frontPage.getGlobalQuery()) + .or().like(AbnormalBillLog::getPrincipalUser, frontPage.getGlobalQuery()) + .or().like(AbnormalBillLog::getDutyCauseDescription, frontPage.getGlobalQuery()) + .or().like(AbnormalBillLog::getDutyCauseType, frontPage.getGlobalQuery()) + .or().like(AbnormalBillLog::getDutyType, frontPage.getGlobalQuery()) + .or().like(AbnormalBillLog::getDutySendUserGroup, frontPage.getGlobalQuery()) + .or().like(AbnormalBillLog::getResolveUser, frontPage.getGlobalQuery()) + .or().like(AbnormalBillLog::getAbnormalMethod, frontPage.getGlobalQuery()) + .or().like(AbnormalBillLog::getRouterBo, frontPage.getGlobalQuery()) + .or().like(AbnormalBillLog::getResolveShopOrder, frontPage.getGlobalQuery()) + .or().like(AbnormalBillLog::getResolveRemark, frontPage.getGlobalQuery()) + .or().like(AbnormalBillLog::getResolveSendUser, frontPage.getGlobalQuery()) + .or().like(AbnormalBillLog::getClosedUser, frontPage.getGlobalQuery()) + .or().like(AbnormalBillLog::getAbnormalReason, frontPage.getGlobalQuery()) + .or().like(AbnormalBillLog::getBeforeMeasure, frontPage.getGlobalQuery()) + .or().like(AbnormalBillLog::getCreatedUser, frontPage.getGlobalQuery()) + .or().like(AbnormalBillLog::getModifiedUser, frontPage.getGlobalQuery()) + ); + } + result = abnormalBillLogService.page(frontPage.getPagePlus(), queryWrapper); + return R.ok(result); + } + + /** + * 新增 + * @param abnormalBillLog 传递的实体 + * @return null 失败 实体成功 + */ + @PostMapping + public R save(@RequestBody AbnormalBillLog abnormalBillLog) { + return R.ok(abnormalBillLogService.save(abnormalBillLog)); + } + + /** + * 修改 + * @param abnormalBillLog 传递的实体 + * @return null 失败 实体成功 + */ + @PutMapping + public R updateById(@RequestBody AbnormalBillLog abnormalBillLog) { + return R.ok(abnormalBillLogService.updateById(abnormalBillLog)); + } + + /** + * 根据id删除对象 + * @param id 实体ID + * @return 0 失败 1 成功 + */ + @ResponseBody + @RequestMapping(method = RequestMethod.DELETE, value = "/{id:.+}") + public R removeById(@PathVariable("id") String id){ + return R.ok(abnormalBillLogService.removeById(id)); + } + + /** + * 批量删除对象 + * @param ids 实体集合ID + * @return 0 失败 1 成功 + */ + @ResponseBody + @RequestMapping(method = RequestMethod.POST, value = "/delete-batch") + public R removeByIds(List ids){ + return R.ok(abnormalBillLogService.removeByIds(ids)); + } + + @GetMapping("saveAndUpdate") + public R saveAndUpdate(AbnormalBill abnormalBill, + AbnormalBillDispose abnormalBillDispose, + @RequestParam List ncGroupAndNcCodes, + @RequestParam List dutyCauseType, + @RequestParam List dutyType){ + abnormalBillLogService.saveAndUpdate(abnormalBill,abnormalBillDispose,ncGroupAndNcCodes,dutyCauseType,dutyType); + return R.ok(); + } +} \ No newline at end of file diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/dto/AbnormalBillDisposeDto.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/dto/AbnormalBillDisposeDto.java index e436e261..fc94d2a4 100644 --- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/dto/AbnormalBillDisposeDto.java +++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/dto/AbnormalBillDisposeDto.java @@ -19,6 +19,11 @@ public class AbnormalBillDisposeDto extends AbnormalBillDispose { */ private String status; + /** + * 物料主键 + */ + private String itemBo; + /** * 物料编号 */ @@ -412,4 +417,12 @@ public class AbnormalBillDisposeDto extends AbnormalBillDispose { public void setOperation(String operation) { this.operation = operation; } + + public String getItemBo() { + return itemBo; + } + + public void setItemBo(String itemBo) { + this.itemBo = itemBo; + } } diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/mapper/AbnormalBillLogMapper.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/mapper/AbnormalBillLogMapper.java new file mode 100644 index 00000000..71b2dcc7 --- /dev/null +++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/mapper/AbnormalBillLogMapper.java @@ -0,0 +1,22 @@ +package com.foreverwin.mesnac.anomaly.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.foreverwin.mesnac.anomaly.model.AbnormalBill; +import com.foreverwin.mesnac.anomaly.model.AbnormalBillLog; +import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Repository; + +/** + *

+ * 异常单记录表 Mapper 接口 + *

+ * + * @author 赵嘉伟 + * @since 2021-07-16 + */ +@Repository +public interface AbnormalBillLogMapper extends BaseMapper { + + AbnormalBillLog findAllByAbnormalNo(@Param("abnormalBill") AbnormalBill abnormalBill); + +} \ No newline at end of file diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/model/AbnormalBillLog.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/model/AbnormalBillLog.java new file mode 100644 index 00000000..e413b17f --- /dev/null +++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/model/AbnormalBillLog.java @@ -0,0 +1,936 @@ +package com.foreverwin.mesnac.anomaly.model; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; + +import java.io.Serializable; +import java.time.LocalDateTime; + +/** + *

+ * 异常单记录表 + *

+ * + * @author 赵嘉伟 + * @since 2021-07-16 + */ + +@TableName("Z_ABNORMAL_BILL_LOG") + +public class AbnormalBillLog extends Model { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @TableId(value = "HANDLE", type = IdType.INPUT) + private String handle; + /** + * 站点 + */ + @TableField("SITE") + private String site; + /** + * 异常单 + */ + @TableField("ABNORMAL_NO") + private String abnormalNo; + /** + * 异常状态 + */ + @TableField("STATUS") + private String status; + /** + * 异常类型 + */ + @TableField("TYPE") + private String type; + /** + * 物料BO + */ + @TableField("ITEM_BO") + private String itemBo; + /** + * SFC条码 + */ + @TableField("SFC") + private String sfc; + /** + * 操作维护 + */ + @TableField("OPERATION") + private String operation; + /** + * 异常车间 + */ + @TableField("WORK_CENTER") + private String workCenter; + /** + * 工单 + */ + @TableField("SHOP_ORDER") + private String shopOrder; + /** + * 消息类型 + */ + @TableField("MESSAGE_TYPE") + private String messageType; + /** + * 设备编号 + */ + @TableField("RESRCE") + private String resrce; + /** + * 不良代码 + */ + @TableField("NC_CODE") + private String ncCode; + /** + * 不良代码组 + */ + @TableField("NC_CODE_GROUP") + private String ncCodeGroup; + /** + * 停机处理 + */ + @TableField("SHUT_DOWN") + private String shutDown; + /** + * 响应人员 + */ + @TableField("RESPONSE_USER") + private String responseUser; + /** + * 响应时间 + */ + @TableField("RESPONSE_DATE_TIME") + private LocalDateTime responseDateTime; + /** + * 问题描述 + */ + @TableField("PB_DESCRIPTION") + private String pbDescription; + /** + * 不良品数量 + */ + @TableField("NC_QTY") + private String ncQty; + /** + * 问题等级 + */ + @TableField("PB_GRADE") + private String pbGrade; + /** + * 问题提报人 + */ + @TableField("PB_USER") + private String pbUser; + /** + * 问题数量 + */ + @TableField("PB_QTY") + private String pbQty; + /** + * 建议维修时间 + */ + @TableField("REPAIR_DATE_TIME") + private LocalDateTime repairDateTime; + /** + * 发现环节 + */ + @TableField("DISCOVER") + private String discover; + /** + * 检验人员 + */ + @TableField("INSPECTOR") + private String inspector; + /** + * 实物位置 + */ + @TableField("ENTITY_LOCATION") + private String entityLocation; + /** + * 上报来源 + */ + @TableField("REPORT_FROM") + private String reportFrom; + /** + * 关联来源 + */ + @TableField("OBJECT_BO") + private String objectBo; + /** + * 问题照片 + */ + @TableField("PB_PHOTOSHOP") + private String pbPhotoshop; + /** + * 取消代码 + */ + @TableField("CANCEL_CODE") + private String cancelCode; + /** + * 取消原因 + */ + @TableField("CANCEL_REASON") + private String cancelReason; + /** + * 取消时间 + */ + @TableField("CANCEL_DATE_TIME") + private LocalDateTime cancelDateTime; + /** + * 取消人 + */ + @TableField("CANCEL_USER") + private String cancelUser; + /** + * 责任划分填报人 + */ + @TableField("DUTY_USER") + private String dutyUser; + /** + * 责任划分填报时间 + */ + @TableField("DUTY_DATE_TIME") + private LocalDateTime dutyDateTime; + /** + * 责任部门 + */ + @TableField("DUTY_DEPART") + private String dutyDepart; + /** + * 责任人 + */ + @TableField("PRINCIPAL_USER") + private String principalUser; + /** + * 原因分析 + */ + @TableField("DUTY_CAUSE_DESCRIPTION") + private String dutyCauseDescription; + /** + * 原因分类 + */ + @TableField("DUTY_CAUSE_TYPE") + private String dutyCauseType; + /** + * 责任分类 + */ + @TableField("DUTY_TYPE") + private String dutyType; + /** + * 发送用户组 + */ + @TableField("DUTY_SEND_USER_GROUP") + private String dutySendUserGroup; + /** + * 解决方案填报人 + */ + @TableField("RESOLVE_USER") + private String resolveUser; + /** + * 解决方案填报时间 + */ + @TableField("RESOLVE_DATE_TIME") + private LocalDateTime resolveDateTime; + /** + * 异常方案 + */ + @TableField("ABNORMAL_METHOD") + private String abnormalMethod; + /** + * 返修工艺 + */ + @TableField("ROUTER_BO") + private String routerBo; + /** + * 返修工单 + */ + @TableField("RESOLVE_SHOP_ORDER") + private String resolveShopOrder; + /** + * 方案备注 + */ + @TableField("RESOLVE_REMARK") + private String resolveRemark; + /** + * 发送用户 + */ + @TableField("RESOLVE_SEND_USER") + private String resolveSendUser; + /** + * 闭环关闭填报人 + */ + @TableField("CLOSED_USER") + private String closedUser; + /** + * 闭环关闭填报时间 + */ + @TableField("CLOSED_DATE_TIME") + private LocalDateTime closedDateTime; + /** + * 异常原因 + */ + @TableField("ABNORMAL_REASON") + private String abnormalReason; + /** + * 预防措施 + */ + @TableField("BEFORE_MEASURE") + private String beforeMeasure; + /** + * 创建人 + */ + @TableField("CREATED_USER") + private String createdUser; + /** + * 创建日期 + */ + @TableField("CREATED_DATA_TIME") + private LocalDateTime createdDataTime; + /** + * 修改人 + */ + @TableField("MODIFIED_USER") + private String modifiedUser; + /** + * 修改日期 + */ + @TableField("MODIFIED_DATE_TIME") + private LocalDateTime modifiedDateTime; + + + public String getHandle() { + return handle; + } + + public void setHandle(String handle) { + this.handle = handle; + } + + public String getSite() { + return site; + } + + public void setSite(String site) { + this.site = site; + } + + public String getAbnormalNo() { + return abnormalNo; + } + + public void setAbnormalNo(String abnormalNo) { + this.abnormalNo = abnormalNo; + } + + public String getStatus() { + return status; + } + + public void setStatus(String status) { + this.status = status; + } + + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } + + public String getItemBo() { + return itemBo; + } + + public void setItemBo(String itemBo) { + this.itemBo = itemBo; + } + + public String getSfc() { + return sfc; + } + + public void setSfc(String sfc) { + this.sfc = sfc; + } + + public String getOperation() { + return operation; + } + + public void setOperation(String operation) { + this.operation = operation; + } + + public String getWorkCenter() { + return workCenter; + } + + public void setWorkCenter(String workCenter) { + this.workCenter = workCenter; + } + + public String getShopOrder() { + return shopOrder; + } + + public void setShopOrder(String shopOrder) { + this.shopOrder = shopOrder; + } + + public String getMessageType() { + return messageType; + } + + public void setMessageType(String messageType) { + this.messageType = messageType; + } + + public String getResrce() { + return resrce; + } + + public void setResrce(String resrce) { + this.resrce = resrce; + } + + public String getNcCode() { + return ncCode; + } + + public void setNcCode(String ncCode) { + this.ncCode = ncCode; + } + + public String getNcCodeGroup() { + return ncCodeGroup; + } + + public void setNcCodeGroup(String ncCodeGroup) { + this.ncCodeGroup = ncCodeGroup; + } + + public String getShutDown() { + return shutDown; + } + + public void setShutDown(String shutDown) { + this.shutDown = shutDown; + } + + public String getResponseUser() { + return responseUser; + } + + public void setResponseUser(String responseUser) { + this.responseUser = responseUser; + } + + public LocalDateTime getResponseDateTime() { + return responseDateTime; + } + + public void setResponseDateTime(LocalDateTime responseDateTime) { + this.responseDateTime = responseDateTime; + } + + public String getPbDescription() { + return pbDescription; + } + + public void setPbDescription(String pbDescription) { + this.pbDescription = pbDescription; + } + + public String getNcQty() { + return ncQty; + } + + public void setNcQty(String ncQty) { + this.ncQty = ncQty; + } + + public String getPbGrade() { + return pbGrade; + } + + public void setPbGrade(String pbGrade) { + this.pbGrade = pbGrade; + } + + public String getPbUser() { + return pbUser; + } + + public void setPbUser(String pbUser) { + this.pbUser = pbUser; + } + + public String getPbQty() { + return pbQty; + } + + public void setPbQty(String pbQty) { + this.pbQty = pbQty; + } + + public LocalDateTime getRepairDateTime() { + return repairDateTime; + } + + public void setRepairDateTime(LocalDateTime repairDateTime) { + this.repairDateTime = repairDateTime; + } + + public String getDiscover() { + return discover; + } + + public void setDiscover(String discover) { + this.discover = discover; + } + + public String getInspector() { + return inspector; + } + + public void setInspector(String inspector) { + this.inspector = inspector; + } + + public String getEntityLocation() { + return entityLocation; + } + + public void setEntityLocation(String entityLocation) { + this.entityLocation = entityLocation; + } + + public String getReportFrom() { + return reportFrom; + } + + public void setReportFrom(String reportFrom) { + this.reportFrom = reportFrom; + } + + public String getObjectBo() { + return objectBo; + } + + public void setObjectBo(String objectBo) { + this.objectBo = objectBo; + } + + public String getPbPhotoshop() { + return pbPhotoshop; + } + + public void setPbPhotoshop(String pbPhotoshop) { + this.pbPhotoshop = pbPhotoshop; + } + + public String getCancelCode() { + return cancelCode; + } + + public void setCancelCode(String cancelCode) { + this.cancelCode = cancelCode; + } + + public String getCancelReason() { + return cancelReason; + } + + public void setCancelReason(String cancelReason) { + this.cancelReason = cancelReason; + } + + public LocalDateTime getCancelDateTime() { + return cancelDateTime; + } + + public void setCancelDateTime(LocalDateTime cancelDateTime) { + this.cancelDateTime = cancelDateTime; + } + + public String getCancelUser() { + return cancelUser; + } + + public void setCancelUser(String cancelUser) { + this.cancelUser = cancelUser; + } + + public String getDutyUser() { + return dutyUser; + } + + public void setDutyUser(String dutyUser) { + this.dutyUser = dutyUser; + } + + public LocalDateTime getDutyDateTime() { + return dutyDateTime; + } + + public void setDutyDateTime(LocalDateTime dutyDateTime) { + this.dutyDateTime = dutyDateTime; + } + + public String getDutyDepart() { + return dutyDepart; + } + + public void setDutyDepart(String dutyDepart) { + this.dutyDepart = dutyDepart; + } + + public String getPrincipalUser() { + return principalUser; + } + + public void setPrincipalUser(String principalUser) { + this.principalUser = principalUser; + } + + public String getDutyCauseDescription() { + return dutyCauseDescription; + } + + public void setDutyCauseDescription(String dutyCauseDescription) { + this.dutyCauseDescription = dutyCauseDescription; + } + + public String getDutyCauseType() { + return dutyCauseType; + } + + public void setDutyCauseType(String dutyCauseType) { + this.dutyCauseType = dutyCauseType; + } + + public String getDutyType() { + return dutyType; + } + + public void setDutyType(String dutyType) { + this.dutyType = dutyType; + } + + public String getDutySendUserGroup() { + return dutySendUserGroup; + } + + public void setDutySendUserGroup(String dutySendUserGroup) { + this.dutySendUserGroup = dutySendUserGroup; + } + + public String getResolveUser() { + return resolveUser; + } + + public void setResolveUser(String resolveUser) { + this.resolveUser = resolveUser; + } + + public LocalDateTime getResolveDateTime() { + return resolveDateTime; + } + + public void setResolveDateTime(LocalDateTime resolveDateTime) { + this.resolveDateTime = resolveDateTime; + } + + public String getAbnormalMethod() { + return abnormalMethod; + } + + public void setAbnormalMethod(String abnormalMethod) { + this.abnormalMethod = abnormalMethod; + } + + public String getRouterBo() { + return routerBo; + } + + public void setRouterBo(String routerBo) { + this.routerBo = routerBo; + } + + public String getResolveShopOrder() { + return resolveShopOrder; + } + + public void setResolveShopOrder(String resolveShopOrder) { + this.resolveShopOrder = resolveShopOrder; + } + + public String getResolveRemark() { + return resolveRemark; + } + + public void setResolveRemark(String resolveRemark) { + this.resolveRemark = resolveRemark; + } + + public String getResolveSendUser() { + return resolveSendUser; + } + + public void setResolveSendUser(String resolveSendUser) { + this.resolveSendUser = resolveSendUser; + } + + public String getClosedUser() { + return closedUser; + } + + public void setClosedUser(String closedUser) { + this.closedUser = closedUser; + } + + public LocalDateTime getClosedDateTime() { + return closedDateTime; + } + + public void setClosedDateTime(LocalDateTime closedDateTime) { + this.closedDateTime = closedDateTime; + } + + public String getAbnormalReason() { + return abnormalReason; + } + + public void setAbnormalReason(String abnormalReason) { + this.abnormalReason = abnormalReason; + } + + public String getBeforeMeasure() { + return beforeMeasure; + } + + public void setBeforeMeasure(String beforeMeasure) { + this.beforeMeasure = beforeMeasure; + } + + public String getCreatedUser() { + return createdUser; + } + + public void setCreatedUser(String createdUser) { + this.createdUser = createdUser; + } + + public LocalDateTime getCreatedDataTime() { + return createdDataTime; + } + + public void setCreatedDataTime(LocalDateTime createdDataTime) { + this.createdDataTime = createdDataTime; + } + + public String getModifiedUser() { + return modifiedUser; + } + + public void setModifiedUser(String modifiedUser) { + this.modifiedUser = modifiedUser; + } + + public LocalDateTime getModifiedDateTime() { + return modifiedDateTime; + } + + public void setModifiedDateTime(LocalDateTime modifiedDateTime) { + this.modifiedDateTime = modifiedDateTime; + } + +public static final String HANDLE = "HANDLE"; + +public static final String SITE = "SITE"; + +public static final String ABNORMAL_NO = "ABNORMAL_NO"; + +public static final String STATUS = "STATUS"; + +public static final String TYPE = "TYPE"; + +public static final String ITEM_BO = "ITEM_BO"; + +public static final String SFC = "SFC"; + +public static final String OPERATION = "OPERATION"; + +public static final String WORK_CENTER = "WORK_CENTER"; + +public static final String SHOP_ORDER = "SHOP_ORDER"; + +public static final String MESSAGE_TYPE = "MESSAGE_TYPE"; + +public static final String RESRCE = "RESRCE"; + +public static final String NC_CODE = "NC_CODE"; + +public static final String NC_CODE_GROUP = "NC_CODE_GROUP"; + +public static final String SHUT_DOWN = "SHUT_DOWN"; + +public static final String RESPONSE_USER = "RESPONSE_USER"; + +public static final String RESPONSE_DATE_TIME = "RESPONSE_DATE_TIME"; + +public static final String PB_DESCRIPTION = "PB_DESCRIPTION"; + +public static final String NC_QTY = "NC_QTY"; + +public static final String PB_GRADE = "PB_GRADE"; + +public static final String PB_USER = "PB_USER"; + +public static final String PB_QTY = "PB_QTY"; + +public static final String REPAIR_DATE_TIME = "REPAIR_DATE_TIME"; + +public static final String DISCOVER = "DISCOVER"; + +public static final String INSPECTOR = "INSPECTOR"; + +public static final String ENTITY_LOCATION = "ENTITY_LOCATION"; + +public static final String REPORT_FROM = "REPORT_FROM"; + +public static final String OBJECT_BO = "OBJECT_BO"; + +public static final String PB_PHOTOSHOP = "PB_PHOTOSHOP"; + +public static final String CANCEL_CODE = "CANCEL_CODE"; + +public static final String CANCEL_REASON = "CANCEL_REASON"; + +public static final String CANCEL_DATE_TIME = "CANCEL_DATE_TIME"; + +public static final String CANCEL_USER = "CANCEL_USER"; + +public static final String DUTY_USER = "DUTY_USER"; + +public static final String DUTY_DATE_TIME = "DUTY_DATE_TIME"; + +public static final String DUTY_DEPART = "DUTY_DEPART"; + +public static final String PRINCIPAL_USER = "PRINCIPAL_USER"; + +public static final String DUTY_CAUSE_DESCRIPTION = "DUTY_CAUSE_DESCRIPTION"; + +public static final String DUTY_CAUSE_TYPE = "DUTY_CAUSE_TYPE"; + +public static final String DUTY_TYPE = "DUTY_TYPE"; + +public static final String DUTY_SEND_USER_GROUP = "DUTY_SEND_USER_GROUP"; + +public static final String RESOLVE_USER = "RESOLVE_USER"; + +public static final String RESOLVE_DATE_TIME = "RESOLVE_DATE_TIME"; + +public static final String ABNORMAL_METHOD = "ABNORMAL_METHOD"; + +public static final String ROUTER_BO = "ROUTER_BO"; + +public static final String RESOLVE_SHOP_ORDER = "RESOLVE_SHOP_ORDER"; + +public static final String RESOLVE_REMARK = "RESOLVE_REMARK"; + +public static final String RESOLVE_SEND_USER = "RESOLVE_SEND_USER"; + +public static final String CLOSED_USER = "CLOSED_USER"; + +public static final String CLOSED_DATE_TIME = "CLOSED_DATE_TIME"; + +public static final String ABNORMAL_REASON = "ABNORMAL_REASON"; + +public static final String BEFORE_MEASURE = "BEFORE_MEASURE"; + +public static final String CREATED_USER = "CREATED_USER"; + +public static final String CREATED_DATA_TIME = "CREATED_DATA_TIME"; + +public static final String MODIFIED_USER = "MODIFIED_USER"; + +public static final String MODIFIED_DATE_TIME = "MODIFIED_DATE_TIME"; + + + @Override + protected Serializable pkVal() { + return this.handle; + } + + @Override + public String toString() { + return "AbnormalBillLog{" + + "handle = " + handle + + ", site = " + site + + ", abnormalNo = " + abnormalNo + + ", status = " + status + + ", type = " + type + + ", itemBo = " + itemBo + + ", sfc = " + sfc + + ", operation = " + operation + + ", workCenter = " + workCenter + + ", shopOrder = " + shopOrder + + ", messageType = " + messageType + + ", resrce = " + resrce + + ", ncCode = " + ncCode + + ", ncCodeGroup = " + ncCodeGroup + + ", 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 + + ", dutyUser = " + dutyUser + + ", dutyDateTime = " + dutyDateTime + + ", dutyDepart = " + dutyDepart + + ", principalUser = " + principalUser + + ", dutyCauseDescription = " + dutyCauseDescription + + ", dutyCauseType = " + dutyCauseType + + ", dutyType = " + dutyType + + ", dutySendUserGroup = " + dutySendUserGroup + + ", resolveUser = " + resolveUser + + ", resolveDateTime = " + resolveDateTime + + ", abnormalMethod = " + abnormalMethod + + ", routerBo = " + routerBo + + ", resolveShopOrder = " + resolveShopOrder + + ", resolveRemark = " + resolveRemark + + ", resolveSendUser = " + resolveSendUser + + ", closedUser = " + closedUser + + ", closedDateTime = " + closedDateTime + + ", abnormalReason = " + abnormalReason + + ", beforeMeasure = " + beforeMeasure + + ", createdUser = " + createdUser + + ", createdDataTime = " + createdDataTime + + ", modifiedUser = " + modifiedUser + + ", modifiedDateTime = " + modifiedDateTime + + "}"; + } +} \ No newline at end of file diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/AbnormalBillLogService.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/AbnormalBillLogService.java new file mode 100644 index 00000000..50878b58 --- /dev/null +++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/AbnormalBillLogService.java @@ -0,0 +1,39 @@ +package com.foreverwin.mesnac.anomaly.service; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.IService; +import com.foreverwin.mesnac.anomaly.model.AbnormalBill; +import com.foreverwin.mesnac.anomaly.model.AbnormalBillDispose; +import com.foreverwin.mesnac.anomaly.model.AbnormalBillLog; +import com.foreverwin.modular.core.util.FrontPage; +import org.springframework.web.bind.annotation.RequestParam; + +import java.util.List; + +/** + *

+ * 异常单记录表 服务类 + *

+ * + * @author 赵嘉伟 + * @since 2021-07-16 + */ +public interface AbnormalBillLogService extends IService { + + /** + * 分页查询 + * @param frontPage + * @return + */ + IPage selectPage(FrontPage frontPage, AbnormalBillLog abnormalBillLog); + + List selectList(AbnormalBillLog abnormalBillLog); + + void saveAndUpdate(AbnormalBill abnormalBill, + AbnormalBillDispose abnormalBillDispose, + @RequestParam List ncGroupAndNcCodes, + @RequestParam List dutyCauseType, + @RequestParam List dutyType); + + +} \ No newline at end of file diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalBillLogServiceImpl.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalBillLogServiceImpl.java new file mode 100644 index 00000000..c68e501f --- /dev/null +++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalBillLogServiceImpl.java @@ -0,0 +1,128 @@ +package com.foreverwin.mesnac.anomaly.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.foreverwin.mesnac.anomaly.mapper.AbnormalBillLogMapper; +import com.foreverwin.mesnac.anomaly.mapper.AbnormalNcCodeMapper; +import com.foreverwin.mesnac.anomaly.model.AbnormalBill; +import com.foreverwin.mesnac.anomaly.model.AbnormalBillDispose; +import com.foreverwin.mesnac.anomaly.model.AbnormalBillLog; +import com.foreverwin.mesnac.anomaly.model.AbnormalNcCode; +import com.foreverwin.mesnac.anomaly.service.AbnormalBillDisposeService; +import com.foreverwin.mesnac.anomaly.service.AbnormalBillLogService; +import com.foreverwin.mesnac.anomaly.service.AbnormalBillService; +import com.foreverwin.mesnac.anomaly.service.AbnormalNcCodeService; +import com.foreverwin.mesnac.common.constant.Constants; +import com.foreverwin.mesnac.common.util.StringUtil; +import com.foreverwin.modular.core.util.CommonMethods; +import com.foreverwin.modular.core.util.FrontPage; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +/** + *

+ * 异常单记录表 服务实现类 + *

+ * + * @author 赵嘉伟 + * @since 2021-07-16 + */ +@Service +@Transactional(rollbackFor = Exception.class) +public class AbnormalBillLogServiceImpl extends ServiceImpl implements AbnormalBillLogService { + + + @Autowired + private AbnormalBillLogMapper abnormalBillLogMapper; + + @Autowired + private AbnormalNcCodeService abnormalNcCodeService; + + @Autowired + private AbnormalNcCodeMapper abnormalNcCodeMapper; + + @Autowired + private AbnormalBillService abnormalBillService; + + @Autowired + private AbnormalBillDisposeService abnormalBillDisposeService; + + @Override + public IPage selectPage(FrontPage frontPage, AbnormalBillLog abnormalBillLog) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.setEntity(abnormalBillLog); + return super.page(frontPage.getPagePlus(), queryWrapper); + } + + @Override + public List selectList(AbnormalBillLog abnormalBillLog) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.setEntity(abnormalBillLog); + return super.list(queryWrapper); + } + + @Override + public void saveAndUpdate(AbnormalBill abnormalBill, AbnormalBillDispose abnormalBillDispose, List ncGroupAndNcCodes, List dutyCauseType, List dutyType) { + String user = CommonMethods.getUser(); + LocalDateTime now = LocalDateTime.now(); + AbnormalBillLog abnormalBillLog = abnormalBillLogMapper.findAllByAbnormalNo(abnormalBill); + + if(abnormalBillLogMapper.selectById(abnormalBillLog.getHandle()) == null){ + //根据abnormalNo找到不合格代码组 + StringBuilder ncGroup = new StringBuilder(); + AbnormalNcCode abnormalNcCode = new AbnormalNcCode(); + abnormalNcCode.setAbnormalBillBo(abnormalBillLog.getHandle()); + + QueryWrapper abnormalNcCodeQueryWrapper = new QueryWrapper<>(); + abnormalNcCodeQueryWrapper.eq("ABNORMAL_BILL_BO",abnormalBillLog.getHandle()); + List abnormalNcCodes = abnormalNcCodeMapper.selectList(abnormalNcCodeQueryWrapper); + if(abnormalNcCodes != null && abnormalNcCodes.size() > 0){ + for(AbnormalNcCode abnormalNcGroup : abnormalNcCodes){ + ncGroup.append(abnormalNcGroup.getNcCodeGroup()).append(","); + } + } + List ncGroups =new ArrayList<>(); + if(!StringUtil.isBlank(ncGroup.toString().toString())){ + ncGroup = new StringBuilder(ncGroup.substring(0, ncGroup.length() - 1)); + List strings = Arrays.asList(ncGroup.toString().split(",")); + ncGroups.add(strings.get(0)); + for (int i = 1; i < strings.size(); i++) { + for(int j = 0; j < ncGroups.size(); j++){ + if(j == (ncGroups.size() - 1) && !ncGroups.get(j).equals(strings.get(i))){ + ncGroups.add(strings.get(i)); + } + if(ncGroups.get(j).equals(strings.get(i))){ + break; + } + } + } + } + ncGroup = new StringBuilder(); + for (int i = 0; i < ncGroups.size(); i++) { + if(i == (ncGroups.size() - 1)){ + ncGroup.append(ncGroups.get(i)); + }else{ + ncGroup.append(ncGroups.get(i)).append(","); + } + } + abnormalBillLog.setNcCodeGroup(ncGroup.toString()); + abnormalBillLog.setCreatedUser(user); + abnormalBillLog.setCreatedDataTime(now); + abnormalBillLog.setModifiedUser(user); + abnormalBillLog.setModifiedDateTime(now); + this.save(abnormalBillLog);; + } +// abnormalBillService.generateAbnormalBill(abnormalBill,abnormalBillDispose,dutyCauseType,dutyType); +// abnormalBillService.saveOrUpdate(abnormalBill); +// abnormalBillDisposeService.saveOrUpdate(abnormalBillDispose); + if(Constants.ABNORMAL_QUALITY.equals(abnormalBill.getType())){ + abnormalBillService.anomalyReport(abnormalBill,abnormalBillDispose,ncGroupAndNcCodes,dutyCauseType,dutyType); + } + } +} \ No newline at end of file diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalBillServiceImpl.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalBillServiceImpl.java index 16d911d7..78fed7c5 100644 --- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalBillServiceImpl.java +++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalBillServiceImpl.java @@ -99,6 +99,9 @@ public class AbnormalBillServiceImpl extends ServiceImpl selectPage(FrontPage frontPage, AbnormalBill abnormalBill) { QueryWrapper queryWrapper = new QueryWrapper<>(); @@ -399,10 +402,10 @@ public class AbnormalBillServiceImpl extends ServiceImpl causeTypes = new ArrayList<>(); //判断原因分类是否为空,如果不为空,把它放进Z_ABNORMAL_CAUSE表里面 if(dutyCauseType != null && dutyCauseType.size() >= 1){ @@ -440,6 +444,18 @@ public class AbnormalBillServiceImpl extends ServiceImpl operationQueryWrapper = new QueryWrapper(); + operationQueryWrapper.eq("OPERATION",abnormalBill.getOperation()) + .eq("SITE",site); + List operations = operationMapper.selectList(operationQueryWrapper); + if(operations == null || operations.size() == 0){ + throw BusinessException.build("工序编号传递错误"); + } + } /** * 判断设备传递的不良代码是否有误 diff --git a/anomaly/src/main/resources/mapper/AbnormalBillDisposeMapper.xml b/anomaly/src/main/resources/mapper/AbnormalBillDisposeMapper.xml index 4377b1b0..66104a46 100644 --- a/anomaly/src/main/resources/mapper/AbnormalBillDisposeMapper.xml +++ b/anomaly/src/main/resources/mapper/AbnormalBillDisposeMapper.xml @@ -37,6 +37,7 @@ + @@ -627,7 +628,7 @@ ZABD.DUTY_SEND_USER_GROUP DUTY_SEND_USER_GROUP,ZABD.DUTY_TYPE DUTY_TYPE,ZABD.PRINCIPAL_USER PRINCIPAL_USER,ZABD.ABNORMAL_METHOD ABNORMAL_METHOD, R.ROUTER ROUTER,ZABD.RESOLVE_SHOP_ORDER RESOLVE_SHOP_ORDER,ZABD.RESOLVE_REMARK RESOLVE_REMARK,ZABD.RESOLVE_SEND_USER RESOLVE_SEND_USER, ZABD.ABNORMAL_REASON ABNORMAL_REASON,ZABD.BEFORE_MEASURE BEFORE_MEASURE,"MAP".VALUE "MAP",listagg(ZANC.NC_CODE_GROUP || '/'||ZANC.NC_CODE || ',') within GROUP(ORDER BY zab.ABNORMAL_NO) NC_CODE, - ZABD.ROUTER_BO ROUTER_BO,ZAB.OPERATION OPERATION + ZABD.ROUTER_BO ROUTER_BO,ZAB.OPERATION OPERATION,I.HANDLE ITEM_BO FROM Z_ABNORMAL_BILL ZAB LEFT JOIN Z_ABNORMAL_BILL_DISPOSE ZABD ON ZAB.HANDLE = ZABD.ABNORMAL_BILL_BO INNER JOIN ITEM I ON I.HANDLE = ZAB.ITEM_BO @@ -662,8 +663,7 @@ ZAB.PB_PHOTOSHOP ,ZABD.DUTY_CAUSE_DESCRIPTION ,ZABD.DUTY_CAUSE_TYPE ,ZABD.DUTY_DEPART , ZABD.DUTY_SEND_USER_GROUP ,ZABD.DUTY_TYPE ,ZABD.PRINCIPAL_USER ,ZABD.ABNORMAL_METHOD , R.ROUTER ,ZABD.RESOLVE_SHOP_ORDER ,ZABD.RESOLVE_REMARK ,ZABD.RESOLVE_SEND_USER , - ZABD.ABNORMAL_REASON ,ZABD.BEFORE_MEASURE ,"MAP".VALUE,ZABD.ROUTER_BO,ZAB.OPERATION - + ZABD.ABNORMAL_REASON ,ZABD.BEFORE_MEASURE ,"MAP".VALUE,ZABD.ROUTER_BO,ZAB.OPERATION,I.HANDLE diff --git a/anomaly/src/main/resources/mapper/AbnormalBillLogMapper.xml b/anomaly/src/main/resources/mapper/AbnormalBillLogMapper.xml new file mode 100644 index 00000000..d619299b --- /dev/null +++ b/anomaly/src/main/resources/mapper/AbnormalBillLogMapper.xml @@ -0,0 +1,1166 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + HANDLE, SITE, ABNORMAL_NO, STATUS, TYPE, ITEM_BO, SFC, OPERATION, WORK_CENTER, SHOP_ORDER, MESSAGE_TYPE, RESRCE, NC_CODE, NC_CODE_GROUP, 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, DUTY_USER, DUTY_DATE_TIME, DUTY_DEPART, PRINCIPAL_USER, DUTY_CAUSE_DESCRIPTION, DUTY_CAUSE_TYPE, DUTY_TYPE, DUTY_SEND_USER_GROUP, RESOLVE_USER, RESOLVE_DATE_TIME, ABNORMAL_METHOD, ROUTER_BO, RESOLVE_SHOP_ORDER, RESOLVE_REMARK, RESOLVE_SEND_USER, CLOSED_USER, CLOSED_DATE_TIME, ABNORMAL_REASON, BEFORE_MEASURE, CREATED_USER, CREATED_DATA_TIME, MODIFIED_USER, MODIFIED_DATE_TIME + + + + + + + + + + + + + + + + + + + + + + + + + INSERT INTO Z_ABNORMAL_BILL_LOG + + HANDLE, + SITE, + ABNORMAL_NO, + STATUS, + TYPE, + ITEM_BO, + SFC, + OPERATION, + WORK_CENTER, + SHOP_ORDER, + MESSAGE_TYPE, + RESRCE, + NC_CODE, + NC_CODE_GROUP, + 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, + DUTY_USER, + DUTY_DATE_TIME, + DUTY_DEPART, + PRINCIPAL_USER, + DUTY_CAUSE_DESCRIPTION, + DUTY_CAUSE_TYPE, + DUTY_TYPE, + DUTY_SEND_USER_GROUP, + RESOLVE_USER, + RESOLVE_DATE_TIME, + ABNORMAL_METHOD, + ROUTER_BO, + RESOLVE_SHOP_ORDER, + RESOLVE_REMARK, + RESOLVE_SEND_USER, + CLOSED_USER, + CLOSED_DATE_TIME, + ABNORMAL_REASON, + BEFORE_MEASURE, + CREATED_USER, + CREATED_DATA_TIME, + MODIFIED_USER, + MODIFIED_DATE_TIME, + VALUES + + #{handle}, + #{site}, + #{abnormalNo}, + #{status}, + #{type}, + #{itemBo}, + #{sfc}, + #{operation}, + #{workCenter}, + #{shopOrder}, + #{messageType}, + #{resrce}, + #{ncCode}, + #{ncCodeGroup}, + #{shutDown}, + #{responseUser}, + #{responseDateTime}, + #{pbDescription}, + #{ncQty}, + #{pbGrade}, + #{pbUser}, + #{pbQty}, + #{repairDateTime}, + #{discover}, + #{inspector}, + #{entityLocation}, + #{reportFrom}, + #{objectBo}, + #{pbPhotoshop}, + #{cancelCode}, + #{cancelReason}, + #{cancelDateTime}, + #{cancelUser}, + #{dutyUser}, + #{dutyDateTime}, + #{dutyDepart}, + #{principalUser}, + #{dutyCauseDescription}, + #{dutyCauseType}, + #{dutyType}, + #{dutySendUserGroup}, + #{resolveUser}, + #{resolveDateTime}, + #{abnormalMethod}, + #{routerBo}, + #{resolveShopOrder}, + #{resolveRemark}, + #{resolveSendUser}, + #{closedUser}, + #{closedDateTime}, + #{abnormalReason}, + #{beforeMeasure}, + #{createdUser}, + #{createdDataTime}, + #{modifiedUser}, + #{modifiedDateTime}, + + + + + INSERT INTO Z_ABNORMAL_BILL_LOG + + + VALUES + + #{handle}, + #{site}, + #{abnormalNo}, + #{status}, + #{type}, + #{itemBo}, + #{sfc}, + #{operation}, + #{workCenter}, + #{shopOrder}, + #{messageType}, + #{resrce}, + #{ncCode}, + #{ncCodeGroup}, + #{shutDown}, + #{responseUser}, + #{responseDateTime}, + #{pbDescription}, + #{ncQty}, + #{pbGrade}, + #{pbUser}, + #{pbQty}, + #{repairDateTime}, + #{discover}, + #{inspector}, + #{entityLocation}, + #{reportFrom}, + #{objectBo}, + #{pbPhotoshop}, + #{cancelCode}, + #{cancelReason}, + #{cancelDateTime}, + #{cancelUser}, + #{dutyUser}, + #{dutyDateTime}, + #{dutyDepart}, + #{principalUser}, + #{dutyCauseDescription}, + #{dutyCauseType}, + #{dutyType}, + #{dutySendUserGroup}, + #{resolveUser}, + #{resolveDateTime}, + #{abnormalMethod}, + #{routerBo}, + #{resolveShopOrder}, + #{resolveRemark}, + #{resolveSendUser}, + #{closedUser}, + #{closedDateTime}, + #{abnormalReason}, + #{beforeMeasure}, + #{createdUser}, + #{createdDataTime}, + #{modifiedUser}, + #{modifiedDateTime}, + + + + + + UPDATE Z_ABNORMAL_BILL_LOG + SITE=#{et.site}, + ABNORMAL_NO=#{et.abnormalNo}, + STATUS=#{et.status}, + TYPE=#{et.type}, + ITEM_BO=#{et.itemBo}, + SFC=#{et.sfc}, + OPERATION=#{et.operation}, + WORK_CENTER=#{et.workCenter}, + SHOP_ORDER=#{et.shopOrder}, + MESSAGE_TYPE=#{et.messageType}, + RESRCE=#{et.resrce}, + NC_CODE=#{et.ncCode}, + NC_CODE_GROUP=#{et.ncCodeGroup}, + SHUT_DOWN=#{et.shutDown}, + RESPONSE_USER=#{et.responseUser}, + RESPONSE_DATE_TIME=#{et.responseDateTime}, + PB_DESCRIPTION=#{et.pbDescription}, + NC_QTY=#{et.ncQty}, + PB_GRADE=#{et.pbGrade}, + PB_USER=#{et.pbUser}, + PB_QTY=#{et.pbQty}, + REPAIR_DATE_TIME=#{et.repairDateTime}, + DISCOVER=#{et.discover}, + INSPECTOR=#{et.inspector}, + ENTITY_LOCATION=#{et.entityLocation}, + REPORT_FROM=#{et.reportFrom}, + OBJECT_BO=#{et.objectBo}, + PB_PHOTOSHOP=#{et.pbPhotoshop}, + CANCEL_CODE=#{et.cancelCode}, + CANCEL_REASON=#{et.cancelReason}, + CANCEL_DATE_TIME=#{et.cancelDateTime}, + CANCEL_USER=#{et.cancelUser}, + DUTY_USER=#{et.dutyUser}, + DUTY_DATE_TIME=#{et.dutyDateTime}, + DUTY_DEPART=#{et.dutyDepart}, + PRINCIPAL_USER=#{et.principalUser}, + DUTY_CAUSE_DESCRIPTION=#{et.dutyCauseDescription}, + DUTY_CAUSE_TYPE=#{et.dutyCauseType}, + DUTY_TYPE=#{et.dutyType}, + DUTY_SEND_USER_GROUP=#{et.dutySendUserGroup}, + RESOLVE_USER=#{et.resolveUser}, + RESOLVE_DATE_TIME=#{et.resolveDateTime}, + ABNORMAL_METHOD=#{et.abnormalMethod}, + ROUTER_BO=#{et.routerBo}, + RESOLVE_SHOP_ORDER=#{et.resolveShopOrder}, + RESOLVE_REMARK=#{et.resolveRemark}, + RESOLVE_SEND_USER=#{et.resolveSendUser}, + CLOSED_USER=#{et.closedUser}, + CLOSED_DATE_TIME=#{et.closedDateTime}, + ABNORMAL_REASON=#{et.abnormalReason}, + BEFORE_MEASURE=#{et.beforeMeasure}, + CREATED_USER=#{et.createdUser}, + CREATED_DATA_TIME=#{et.createdDataTime}, + MODIFIED_USER=#{et.modifiedUser}, + MODIFIED_DATE_TIME=#{et.modifiedDateTime}, + WHERE HANDLE=#{et.handle} and ${et.MP_OPTLOCK_VERSION_COLUMN}=#{et.MP_OPTLOCK_VERSION_ORIGINAL} + + + + + UPDATE Z_ABNORMAL_BILL_LOG + SITE=#{et.site}, + ABNORMAL_NO=#{et.abnormalNo}, + STATUS=#{et.status}, + TYPE=#{et.type}, + ITEM_BO=#{et.itemBo}, + SFC=#{et.sfc}, + OPERATION=#{et.operation}, + WORK_CENTER=#{et.workCenter}, + SHOP_ORDER=#{et.shopOrder}, + MESSAGE_TYPE=#{et.messageType}, + RESRCE=#{et.resrce}, + NC_CODE=#{et.ncCode}, + NC_CODE_GROUP=#{et.ncCodeGroup}, + SHUT_DOWN=#{et.shutDown}, + RESPONSE_USER=#{et.responseUser}, + RESPONSE_DATE_TIME=#{et.responseDateTime}, + PB_DESCRIPTION=#{et.pbDescription}, + NC_QTY=#{et.ncQty}, + PB_GRADE=#{et.pbGrade}, + PB_USER=#{et.pbUser}, + PB_QTY=#{et.pbQty}, + REPAIR_DATE_TIME=#{et.repairDateTime}, + DISCOVER=#{et.discover}, + INSPECTOR=#{et.inspector}, + ENTITY_LOCATION=#{et.entityLocation}, + REPORT_FROM=#{et.reportFrom}, + OBJECT_BO=#{et.objectBo}, + PB_PHOTOSHOP=#{et.pbPhotoshop}, + CANCEL_CODE=#{et.cancelCode}, + CANCEL_REASON=#{et.cancelReason}, + CANCEL_DATE_TIME=#{et.cancelDateTime}, + CANCEL_USER=#{et.cancelUser}, + DUTY_USER=#{et.dutyUser}, + DUTY_DATE_TIME=#{et.dutyDateTime}, + DUTY_DEPART=#{et.dutyDepart}, + PRINCIPAL_USER=#{et.principalUser}, + DUTY_CAUSE_DESCRIPTION=#{et.dutyCauseDescription}, + DUTY_CAUSE_TYPE=#{et.dutyCauseType}, + DUTY_TYPE=#{et.dutyType}, + DUTY_SEND_USER_GROUP=#{et.dutySendUserGroup}, + RESOLVE_USER=#{et.resolveUser}, + RESOLVE_DATE_TIME=#{et.resolveDateTime}, + ABNORMAL_METHOD=#{et.abnormalMethod}, + ROUTER_BO=#{et.routerBo}, + RESOLVE_SHOP_ORDER=#{et.resolveShopOrder}, + RESOLVE_REMARK=#{et.resolveRemark}, + RESOLVE_SEND_USER=#{et.resolveSendUser}, + CLOSED_USER=#{et.closedUser}, + CLOSED_DATE_TIME=#{et.closedDateTime}, + ABNORMAL_REASON=#{et.abnormalReason}, + BEFORE_MEASURE=#{et.beforeMeasure}, + CREATED_USER=#{et.createdUser}, + CREATED_DATA_TIME=#{et.createdDataTime}, + MODIFIED_USER=#{et.modifiedUser}, + MODIFIED_DATE_TIME=#{et.modifiedDateTime}, + WHERE HANDLE=#{et.handle} and ${et.MP_OPTLOCK_VERSION_COLUMN}=#{et.MP_OPTLOCK_VERSION_ORIGINAL} + + + + + UPDATE Z_ABNORMAL_BILL_LOG + SITE=#{et.site}, + ABNORMAL_NO=#{et.abnormalNo}, + STATUS=#{et.status}, + TYPE=#{et.type}, + ITEM_BO=#{et.itemBo}, + SFC=#{et.sfc}, + OPERATION=#{et.operation}, + WORK_CENTER=#{et.workCenter}, + SHOP_ORDER=#{et.shopOrder}, + MESSAGE_TYPE=#{et.messageType}, + RESRCE=#{et.resrce}, + NC_CODE=#{et.ncCode}, + NC_CODE_GROUP=#{et.ncCodeGroup}, + SHUT_DOWN=#{et.shutDown}, + RESPONSE_USER=#{et.responseUser}, + RESPONSE_DATE_TIME=#{et.responseDateTime}, + PB_DESCRIPTION=#{et.pbDescription}, + NC_QTY=#{et.ncQty}, + PB_GRADE=#{et.pbGrade}, + PB_USER=#{et.pbUser}, + PB_QTY=#{et.pbQty}, + REPAIR_DATE_TIME=#{et.repairDateTime}, + DISCOVER=#{et.discover}, + INSPECTOR=#{et.inspector}, + ENTITY_LOCATION=#{et.entityLocation}, + REPORT_FROM=#{et.reportFrom}, + OBJECT_BO=#{et.objectBo}, + PB_PHOTOSHOP=#{et.pbPhotoshop}, + CANCEL_CODE=#{et.cancelCode}, + CANCEL_REASON=#{et.cancelReason}, + CANCEL_DATE_TIME=#{et.cancelDateTime}, + CANCEL_USER=#{et.cancelUser}, + DUTY_USER=#{et.dutyUser}, + DUTY_DATE_TIME=#{et.dutyDateTime}, + DUTY_DEPART=#{et.dutyDepart}, + PRINCIPAL_USER=#{et.principalUser}, + DUTY_CAUSE_DESCRIPTION=#{et.dutyCauseDescription}, + DUTY_CAUSE_TYPE=#{et.dutyCauseType}, + DUTY_TYPE=#{et.dutyType}, + DUTY_SEND_USER_GROUP=#{et.dutySendUserGroup}, + RESOLVE_USER=#{et.resolveUser}, + RESOLVE_DATE_TIME=#{et.resolveDateTime}, + ABNORMAL_METHOD=#{et.abnormalMethod}, + ROUTER_BO=#{et.routerBo}, + RESOLVE_SHOP_ORDER=#{et.resolveShopOrder}, + RESOLVE_REMARK=#{et.resolveRemark}, + RESOLVE_SEND_USER=#{et.resolveSendUser}, + CLOSED_USER=#{et.closedUser}, + CLOSED_DATE_TIME=#{et.closedDateTime}, + ABNORMAL_REASON=#{et.abnormalReason}, + BEFORE_MEASURE=#{et.beforeMeasure}, + CREATED_USER=#{et.createdUser}, + CREATED_DATA_TIME=#{et.createdDataTime}, + MODIFIED_USER=#{et.modifiedUser}, + MODIFIED_DATE_TIME=#{et.modifiedDateTime}, + + + + + HANDLE=#{ew.entity.handle} + AND SITE=#{ew.entity.site} + AND ABNORMAL_NO=#{ew.entity.abnormalNo} + AND STATUS=#{ew.entity.status} + AND TYPE=#{ew.entity.type} + AND ITEM_BO=#{ew.entity.itemBo} + AND SFC=#{ew.entity.sfc} + AND OPERATION=#{ew.entity.operation} + AND WORK_CENTER=#{ew.entity.workCenter} + AND SHOP_ORDER=#{ew.entity.shopOrder} + AND MESSAGE_TYPE=#{ew.entity.messageType} + AND RESRCE=#{ew.entity.resrce} + AND NC_CODE=#{ew.entity.ncCode} + AND NC_CODE_GROUP=#{ew.entity.ncCodeGroup} + AND SHUT_DOWN=#{ew.entity.shutDown} + AND RESPONSE_USER=#{ew.entity.responseUser} + AND RESPONSE_DATE_TIME=#{ew.entity.responseDateTime} + AND PB_DESCRIPTION=#{ew.entity.pbDescription} + AND NC_QTY=#{ew.entity.ncQty} + AND PB_GRADE=#{ew.entity.pbGrade} + AND PB_USER=#{ew.entity.pbUser} + AND PB_QTY=#{ew.entity.pbQty} + AND REPAIR_DATE_TIME=#{ew.entity.repairDateTime} + AND DISCOVER=#{ew.entity.discover} + AND INSPECTOR=#{ew.entity.inspector} + AND ENTITY_LOCATION=#{ew.entity.entityLocation} + AND REPORT_FROM=#{ew.entity.reportFrom} + AND OBJECT_BO=#{ew.entity.objectBo} + AND PB_PHOTOSHOP=#{ew.entity.pbPhotoshop} + AND CANCEL_CODE=#{ew.entity.cancelCode} + AND CANCEL_REASON=#{ew.entity.cancelReason} + AND CANCEL_DATE_TIME=#{ew.entity.cancelDateTime} + AND CANCEL_USER=#{ew.entity.cancelUser} + AND DUTY_USER=#{ew.entity.dutyUser} + AND DUTY_DATE_TIME=#{ew.entity.dutyDateTime} + AND DUTY_DEPART=#{ew.entity.dutyDepart} + AND PRINCIPAL_USER=#{ew.entity.principalUser} + AND DUTY_CAUSE_DESCRIPTION=#{ew.entity.dutyCauseDescription} + AND DUTY_CAUSE_TYPE=#{ew.entity.dutyCauseType} + AND DUTY_TYPE=#{ew.entity.dutyType} + AND DUTY_SEND_USER_GROUP=#{ew.entity.dutySendUserGroup} + AND RESOLVE_USER=#{ew.entity.resolveUser} + AND RESOLVE_DATE_TIME=#{ew.entity.resolveDateTime} + AND ABNORMAL_METHOD=#{ew.entity.abnormalMethod} + AND ROUTER_BO=#{ew.entity.routerBo} + AND RESOLVE_SHOP_ORDER=#{ew.entity.resolveShopOrder} + AND RESOLVE_REMARK=#{ew.entity.resolveRemark} + AND RESOLVE_SEND_USER=#{ew.entity.resolveSendUser} + AND CLOSED_USER=#{ew.entity.closedUser} + AND CLOSED_DATE_TIME=#{ew.entity.closedDateTime} + AND ABNORMAL_REASON=#{ew.entity.abnormalReason} + AND BEFORE_MEASURE=#{ew.entity.beforeMeasure} + AND CREATED_USER=#{ew.entity.createdUser} + AND CREATED_DATA_TIME=#{ew.entity.createdDataTime} + AND MODIFIED_USER=#{ew.entity.modifiedUser} + AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime} + + + ${ew.sqlSegment} + + + + + ${ew.sqlSegment} + + + + + DELETE FROM Z_ABNORMAL_BILL_LOG WHERE HANDLE=#{handle} + + + + DELETE FROM Z_ABNORMAL_BILL_LOG + + + + + ${k} = #{cm[${k}]} + + + + + + + + DELETE FROM Z_ABNORMAL_BILL_LOG + + + + + HANDLE=#{ew.entity.handle} + + AND SITE=#{ew.entity.site} + AND ABNORMAL_NO=#{ew.entity.abnormalNo} + AND STATUS=#{ew.entity.status} + AND TYPE=#{ew.entity.type} + AND ITEM_BO=#{ew.entity.itemBo} + AND SFC=#{ew.entity.sfc} + AND OPERATION=#{ew.entity.operation} + AND WORK_CENTER=#{ew.entity.workCenter} + AND SHOP_ORDER=#{ew.entity.shopOrder} + AND MESSAGE_TYPE=#{ew.entity.messageType} + AND RESRCE=#{ew.entity.resrce} + AND NC_CODE=#{ew.entity.ncCode} + AND NC_CODE_GROUP=#{ew.entity.ncCodeGroup} + AND SHUT_DOWN=#{ew.entity.shutDown} + AND RESPONSE_USER=#{ew.entity.responseUser} + AND RESPONSE_DATE_TIME=#{ew.entity.responseDateTime} + AND PB_DESCRIPTION=#{ew.entity.pbDescription} + AND NC_QTY=#{ew.entity.ncQty} + AND PB_GRADE=#{ew.entity.pbGrade} + AND PB_USER=#{ew.entity.pbUser} + AND PB_QTY=#{ew.entity.pbQty} + AND REPAIR_DATE_TIME=#{ew.entity.repairDateTime} + AND DISCOVER=#{ew.entity.discover} + AND INSPECTOR=#{ew.entity.inspector} + AND ENTITY_LOCATION=#{ew.entity.entityLocation} + AND REPORT_FROM=#{ew.entity.reportFrom} + AND OBJECT_BO=#{ew.entity.objectBo} + AND PB_PHOTOSHOP=#{ew.entity.pbPhotoshop} + AND CANCEL_CODE=#{ew.entity.cancelCode} + AND CANCEL_REASON=#{ew.entity.cancelReason} + AND CANCEL_DATE_TIME=#{ew.entity.cancelDateTime} + AND CANCEL_USER=#{ew.entity.cancelUser} + AND DUTY_USER=#{ew.entity.dutyUser} + AND DUTY_DATE_TIME=#{ew.entity.dutyDateTime} + AND DUTY_DEPART=#{ew.entity.dutyDepart} + AND PRINCIPAL_USER=#{ew.entity.principalUser} + AND DUTY_CAUSE_DESCRIPTION=#{ew.entity.dutyCauseDescription} + AND DUTY_CAUSE_TYPE=#{ew.entity.dutyCauseType} + AND DUTY_TYPE=#{ew.entity.dutyType} + AND DUTY_SEND_USER_GROUP=#{ew.entity.dutySendUserGroup} + AND RESOLVE_USER=#{ew.entity.resolveUser} + AND RESOLVE_DATE_TIME=#{ew.entity.resolveDateTime} + AND ABNORMAL_METHOD=#{ew.entity.abnormalMethod} + AND ROUTER_BO=#{ew.entity.routerBo} + AND RESOLVE_SHOP_ORDER=#{ew.entity.resolveShopOrder} + AND RESOLVE_REMARK=#{ew.entity.resolveRemark} + AND RESOLVE_SEND_USER=#{ew.entity.resolveSendUser} + AND CLOSED_USER=#{ew.entity.closedUser} + AND CLOSED_DATE_TIME=#{ew.entity.closedDateTime} + AND ABNORMAL_REASON=#{ew.entity.abnormalReason} + AND BEFORE_MEASURE=#{ew.entity.beforeMeasure} + AND CREATED_USER=#{ew.entity.createdUser} + AND CREATED_DATA_TIME=#{ew.entity.createdDataTime} + AND MODIFIED_USER=#{ew.entity.modifiedUser} + AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime} + + + ${ew.sqlSegment} + + + + + ${ew.sqlSegment} + + + + + DELETE FROM Z_ABNORMAL_BILL_LOG WHERE HANDLE IN ( + #{item} + ) + + + +