aps取消开工

cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/dao/ApsProcessOperationDao.java

@@ -46,4 +46,7 @@ public interface ApsProcessOperationDao extends BaseMapper<ApsProcessOperationDo
     List<ApsProcessOperationAndMaterialVo> selectOperationAndMaterialByBlankId(@Param("blankId") String blankId);
 
     List<ProcessIdRelationVo> getAllNextProcessOperationById(@Param("ids") List<String> ids);
+
+    @Update("update aps_process_operation set STARTINGROLL = STARTINGROLL - 1 where ID = #{processoperationid}")
+    void updateByCancelRecord(@Param("processoperationid") String processoperationid);
 }

cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/dao/ApsProcessOperationEquDao.java

@@ -2,6 +2,8 @@ package com.rongwei.bscommon.sys.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.rongwei.bsentity.domain.ApsProcessOperationEquDo;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Update;
 
 /**
  * @Entity com.rongwei.training.domain.ApsProcessOperationOutMater

cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/dao/ApsProcessOperationProcessEquDao.java

@@ -7,6 +7,7 @@ import com.rongwei.bsentity.vo.GanttVos;
 import com.rongwei.bsentity.vo.ProcessIdRelationVo;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
+import org.apache.ibatis.annotations.Update;
 
 import java.util.Date;
 import java.util.List;
@@ -43,7 +44,7 @@ public interface ApsProcessOperationProcessEquDao extends BaseMapper<ApsProcessO
     void updateAboutStateByProcessId(@Param("updateIds") List<ProcessIdRelationVo> updateIds);
 
 
-    @Select("select PROCESSID AS 'processOperationId',MIN(PROCESSSTATUS) AS 'productionStatus' from aps_process_operation_process_equ where DELETED = 0 AND PROCESSID = (select PROCESSID from aps_process_operation_process_equ where ID = #{processOperationEquId}) GROUP BY PROCESSID")
+    @Select("select PROCESSID AS 'processOperationId',MAX(CLOSESTATUS) AS 'productionStatus' from aps_process_operation_process_equ where DELETED = 0 AND PROCESSID = (select PROCESSID from aps_process_operation_process_equ where ID = #{processOperationEquId}) GROUP BY PROCESSID")
     CommonUpdateProductionStatusReq selectEquMinStatus(@Param("processOperationEquId") String processOperationEquId);
 
     @Select("select BLANKID AS 'blankId',MIN(PROCESSSTATUS) AS 'productionStatus' from aps_process_operation where DELETED = 0 AND BLANKID = (select BLANKID from aps_process_operation where ID = #{processOperationId}) GROUP BY BLANKID")
@@ -51,6 +52,12 @@ public interface ApsProcessOperationProcessEquDao extends BaseMapper<ApsProcessO
 
     @Select("select PRODUCTIONORDERID AS 'orderId',MIN(PRODUCTSTATUS) AS 'productionStatus' from aps_blank_order where DELETED = 0 AND PRODUCTIONORDERID = (select PRODUCTIONORDERID from aps_blank_order where ID = #{blankId}) GROUP BY PRODUCTIONORDERID")
     CommonUpdateProductionStatusReq selectBlankMinStatus(@Param("blankId") String blankId);
+
+    @Update("update aps_process_operation_process_equ set STARTINGROLL = STARTINGROLL - 1,WAITREPORTID = null where ID = #{processequid}")
+    void updateByCancelRecord(@Param("processequid") String processequid);
+
+    @Update("update asp_check_items set WAITREPORTID = null where ID = #{deviceId}")
+    void updateEquByCancelRecord(@Param("deviceId") String deviceId);
 }
 
 

cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/dao/ApsReportCheckoutDao.java

@@ -0,0 +1,16 @@
+package com.rongwei.bscommon.sys.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.rongwei.bsentity.domain.ApsReportCheckoutDo;
+
+/**
+ * <p>
+ * 报工记录检查项
+ * </p>
+ *
+ * @author fpy
+ * @since 2024-03-01
+ */
+public interface ApsReportCheckoutDao extends BaseMapper<ApsReportCheckoutDo> {
+
+}

cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/dao/ApsReportMachiningDao.java

@@ -0,0 +1,16 @@
+package com.rongwei.bscommon.sys.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.rongwei.bsentity.domain.ApsReportMachiningDo;
+
+/**
+ * <p>
+ * 报工记录加工参数
+ * </p>
+ *
+ * @author fpy
+ * @since 2024-03-01
+ */
+public interface ApsReportMachiningDao extends BaseMapper<ApsReportMachiningDo> {
+
+}

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

@@ -0,0 +1,11 @@
+package com.rongwei.bscommon.sys.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.rongwei.bsentity.domain.ApsReportCheckoutDo;
+
+/**
+ *
+ */
+public interface ApsReportCheckoutService extends IService<ApsReportCheckoutDo> {
+
+}

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

@@ -0,0 +1,11 @@
+package com.rongwei.bscommon.sys.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.rongwei.bsentity.domain.ApsReportMachiningDo;
+
+/**
+ *
+ */
+public interface ApsReportMachiningService extends IService<ApsReportMachiningDo> {
+
+}

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

@@ -2,10 +2,14 @@ package com.rongwei.bscommon.sys.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.rongwei.bsentity.domain.ApsReportRecordsDo;
+import com.rongwei.rwcommon.base.R;
+
+import java.util.Map;
 
 /**
  *
  */
 public interface ApsReportRecordsService extends IService<ApsReportRecordsDo> {
 
+    R cancelRecord(Map<String, String> req);
 }

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

@@ -21,6 +21,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.util.List;
@@ -83,6 +84,7 @@ public class ApsProcessOperationProcessEquServiceImpl extends ServiceImpl<ApsPro
 
 
     @Override
+    @Transactional
     public R updateProductionStatus(CommonUpdateProductionStatusReq request) {
 
         //根据粒度顺序
@@ -101,18 +103,59 @@ public class ApsProcessOperationProcessEquServiceImpl extends ServiceImpl<ApsPro
         return R.ok();
     }
 
-    private void updateProcess(String processOperationId) {
+    private void updateProcess(String processOperationEquId) {
         //查询所有子表明细的最小生产状态和工序作业ID
-        CommonUpdateProductionStatusReq one = this.baseMapper.selectEquMinStatus(processOperationId);
+        CommonUpdateProductionStatusReq one = this.baseMapper.selectEquMinStatus(processOperationEquId);
         if(ObjectUtil.isEmpty(one)){
             return;
         }
         //工序作业ID
         String processId = one.getProcessOperationId();
-        //更新工序作业的生产状态
+
+        //计算工序作业的完工状态
+        /**
+         * 如果没有作业明细，并且未完工卷数=0，或者有作业明细，并且所有作业明细完工状态=已完工，则=已完工
+         * 如果没有作业明细，并且未完工卷数>0，或者有作业明细，并且任一作业明细完工状态=未完工，则=未完工
+         */
         ApsProcessOperationDo apsProcessOperationDo = new ApsProcessOperationDo();
+        //更新工序作业的完工状态
+        apsProcessOperationDo.setClosestatus(one.getProductionStatus());
+        //查询工序作业信息
+        ApsProcessOperationDo processOperationDo = apsProcessOperationService.getById(processId);
+        //已开工卷数
+        Integer startingroll = processOperationDo.getStartingroll();
+        //未完工卷数
+        Integer unfinishroll = processOperationDo.getUnfinishroll();
+        //计算作业状态
+        /**
+         * 如果已开工卷数=0，则=待开工；
+         * 如果已开工卷数>0，并且完工状态=未完工，则=加工中；（先更新完工状态）
+         * 如果未完工卷数=0，并且完工状态=已完工，则=已完工（先更新完工状态）
+         */
+        if(startingroll <= 0){
+            apsProcessOperationDo.setWorkstatus("待开工");
+            //容错修正
+            apsProcessOperationDo.setStartingroll(0);
+        }
+        if(startingroll > 0 && apsProcessOperationDo.getClosestatus().equals("未完工")){
+            apsProcessOperationDo.setWorkstatus("加工中");
+        }
+        if(unfinishroll == 0 && apsProcessOperationDo.getClosestatus().equals("已完工")){
+            apsProcessOperationDo.setWorkstatus("已完工");
+        }
+
+        //更新工序作业的生产状态
+        //开工和报工检验后，生产状态=作业状态（先更新作业状态）
+        if(apsProcessOperationDo.getWorkstatus().equals("待开工")){
+            apsProcessOperationDo.setProcessstatus("30");
+        }
+        if(apsProcessOperationDo.getWorkstatus().equals("加工中")){
+            apsProcessOperationDo.setProcessstatus("40");
+        }
+        if(apsProcessOperationDo.getWorkstatus().equals("已完工")){
+            apsProcessOperationDo.setProcessstatus("50");
+        }
         apsProcessOperationDo.setId(processId);
-        apsProcessOperationDo.setProcessstatus(one.getProductionStatus());
         apsProcessOperationService.updateById(apsProcessOperationDo);
 
         //更新坯料计划

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

@@ -0,0 +1,20 @@
+package com.rongwei.bscommon.sys.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.rongwei.bscommon.sys.dao.ApsReportCheckoutDao;
+import com.rongwei.bscommon.sys.service.ApsReportCheckoutService;
+import com.rongwei.bsentity.domain.ApsReportCheckoutDo;
+import org.springframework.stereotype.Service;
+
+/**
+ *
+ */
+@Service
+public class ApsReportCheckoutServiceImpl extends ServiceImpl<ApsReportCheckoutDao, ApsReportCheckoutDo>
+implements ApsReportCheckoutService {
+
+}
+
+
+
+

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

@@ -0,0 +1,20 @@
+package com.rongwei.bscommon.sys.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.rongwei.bscommon.sys.dao.ApsReportMachiningDao;
+import com.rongwei.bscommon.sys.service.ApsReportMachiningService;
+import com.rongwei.bsentity.domain.ApsReportMachiningDo;
+import org.springframework.stereotype.Service;
+
+/**
+ *
+ */
+@Service
+public class ApsReportMachiningServiceImpl extends ServiceImpl<ApsReportMachiningDao, ApsReportMachiningDo>
+implements ApsReportMachiningService {
+
+}
+
+
+
+

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

@@ -19,6 +19,7 @@ import com.rongwei.safecommon.utils.CXCommonUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.rongwei.bscommon.sys.service.ApsReportOutputService;
+import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.util.LinkedList;
@@ -40,6 +41,7 @@ public class ApsReportOutputServiceImpl extends ServiceImpl<ApsReportOutputDao,
     private ApsReportRecordsService apsReportRecordsService;
 
     @Override
+    @Transactional
     public R insertMyReportOutput(InsertMyReportOutputReq req) {
         //最终新增的子表数据
         List<ApsReportOutputDo> resList = new LinkedList<>();

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

@@ -1,11 +1,20 @@
 package com.rongwei.bscommon.sys.service.impl;
 
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.rongwei.bscommon.sys.dao.ApsReportRecordsDao;
-import com.rongwei.bscommon.sys.service.ApsReportRecordsService;
-import com.rongwei.bsentity.domain.ApsReportRecordsDo;
+import com.rongwei.bscommon.sys.dao.*;
+import com.rongwei.bscommon.sys.service.*;
+import com.rongwei.bsentity.domain.*;
 
+import com.rongwei.bsentity.vo.CommonUpdateProductionStatusReq;
+import com.rongwei.rwcommon.base.R;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+import java.util.Map;
 
 /**
  *
@@ -13,7 +22,98 @@ import org.springframework.stereotype.Service;
 @Service
 public class ApsReportRecordsServiceImpl extends ServiceImpl<ApsReportRecordsDao, ApsReportRecordsDo>
 implements ApsReportRecordsService {
+    @Autowired
+    private ApsReportOutputService apsReportOutputService;
+    @Autowired
+    private ApsReportCheckoutService apsReportCheckoutService;
+    @Autowired
+    private ApsReportMachiningService apsReportMachiningService;
+    @Autowired
+    private ApsWorkInProgressInventoryService apsWorkInProgressInventoryService;
+    @Autowired
+    private ApsProcessOperationProcessEquService apsProcessOperationProcessEquService;
+    @Resource
+    private ApsProcessOperationProcessEquDao apsProcessOperationProcessEquDao;
+    @Resource
+    private ApsProcessOperationDao apsProcessOperationDao;
+
+    @Override
+    @Transactional
+    public R cancelRecord(Map<String, String> req) {
+        String recordId;
+        try {
+            recordId = req.get("ID");
+        } catch (Exception e) {
+            e.printStackTrace();
+            return R.error("报工记录ID错误");
+        }
+        //查询报工详情
+        ApsReportRecordsDo recordsDo = this.getById(recordId);
+        if(ObjectUtil.isEmpty(recordsDo)){
+            return R.error("报工记录未找到");
+        }
+        //删除报工记录
+        this.removeById(recordId);
+        //删除报工输出物料
+        apsReportOutputService.remove(new QueryWrapper<ApsReportOutputDo>().lambda().eq(ApsReportOutputDo::getMainid,recordId));
+        //删除报工加工参数
+        apsReportMachiningService.remove(new QueryWrapper<ApsReportMachiningDo>().lambda().eq(ApsReportMachiningDo::getMainid,recordId));
+        //删除报工检查项
+        apsReportCheckoutService.remove(new QueryWrapper<ApsReportCheckoutDo>().lambda().eq(ApsReportCheckoutDo::getMainid,recordId));
+
+        //更新输入物料在制品：如果输入物料有批次号，并且在制品库存中有输入物料批次号的在制品，则更新该在制品的在制品状态=待加工
+        if(ObjectUtil.isNotEmpty(recordsDo.getBatchnumber())){
+            ApsWorkInProgressInventoryDo apsWorkInProgressInventoryDo = new ApsWorkInProgressInventoryDo();
+            apsWorkInProgressInventoryDo.setWorkinprocessstatus("待加工");
+            apsWorkInProgressInventoryService.update(apsWorkInProgressInventoryDo,new QueryWrapper<ApsWorkInProgressInventoryDo>().lambda().eq(ApsWorkInProgressInventoryDo::getBatchnumber,recordsDo.getBatchnumber()));
+        }
+
+        //更新工序作业和作业明细
+        //明细的已开工卷数=已开工卷数-1 ;明细的待报工记录ID=（空），设备的带报工记录ID=（空）；工序作业的已开工卷数-1
+
+        //工序作业ID
+        String processoperationid = recordsDo.getProcessoperationid();
+        //工序作业明细ID
+        String processequid = recordsDo.getProcessequid();
+
+        //更新该工序作业的作业明细的作业状态字段、已开工卷数、明细的待报工记录ID=（空）
+        apsProcessOperationProcessEquDao.updateByCancelRecord(processequid);
+
+        //更新该工序作业的已开工卷数-1
+        apsProcessOperationDao.updateByCancelRecord(processoperationid);
+
+        //查询作业明细详情
+        ApsProcessOperationProcessEquDo equDo = apsProcessOperationProcessEquDao.selectById(processequid);
+
+        //更新设备的待报工记录ID
+        apsProcessOperationProcessEquDao.updateEquByCancelRecord(equDo.getProcessdeviceid());
+
+        //作业明细的作业状态
+        /**
+         * 如果已开工卷数=0，则=待开工；
+         * 如果已开工卷数>0，并且完工状态=未完工，则=加工中；（先更新完工状态）
+         * 如果未完工卷数=0，并且完工状态=已完工，则=已完工（先更新完工状态）
+         */
+        ApsProcessOperationProcessEquDo apsProcessOperationProcessEquDo = new ApsProcessOperationProcessEquDo();
+        apsProcessOperationProcessEquDo.setId(equDo.getId());
+        if(equDo.getStartingroll() == 0){
+            apsProcessOperationProcessEquDo.setWorkstatus("待开工");
+        }
+        if(equDo.getStartingroll() > 0 && equDo.getClosestatus().equals("未完工")){
+            apsProcessOperationProcessEquDo.setWorkstatus("加工中");
+        }
+        if(ObjectUtil.isNotEmpty(equDo.getUnfinishroll()) && equDo.getUnfinishroll() == 0){
+            apsProcessOperationProcessEquDo.setWorkstatus("已完工");
+        }
+        apsProcessOperationProcessEquDao.updateById(apsProcessOperationProcessEquDo);
+
+        //更新其余信息
+        CommonUpdateProductionStatusReq commonUpdateProductionStatusReq = new CommonUpdateProductionStatusReq();
+        commonUpdateProductionStatusReq.setProcessOperationEquId(equDo.getId());
+        apsProcessOperationProcessEquService.updateProductionStatus(commonUpdateProductionStatusReq);
 
+        return R.ok();
+    }
 }
 
 

cx-aps/cx-aps-entity/src/main/java/com/rongwei/bsentity/domain/ApsReportCheckoutDo.java

@@ -0,0 +1,84 @@
+package com.rongwei.bsentity.domain;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * aps_report_checkout
+ * @author 
+ */
+@TableName(value = "aps_report_checkout")
+@Data
+public class ApsReportCheckoutDo implements Serializable {
+    /**
+     * 主键ID
+     */
+    private String id;
+
+    private String tenantid;
+
+    /**
+     * 扩展json格式配置
+     */
+    private String roption;
+
+    /**
+     * 是否删除Y/N
+     */
+    private String deleted;
+
+    /**
+     * 报工备注
+     */
+    private String remark;
+
+    /**
+     * 创建时间
+     */
+    private Date createdate;
+
+    /**
+     * 创建用户ID
+     */
+    private String createuserid;
+
+    /**
+     * 修改日期
+     */
+    private Date modifydate;
+
+    /**
+     * 修改用户ID
+     */
+    private String modifyuserid;
+
+    /**
+     * 创建人
+     */
+    private String createusername;
+
+    /**
+     * 修改人
+     */
+    private String modifyusername;
+
+    /**
+     * 主表id(报告记录表主键)
+     */
+    private String mainid;
+
+    /**
+     * 检查项目
+     */
+    private String checkitem;
+
+    /**
+     * 检查值
+     */
+    private String checkparameter;
+
+    private static final long serialVersionUID = 1L;
+}

cx-aps/cx-aps-entity/src/main/java/com/rongwei/bsentity/domain/ApsReportMachiningDo.java

@@ -0,0 +1,84 @@
+package com.rongwei.bsentity.domain;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * aps_report_checkout
+ * @author 
+ */
+@TableName(value = "aps_report_machining")
+@Data
+public class ApsReportMachiningDo implements Serializable {
+    /**
+     * 主键ID
+     */
+    private String id;
+
+    private String tenantid;
+
+    /**
+     * 扩展json格式配置
+     */
+    private String roption;
+
+    /**
+     * 是否删除Y/N
+     */
+    private String deleted;
+
+    /**
+     * 报工备注
+     */
+    private String remark;
+
+    /**
+     * 创建时间
+     */
+    private Date createdate;
+
+    /**
+     * 创建用户ID
+     */
+    private String createuserid;
+
+    /**
+     * 修改日期
+     */
+    private Date modifydate;
+
+    /**
+     * 修改用户ID
+     */
+    private String modifyuserid;
+
+    /**
+     * 创建人
+     */
+    private String createusername;
+
+    /**
+     * 修改人
+     */
+    private String modifyusername;
+
+    /**
+     * 主表id(报告记录表主键)
+     */
+    private String mainid;
+
+    /**
+     * 检查项目
+     */
+    private String checkitem;
+
+    /**
+     * 检查值
+     */
+    private String checkparameter;
+
+    private static final long serialVersionUID = 1L;
+}

cx-aps/cx-aps-entity/src/main/java/com/rongwei/bsentity/domain/ApsWorkInProgressInventory.java

@@ -1,182 +0,0 @@
-package com.rongwei.bsentity.domain;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.rongwei.rwcommon.base.BaseDo;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * 在制品库存表
- * @TableName aps_work_in_progress_inventory
- */
-@TableName(value ="aps_work_in_progress_inventory")
-@Data
-public class ApsWorkInProgressInventory extends BaseDo implements Serializable {
-    /**
-     * 主键
-     */
-    @TableId
-    private String id;
-
-    /**
-     * 所属租户ID
-     */
-    private String tenantid;
-
-    /**
-     * 扩展json格式配置
-     */
-    private String roption;
-
-    /**
-     * 是否删除
-     */
-    private String deleted;
-
-    /**
-     * 备注
-     */
-    private String remark;
-
-    /**
-     * 创建时间
-     */
-    private Date createdate;
-
-    /**
-     * 创建用户ID
-     */
-    private String createuserid;
-
-    /**
-     * 修改日期
-     */
-    private Date modifydate;
-
-    /**
-     * 修改用户ID
-     */
-    private String modifyuserid;
-
-    /**
-     * 创建人名称
-     */
-    private String createusername;
-
-    /**
-     * 修改人名称
-     */
-    private String modifyusername;
-
-    /**
-     * 坯料批次号
-     */
-    private String blankbatchnumber;
-
-    /**
-     * 坯料ID
-     */
-    private String blankid;
-
-    /**
-     * 坯料
-     */
-    private String blankname;
-
-    /**
-     * 工序作业ID
-     */
-    private String processoperationid;
-
-    /**
-     * 报工记录ID
-     */
-    private String workreportrecordid;
-
-    /**
-     * 作业输出物料ID
-     */
-    private String joboutputmaterialid;
-
-    /**
-     * 报工输出物料ID
-     */
-    private String reportoutputmaterialid;
-
-    /**
-     * 批次号
-     */
-    private String batchnumber;
-
-    /**
-     * 在制品
-     */
-    private String workinprocess;
-
-    /**
-     * 生产日期
-     */
-    private Date productdate;
-
-    /**
-     * 加工工厂
-     */
-    private String productfactory;
-
-    /**
-     * 加工车间
-     */
-    private String productworkshop;
-
-    /**
-     * 加工设备
-     */
-    private String productdevice;
-
-    /**
-     * 客户名称
-     */
-    private String customername;
-
-    /**
-     * 订单号
-     */
-    private String ordernumber;
-
-    /**
-     * 检验等级
-     */
-    private String inspectionlevel;
-
-    /**
-     * 是否合格
-     */
-    private String isqualified;
-
-    /**
-     * 在制品类型
-     */
-    private String workinprocesstype;
-
-    /**
-     * 在制品状态
-     */
-    private String workinprocessstatus;
-
-    /**
-     * 待加工工序作业ID
-     */
-    private String pendingprocessid;
-
-    /**
-     * 备料计划ID
-     */
-    private String planmaterialid;
-
-    @TableField(exist = false)
-    private static final long serialVersionUID = 1L;
-}

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

@@ -0,0 +1,48 @@
+package com.rongwei.bsserver.controller;
+
+
+import com.rongwei.bscommon.sys.service.ApsReportRecordsService;
+import com.rongwei.rwcommon.base.R;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+
+/**
+ * <p>
+ * 作业报工记录 前端控制器
+ * </p>
+ *
+ * @author sc
+ * @since 2024-03-28
+ */
+@Slf4j
+@RestController
+@RequestMapping("/apsReportRecord")
+public class ApsReportRecordController {
+    @Autowired
+    private ApsReportRecordsService apsReportRecordsService;
+
+    /**
+     *  取消报工
+     * @param req
+     * @return
+     */
+    @PostMapping("/cancelRecord")
+    public R cancelRecord(@RequestBody Map<String, String> req) {
+        try {
+            log.info("取消报工;参数为：{}", req);
+            return apsReportRecordsService.cancelRecord(req);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return R.error("取消报工错误");
+        }
+    }
+
+
+}
+