Browse Source

排程数据组装bug修改

fangpy 1 year ago
parent
commit
14fc0735ae

+ 3 - 3
cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ApsServiceImpl.java

@@ -323,9 +323,9 @@ public class ApsServiceImpl implements ApsService {
                                                 .eq(ApsProcessOperationOutMaterDo::getMainid, processesDo.getId()));
                                         er.setProcessType(processesDo.getProcess());
                                         // 合金+输入物料+宽度+厚度
-                                        er.setSeriesProduceMark(operationDo.getMetal() + "^_^" + operationDo.getProducttype() + "^_^" + operationDo.getProwidth() + "^_^" + operationDo.getThickness() + "^_^" + outMaterDos.get(0).getThickness());
-                                        er.setVolumeMetal(operationDo.getMetal());
-                                        er.setVolumeMetalstate(operationDo.getMetalstate());
+                                        er.setSeriesProduceMark(processesDo.getMetal() + "^_^" + processesDo.getProducttype() + "^_^" + processesDo.getProwidth() + "^_^" + processesDo.getThickness() + "^_^" + outMaterDos.get(0).getThickness());
+                                        er.setVolumeMetal(processesDo.getMetal());
+                                        er.setVolumeMetalstate(processesDo.getMetalstate());
                                         er.setPrepressworkmin(processesDo.getPrepressworkmin() == null ? null : processesDo.getPrepressworkmin().intValue());
                                         er.setCutfinishmin(processesDo.getCutfinishmin() == null ? null : processesDo.getCutfinishmin().intValue());
                                         // 单卷宽度、重量数据赋值