|
@@ -1871,8 +1871,9 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
|
|
|
List<ApsProcessOperationOutMaterDo> apsProcessOperationOutMaterDos = apsProcessOperationOutMaterService.listByMap(map).stream().collect(Collectors.toList());
|
|
|
for (ApsProcessOperationOutMaterDo apsProcessOperationOutMaterDo : apsProcessOperationOutMaterDos) {
|
|
|
Integer curOutMaterCancelRoll = curcancelroll * apsProcessOperationOutMaterDo.getOutval();//输出物料本次取消卷数
|
|
|
-// apsProcessOperationOutMaterDo = cancelProcessOperationOutMater(curOutMaterCancelRoll, apsProcessOperationOutMaterDo,apsProcessOperationDos);
|
|
|
- apsProcessOperationOutMaterDo.setOutcancelroll(apsProcessOperationOutMaterDo.getOutcancelroll() + curOutMaterCancelRoll);
|
|
|
+ if(cancelProcessOperationVo.getSetcancelroll()){
|
|
|
+ apsProcessOperationOutMaterDo.setOutcancelroll(apsProcessOperationOutMaterDo.getOutcancelroll() + curOutMaterCancelRoll);
|
|
|
+ }
|
|
|
Integer curStockCancelRoll = 0;//本次备料取消卷数
|
|
|
Integer curMoveCancelRoll = 0;//本次流转取消卷数
|
|
|
Integer curProdCancelRoll = 0;//本次成品取消卷数
|