Merge branch 'master' of https://gitee.com/forever_win/mesnac.biz
Leon
4 years ago
commit
e0fd7a8dcb
@ -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<AbnormalBillLog> result;
|
||||
QueryWrapper<AbnormalBillLog> queryWrapper = new QueryWrapper<>();
|
||||
queryWrapper.setEntity(abnormalBillLog);
|
||||
result = abnormalBillLogService.list(queryWrapper);
|
||||
return R.ok(result);
|
||||
}
|
||||
|
||||
/**
|
||||
* 分页查询数据
|
||||
*
|
||||
* @param frontPage 分页信息
|
||||
* @return
|
||||
*/
|
||||
@ResponseBody
|
||||
@GetMapping("/page")
|
||||
public R page(FrontPage<AbnormalBillLog> frontPage, AbnormalBillLog abnormalBillLog){
|
||||
IPage result;
|
||||
QueryWrapper<AbnormalBillLog> 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<String> ids){
|
||||
return R.ok(abnormalBillLogService.removeByIds(ids));
|
||||
}
|
||||
|
||||
@GetMapping("saveAndUpdate")
|
||||
public R saveAndUpdate(AbnormalBill abnormalBill,
|
||||
AbnormalBillDispose abnormalBillDispose,
|
||||
@RequestParam List<String> ncGroupAndNcCodes,
|
||||
@RequestParam List<String> dutyCauseType,
|
||||
@RequestParam List<String> dutyType){
|
||||
abnormalBillLogService.saveAndUpdate(abnormalBill,abnormalBillDispose,ncGroupAndNcCodes,dutyCauseType,dutyType);
|
||||
return R.ok();
|
||||
}
|
||||
}
|
||||
@ -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;
|
||||
|
||||
/**
|
||||
* <p>
|
||||
* 异常单记录表 Mapper 接口
|
||||
* </p>
|
||||
*
|
||||
* @author 赵嘉伟
|
||||
* @since 2021-07-16
|
||||
*/
|
||||
@Repository
|
||||
public interface AbnormalBillLogMapper extends BaseMapper<AbnormalBillLog> {
|
||||
|
||||
AbnormalBillLog findAllByAbnormalNo(@Param("abnormalBill") AbnormalBill abnormalBill);
|
||||
|
||||
}
|
||||
@ -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;
|
||||
|
||||
/**
|
||||
* <p>
|
||||
* 异常单记录表
|
||||
* </p>
|
||||
*
|
||||
* @author 赵嘉伟
|
||||
* @since 2021-07-16
|
||||
*/
|
||||
|
||||
@TableName("Z_ABNORMAL_BILL_LOG")
|
||||
|
||||
public class AbnormalBillLog extends Model<AbnormalBillLog> {
|
||||
|
||||
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 +
|
||||
"}";
|
||||
}
|
||||
}
|
||||
@ -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;
|
||||
|
||||
/**
|
||||
* <p>
|
||||
* 异常单记录表 服务类
|
||||
* </p>
|
||||
*
|
||||
* @author 赵嘉伟
|
||||
* @since 2021-07-16
|
||||
*/
|
||||
public interface AbnormalBillLogService extends IService<AbnormalBillLog> {
|
||||
|
||||
/**
|
||||
* 分页查询
|
||||
* @param frontPage
|
||||
* @return
|
||||
*/
|
||||
IPage<AbnormalBillLog> selectPage(FrontPage<AbnormalBillLog> frontPage, AbnormalBillLog abnormalBillLog);
|
||||
|
||||
List<AbnormalBillLog> selectList(AbnormalBillLog abnormalBillLog);
|
||||
|
||||
void saveAndUpdate(AbnormalBill abnormalBill,
|
||||
AbnormalBillDispose abnormalBillDispose,
|
||||
@RequestParam List<String> ncGroupAndNcCodes,
|
||||
@RequestParam List<String> dutyCauseType,
|
||||
@RequestParam List<String> dutyType);
|
||||
|
||||
|
||||
}
|
||||
@ -0,0 +1,175 @@
|
||||
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.enums.HandleEnum;
|
||||
import com.foreverwin.mesnac.common.util.StringUtil;
|
||||
import com.foreverwin.mesnac.meapi.mapper.NwaUserMapper;
|
||||
import com.foreverwin.mesnac.meapi.mapper.ShopOrderMapper;
|
||||
import com.foreverwin.mesnac.meapi.model.Router;
|
||||
import com.foreverwin.mesnac.meapi.model.ShopOrder;
|
||||
import com.foreverwin.mesnac.meapi.service.RouterService;
|
||||
import com.foreverwin.modular.core.exception.BusinessException;
|
||||
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;
|
||||
/**
|
||||
* <p>
|
||||
* 异常单记录表 服务实现类
|
||||
* </p>
|
||||
*
|
||||
* @author 赵嘉伟
|
||||
* @since 2021-07-16
|
||||
*/
|
||||
@Service
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public class AbnormalBillLogServiceImpl extends ServiceImpl<AbnormalBillLogMapper, AbnormalBillLog> implements AbnormalBillLogService {
|
||||
|
||||
|
||||
@Autowired
|
||||
private AbnormalBillLogMapper abnormalBillLogMapper;
|
||||
|
||||
@Autowired
|
||||
private AbnormalNcCodeService abnormalNcCodeService;
|
||||
|
||||
@Autowired
|
||||
private AbnormalNcCodeMapper abnormalNcCodeMapper;
|
||||
|
||||
@Autowired
|
||||
private AbnormalBillService abnormalBillService;
|
||||
|
||||
@Autowired
|
||||
private AbnormalBillDisposeService abnormalBillDisposeService;
|
||||
|
||||
@Autowired
|
||||
private RouterService routerService;
|
||||
|
||||
@Autowired
|
||||
private NwaUserMapper nwaUserMapper;
|
||||
|
||||
@Autowired
|
||||
private ShopOrderMapper shopOrderMapper;
|
||||
|
||||
@Override
|
||||
public IPage<AbnormalBillLog> selectPage(FrontPage<AbnormalBillLog> frontPage, AbnormalBillLog abnormalBillLog) {
|
||||
QueryWrapper<AbnormalBillLog> queryWrapper = new QueryWrapper<>();
|
||||
queryWrapper.setEntity(abnormalBillLog);
|
||||
return super.page(frontPage.getPagePlus(), queryWrapper);
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<AbnormalBillLog> selectList(AbnormalBillLog abnormalBillLog) {
|
||||
QueryWrapper<AbnormalBillLog> queryWrapper = new QueryWrapper<>();
|
||||
queryWrapper.setEntity(abnormalBillLog);
|
||||
return super.list(queryWrapper);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void saveAndUpdate(AbnormalBill abnormalBill, AbnormalBillDispose abnormalBillDispose, List<String> ncGroupAndNcCodes, List<String> dutyCauseType, List<String> dutyType) {
|
||||
String user = CommonMethods.getUser();
|
||||
LocalDateTime now = LocalDateTime.now();
|
||||
String site = CommonMethods.getSite();
|
||||
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<AbnormalNcCode> abnormalNcCodeQueryWrapper = new QueryWrapper<>();
|
||||
abnormalNcCodeQueryWrapper.eq("ABNORMAL_BILL_BO",abnormalBillLog.getHandle());
|
||||
List<AbnormalNcCode> abnormalNcCodes = abnormalNcCodeMapper.selectList(abnormalNcCodeQueryWrapper);
|
||||
if(abnormalNcCodes != null && abnormalNcCodes.size() > 0){
|
||||
for(AbnormalNcCode abnormalNcGroup : abnormalNcCodes){
|
||||
ncGroup.append(abnormalNcGroup.getNcCodeGroup()).append(",");
|
||||
}
|
||||
}
|
||||
List<String> ncGroups =new ArrayList<>();
|
||||
if(!StringUtil.isBlank(ncGroup.toString().toString())){
|
||||
ncGroup = new StringBuilder(ncGroup.substring(0, ncGroup.length() - 1));
|
||||
List<String> 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);;
|
||||
}
|
||||
if(!StringUtil.isBlank(abnormalBillDispose.getRouterBo())){
|
||||
//分割该工艺路线
|
||||
String[] routerSplit = abnormalBillDispose.getRouterBo().split(",");
|
||||
//判断该返修工艺是否正确
|
||||
Router router = new Router();
|
||||
router.setSite(site);
|
||||
router.setRouter(routerSplit[1]);
|
||||
router.setRouterType(routerSplit[2]);
|
||||
router.setCurrentRevision("true");
|
||||
List<Router> routers = routerService.selectList(router);
|
||||
if(routers == null || routers.size() == 0){
|
||||
throw BusinessException.build("该返修工艺不存在");
|
||||
}
|
||||
}
|
||||
//判断返修工单是否正确
|
||||
if(!StringUtil.isBlank(abnormalBillDispose.getResolveShopOrder())){
|
||||
ShopOrder shopOrder = shopOrderMapper.selectById(HandleEnum.SHOP_ORDER.getHandle(site, abnormalBillDispose.getResolveShopOrder()));
|
||||
if(shopOrder == null){
|
||||
throw BusinessException.build("该返修工单不存在");
|
||||
}
|
||||
}
|
||||
//发送用户
|
||||
String[] split = abnormalBillDispose.getResolveSendUser().split(",");
|
||||
List<String> strings = Arrays.asList(split);
|
||||
int length = nwaUserMapper.checkUser(site, strings);
|
||||
if(length != strings.size()){
|
||||
throw BusinessException.build("发送用户填报错误");
|
||||
}
|
||||
|
||||
|
||||
|
||||
if(Constants.ABNORMAL_QUALITY.equals(abnormalBill.getType())){
|
||||
abnormalBillService.anomalyReport(abnormalBill,abnormalBillDispose,ncGroupAndNcCodes,dutyCauseType,dutyType);
|
||||
}else if(Constants.ABNORMAL_OTHER.equals(abnormalBill.getType())){
|
||||
abnormalBillService.anomalyReportOther(abnormalBill,abnormalBillDispose,dutyCauseType,dutyType);
|
||||
}
|
||||
}
|
||||
}
|
||||
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue