Leon 4 years ago
commit e7bbf36535

@ -174,7 +174,7 @@ public class AbnormalBillController {
String site = CommonMethods.getSite();
//消息类型
if(!StringUtil.isBlank(messageType)){
List<NcCode> ncByNG = ncCodeService.findNcByNG(messageType);
List<NcCode> ncByNG = ncCodeService.findNcByNG(messageType,null);
hashMap.put("ncByNG",ncByNG);
}
@ -264,4 +264,9 @@ public class AbnormalBillController {
return R.ok(abnormalBillService.backLog(abnormalBillDto));
}
@GetMapping("/findAllByAbnormalNo")
public R findAllByAbnormalNo(AbnormalBill abnormalBill){
return R.ok(abnormalBillService.findAllByAbnormalNo(abnormalBill));
}
}

@ -0,0 +1,353 @@
package com.foreverwin.mesnac.anomaly.dto;
import com.foreverwin.mesnac.anomaly.model.AbnormalBillDispose;
import java.util.List;
/**
* @Description
* @Author zhaojiawei
* @Since 2021-07-06
*/
public class AbnormalBillDisposeDto extends AbnormalBillDispose {
/**
*
*/
private String abnormalNo;
/**
*
*/
private String status;
/**
*
*/
private String item;
/**
*
*/
private String itemDescription;
/**
*
*/
private String type;
/**
*
*/
private String sfc;
/**
*
*/
private String messageType;
/**
*
*/
private String shopOrder;
/**
*
*/
private String workCenter;
/**
*
*/
private String resrce;
/**
*
*/
private String workOrder;
/**
*
*/
private String itemNumber;
/**
*
*/
private String productCategory;
/**
*
*/
private String map;
/**
*
*/
private List<String> ncCode;
/**
*
*/
private String pbDescription;
/**
*
*/
private String ncQty;
/**
*
*/
private String pbGrade;
/**
*
*/
private String pbUser;
/**
*
*/
private String pbQty;
/**
*
*/
private String discover;
/**
*
*/
private String inspector;
/**
*
*/
private String entityLocation;
/**
*
*/
private String reportFrom;
/**
*
*/
private String objectBo;
/**
*
*/
private String pbPhotoShop;
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 getItem() {
return item;
}
public void setItem(String item) {
this.item = item;
}
public String getItemDescription() {
return itemDescription;
}
public void setItemDescription(String itemDescription) {
this.itemDescription = itemDescription;
}
public String getType() {
return type;
}
public void setType(String type) {
this.type = type;
}
public String getSfc() {
return sfc;
}
public void setSfc(String sfc) {
this.sfc = sfc;
}
public String getMessageType() {
return messageType;
}
public void setMessageType(String messageType) {
this.messageType = messageType;
}
public String getShopOrder() {
return shopOrder;
}
public void setShopOrder(String shopOrder) {
this.shopOrder = shopOrder;
}
public String getWorkCenter() {
return workCenter;
}
public void setWorkCenter(String workCenter) {
this.workCenter = workCenter;
}
public String getResrce() {
return resrce;
}
public void setResrce(String resrce) {
this.resrce = resrce;
}
public String getWorkOrder() {
return workOrder;
}
public void setWorkOrder(String workOrder) {
this.workOrder = workOrder;
}
public String getItemNumber() {
return itemNumber;
}
public void setItemNumber(String itemNumber) {
this.itemNumber = itemNumber;
}
public String getProductCategory() {
return productCategory;
}
public void setProductCategory(String productCategory) {
this.productCategory = productCategory;
}
public String getMap() {
return map;
}
public void setMap(String map) {
this.map = map;
}
public List<String> getNcCode() {
return ncCode;
}
public void setNcCode(List<String> ncCode) {
this.ncCode = ncCode;
}
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 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;
}
}

@ -14,11 +14,11 @@ public class AbnormalBillDto extends AbnormalBill {
/**
* seq
*/
String seq;
private String seq;
/**
*
*/
String itemDescription;
private String itemDescription;
/**
*

@ -1,7 +1,10 @@
package com.foreverwin.mesnac.anomaly.mapper;
import com.foreverwin.mesnac.anomaly.model.AbnormalBillDispose;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.foreverwin.mesnac.anomaly.dto.AbnormalBillDisposeDto;
import com.foreverwin.mesnac.anomaly.model.AbnormalBill;
import com.foreverwin.mesnac.anomaly.model.AbnormalBillDispose;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
/**
@ -15,4 +18,7 @@ import org.springframework.stereotype.Repository;
@Repository
public interface AbnormalBillDisposeMapper extends BaseMapper<AbnormalBillDispose> {
AbnormalBillDisposeDto findAllByAbnormalNo(@Param("abnormalBill") AbnormalBill abnormalBill, @Param("language")String language);
}

@ -19,4 +19,5 @@ import java.util.List;
@Repository
public interface AbnormalBillMapper extends BaseMapper<AbnormalBill> {
List<AbnormalBillDto> backLog(@Param("abnormalBill")AbnormalBillDto abnormalBillDto, @Param("language")String language);
}

@ -2,6 +2,7 @@ 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.dto.AbnormalBillDisposeDto;
import com.foreverwin.mesnac.anomaly.dto.AbnormalBillDto;
import com.foreverwin.mesnac.anomaly.model.AbnormalBill;
import com.foreverwin.mesnac.anomaly.model.AbnormalBillDispose;
@ -57,4 +58,9 @@ public interface AbnormalBillService extends IService<AbnormalBill> {
*/
List<AbnormalBillDto> backLog(AbnormalBillDto abnormalBillDto);
/**
* **
*/
AbnormalBillDisposeDto findAllByAbnormalNo(AbnormalBill abnormalBill);
}

@ -3,7 +3,9 @@ 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.dto.AbnormalBillDisposeDto;
import com.foreverwin.mesnac.anomaly.dto.AbnormalBillDto;
import com.foreverwin.mesnac.anomaly.mapper.AbnormalBillDisposeMapper;
import com.foreverwin.mesnac.anomaly.mapper.AbnormalBillMapper;
import com.foreverwin.mesnac.anomaly.model.*;
import com.foreverwin.mesnac.anomaly.service.*;
@ -12,8 +14,10 @@ import com.foreverwin.mesnac.common.helper.NextNumberHelper;
import com.foreverwin.mesnac.common.util.StringUtil;
import com.foreverwin.mesnac.meapi.mapper.NcGroupMapper;
import com.foreverwin.mesnac.meapi.mapper.ResrceMapper;
import com.foreverwin.mesnac.meapi.model.NcCode;
import com.foreverwin.mesnac.meapi.model.NcGroup;
import com.foreverwin.mesnac.meapi.model.Resrce;
import com.foreverwin.mesnac.meapi.service.NcCodeService;
import com.foreverwin.mesnac.meapi.service.NwaUserService;
import com.foreverwin.modular.core.exception.BusinessException;
import com.foreverwin.modular.core.util.CommonMethods;
@ -60,6 +64,9 @@ public class AbnormalBillServiceImpl extends ServiceImpl<AbnormalBillMapper, Abn
@Autowired
private NwaUserService nwaUserService;
@Autowired
private NcCodeService ncCodeService;
@Autowired
private AbnormalNcCodeService abnormalNcCodeService;
@ -69,6 +76,9 @@ public class AbnormalBillServiceImpl extends ServiceImpl<AbnormalBillMapper, Abn
@Autowired
private AbnormalDutyService abnormalDutyService;
@Autowired
private AbnormalBillDisposeMapper abnormalBillDisposeMapper;
@Override
public IPage<AbnormalBill> selectPage(FrontPage<AbnormalBill> frontPage, AbnormalBill abnormalBill) {
QueryWrapper<AbnormalBill> queryWrapper = new QueryWrapper<>();
@ -152,6 +162,11 @@ public class AbnormalBillServiceImpl extends ServiceImpl<AbnormalBillMapper, Abn
@Override
public String anomalyReportDevice(AbnormalBill abnormalBill,AbnormalBillDispose abnormalBillDispose) {
this.generateAbnormalBill(abnormalBill,abnormalBillDispose,null,null);
List<NcCode> ncByNG = ncCodeService.findNcByNG(abnormalBill.getMessageType(), abnormalBill.getNcCode());
if(ncByNG == null || ncByNG.size() <= 0){
throw BusinessException.build("该消息类型下没有该不良代码");
}
this.saveOrUpdate(abnormalBill);
abnormalBillDisposeService.saveOrUpdate(abnormalBillDispose);
return abnormalBill.getAbnormalNo();
@ -164,6 +179,18 @@ public class AbnormalBillServiceImpl extends ServiceImpl<AbnormalBillMapper, Abn
}
@Override
public AbnormalBillDisposeDto findAllByAbnormalNo(AbnormalBill abnormalBill) {
String site = CommonMethods.getSite();
String local=LocaleContextHolder.getLocale().getLanguage();
abnormalBill.setSite(site);
if(StringUtil.isEmpty(abnormalBill.getAbnormalNo())){
return null;
}
return abnormalBillDisposeMapper.findAllByAbnormalNo(abnormalBill,local);
}
@Override
public void generateAbnormalBill(AbnormalBill abnormalBill, AbnormalBillDispose abnormalBillDispose,List<String> dutyCauseType,List<String> dutyType) {
String site = CommonMethods.getSite();
@ -255,7 +282,7 @@ public class AbnormalBillServiceImpl extends ServiceImpl<AbnormalBillMapper, Abn
abnormalBillDispose.setModifiedUser(user);
//判断SFC、设备编号、消息类型是否不正确或为空
if(StringUtil.isBlank(abnormalBill.getSfc()) && "S".equals(abnormalBill.getType())){
if(StringUtil.isBlank(abnormalBill.getSfc()) && !"S".equals(abnormalBill.getType())){
throw BusinessException.build("产品条码不能为空");
}
if(StringUtil.isBlank(abnormalBill.getResrce())){
@ -303,6 +330,7 @@ public class AbnormalBillServiceImpl extends ServiceImpl<AbnormalBillMapper, Abn
abnormalBill.setCancelReason(cancelBrowse);
abnormalBill.setCancelUser(CommonMethods.getUser());
abnormalBill.setCancelDateTime(now);
this.saveOrUpdate(abnormalBill);
}
}

@ -32,6 +32,35 @@
<result column="MODIFIED_DATE_TIME" property="modifiedDateTime" />
</resultMap>
<!--异常响应界面检索用-->
<resultMap id="AbnormalBillDisposeDto" type="com.foreverwin.mesnac.anomaly.dto.AbnormalBillDisposeDto" extends="BaseResultMap">
<result column="ABNORMAL_NO" property="abnormalNo"/>
<result column="STATUS" property="status"/>
<result column="ITEM" property="item"/>
<result column="ITEM_DESCRIPTION" property="itemDescription"/>
<result column="TYPE" property="type"/>
<result column="SFC" property="sfc"/>
<result column="MESSAGE_TYPE" property="messageType"/>
<result column="SHOP_ORDER" property="shopOrder"/>
<result column="WORK_CENTER" property="workCenter"/>
<result column="RESRCE" property="resrce"/>
<result column="WORK_ORDER" property="workOrder"/>
<result column="ITEM_NUMBER" property="itemNumber"/>
<result column="PRODUCT_CATEGORY" property="productCategory"/>
<result column="MAP" property="map"/>
<result column="PB_DESCRIPTION" property="pbDescription"/>
<result column="NC_QTY" property="ncQty"/>
<result column="PB_GRADE" property="pbGrade"/>
<result column="PB_USER" property="pbUser"/>
<result column="PB_QTY" property="pbQty"/>
<result column="DISCOVER" property="discover"/>
<result column="INSPECTOR" property="inspector"/>
<result column="ENTITY_LOCATION" property="entityLocation"/>
<result column="REPORT_FROM" property="reportFrom"/>
<result column="OBJECT_BO" property="objectBo"/>
<result column="PB_PHOTOSHOP" property="pbPhotoShop"/>
</resultMap>
<!-- 通用查询结果列 -->
<sql id="Base_Column_List">
HANDLE, SITE, ABNORMAL_BILL_BO, DUTY_USER, DUTY_DATE_TIME, DUTY_DEPART, DUTY_TYPE, PRINCIPAL_USER, DUTY_CAUSE_DESCRIPTION, DUTY_CAUSE_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

@ -848,5 +848,7 @@
</if>
</where>
</select>
<!---->
</mapper>

Loading…
Cancel
Save