feature 代码提交

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

@@ -6,6 +6,7 @@ import com.rongwei.bscommon.sys.service.ApsBlankOrderService;
 import com.rongwei.bscommon.sys.service.ApsReportRecordsService;
 import com.rongwei.bscommon.sys.service.ReportCheckService;
 import com.rongwei.bsentity.domain.*;
+import com.rongwei.bsentity.vo.CommonUpdateProductionStatusReq;
 import com.rongwei.bsentity.vo.ProcessIdRelationVo;
 import com.rongwei.rwcommon.base.BaseDo;
 import com.rongwei.rwcommon.base.R;
@@ -88,7 +89,7 @@ public class ReportCheckServiceImpl implements ReportCheckService {
         }
         // 获取当前报工记录对应的工序作业记录
         ApsProcessOperationProcessEquDo currentProcessOperationEqu = apsProcessOperationProcessEquService.getById(reportRecordsDo.getProcessequid());
-
+        String processOperationEquId = currentProcessOperationEqu.getId();
         // 获取工序作业主表信息
         ApsProcessOperationDo currentProcessOperationMainDo = apsProcessOperationService.getOne(new LambdaQueryWrapper<ApsProcessOperationDo>()
                 .eq(ApsProcessOperationDo::getId, reportRecordsDo.getProcessoperationid()).eq(BaseDo::getDeleted, NO_DELETED));
@@ -104,10 +105,10 @@ public class ReportCheckServiceImpl implements ReportCheckService {
         String previousprocessid = currentProcessOperationMainDo.getPreviousprocessid();
         // 获取工序作业对应的输出物料信息
         ApsProcessOperationOutMaterDo operationOutMaterDoList = apsProcessOperationOutMaterService.getOne(new LambdaQueryWrapper<ApsProcessOperationOutMaterDo>()
-                .eq(ApsProcessOperationOutMaterDo::getMainid, currentProcessOperationEqu.getId())
+                .eq(ApsProcessOperationOutMaterDo::getMainid, processOperationEquId)
                 .eq(BaseDo::getDeleted, NO_DELETED), false);
         if (operationOutMaterDoList == null) {
-            log.error("无法根据工序作业ID:{}获取对应的输出物料信息", currentProcessOperationEqu.getId());
+            log.error("无法根据工序作业ID:{}获取对应的输出物料信息", processOperationEquId);
             return R.error();
         }
         // 获取该工序生成的物料输出信息
@@ -198,7 +199,7 @@ public class ReportCheckServiceImpl implements ReportCheckService {
         }
         /************************更新工序*******************************/
         // 更新工序作业明细表的输出已检验卷数，不合格卷数，合格卷数完工状态,作业状态,生产状态
-        apsProcessOperationProcessEquService.updateAboutCheckBatchNum(currentProcessOperationEqu.getId(), inspectQuantity,
+        apsProcessOperationProcessEquService.updateAboutCheckBatchNum(processOperationEquId, inspectQuantity,
                 qualifiedQuantity, unqualifiedQuantity, previousprocessid, currentProcessOperationMainDo.getId());
         // 更新工序主表的 已检验卷数，不合格卷数，合格卷数 , 完工状态,作业状态,生产状态
         apsProcessOperationService.updateAboutCheckBatchNum(currentProcessOperationMainDo.getId(), inspectQuantity,
@@ -234,6 +235,10 @@ public class ReportCheckServiceImpl implements ReportCheckService {
                 apsProcessOperationProcessEquService.updateAboutStateByProcessId(allNextProcessOperationById);
             }
         }
+        CommonUpdateProductionStatusReq req= new CommonUpdateProductionStatusReq();
+        req.setProcessOperationEquId(processOperationEquId);
+        // 更新
+        apsProcessOperationProcessEquService.updateProductionStatus(req);
         return R.ok();
     }