aps-订单评审 删除接口

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

@@ -0,0 +1,8 @@
+package com.rongwei.bscommon.sys.dao;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.rongwei.bsentity.domain.ApsOrderAlloyCompositionDo;
+
+public interface ApsOrderAlloyCompositionDao extends BaseMapper<ApsOrderAlloyCompositionDo> {
+}

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

@@ -42,4 +42,5 @@ public interface ApsBlankOrderService extends IService<ApsBlankOrderDo> {
     R checkBlankOrder(CheckAndSaveOrUpdateBlankReq req, int i);
 
     R removeBlankOrder(ApsBlankOrderDo req);
+    void removeBlankOrderAndChild(ApsBlankOrderDo req);
 }

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

@@ -0,0 +1,8 @@
+package com.rongwei.bscommon.sys.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.rongwei.bsentity.domain.ApsOrderAlloyCompositionDo;
+
+
+public interface ApsOrderAlloyCompositionService extends IService<ApsOrderAlloyCompositionDo> {
+}

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

@@ -3,6 +3,7 @@ package com.rongwei.bscommon.sys.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.rongwei.bsentity.domain.ApsProductionOrderDo;
 import com.rongwei.bsentity.vo.CheckAndSaveOrUpdateOrderReq;
+import com.rongwei.bsentity.vo.DeleteOrderVo;
 import com.rongwei.rwcommon.base.R;
 
 import java.util.List;
@@ -25,4 +26,6 @@ public interface ApsProductionOrderService extends IService<ApsProductionOrderDo
     R changeOrder(ApsProductionOrderDo req);
 
     void processDelay();
+
+    R deleteOrder(DeleteOrderVo req);
 }

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

@@ -1604,11 +1604,32 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
             return R.error("坯料Id不能为空");
         }
         ApsBlankOrderDo apsBlankOrderDo = this.getById(req.getId());
+        removeBlankOrderAndChild(apsBlankOrderDo);
+
+        //物理删除相关的工序作业备份
+        this.baseMapper.deleteProcessBackupByBlankId(req.getId());
+        //物理删除相关的作业明细备份
+        this.baseMapper.deleteProcessEquBackupByBlankId(req.getId());
+
+        //查询此订单的其他任一一个坯料计划的Id，重新更新订单的状态
+        CommonUpdateProductionStatusReq commonUpdateProductionStatusReq = new CommonUpdateProductionStatusReq();
+        ApsBlankOrderDo one = this.getOne(new QueryWrapper<ApsBlankOrderDo>().lambda().eq(ApsBlankOrderDo::getProductionorderid, apsBlankOrderDo.getProductionorderid()));
+        if (ObjectUtil.isNotEmpty(one)) {
+            commonUpdateProductionStatusReq.setBlankId(one.getId());
+        } else {
+            commonUpdateProductionStatusReq.setOrderId(apsBlankOrderDo.getProductionorderid());
+        }
+        apsProcessOperationProcessEquService.updateProductionStatus(commonUpdateProductionStatusReq);
+
+        return R.ok();
+    }
+
+    public void removeBlankOrderAndChild(ApsBlankOrderDo req) {
         //删除坯料计划
         this.removeById(req.getId());
 
         //如果是备料，删除计划后，备料的计划ID设置为空
-        if (apsBlankOrderDo.getPreparematerial().equals("是")) {
+        if (req.getPreparematerial().equals("是")) {
             ApsWorkInProgressInventoryDo needUpdate = new ApsWorkInProgressInventoryDo();
             needUpdate.setPlanmaterialid("");
             apsWorkInProgressInventoryService.update(needUpdate, new QueryWrapper<ApsWorkInProgressInventoryDo>().lambda().eq(ApsWorkInProgressInventoryDo::getPlanmaterialid, req.getId()));
@@ -1628,22 +1649,5 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
 
         //逻辑删除坯料计划的工艺路线
         this.baseMapper.removeMindMappingByBlankId(req.getId());
-
-        //物理删除相关的工序作业备份
-        this.baseMapper.deleteProcessBackupByBlankId(req.getId());
-        //物理删除相关的作业明细备份
-        this.baseMapper.deleteProcessEquBackupByBlankId(req.getId());
-
-        //查询此订单的其他任一一个坯料计划的Id，重新更新订单的状态
-        CommonUpdateProductionStatusReq commonUpdateProductionStatusReq = new CommonUpdateProductionStatusReq();
-        ApsBlankOrderDo one = this.getOne(new QueryWrapper<ApsBlankOrderDo>().lambda().eq(ApsBlankOrderDo::getProductionorderid, apsBlankOrderDo.getProductionorderid()));
-        if (ObjectUtil.isNotEmpty(one)) {
-            commonUpdateProductionStatusReq.setBlankId(one.getId());
-        } else {
-            commonUpdateProductionStatusReq.setOrderId(apsBlankOrderDo.getProductionorderid());
-        }
-        apsProcessOperationProcessEquService.updateProductionStatus(commonUpdateProductionStatusReq);
-
-        return R.ok();
     }
 }

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

@@ -0,0 +1,13 @@
+package com.rongwei.bscommon.sys.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.rongwei.bscommon.sys.dao.ApsOrderAlloyCompositionDao;
+import com.rongwei.bscommon.sys.service.ApsOrderAlloyCompositionService;
+import com.rongwei.bsentity.domain.ApsOrderAlloyCompositionDo;
+import org.springframework.stereotype.Service;
+
+
+@Service
+public class ApsOrderAlloyCompositionServiceImpl extends ServiceImpl<ApsOrderAlloyCompositionDao, ApsOrderAlloyCompositionDo> implements ApsOrderAlloyCompositionService {
+
+}

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

@@ -7,10 +7,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.rongwei.bscommon.sys.dao.*;
-import com.rongwei.bscommon.sys.service.ApsBlankOrderService;
-import com.rongwei.bscommon.sys.service.ApsProcessOutputProductService;
-import com.rongwei.bscommon.sys.service.ApsProductDetailService;
-import com.rongwei.bscommon.sys.service.ApsProductionOrderService;
+import com.rongwei.bscommon.sys.service.*;
 import com.rongwei.bscommon.sys.utils.ApsUtils;
 import com.rongwei.bsentity.domain.*;
 import com.rongwei.bsentity.vo.*;
@@ -64,6 +61,10 @@ public class ApsProductionOrderServiceImpl extends ServiceImpl<ApsProductionOrde
     private CXCommonFeginClient autoCommonFeginClient;
     @Autowired
     private ApsProductDetailService apsProductDetailService;
+    @Autowired
+    private ApsProductionMergeOrderService apsProductionMergeOrderService;
+    @Autowired
+    private ApsOrderAlloyCompositionService apsOrderAlloyCompositionService;
 
     public static final String ERROR_MSG = "%s上诉订单的排程交货期大于承诺交货期";
 
@@ -366,6 +367,46 @@ public class ApsProductionOrderServiceImpl extends ServiceImpl<ApsProductionOrde
         return R.ok();
     }
 
+    @Override
+    @Transactional
+    public R deleteOrder(DeleteOrderVo req) {
+        if (ObjectUtil.isEmpty(req.getOrderId())) {
+            return R.error("订单ID不能为空");
+        }
+
+        List<ApsBlankOrderDo> blankList = apsBlankOrderService.list(new QueryWrapper<ApsBlankOrderDo>().lambda().eq(ApsBlankOrderDo::getProductionorderid, req.getOrderId()));
+        //清除排程备份
+        if (req.getNeedDelBackup()) {
+            //查询订单下的坯料计划
+
+            List<String> blankIdList = blankList.stream().map(ApsBlankOrderDo::getId).collect(Collectors.toList());
+            SysUserVo currentUser = CXCommonUtils.getCurrentUser();
+            String factoryId = CXCommonUtils.getCurrentUserFactoryId(currentUser);
+            apsProcessOperationBackupDao.deletedByBlankId(blankIdList, factoryId);
+            apsProcessOperationProcessEquBackupDao.deletedByBlankId(blankIdList, factoryId);
+        }
+
+        //删除该订单，包括订单明细，合并订单及明细，坯料计划，工序作业
+        //删除订单
+        this.removeById(req.getOrderId());
+
+        //删除订单明细子表
+        apsProductDetailService.remove(new QueryWrapper<ApsProductDetailDo>().lambda().eq(ApsProductDetailDo::getMainid, req.getOrderId()));
+
+        //删除合并订单子表
+        apsProductionMergeOrderService.remove(new QueryWrapper<ApsProductionMergeOrderDo>().lambda().eq(ApsProductionMergeOrderDo::getMainid, req.getOrderId()));
+
+        //删除合计成分要求子表
+        apsOrderAlloyCompositionService.remove(new QueryWrapper<ApsOrderAlloyCompositionDo>().lambda().eq(ApsOrderAlloyCompositionDo::getProductionorderid, req.getOrderId()));
+
+        //遍历删除坯料计划子表
+        for (ApsBlankOrderDo apsBlankOrderDo : blankList) {
+            apsBlankOrderService.removeBlankOrderAndChild(apsBlankOrderDo);
+        }
+
+        return R.ok();
+    }
+
     /*
     作业延期提醒
      */

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

@@ -1,6 +1,7 @@
 package com.rongwei.bsentity.domain;
 
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.rongwei.rwcommon.base.BaseDo;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -13,7 +14,7 @@ import java.util.Date;
  */
 @Data
 @TableName("aps_alloy_composition")
-public class ApsAlloyCompositionDo implements Serializable {
+public class ApsAlloyCompositionDo extends BaseDo {
     /**
      * 主键ID
      */
@@ -26,45 +27,7 @@ public class ApsAlloyCompositionDo implements Serializable {
      */
     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;
 
     /**
      * 所属工厂

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

@@ -1,6 +1,7 @@
 package com.rongwei.bsentity.domain;
 
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.rongwei.rwcommon.base.BaseDo;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -12,7 +13,7 @@ import java.util.Date;
  */
 @Data
 @TableName("aps_alloy")
-public class ApsAlloyDo implements Serializable {
+public class ApsAlloyDo extends BaseDo {
     /**
      * 主键ID
      */
@@ -25,45 +26,6 @@ public class ApsAlloyDo implements Serializable {
      */
     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;
 
     /**
      * 所属工厂

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

@@ -1,6 +1,7 @@
 package com.rongwei.bsentity.domain;
 
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.rongwei.rwcommon.base.BaseDo;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -12,7 +13,7 @@ import java.util.Date;
  */
 @Data
 @TableName("aps_check_parameter")
-public class ApsCheckParameterDo implements Serializable {
+public class ApsCheckParameterDo extends BaseDo {
     /**
      * 主键ID
      */
@@ -25,45 +26,6 @@ public class ApsCheckParameterDo implements Serializable {
      */
     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;
 
     /**
      * 检查项

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

@@ -0,0 +1,49 @@
+package com.rongwei.bsentity.domain;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.rongwei.rwcommon.base.BaseDo;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * aps_order_alloy_composition
+ * @author 
+ */
+@Data
+@TableName("aps_order_alloy_composition")
+public class ApsOrderAlloyCompositionDo extends BaseDo {
+    /**
+     * 主键
+     */
+    private String id;
+
+    /**
+     * 所属租户ID
+     */
+    private String tenantid;
+
+    /**
+     * 扩展json格式配置
+     */
+    private String roption;
+
+
+    /**
+     * 生产订单ID
+     */
+    private String productionorderid;
+
+    /**
+     * 合金
+     */
+    private String alloy;
+
+    /**
+     * 成分要求
+     */
+    private String compontentrequirement;
+
+    private static final long serialVersionUID = 1L;
+}

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

@@ -1,6 +1,7 @@
 package com.rongwei.bsentity.domain;
 
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.rongwei.rwcommon.base.BaseDo;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -12,7 +13,7 @@ import java.util.Date;
  */
 @Data
 @TableName("aps_parameter")
-public class ApsParameterDo implements Serializable {
+public class ApsParameterDo extends BaseDo {
     /**
      * 主键ID
      */
@@ -25,46 +26,6 @@ public class ApsParameterDo implements Serializable {
      */
     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;
-
     /**
      * 参数
      */

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

@@ -5,6 +5,7 @@ import java.math.BigDecimal;
 import java.util.Date;
 
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.rongwei.rwcommon.base.BaseDo;
 import lombok.Data;
 
 /**
@@ -13,7 +14,7 @@ import lombok.Data;
  */
 @Data
 @TableName("aps_process_output_product")
-public class ApsProcessOutputProductDo implements Serializable {
+public class ApsProcessOutputProductDo extends BaseDo {
     /**
      * 主键ID
      */
@@ -26,46 +27,6 @@ public class ApsProcessOutputProductDo implements Serializable {
      */
     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;
-
     /**
      * 所属工厂
      */

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

@@ -1,6 +1,7 @@
 package com.rongwei.bsentity.domain;
 
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.rongwei.rwcommon.base.BaseDo;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -13,7 +14,7 @@ import java.util.Date;
  */
 @Data
 @TableName("aps_report_blank_compent")
-public class ApsReportBlankCompentDo implements Serializable {
+public class ApsReportBlankCompentDo extends BaseDo {
     /**
      * 主键
      */
@@ -29,46 +30,6 @@ public class ApsReportBlankCompentDo implements Serializable {
      */
     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;
-
     /**
      * 主表ID
      */

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

@@ -1,6 +1,7 @@
 package com.rongwei.bsentity.domain;
 
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.rongwei.rwcommon.base.BaseDo;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -12,7 +13,7 @@ import java.util.Date;
  */
 @TableName(value = "aps_report_checkout")
 @Data
-public class ApsReportCheckoutDo implements Serializable {
+public class ApsReportCheckoutDo extends BaseDo {
     /**
      * 主键ID
      */
@@ -25,45 +26,6 @@ public class ApsReportCheckoutDo implements Serializable {
      */
     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(报告记录表主键)

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

@@ -1,6 +1,7 @@
 package com.rongwei.bsentity.domain;
 
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.rongwei.rwcommon.base.BaseDo;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -12,7 +13,7 @@ import java.util.Date;
  */
 @TableName(value = "aps_report_machining")
 @Data
-public class ApsReportMachiningDo implements Serializable {
+public class ApsReportMachiningDo extends BaseDo {
     /**
      * 主键ID
      */
@@ -25,46 +26,6 @@ public class ApsReportMachiningDo implements Serializable {
      */
     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(报告记录表主键)
      */

cx-aps/cx-aps-entity/src/main/java/com/rongwei/bsentity/vo/DeleteOrderVo.java

@@ -0,0 +1,15 @@
+package com.rongwei.bsentity.vo;
+
+import lombok.Data;
+
+/**
+ * @author ：sc
+ * @since ：2024/5/14
+ */
+@Data
+public class DeleteOrderVo {
+    //订单ID
+    private String orderId;
+    //是否需要清除排程备份
+    private Boolean needDelBackup = false;
+}

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

@@ -3,6 +3,7 @@ package com.rongwei.bsserver.controller;
 import com.rongwei.bscommon.sys.service.ApsProductionOrderService;
 import com.rongwei.bsentity.domain.ApsProductionOrderDo;
 import com.rongwei.bsentity.vo.CheckAndSaveOrUpdateOrderReq;
+import com.rongwei.bsentity.vo.DeleteOrderVo;
 import com.rongwei.rwcommon.base.R;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -90,4 +91,11 @@ public class ApsProductionOrderController {
         apsProductionOrderService.processDelay();
     }
 
+    /**
+     * 删除订单评审
+     */
+    @PostMapping("/deleteOrder")
+    public R deleteOrder(@RequestBody DeleteOrderVo req){
+        return apsProductionOrderService.deleteOrder(req);
+    }
 }