xiangwei.zhang
/
i3plus-mes-pcn-panasonic-jx
forked from I3_CDG/i3plus-mes-pcn-panasonic-jx
1
0
Fork 0
Code Pull Requests Activity

修复产线班次固定作业内容信息时间重复校验逻辑有误

Browse Source
dev
yxw 1 year ago
parent 6b9d258845
commit 30ae5a9eba
10 changed files with 15 additions and 37 deletions
Show Stats Download Patch File Download Diff File

2
modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/controller/base/QualityController.java
Unescape Escape View File

@ -113,7 +113,7 @@ public class QualityController extends MesPcnBaseController {
@ApiOperation(value = "解冻")
public ResultBean doUnfreeze(RepairRequestModel repairRequestModel) {
try {
qualityDecisionService.doUnfreeze(repairRequestModel);
//qualityDecisionService.doUnfreeze(repairRequestModel);
return ResultBean.success("解冻成功!").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
} catch (ImppBusiException busExcep) {
return ResultBean.fail(busExcep);

4
modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/base/QualityDecisionService.java
Unescape Escape View File

@ -466,7 +466,7 @@ public class QualityDecisionService implements IQualityDecisionService {
List<MesBadCellDetail> badCellDetailList = getMesBadCellDetails(repairRequestModel, isFinalCheckAfterSn, produceSnExtModel, produceSnExt);
boolean isCompleteRepair = CollectionUtils.isEmpty(badCellDetailList) ? false : badCellDetailList.stream().filter(o -> o.getRepairStatus() == MesPcnExtEnumUtil.MES_REPAIR_STATUS.REPAIRED.getValue()).collect(Collectors.toList()).size() > 0 ;
boolean isCompleteRepair = CollectionUtils.isEmpty(badCellDetailList) ? true : badCellDetailList.stream().filter(o -> (null != o && !StringUtils.isEmpty(o.getRepairStatus()) && MesPcnExtEnumUtil.MES_REPAIR_STATUS.NO_REPAIR.getValue() == o.getRepairStatus())).collect(Collectors.toList()).size() > 0 ;
if (produceSnExtModel.getQcStatus() != MesPcnExtEnumUtil.PRODUCE_SN_QC_STATUS.DEFECTED.getValue()) {
throw ImppExceptionBuilder.newInstance()
@ -476,7 +476,7 @@ public class QualityDecisionService implements IQualityDecisionService {
.build();
}
if (!isCompleteRepair) {
if (isCompleteRepair) {
throw ImppExceptionBuilder.newInstance()
.setSystemID(CommonEnumUtil.SOFT_TYPE.MES_PCN.getCode())
.setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())

13
modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/base/SxWorkOrderExtService.java
Unescape Escape View File

@ -152,8 +152,6 @@ public class SxWorkOrderExtService implements ISxWorkOrderExtService {
checkReworkQty(workOrderDto);
checkReworkOrderBindSn(workOrderDto);
BeanUtils.copyProperties(workOrderDto, mesWorkOrderExt);
String userName = AuthUtil.getSessionUser().getUserName();
String organizeCode = AuthUtil.getOrganize().getOrganizeCode();
@ -162,17 +160,6 @@ public class SxWorkOrderExtService implements ISxWorkOrderExtService {
insertNewWorkOrder(mesWorkOrderExt);
}
private List<MesProduceSnExt> checkReworkOrderBindSn(GenerateWorkOrderDto workOrderDto) {
if (StringUtils.isEmpty(workOrderDto.getProduceSnStart()) || StringUtils.isEmpty(workOrderDto.getProduceSnEnd())) return null;
List<MesProduceSnExt> produceSnExtList = new ArrayList<>();
return produceSnExtList;
}
private void checkReworkQty(GenerateWorkOrderDto workOrderDto) {
Double qty = workOrderDto.getQty();
Double planQty = workOrderDto.getPlanQty();

5
modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/ProduceSnExtService.java
Unescape Escape View File

@ -672,7 +672,7 @@ public class ProduceSnExtService implements IProduceSnExtService {
throw ImppExceptionBuilder.newInstance()
.setSystemID(CommonEnumUtil.SOFT_TYPE.MES_PCN.getCode())
.setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
.setErrorDetail("工单[%s]关联的物料号[%s]未维护成外制件", workOrder.getOrderNo(), workOrder.getPartNo())
.setErrorDetail("工单[%s]关联的物料号[%s]基础信息物料分类2未维护成JX内制", workOrder.getOrderNo(), workOrder.getPartNo())
.build();
}
@ -775,6 +775,7 @@ public class ProduceSnExtService implements IProduceSnExtService {
.setErrorDetail("请检查工单[%s]数量", workOrder.getOrderNo())
.build();
}
genSerialNoModel.setPartNo(partDb.getPartNo());
BaseResultBean<String> resultBean = syncFuncService.syncSerialNo(genSerialNoModel, userInfo, workOrder.getOrganizeCode(), codeType.getCount());
if (resultBean != null && resultBean.isSuccess()) {
if (CollectionUtils.isEmpty(resultBean.getResultList())) {
@ -944,7 +945,7 @@ public class ProduceSnExtService implements IProduceSnExtService {
throw ImppExceptionBuilder.newInstance()
.setSystemID(CommonEnumUtil.SOFT_TYPE.MES_PCN.getCode())
.setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION_DATA_NOT_EXIT.getCode())
.setErrorDetail("模板错误,请检查模板配置")
.setErrorDetail("模板错误,请检查模板配置;详细报错原因：%s",e.getMessage())
.build();
}

2
modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/jx/JxOqcManageService.java
Unescape Escape View File

@ -776,7 +776,7 @@ public class JxOqcManageService implements IJxOqcManageService {
}
private Double baseConvertToDecimalism(String value, int baseOfValue) {
return Double.valueOf(Integer.parseInt(value, MesPcnExtEnumUtil.OQC_BASE_TYPE.baseOfValue(baseOfValue)));
return (MesPcnExtEnumUtil.OQC_BASE_TYPE.DECIMALISM.getValue() == baseOfValue) ? Double.valueOf(value) : Double.valueOf(Integer.parseInt(value, MesPcnExtEnumUtil.OQC_BASE_TYPE.baseOfValue(baseOfValue)));
}
@Override

2
modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/jx/TorqueManageCheckDetailService.java
Unescape Escape View File

@ -125,6 +125,8 @@ public class TorqueManageCheckDetailService implements ITorqueManageCheckService
}
}
if("该项不需要点检".equals(torqueManageTaskDetail.getRemark())) torqueManageTaskDetailDb.setCheckResult(MesPcnExtEnumUtil.CHECK_RESULT.OK.getValue());
torqueManageTaskDetailDb.setCheckTime(TimeTool.getNowTime(true));
torqueManageTaskDetailDb.setCheckUser(torqueManageTaskDetail.getModifyUser());
torqueManageTaskDetailDb.setRotationNoAbnormal(torqueManageTaskDetail.getRotationNoAbnormal());

9
modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/print/method/JxPrintPackageAndSpotTicketService.java
Unescape Escape View File

@ -17,8 +17,8 @@ import java.util.stream.Collectors;
/**
* @Description 嘉兴现品票打印数据（工厂内部使用）
* @Author: wangjie
* @CreateDate: 2020/6/22 9:38 AM
* @Author: xinwang.yi
* @CreateDate: 2023/11/29 9:38 AM
* @Description:
**/
@Slf4j
@ -43,8 +43,7 @@ public class JxPrintPackageAndSpotTicketService extends SxPrintDispatchService i
if (null == workOrderExt) {
continue;
}
String[] dateArr = workOrderExt.getStartTime().substring(2, 7).split("-");
startTimeMap.put(workOrderNo, new StringJoiner(".").add(dateArr[1]).add(dateArr[0]).toString());
startTimeMap.put(workOrderNo, workOrderExt.getStartTime().substring(0, 10).replaceAll("-", "/"));
}
for (PackageExtModel pack : packList) {
@ -71,7 +70,7 @@ public class JxPrintPackageAndSpotTicketService extends SxPrintDispatchService i
resultMap.put(MesPcnExtConstWords.QR_CODE, pack.getPackageNo());
// 生产日期
resultMap.put(MesPcnExtConstWords.YEAR_MONTH_DAY, pack.getWorkTime());
resultMap.put(MesPcnExtConstWords.YEAR_MONTH_DAY, startTimeMap.get(pack.getLastWorkOrderNo()));
resultMap.put(MesPcnExtConstWords.QTY, pack.getQty());
resultMapList.add(resultMap);

5
modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/print/strategy/SxPrintTemplateDispatchService.java
Unescape Escape View File

@ -98,11 +98,6 @@ public class SxPrintTemplateDispatchService {
MesBusiConfig mesBusiConfig = busiConfigService.queryBusiConfigeByCfgCode(MesPcnExtConstWords.COMMON_TEMPLATE_URL, printModel.getLabelTemplate().getOrganizeCode());
if(mesBusiConfig == null){
log.info("BarTender模板地址未维护 - cfgCode - COMMON_TEMPLATE_URL");
//throw ImppExceptionBuilder.newInstance()
// .setSystemID(CommonEnumUtil.SOFT_TYPE.MES_PCN.getCode())
// .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
// .setErrorDetail("BarTender模板地址未维护，请在业务配置页面中维护配置代码[COMMON_TEMPLATE_URL]”")
// .build();
}else{
resultMap.put(MesPcnExtConstWords.TEMPLATE_URL, mesBusiConfig.getCfgValue() + printModel.getLabelTemplate().getTemplateCode() +".BTW");
}

6
modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/model/GenerateWorkOrderDto.java
Unescape Escape View File

@ -58,10 +58,4 @@ public class GenerateWorkOrderDto {
@ApiParam("Erp库存地")
private String erpWarehouse;
@ApiParam("产品条码起始")
private String produceSnStart;
@ApiParam("产品条码截至")
private String produceSnEnd;
}

4
modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/util/MesPcnExtEnumUtil.java
Unescape Escape View File

@ -2558,8 +2558,8 @@ public class MesPcnExtEnumUtil {
* 物料类型2
*/
public enum CATEGORY_CODE_2 {
INSIDE("10", "内置件"),
OUTSIDE("20", "外制件");
INSIDE("10", "备用"),
OUTSIDE("20", "JX内制");
private String value;
private String description;

Write Preview
Loading…
Cancel
Save