Merge remote-tracking branch 'origin/mode-min-unit' into mode-min-unit

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

@@ -477,7 +477,11 @@ public class ApsServiceImpl implements ApsService {
                 }
                 // 合金
                 processes.setVolumeMetal(operationDo.getMetal());
-                processes.setVolumeMetalstate(operationDo.getMetalstate());
+                if("成退".equals(operationDo.getProcess()) || "中退".equals(operationDo.getProcess())){
+                    processes.setVolumeMetalstate(outMaterDos.get(0).getMetalstate());
+                }else{
+                    processes.setVolumeMetalstate(operationDo.getMetalstate());
+                }
                 // 连续生产标识设置
                 // 合金+输入物料+宽度+输入物料厚度+输出物料厚度（取第一个冷轧工序使用）
                 processes.setSeriesProduceMark(operationDo.getMetal() + "^_^" + operationDo.getProducttype() + "^_^" + operationDo.getProwidth() + "^_^" + operationDo.getThickness() + "^_^" + outMaterDos.get(0).getThickness());