|
@@ -1814,6 +1814,7 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
|
|
|
String craftrouteid = cancelProcessOperationVo.getCraftrouteid();
|
|
|
Integer curcancelroll = cancelProcessOperationVo.getCurcancelroll();
|
|
|
|
|
|
+ //本道工序作业
|
|
|
ApsProcessOperationDo apsProcessOperationDo = cancelProcessOperationVo.getApsprocessoperationdo();
|
|
|
apsProcessOperationDo.setCancelroll(apsProcessOperationDo.getCancelroll() + curcancelroll);
|
|
|
apsProcessOperationDo.setLeavewaitworkroll(apsProcessOperationDo.getPlanprocessrall() - apsProcessOperationDo.getStartingroll() - apsProcessOperationDo.getInputunqualifiedroll() - apsProcessOperationDo.getCancelroll());
|
|
@@ -1840,9 +1841,7 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
|
|
|
Map<String, Object> map = new HashMap<>();
|
|
|
map.put("MAINID", apsProcessOperationDo.getId());
|
|
|
List<ApsProcessOperationOutMaterDo> apsProcessOperationOutMaterDos = apsProcessOperationOutMaterService.listByMap(map).stream().collect(Collectors.toList());
|
|
|
- for (ApsProcessOperationOutMaterDo apsProcessOperationOutMaterDo : apsProcessOperationOutMaterDos) {
|
|
|
-
|
|
|
- }
|
|
|
+ cancelProcessOperationOutMater(curcancelroll,apsProcessOperationOutMaterDos);
|
|
|
|
|
|
//本道工序的作业明细
|
|
|
|
|
@@ -1861,6 +1860,18 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+ /*
|
|
|
+ 更新输出物料取消卷数
|
|
|
+ curcancelroll:工序作业本次取消卷数
|
|
|
+ apsProcessOperationOutMaterDos:输出物料
|
|
|
+ */
|
|
|
+ public void cancelProcessOperationOutMater(Integer curcancelroll,List<ApsProcessOperationOutMaterDo> apsProcessOperationOutMaterDos){
|
|
|
+ for (ApsProcessOperationOutMaterDo apsProcessOperationOutMaterDo : apsProcessOperationOutMaterDos) {
|
|
|
+ Integer curOutMaterCancelRoll=curcancelroll*apsProcessOperationOutMaterDo.getOutval();
|
|
|
+ apsProcessOperationOutMaterDo.setOutcancelroll(apsProcessOperationOutMaterDo.getOutcancelroll()+curOutMaterCancelRoll);
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
/*
|
|
|
工艺步骤管理/输入物料描述
|
|
|
*/
|