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

生产管理修改

Browse Source
liweidong
李涛 3 weeks ago
parent 75af0863d4
commit 864aed543d
3 changed files with 16 additions and 28 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      blade-common/src/main/java/org/springblade/common/constant/LauncherConstant.java
  2. 3
      blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/MakeRecServiceImpl.java
  3. 33
      blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/WorkOrderServiceImpl.java

8
blade-common/src/main/java/org/springblade/common/constant/LauncherConstant.java
Unescape View File

@ -12,9 +12,9 @@ public interface LauncherConstant {
/** /**
* nacos 命名空间 * nacos 命名空间
*/ */
String NACOS_NAMESPACE = "feaf627f-a847-463b-8b73-24a0538f526e"; // String NACOS_NAMESPACE = "feaf627f-a847-463b-8b73-24a0538f526e";
// 生产环境 // 生产环境
// String NACOS_NAMESPACE = "db3f4da1-ae19-4104-8c17-6d9b8f069401"; String NACOS_NAMESPACE = "db3f4da1-ae19-4104-8c17-6d9b8f069401";
// 测试环境 // 测试环境
// String NACOS_NAMESPACE = "6cdd0310-0d61-4f54-891a-7fb06224d9b8"; // String NACOS_NAMESPACE = "6cdd0310-0d61-4f54-891a-7fb06224d9b8";
@ -31,8 +31,8 @@ public interface LauncherConstant {
/** /**
* nacos dev 地址 * nacos dev 地址
*/ */
// String NACOS_DEV_ADDR = "192.168.249.27:8848"; String NACOS_DEV_ADDR = "192.168.249.27:8848";
String NACOS_DEV_ADDR = "127.0.0.1:8848"; // String NACOS_DEV_ADDR = "127.0.0.1:8848";
/**R /**R
* nacos prod 地址 * nacos prod 地址

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

@ -95,7 +95,8 @@ public class MakeRecServiceImpl extends BaseServiceImpl<MakeRecMapper, MakeRec>
} }
YieldOrder yieldOrder = yieldOrderService.getById(wo.getYoId()); YieldOrder yieldOrder = yieldOrderService.getById(wo.getYoId());
WorkPlanDto workPlanDto = new WorkPlanDto(yieldOrder, wo, wp, isBinging); WorkPlanDto workPlanDto = new WorkPlanDto(yieldOrder, wo, wp, isBinging);
workPlanDto.setCurrentWpTitle(""); BsProcessSetEntity currentWp = bsProcessSetService.getById(wp.getPpsId());
workPlanDto.setCurrentWpTitle(currentWp.getName());
workPlanDto.setCurrentMakeTeam(""); workPlanDto.setCurrentMakeTeam("");
workPlanDto.setFrontWpTitle(""); workPlanDto.setFrontWpTitle("");
workPlanDto.setFrontMakeTeam(""); workPlanDto.setFrontMakeTeam("");

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

@ -1170,8 +1170,7 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
days = ProcessCycleEnum.BC_TYPE_CYCLE_SIN_TER.getValue(); days = ProcessCycleEnum.BC_TYPE_CYCLE_SIN_TER.getValue();
} else if (YieldOrder.YIELD_TYPE_3.equals(pjYieldOrder.getYieldType())) { } else if (YieldOrder.YIELD_TYPE_3.equals(pjYieldOrder.getYieldType())) {
days = ProcessCycleEnum.BC_TYPE_CYCLE_SIN_BL.getValue(); days = ProcessCycleEnum.BC_TYPE_CYCLE_SIN_BL.getValue();
} else if (YieldOrder.YIELD_TYPE_4.equals(pjYieldOrder.getYieldType()) || } else if (YieldOrder.YIELD_TYPE_4.equals(pjYieldOrder.getYieldType()) || YieldOrder.YIELD_TYPE_5.equals(pjYieldOrder.getYieldType())) {
YieldOrder.YIELD_TYPE_5.equals(pjYieldOrder.getYieldType())) {
days = ProcessCycleEnum.BC_TYPE_CYCLE_SIN_JS.getValue(); days = ProcessCycleEnum.BC_TYPE_CYCLE_SIN_JS.getValue();
} else if (YieldOrder.YIELD_TYPE_6.equals(pjYieldOrder.getYieldType())) { } else if (YieldOrder.YIELD_TYPE_6.equals(pjYieldOrder.getYieldType())) {
days = ProcessCycleEnum.BC_TYPE_CYCLE_SIN_MJ.getValue(); days = ProcessCycleEnum.BC_TYPE_CYCLE_SIN_MJ.getValue();
@ -1208,14 +1207,14 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
orderDataVO.setProdIdent(yieldOrder.getProductIdent()); orderDataVO.setProdIdent(yieldOrder.getProductIdent());
orderDataVO.setYpMemo(yieldOrder.getYpMemo()); orderDataVO.setYpMemo(yieldOrder.getYpMemo());
orderDataVO.setMainProcessingUnit(workOrder.getTsId() != null ? teamSetService.getById(workOrder.getTsId()).getTsName() : workOrder.getOcId() != null ? oemService.getById(workOrder.getOcId()).getOcName() : ""); orderDataVO.setMainProcessingUnit(workOrder.getTsId() != null ? teamSetService.getById(workOrder.getTsId()).getTsName() : workOrder.getOcId() != null ? oemService.getById(workOrder.getOcId()).getOcName() : "");
ProduceMonitorDsPartVO dsPartVO = new ProduceMonitorDsPartVO();
if (dsPartEntity != null) { if (dsPartEntity != null) {
ProduceMonitorDsPartVO dsPartVO = new ProduceMonitorDsPartVO();
// 组装零件信息 // 组装零件信息
BeanUtils.copyProperties(dsPartEntity, dsPartVO); BeanUtils.copyProperties(dsPartEntity, dsPartVO);
// todo erp查询pdm零件图纸地址 // todo erp查询pdm零件图纸地址
dsPartVO.setUrl("http://MESLoginUser:MESloginUseradmin@pdm.caoe.com/Windchill/netmarkets/jsp/ext/caoe/mes/export.jsp?oid="); dsPartVO.setUrl("http://MESLoginUser:MESloginUseradmin@pdm.caoe.com/Windchill/netmarkets/jsp/ext/caoe/mes/export.jsp?oid=");
orderDataVO.setDsPart(dsPartVO);
} }
orderDataVO.setDsPart(dsPartVO);
// 组装工序信息 // 组装工序信息
for (ProduceMonitorWorkPlanVO workPlan : workPlans) { for (ProduceMonitorWorkPlanVO workPlan : workPlans) {
@ -1604,7 +1603,9 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
workPlanItem.setWpId(workPlan.getId()); workPlanItem.setWpId(workPlan.getId());
workPlanItem.setItemCode(project.getProjectCode()); workPlanItem.setItemCode(project.getProjectCode());
workPlanItem.setItemName(project.getProjectName()); workPlanItem.setItemName(project.getProjectName());
workPlanItem.setStandardId(Long.valueOf(project.getProjectStandard())); if (project.getProjectStandard() != null) {
workPlanItem.setStandardId(Long.parseLong(project.getProjectStandard()));
}
workPlanItem.setStandardName(project.getProjectStandardName()); workPlanItem.setStandardName(project.getProjectStandardName());
workPlanItem.setHourQuota(project.getProHours()); workPlanItem.setHourQuota(project.getProHours());
workPlanItem.setHourPrepare(project.getPrepareHours()); workPlanItem.setHourPrepare(project.getPrepareHours());
@ -1708,9 +1709,7 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
wo.setPriority(updatePriorityDTO.getPriority()); wo.setPriority(updatePriorityDTO.getPriority());
wo.setDemandDate(updatePriorityDTO.getDemandDate()); wo.setDemandDate(updatePriorityDTO.getDemandDate());
boolean b = this.updateById(wo); boolean b = this.updateById(wo);
if (b && (WorkOrder.PRIORITY_NORMAL.equals(updatePriorityDTO.getPriority()) if (b && (WorkOrder.PRIORITY_NORMAL.equals(updatePriorityDTO.getPriority()) || WorkOrder.PRIORITY_PRO_IMP.equals(updatePriorityDTO.getPriority()) || WorkOrder.PRIORITY_PACT_IMP.equals(updatePriorityDTO.getPriority())) && wo.getRunStatus() < WorkOrder.RUN_STATUS_RECEIVE) {
|| WorkOrder.PRIORITY_PRO_IMP.equals(updatePriorityDTO.getPriority())
|| WorkOrder.PRIORITY_PACT_IMP.equals(updatePriorityDTO.getPriority())) && wo.getRunStatus() < WorkOrder.RUN_STATUS_RECEIVE) {
// 修改生产订单为待排产 // 修改生产订单为待排产
log.info("修改优先级后重新排产"); log.info("修改优先级后重新排产");
YieldOrder yieldOrder = new YieldOrder(); YieldOrder yieldOrder = new YieldOrder();
@ -1938,17 +1937,7 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
throw new ServiceException("未绑定飞跋和设备或未维护生产追溯信息!!!"); throw new ServiceException("未绑定飞跋和设备或未维护生产追溯信息!!!");
} }
} }
} else if ("玻璃封接清洗".equals(dsProcess.getName()) || "玻璃封接退火".equals(dsProcess.getName()) || } else if ("玻璃封接清洗".equals(dsProcess.getName()) || "玻璃封接退火".equals(dsProcess.getName()) || "玻璃封接预氧化（箱式炉）".equals(dsProcess.getName()) || "玻璃封接预氧化（链式炉）".equals(dsProcess.getName()) || "玻璃封接（链式炉）".equals(dsProcess.getName()) || "玻璃封接（真空炉）".equals(dsProcess.getName()) || "玻璃封接灌胶".equals(dsProcess.getName()) || "玻璃饼压制".equals(dsProcess.getName()) || "玻璃饼排蜡玻化".equals(dsProcess.getName()) || "玻璃饼振光".equals(dsProcess.getName()) || "石墨模烘干".equals(dsProcess.getName()) || "石墨模焙烧".equals(dsProcess.getName()) || "真空炉灌胶".equals(dsProcess.getName()) || "玻璃封接电镀去氧化皮".equals(dsProcess.getName()) || "玻璃封接电化学抛光".equals(dsProcess.getName()) || "玻璃封接湿喷砂".equals(dsProcess.getName()) || "玻璃封接电镀".equals(dsProcess.getName()) || "玻璃封接插针电镀".equals(dsProcess.getName()) || "玻璃封接壳体电镀".equals(dsProcess.getName()) || "玻璃封接电镀下挂".equals(dsProcess.getName()) || "烧结浸保护剂".equals(dsProcess.getName())) {
"玻璃封接预氧化（箱式炉）".equals(dsProcess.getName()) || "玻璃封接预氧化（链式炉）".equals(dsProcess.getName()) ||
"玻璃封接（链式炉）".equals(dsProcess.getName()) || "玻璃封接（真空炉）".equals(dsProcess.getName()) ||
"玻璃封接灌胶".equals(dsProcess.getName()) || "玻璃饼压制".equals(dsProcess.getName()) ||
"玻璃饼排蜡玻化".equals(dsProcess.getName()) || "玻璃饼振光".equals(dsProcess.getName()) ||
"石墨模烘干".equals(dsProcess.getName()) || "石墨模焙烧".equals(dsProcess.getName()) ||
"真空炉灌胶".equals(dsProcess.getName()) || "玻璃封接电镀去氧化皮".equals(dsProcess.getName()) ||
"玻璃封接电化学抛光".equals(dsProcess.getName()) || "玻璃封接湿喷砂".equals(dsProcess.getName()) ||
"玻璃封接电镀".equals(dsProcess.getName()) || "玻璃封接插针电镀".equals(dsProcess.getName()) ||
"玻璃封接壳体电镀".equals(dsProcess.getName()) || "玻璃封接电镀下挂".equals(dsProcess.getName()) ||
"烧结浸保护剂".equals(dsProcess.getName())) {
mtu = macToolUseService.queryByParams(wp.getId(), 1, 1, 1); mtu = macToolUseService.queryByParams(wp.getId(), 1, 1, 1);
if (mtu == null) { if (mtu == null) {
// 验证是否维护了生产追溯信息 // 验证是否维护了生产追溯信息
@ -2052,8 +2041,7 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
} }
// cdl 20250218 修改分槽同一槽号连续出现 // cdl 20250218 修改分槽同一槽号连续出现
this.setTemplateData(dsRbFilePreserveSlot, qcProduceRun, newDsRbFilePreserveSlot, dsRbFilePreserveDetailList, this.setTemplateData(dsRbFilePreserveSlot, qcProduceRun, newDsRbFilePreserveSlot, dsRbFilePreserveDetailList, newDsRbFilePreserveDetail, workPlan, temporaryList, prMacToolUse);
newDsRbFilePreserveDetail, workPlan, temporaryList, prMacToolUse);
} }
// 判断是不是自动线并且有水墨连续性 // 判断是不是自动线并且有水墨连续性
@ -2065,8 +2053,7 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
MesQcProduceRunEntity qcProduceRun = new MesQcProduceRunEntity(); MesQcProduceRunEntity qcProduceRun = new MesQcProduceRunEntity();
qcProduceRun.setQualified("1"); qcProduceRun.setQualified("1");
// cdl 20250218 修改分槽同一槽号连续出现 // cdl 20250218 修改分槽同一槽号连续出现
this.setTemplateData(dsRbFilePreserveSlot, qcProduceRun, newDsRbFilePreserveSlot, dsRbFilePreserveDetailList, this.setTemplateData(dsRbFilePreserveSlot, qcProduceRun, newDsRbFilePreserveSlot, dsRbFilePreserveDetailList, newDsRbFilePreserveDetail, workPlan, temporaryList, prMacToolUse);
newDsRbFilePreserveDetail, workPlan, temporaryList, prMacToolUse);
} }
} }
} }

Write Preview
Loading…
Cancel
Save