Browse Source

feature 代码提交

xiahan 1 year ago
parent
commit
b4d14e39f2

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

@@ -166,11 +166,11 @@ public class ReportCheckServiceImpl implements ReportCheckService {
         }
         // 更新当前工序作业和作业明细的已检验卷数
         currentProcessOperationMainDo.setCheckoutroll(currentProcessOperationMainDo.getCheckoutroll() + reportOutputDos.size());
-        apsProcessOperationService.save(currentProcessOperationMainDo);
+        apsProcessOperationService.updateById(currentProcessOperationMainDo);
         currentProcessOperationEqu.setCheckoutroll(currentProcessOperationEqu.getCheckoutroll() + reportOutputDos.size());
         currentProcessOperationEqu.setWorkstatus(JOBSTATUS_TO_BE_END);
         currentProcessOperationEqu.setBachmaterialprocess("");
-        apsProcessOperationProcessEquService.save(currentProcessOperationEqu);
+        apsProcessOperationProcessEquService.updateById(currentProcessOperationEqu);
         // 更新 更新该报工检验记录所有输出物料 以及待加工料卷批次号
         updateProcessOutputMater(apsWorkInProgressInventoryDos, reportOutputDos, operationOutMaterDoList, currentProcessOperationMainDo);
         // 更新报工输出物料 检验状态
@@ -180,7 +180,9 @@ public class ReportCheckServiceImpl implements ReportCheckService {
         if (reportOutputDos.stream().anyMatch(info -> NO.equals(info.getQualified()))) {
             goBackWf(processOperationEquId, blankId, productionOrderDo);
         }
-        ;
+        apsReportRecordsService.update(new LambdaUpdateWrapper<ApsReportRecordsDo>().eq(ApsReportRecordsDo::getId, id)
+                .set(ApsReportRecordsDo::getCheckstatus, VERIFIED)
+                .set(ApsReportRecordsDo::getNeedcheckbatchnumber, ""));
         return R.ok();
         /*******************************************以下为旧逻辑*****************************************/
         // 获取检验不合格批次的数量