aps-作业报工暂存加锁

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

@@ -6,6 +6,7 @@ import com.rongwei.bsentity.vo.SaveReportReq;
 import com.rongwei.bsentity.vo.SmallRollStartReportReq;
 import com.rongwei.bsentity.vo.StartRePortReq;
 import com.rongwei.rwcommon.base.R;
+import com.rongwei.rwcommon.vo.generalsql.MasterSlaveUpdateVo;
 
 import java.util.Map;
 
@@ -23,4 +24,6 @@ public interface ApsReportRecordsService extends IService<ApsReportRecordsDo> {
     R checkMergeProcess(ApsReportRecordsDo req);
 
     R smallRollStartReport(SmallRollStartReportReq req);
+
+    R generalMsUpdate(MasterSlaveUpdateVo masterSlaveUpdate);
 }

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

@@ -17,6 +17,7 @@ import com.rongwei.rwadmincommon.system.vo.SysUserVo;
 import com.rongwei.rwcommon.base.R;
 import com.rongwei.rwcommon.base.exception.CustomException;
 import com.rongwei.rwcommon.utils.SecurityUtil;
+import com.rongwei.rwcommon.vo.generalsql.MasterSlaveUpdateVo;
 import com.rongwei.rwcommonentity.commonservers.vo.SysSerialVo;
 import com.rongwei.safecommon.fegin.CXAdminFeginClient;
 import com.rongwei.safecommon.utils.CXCommonUtils;
@@ -1693,6 +1694,17 @@ public class ApsReportRecordsServiceImpl extends ServiceImpl<ApsReportRecordsDao
         }
     }
 
+    @Override
+    public R generalMsUpdate(MasterSlaveUpdateVo masterSlaveUpdate) {
+        String recordId = masterSlaveUpdate.getMasterUpdate().getColumnQueryTypes().get(0).getColumns().get(0).getValue();
+        ApsReportRecordsDo recordsDo = this.getById(recordId);
+        if (ObjectUtil.isEmpty(recordsDo) || !recordsDo.getReportworkstatus().equals("已开工")) {
+            return R.error("此作业已取消开工或已报工，请刷新列表后重试");
+        }
+        cxAdminFeginClient.generalMsUpdate(masterSlaveUpdate);
+        return R.ok();
+    }
+
 
 }
 

cx-aps/cx-aps-server/src/main/java/com/rongwei/bsserver/controller/ApsReportRecordController.java

@@ -7,6 +7,7 @@ import com.rongwei.bsentity.vo.SaveReportReq;
 import com.rongwei.bsentity.vo.SmallRollStartReportReq;
 import com.rongwei.bsentity.vo.StartRePortReq;
 import com.rongwei.rwcommon.base.R;
+import com.rongwei.rwcommon.vo.generalsql.MasterSlaveUpdateVo;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -79,5 +80,13 @@ public class ApsReportRecordController {
         log.info("小卷开工;参数为：{}", req);
         return apsReportRecordsService.smallRollStartReport(req);
     }
+
+    /**
+     * 作业报工 修改
+     */
+    @PostMapping("/generalMsUpdate")
+    public R generalMsUpdate(@RequestBody MasterSlaveUpdateVo masterSlaveUpdate) {
+        return apsReportRecordsService.generalMsUpdate(masterSlaveUpdate);
+    }
 }