suojin
/
jonhon-mes-svr
23
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

生产订单状态修改为枚举

Browse Source
liweidong
李涛 2 weeks ago
parent 4b5abb503e
commit 3604c55208
8 changed files with 37 additions and 37 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/entity/YieldOrder.java
  2. 8
      blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderServiceImpl.java
  3. 3
      blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldPlanServiceImpl.java
  4. 2
      blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/PdaSaveServiceImpl.java
  5. 2
      blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/WorkOrderRunServiceImpl.java
  6. 32
      blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/WorkOrderServiceImpl.java
  7. 11
      blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/InspectionTaskServiceImpl.java
  8. 14
      blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/service/impl/ErpMesRbWoServiceImpl.java

2
blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/entity/YieldOrder.java
Unescape View File

@ -23,8 +23,6 @@ import java.util.Date;
@TableName(value = "MES_YIELD_ORDER")
@Data
public class YieldOrder extends BaseEntity {
@TableField(exist = false)
private static final long serialVersionUID = 1L;
/**
* 待接收

8
blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderServiceImpl.java
Unescape View File

@ -1013,23 +1013,23 @@ public class YieldOrderServiceImpl extends BaseServiceImpl<YieldOrderMapper, Yie
@Override
public void updateYieldStatus(Long yoId, Integer curStatus, double v) {
YieldOrder yo = this.getById(yoId);
if (YieldOrder.CUR_STATUS_NORMAL.equals(curStatus)) {
if (YieldOrderEnum.STATUS_NORMAL.getCode() == curStatus) {
yo.setStatus(curStatus);
yo.setReceiveTime(null);
yo.setYpMemo(null);
yo.setReceiveUser(null);
} else if (YieldOrder.CUR_STATUS_PROCESSING.equals(curStatus)) {
} else if (YieldOrderEnum.STATUS_PROCESSING.getCode() == curStatus) {
yo.setStatus(curStatus);
// if (po != null) {
// po.setStatus(YieldPlanEnum.STATUS_PROCESSING.getCode());
// }
} else if (YieldOrder.CUR_STATUS_COMPLETED.equals(curStatus)) {
} else if (YieldOrderEnum.STATUS_COMPLETED.getCode() == curStatus) {
List<WorkOrder> listWo = workOrderMapper.listByYoId(yo.getId());
boolean completed = listWo.stream().map(wo -> wo.getRunStatus() >= WorkOrder.RUN_STATUS_COMPLETED).findAny().isPresent();
if (completed) {
yo.setStatus(curStatus);
}
} else if (YieldOrder.CUR_STATUS_VOIDED.equals(curStatus)) {
} else if (YieldOrderEnum.STATUS_CLOSED.getCode() == curStatus) {
//整单报废
List<WorkOrder> listWo = workOrderMapper.selectList(Wrappers.lambdaQuery(WorkOrder.class).eq(WorkOrder::getYoId, yo.getId()));
boolean completed = listWo.stream().map(wo -> WorkOrder.RUN_STATUS_VOIDED.equals(wo.getRunStatus())).findAny().isPresent();

3
blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldPlanServiceImpl.java
Unescape View File

@ -20,6 +20,7 @@ import org.springblade.desk.order.mapper.YieldPlanMapper;
import org.springblade.desk.order.pojo.dto.YieldPlanDto;
import org.springblade.desk.order.pojo.entity.YieldOrder;
import org.springblade.desk.order.pojo.entity.YieldPlan;
import org.springblade.desk.order.pojo.enums.YieldOrderEnum;
import org.springblade.desk.order.pojo.enums.YieldPlanEnum;
import org.springblade.desk.order.service.IYieldOrderService;
import org.springblade.desk.order.service.IYieldPlanService;
@ -216,7 +217,7 @@ public class YieldPlanServiceImpl extends BaseServiceImpl<YieldPlanMapper, Yield
yieldOrder.setYpCode("");
yieldOrder.setYpArea((double) 0);
yieldOrder.setSiteWork(true);
yieldOrder.setBusinessType(YieldOrder.BUSINESS_TYPE_SJ);
yieldOrder.setBusinessType(YieldOrderEnum.BUSINESS_TYPE_SJ.getCode());
yieldOrder.setPartCode(dsPartEntity.getPartCode());
yieldOrder.setPartName(dsPartEntity.getPartName());
yieldOrder.setProductIdent(yieldPlan.getProductIdent());

2
blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/PdaSaveServiceImpl.java
Unescape View File

@ -1117,7 +1117,7 @@ public class PdaSaveServiceImpl extends BaseServiceImpl<WorkPlanMapper, WorkPlan
boolean bool = true;
if (yoList != null && !yoList.isEmpty()) {
for (YieldOrder item : yoList) {
if (item.getStatus() < YieldOrder.CUR_STATUS_COMPLETED) {
if (item.getStatus() < YieldOrderEnum.STATUS_COMPLETED.getCode()) {
bool = false;
break;
}

2
blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/WorkOrderRunServiceImpl.java
Unescape View File

@ -437,7 +437,7 @@ public class WorkOrderRunServiceImpl extends BaseServiceImpl<WorkOrderRunMapper,
//处理同订单
// this.withYield(yo.getId());
//生产订单接收
yo.setReceiveStatus(YieldOrder.CUR_STATUS_NORMAL);
yo.setReceiveStatus(YieldOrderEnum.STATUS_NORMAL.getCode());
//关闭erp外协订单，程序调用存储过程
if (!yo.getManualIncrease() && oldOemCustomer != null) {
erpDataOemClient.closeErpOrder(wxCode, workOrderRun.getApprovalMemo());

32
blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/WorkOrderServiceImpl.java
Unescape View File

@ -749,7 +749,7 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
return null;
}
//非烧结零件跳过子件验证
if (!yieldOrder.getYieldType().equals(YieldOrder.YIELD_TYPE_2)) {
if (!yieldOrder.getYieldType().equals(YieldOrderEnum.YIELD_TYPE_2.getCode())) {
return null;
}
@ -854,7 +854,7 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
workOrder.setRunStatus(runStatus);
if (WorkOrder.RUN_STATUS_RECEIVE.equals(runStatus)) {
workOrder.setPickingStatus(WorkOrder.PICKING_STATUS_OK);
yieldOrderService.updateYieldStatus(workOrder.getYoId(), YieldOrder.CUR_STATUS_PROCESSING, 0d);
yieldOrderService.updateYieldStatus(workOrder.getYoId(), YieldOrderEnum.STATUS_PROCESSING.getCode(), 0d);
} else if (WorkOrder.RUN_STATUS_COMPLETED.equals(runStatus) || WorkOrder.RUN_STATUS_HANDOVER.equals(runStatus)) {
if (workOrder.getPutStoreTime() == null) {
workOrder.setPutStoreTime(new Date());
@ -865,7 +865,7 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
workOrderRun.setRunStatus(WorkOrderRun.RUN_STATUS_COMPLETED);
workOrderRunService.updateById(workOrderRun);
}
yieldOrderService.updateYieldStatus(workOrder.getYoId(), YieldOrder.CUR_STATUS_COMPLETED, workOrder.getInventoryQty());
yieldOrderService.updateYieldStatus(workOrder.getYoId(), YieldOrderEnum.STATUS_COMPLETED.getCode(), workOrder.getInventoryQty());
} else if (WorkOrder.RUN_STATUS_ISSUED.equals(runStatus)) {
workOrder.setApprovalStatus(WorkOrder.APPROVAL_STATUS_NORMAL);
// if (workOrder.getWorkPlan().getMakeTeam() != null) {
@ -879,7 +879,7 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
log.info("新车间订单状态修改：{},订单状态{}", workOrder.getWoCode(), workOrder.getRunStatus());
} else if (WorkOrder.RUN_STATUS_VOIDED.equals(runStatus)) {
//整单报废
yieldOrderService.updateYieldStatus(workOrder.getYoId(), YieldOrder.CUR_STATUS_VOIDED, 0d);
yieldOrderService.updateYieldStatus(workOrder.getYoId(), YieldOrderEnum.STATUS_CLOSED.getCode(), 0d);
WorkOrderRun workOrderRun = workOrderRunService.getById(workOrder.getWorId());
if (workOrderRun != null) {
workOrderRun.setRunStatus(WorkOrderRun.RUN_STATUS_VOIDED);
@ -889,7 +889,7 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
workOrder.setCloseTime(new Date());
// 如果是烧结部件，子件同样关闭
YieldOrder yieldOrder = yieldOrderService.getById(workOrder.getYoId());
if (YieldOrder.YIELD_TYPE_2.equals(yieldOrder.getYieldType())) {
if (YieldOrderEnum.YIELD_TYPE_2.getCode() == yieldOrder.getYieldType()) {
List<YieldOrder> list = yieldOrderService.list(Wrappers.lambdaQuery(YieldOrder.class).eq(YieldOrder::getFatherYoId, yieldOrder.getId()));
if (CollectionUtils.isNotEmpty(list)) {
// 将list转换为id集合
@ -907,7 +907,7 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
}
}
} else if (WorkOrder.RUN_STATUS_SCRAP.equals(runStatus)) {
yieldOrderService.updateYieldStatus(workOrder.getYoId(), YieldOrder.CUR_STATUS_COMPLETED, 0d);
yieldOrderService.updateYieldStatus(workOrder.getYoId(), YieldOrderEnum.STATUS_COMPLETED.getCode(), 0d);
WorkOrderRun workOrderRun = workOrderRunService.getById(workOrder.getWorId());
if (workOrderRun != null) {
workOrderRun.setRunStatus(WorkOrderRun.RUN_STATUS_COMPLETED);
@ -1240,17 +1240,17 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
workOrder.setOem("1");
workOrder.setOemOut("0");
workOrder.setOemType(WorkOrder.OEM_TYPE_WHOLE);
pjYieldOrder.setBusinessType(YieldOrder.BUSINESS_TYPE_WX);
pjYieldOrder.setBusinessType(YieldOrderEnum.BUSINESS_TYPE_WX.getCode());
} else {
days = ProcessCycleEnum.BC_TYPE_CYCLE_HEAT.getValue();
workOrder.setOem("0");
workOrder.setOemOut("1");
workOrder.setOemType(Integer.valueOf(FlowConst.STATUS_NEW));
//重新识别订单类型
if (YieldOrder.YIELD_TYPE_1.equals(pjYieldOrder.getYieldType())) {
pjYieldOrder.setBusinessType(YieldOrder.BUSINESS_TYPE_RB);
if (YieldOrderEnum.YIELD_TYPE_1.getCode() == pjYieldOrder.getYieldType()) {
pjYieldOrder.setBusinessType(YieldOrderEnum.BUSINESS_TYPE_RB.getCode());
} else {
pjYieldOrder.setBusinessType(YieldOrder.BUSINESS_TYPE_SJ);
pjYieldOrder.setBusinessType(YieldOrderEnum.BUSINESS_TYPE_SJ.getCode());
}
}
yieldOrderMapper.updateById(pjYieldOrder);
@ -1258,13 +1258,13 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
workOrder.setDispatcher(dispatcher);
workOrder.setWorId(workOrderRun.getId());
if (YieldOrder.YIELD_TYPE_2.equals(pjYieldOrder.getYieldType())) {
if (YieldOrderEnum.YIELD_TYPE_2.getCode() == pjYieldOrder.getYieldType()) {
days = ProcessCycleEnum.BC_TYPE_CYCLE_SIN_TER.getValue();
} else if (YieldOrder.YIELD_TYPE_3.equals(pjYieldOrder.getYieldType())) {
} else if (YieldOrderEnum.YIELD_TYPE_3.getCode() == pjYieldOrder.getYieldType()) {
days = ProcessCycleEnum.BC_TYPE_CYCLE_SIN_BL.getValue();
} else if (YieldOrder.YIELD_TYPE_4.equals(pjYieldOrder.getYieldType()) || YieldOrder.YIELD_TYPE_5.equals(pjYieldOrder.getYieldType())) {
} else if (YieldOrderEnum.YIELD_TYPE_4.getCode() == pjYieldOrder.getYieldType() || YieldOrderEnum.YIELD_TYPE_5.getCode() == pjYieldOrder.getYieldType()) {
days = ProcessCycleEnum.BC_TYPE_CYCLE_SIN_JS.getValue();
} else if (YieldOrder.YIELD_TYPE_6.equals(pjYieldOrder.getYieldType())) {
} else if (YieldOrderEnum.YIELD_TYPE_6.getCode() == pjYieldOrder.getYieldType()) {
days = ProcessCycleEnum.BC_TYPE_CYCLE_SIN_MJ.getValue();
}
Date date = DateUtil.plusDays(workOrder.getSendDownTime(), days);
@ -1434,7 +1434,7 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
mtuListVO.setHangNum(macToolUse.getHangNum());
mtuListVO.setRsCode(rackSetEntityMap.get(macToolUse.getBsRackSet()) != null ? rackSetEntityMap.get(macToolUse.getBsRackSet()).getRsCode() : "");
mtuListVO.setFsCode(feiBaSetEntityMap.get(macToolUse.getBsFeiBaSet()) != null ? feiBaSetEntityMap.get(macToolUse.getBsFeiBaSet()).getFsCode() : "");
mtuListVO.setDeviceCode(equipmentEntityMap.get(macToolUse.getEquipmentCard()) != null ? equipmentEntityMap.get(macToolUse.getEquipmentCard()).getDeviceName() : "");
mtuListVO.setDeviceCode(equipmentEntityMap.get(macToolUse.getEquipmentCard()) != null ? equipmentEntityMap.get(macToolUse.getEquipmentCard()).getDeviceCode() : "");
mtuList.add(mtuListVO);
}
planDataVO.setMtuList(mtuList);
@ -1458,7 +1458,7 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
}
// 检验项目
List<WorkPlanItem> workPlanItems = workPlanItemService.list(Wrappers.lambdaQuery(WorkPlanItem.class).eq(WorkPlanItem::getWpId, wpId));
List<WorkPlanItem> workPlanItems = workPlanItemService.list(Wrappers.lambdaQuery(WorkPlanItem.class).eq(WorkPlanItem::getWpId, wpId).orderByAsc(WorkPlanItem::getItemCode));
if (CollectionUtils.isNotEmpty(workPlanItems)) {
List<WorkPlanItemDetail> itemDetails = workPlanItemDetailService.list(Wrappers.lambdaQuery(WorkPlanItemDetail.class).in(WorkPlanItemDetail::getWorkPlanItemId, workPlanItems.stream().map(WorkPlanItem::getId).toList()));
List<ProduceMonitorPlanItemVO> itemVos = new ArrayList<>();

11
blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/InspectionTaskServiceImpl.java
Unescape View File

@ -45,6 +45,7 @@ import org.springblade.desk.device.service.IFeiBaSetService;
import org.springblade.desk.device.service.IRackSetService;
import org.springblade.desk.order.mapper.YieldOrderMapper;
import org.springblade.desk.order.pojo.entity.YieldOrder;
import org.springblade.desk.order.pojo.enums.YieldOrderEnum;
import org.springblade.desk.produce.mapper.WorkOrderMapper;
import org.springblade.desk.produce.mapper.WorkPlanMapper;
import org.springblade.desk.produce.pojo.dto.*;
@ -1657,7 +1658,7 @@ public class InspectionTaskServiceImpl extends BaseServiceImpl<InspectionTaskMap
return null;
}
//非烧结零件跳过子件验证
if (!yieldOrder.getYieldType().equals(YieldOrder.YIELD_TYPE_2)) {
if (!yieldOrder.getYieldType().equals(YieldOrderEnum.YIELD_TYPE_2.getCode())) {
return null;
}
@ -1881,14 +1882,14 @@ public class InspectionTaskServiceImpl extends BaseServiceImpl<InspectionTaskMap
@Override
public Object pagePrintSjEleFiles(Long woId, Integer yieldType, List<Boolean> planList, List<Boolean> moduleList) {
if (yieldType == YieldOrder.YIELD_TYPE_4 || yieldType == YieldOrder.YIELD_TYPE_5) {
if (yieldType == YieldOrderEnum.YIELD_TYPE_4.getCode() || yieldType == YieldOrderEnum.YIELD_TYPE_5.getCode()) {
return this.metalParts(woId);
} else if (yieldType == YieldOrder.YIELD_TYPE_6) { // 石墨模
} else if (yieldType == YieldOrderEnum.YIELD_TYPE_6.getCode()) { // 石墨模
// return this.graphiteMold(woId);
return this.metalParts(woId);
} else if (yieldType == YieldOrder.YIELD_TYPE_3) { // 玻璃饼
} else if (yieldType == YieldOrderEnum.YIELD_TYPE_3.getCode()) { // 玻璃饼
return this.glassCake(woId);
} else if (yieldType == YieldOrder.YIELD_TYPE_2) { // 玻璃封接部件
} else if (yieldType == YieldOrderEnum.YIELD_TYPE_2.getCode()) { // 玻璃封接部件
return this.glassSealing(woId, planList, moduleList);
}

14
blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/service/impl/ErpMesRbWoServiceImpl.java
Unescape View File

@ -284,7 +284,7 @@ public class ErpMesRbWoServiceImpl implements IErpMesRbWoService {
purtosoList.forEach(mesRbPurtoso -> {
YieldOrder yieldOrder=new YieldOrder();
yieldOrder.setSiteWork(true);
yieldOrder.setBusinessType(YieldOrder.BUSINESS_TYPE_RB);
yieldOrder.setBusinessType(YieldOrderEnum.BUSINESS_TYPE_RB.getCode());
yieldOrder.setYpCode(mesRbPurtoso.getWono());
yieldOrder.setYpMemo("物资转车间协作加工");
yieldOrder.setManualIncrease(false);
@ -363,7 +363,7 @@ public class ErpMesRbWoServiceImpl implements IErpMesRbWoService {
pacturnrecordList.forEach(mesRbPacturnrecord -> {
YieldOrder yieldOrder=new YieldOrder();
yieldOrder.setSiteWork(true);
yieldOrder.setBusinessType(YieldOrder.BUSINESS_TYPE_RB);
yieldOrder.setBusinessType(YieldOrderEnum.BUSINESS_TYPE_RB.getCode());
yieldOrder.setYpMemo("临时工艺转工");
yieldOrder.setManualIncrease(false);
yieldOrder.setYpCode(mesRbPacturnrecord.getWono());
@ -438,7 +438,7 @@ public class ErpMesRbWoServiceImpl implements IErpMesRbWoService {
rbtosoList.forEach(mesRbtoso -> {
YieldOrder yieldOrder=new YieldOrder();
yieldOrder.setSiteWork(true);
yieldOrder.setBusinessType(YieldOrder.BUSINESS_TYPE_SJ);
yieldOrder.setBusinessType(YieldOrderEnum.BUSINESS_TYPE_SJ.getCode());
yieldOrder.setYpMemo("烧结转工单");
yieldOrder.setManualIncrease(false);
yieldOrder.setYoCode(mesRbtoso.getSono());//生产单号
@ -507,7 +507,7 @@ public class ErpMesRbWoServiceImpl implements IErpMesRbWoService {
wxpromotionList.forEach(mesRbWxpromotion -> {
YieldOrder yieldOrder=new YieldOrder();
yieldOrder.setSiteWork(true);
yieldOrder.setBusinessType(YieldOrder.BUSINESS_TYPE_RB);
yieldOrder.setBusinessType(YieldOrderEnum.BUSINESS_TYPE_RB.getCode());
yieldOrder.setYpMemo("推进计划");
yieldOrder.setManualIncrease(false);
yieldOrder.setYoCode(mesRbWxpromotion.getSono());//生产单号
@ -590,7 +590,7 @@ public class ErpMesRbWoServiceImpl implements IErpMesRbWoService {
mesRbSodelrecwxList.forEach(mesRbSodelrecwx -> {
YieldOrder yieldOrder=new YieldOrder();
yieldOrder.setSiteWork(false);
yieldOrder.setBusinessType(YieldOrder.BUSINESS_TYPE_RB);
yieldOrder.setBusinessType(YieldOrderEnum.BUSINESS_TYPE_RB.getCode());
yieldOrder.setYpMemo("外协转工单");
yieldOrder.setManualIncrease(false);
yieldOrder.setYoCode(mesRbSodelrecwx.getSono());//生产单号
@ -670,7 +670,7 @@ public class ErpMesRbWoServiceImpl implements IErpMesRbWoService {
//将查询出的数据放到单个的变量中
YieldOrder yieldOrder=new YieldOrder();
yieldOrder.setSiteWork(true);
yieldOrder.setBusinessType(YieldOrder.BUSINESS_TYPE_RB);
yieldOrder.setBusinessType(YieldOrderEnum.BUSINESS_TYPE_RB.getCode());
yieldOrder.setYpMemo("正式工艺转工");
yieldOrder.setManualIncrease(false);
yieldOrder.setYoCode(mesRbSodelreczg.getSono());//生产单号
@ -755,7 +755,7 @@ public class ErpMesRbWoServiceImpl implements IErpMesRbWoService {
mesRbPkList.forEach(mesRbPk -> {
YieldOrder yieldOrder=new YieldOrder();
yieldOrder.setSiteWork(true);
yieldOrder.setBusinessType(YieldOrder.BUSINESS_TYPE_RB);
yieldOrder.setBusinessType(YieldOrderEnum.BUSINESS_TYPE_RB.getCode());
yieldOrder.setYpMemo("配套转工单");
yieldOrder.setYoCode(mesRbPk.getWono());//生产单号
yieldOrder.setYpCode(mesRbPk.getWono());

Write Preview
Loading…
Cancel
Save