feature 代码提交

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

@@ -14,7 +14,7 @@ public interface ApsProcessOperationBackupDao extends BaseMapper<ApsProcessOpera
                                 @Param("userId") String userId,
                                 @Param("userName") String userName);
 
-    void deletedByBlankId(@Param("blankIds") List<String> blankIds);
+    void deletedByBlankId(@Param("blankIds") List<String> blankIds,@Param("factoryId") String factoryId);
 
     void processOperationCopy(@Param("userId") String userId,
                               @Param("userName") String userName);

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

@@ -15,7 +15,7 @@ public interface ApsProcessOperationProcessEquBackupDao extends BaseMapper<ApsPr
                                    @Param("userId") String userId,
                                    @Param("userName") String userName);
 
-    void deletedByBlankId(@Param("blankIds") List<String> blankIds);
+    void deletedByBlankId(@Param("blankIds") List<String> blankIds,@Param("factoryId") String factoryId);
 
     void processOperationEquCopy(@Param("processOperationIds") List<String> processOperationIds,
                                  @Param("userId") String userId,

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

@@ -68,6 +68,10 @@ public interface ApsProcessOperationProcessEquDao extends BaseMapper<ApsProcessO
 
     @Select("select apo.ID AS 'blankId',MIN(apo2.PROCESSSTATUS) AS 'productionStatus' from aps_blank_order apo LEFT JOIN aps_process_operation apo2 ON apo2.DELETED = 0 AND apo.ID = apo2.BLANKID where apo.DELETED = 0 AND apo.PRODUCTIONORDERID = #{orderId} GROUP BY apo.ID")
     List<CommonUpdateProductionStatusReq> selectProcessMinStatusList(@Param("orderId") String orderId);
+
+    void publish(@Param("productIdList") List<String> productIdList);
+
+    void publishCancel(@Param("productIdList") List<String> productIdList);
 }
 
 

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

@@ -4,9 +4,6 @@ package com.rongwei.bscommon.sys.dao;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.rongwei.bsentity.domain.ApsCustomerManagementDo;
 import com.rongwei.bsentity.domain.ApsProductDetailDo;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
 import com.rongwei.bsentity.domain.ApsProductionMergeOrderDo;
 import com.rongwei.bsentity.domain.ApsProductionOrderDo;
 import org.apache.ibatis.annotations.Param;
@@ -47,4 +44,7 @@ public interface ApsProductDetailDao extends BaseMapper<ApsProductDetailDo> {
     void publish(@Param("productionOrderIds") List<String> productionOrderIds);
 
     void updateProductstatus(@Param("productionOrderIds") List<String> productionOrderIds);
+
+    void updateProductStatusByBlankId(@Param("blankIds")List<String>blankIds,
+                                      @Param("productStatus") String productStatus);
 }

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

@@ -11,6 +11,7 @@ import java.util.List;
  */
 public interface ApsProductionOrderDao extends BaseMapper<ApsProductionOrderDo> {
     void publish(@Param("ids") List<String> productionOrderIds);
+
     void publishCancel(@Param("ids") List<String> productionOrderIds);
 
 

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

@@ -41,5 +41,5 @@ public interface ApsProcessOperationService extends IService<ApsProcessOperation
 
     R backupProcessOperation();
 
-    R backupCancelProcessOperation();
+    R backupRestoreProcessOperation();
 }

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

@@ -79,6 +79,7 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
     @Autowired
     private ApsProductDetailDao apsProductDetailDao;
 
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void test() {
@@ -177,7 +178,7 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
             String collect = dataByBlankId.stream()
                     .map(info -> info.getOrderno() + "-" + info.getCustomname())
                     .collect(Collectors.joining(";"));
-            logger.error("存在排程交货期>承诺交货期 的订单：{}", collect);
+            logger.error("存在排程交货期大于承诺交货期 的订单：{}", collect);
             return R.error(String.format(ERROR_MSG, collect));
         }
         // 更新坯料计划的生产状态为已发布
@@ -190,15 +191,70 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
                 .in(ApsProcessOperationDo::getBlankid, blankIds)
                 .set(ApsProcessOperationDo::getProcessstatus, "30")
                 .set(ApsProcessOperationDo::getLockmark, LOCKMARK_Y)
-                .set(ApsProcessOperationDo::getWorkstatus, "待开工"));
-        
-
-        return null;
+                .set(ApsProcessOperationDo::getWorkstatus, JOBSTATUS_TO_BE_START));
+        // 更新坯料计划对应产品明细的生产状态为待开工
+        apsProductDetailDao.updateProductStatusByBlankId(blankIds,"30");
+        // 更新工序作业明细的生产状态为待开工
+        processOperationProcessEquService.update(new LambdaUpdateWrapper<ApsProcessOperationProcessEquDo>()
+                .in(ApsProcessOperationProcessEquDo::getBlankid,blankIds)
+                .set(ApsProcessOperationProcessEquDo::getLockmark,LOCKMARK_Y)
+                .set(ApsProcessOperationProcessEquDo::getWorkstatus, JOBSTATUS_TO_BE_START)
+        );
+        List<String> collect = apsBlankOrderDos.stream().map(ApsBlankOrderDo::getProductionorderid).distinct().collect(Collectors.toList());
+        // 更新工序作业的状态
+        apsProcessOperationDao.publish(collect);
+        // 根据坯料ID 删除 备份数据
+        apsProcessOperationBackupDao.deletedByBlankId(blankIds,null);
+        apsProcessOperationProcessEquBackupDao.deletedByBlankId(blankIds,null);
+        return R.ok();
     }
 
+    /**
+     * 取消发布
+     * @param blankIds
+     * @return
+     */
     @Override
     public R publishCancel(List<String> blankIds) {
-        return null;
+        if (blankIds == null || blankIds.isEmpty()) {
+            log.debug("坯料计划为空");
+            return R.error("坯料计划id 必传");
+        }
+        List<String> searchCondition = new ArrayList<String>() {{
+            add("40");
+            add("50");
+        }};
+        // 判断是否存在已发布的工序作业
+        List<ApsBlankOrderDo> apsBlankOrderDos = this.baseMapper.selectBatchIds(blankIds);
+        List<ApsBlankOrderDo> collect1 = apsBlankOrderDos.stream().filter(info -> searchCondition.contains(info.getProductstatus())).collect(Collectors.toList());
+        if (!collect1.isEmpty()) {
+            logger.error("存在已开工的坯料计划：{}", collect1);
+            return R.error("存在已开工的坯料计划");
+        }
+        // 更新坯料计划的生产状态为已发布
+        this.update(new LambdaUpdateWrapper<ApsBlankOrderDo>().in(ApsBlankOrderDo::getId, blankIds)
+                .set(ApsBlankOrderDo::getProductstatus, "20")
+                .set(ApsBlankOrderDo::getJobstatus, JOBSTATUS_TO_BE_START)
+                .set(ApsBlankOrderDo::getLockmark, LOCKMARK_N));
+        // 更新坯料计划对应工序作业的状态为待开工
+        apsProcessOperationService.update(new LambdaUpdateWrapper<ApsProcessOperationDo>()
+                .in(ApsProcessOperationDo::getBlankid, blankIds)
+                .set(ApsProcessOperationDo::getProcessstatus, "20")
+                .set(ApsProcessOperationDo::getLockmark, LOCKMARK_N)
+                .set(ApsProcessOperationDo::getWorkstatus, JOBSTATUS_TO_BE_START));
+        // 更新坯料计划对应产品明细的生产状态为待开工
+        apsProductDetailDao.updateProductStatusByBlankId(blankIds,"20");
+        // 更新工序作业明细的生产状态为待开工
+        processOperationProcessEquService.update(new LambdaUpdateWrapper<ApsProcessOperationProcessEquDo>()
+                .in(ApsProcessOperationProcessEquDo::getBlankid,blankIds)
+                .set(ApsProcessOperationProcessEquDo::getLockmark,LOCKMARK_N)
+                .set(ApsProcessOperationProcessEquDo::getWorkstatus, JOBSTATUS_TO_BE_START)
+        );
+        List<String> collect = apsBlankOrderDos.stream().map(ApsBlankOrderDo::getProductionorderid).distinct().collect(Collectors.toList());
+        // 更新工序作业的状态
+        apsProcessOperationDao.publishCancel(collect);
+
+        return R.ok();
     }
 
     /**
@@ -490,8 +546,8 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
         //获取备份的坯料计划ID
         Set<String> blankIds = apsProcessOperationProcessEquDos.stream().map(ApsProcessOperationProcessEquDo::getBlankid).collect(Collectors.toSet());
         ArrayList<String> blankIdList = new ArrayList<>(blankIds);
-        apsProcessOperationBackupDao.deletedByBlankId(blankIdList);
-        apsProcessOperationProcessEquBackupDao.deletedByBlankId(blankIdList);
+        apsProcessOperationBackupDao.deletedByBlankId(blankIdList,null);
+        apsProcessOperationProcessEquBackupDao.deletedByBlankId(blankIdList,null);
         //增加备份
         List<List<String>> partition1 = Lists.partition(apsProcessOperationIds, 500);
         partition1.forEach(data -> {
@@ -977,8 +1033,8 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
      */
     private void deleteBackup(List<String> blankids, List<String> apsProductionOrderIds) {
         // 删除工序作业和工序作业明备份数据
-        apsProcessOperationBackupDao.deletedByBlankId(blankids);
-        apsProcessOperationProcessEquBackupDao.deletedByBlankId(blankids);
+        apsProcessOperationBackupDao.deletedByBlankId(blankids,null);
+        apsProcessOperationProcessEquBackupDao.deletedByBlankId(blankids,null);
         // 更工序作业生产状态=待排程，是否锁定=否，
         apsProcessOperationService.remove(new LambdaQueryWrapper<ApsProcessOperationDo>().in(ApsProcessOperationDo::getBlankid, blankids));
         // 清空作业明细

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

@@ -7,10 +7,7 @@ import cn.hutool.json.JSONObject;
 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.ApsBlankOrderDao;
-import com.rongwei.bscommon.sys.dao.ApsProcessOperationBackupDao;
-import com.rongwei.bscommon.sys.dao.ApsProcessOperationDao;
-import com.rongwei.bscommon.sys.dao.ApsProcessOperationProcessEquBackupDao;
+import com.rongwei.bscommon.sys.dao.*;
 import com.rongwei.bscommon.sys.service.*;
 import com.rongwei.bsentity.domain.*;
 import com.rongwei.bsentity.vo.CommonUpdateProductionStatusReq;
@@ -19,6 +16,7 @@ import com.rongwei.bsentity.vo.ProcessIdRelationVo;
 import com.rongwei.commonservice.service.SysMindMappingService;
 import com.rongwei.rwadmincommon.system.domain.SysOrganizationDo;
 import com.rongwei.rwadmincommon.system.service.SysOrganizationService;
+import com.rongwei.rwadmincommon.system.vo.SysOrganizationVo;
 import com.rongwei.rwadmincommon.system.vo.SysUserVo;
 import com.rongwei.rwcommon.base.R;
 import com.rongwei.rwcommon.utils.SecurityUtil;
@@ -26,6 +24,7 @@ import com.rongwei.rwcommon.utils.StringUtils;
 import com.rongwei.rwcommonentity.commonservers.domain.SysMindMappingDo;
 import com.rongwei.safecommon.utils.CXCommonUtils;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -35,6 +34,8 @@ import java.text.DecimalFormat;
 import java.util.*;
 import java.util.stream.Collectors;
 
+import static com.rongwei.safecommon.utils.SaveConstans.MINUS_ONE;
+
 /**
  * <p>
  * 生产订单_坯料计划_工序作业 服务实现类
@@ -87,6 +88,8 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
     @Autowired
     private ApsProcessOperationBackupDao apsProcessOperationBackupDao;
     @Autowired
+    private ApsProcessOperationProcessEquDao apsProcessOperationProcessEquDao;
+    @Autowired
     private ApsProcessOperationProcessEquBackupDao apsProcessOperationProcessEquBackupDao;
 
 
@@ -849,9 +852,18 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
     @Override
     public R backupProcessOperation() {
         SysUserVo currentUser = CXCommonUtils.getCurrentUser();
+        List<SysOrganizationVo> organizationDoList = currentUser.getOrganizationDoList();
+        String factoryId = organizationDoList.stream()
+                .filter(org -> MINUS_ONE.equals(org.getPid()))
+                .map(SysOrganizationDo::getId)
+                .distinct()
+                .collect(Collectors.joining(","));
+        if (StringUtils.isBlank(factoryId)) {
+            factoryId = organizationDoList.stream().map(info -> info.getFullpid().split(",")[1]).distinct().collect(Collectors.joining(","));
+        }
         // 先删除
-        apsProcessOperationBackupDao.deletedByBlankId(null);
-        apsProcessOperationProcessEquBackupDao.deletedByBlankId(null);
+        apsProcessOperationBackupDao.deletedByBlankId(null,factoryId);
+        apsProcessOperationProcessEquBackupDao.deletedByBlankId(null,factoryId);
         List<ApsProcessOperationDo> apsProcessOperationDos = apsProcessOperationDao.selectList(
                 new LambdaQueryWrapper<ApsProcessOperationDo>()
                 .in(ApsProcessOperationDo::getProcessstatus, "20", "30", "40"));
@@ -867,15 +879,47 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
     }
 
     /**
-     * 工序作业取消备份
+     * 工序作业恢复备份
      *
      * @return
      */
     @Override
-    public R backupCancelProcessOperation() {
-        log.debug("开始删除工序做鱼备份信息");
-        apsProcessOperationBackupDao.deletedByBlankId(null);
-        apsProcessOperationProcessEquBackupDao.deletedByBlankId(null);
+    public R backupRestoreProcessOperation() {
+        log.debug("开始恢复工序作业备份信息");
+        SysUserVo currentUser = CXCommonUtils.getCurrentUser();
+        String factoryId =null;
+        if(currentUser!=null){
+            List<SysOrganizationVo> organizationDoList = currentUser.getOrganizationDoList();
+             factoryId = organizationDoList.stream()
+                    .filter(org -> MINUS_ONE.equals(org.getPid()))
+                    .map(SysOrganizationDo::getId)
+                    .distinct()
+                    .collect(Collectors.joining(","));
+
+            if (StringUtils.isBlank(factoryId)) {
+                factoryId = organizationDoList.stream().map(info -> info.getFullpid().split(",")[1]).distinct()
+                        .collect(Collectors.joining(","));
+            }
+        }
+        List<ApsProcessOperationProcessEquBackupDo> apsProcessOperationProcessEquBackupDos = apsProcessOperationProcessEquBackupDao
+                .selectList(new LambdaQueryWrapper<ApsProcessOperationProcessEquBackupDo>()
+                .eq(StringUtils.isNotBlank(factoryId),ApsProcessOperationProcessEquBackupDo::getTenantid, factoryId));
+        List<ApsProcessOperationBackupDo> apsProcessOperationBackupDos = apsProcessOperationBackupDao.selectList(new LambdaQueryWrapper<ApsProcessOperationBackupDo>()
+                .eq(StringUtils.isNotBlank(factoryId),ApsProcessOperationBackupDo::getTenantid, factoryId));
+        List<ApsProcessOperationDo> saveList = new ArrayList<>();
+        List<ApsProcessOperationProcessEquDo> equSaveList = new ArrayList<>();
+        apsProcessOperationProcessEquBackupDos.forEach(data->{
+            ApsProcessOperationProcessEquDo equDo= new ApsProcessOperationProcessEquDo();
+            BeanUtils.copyProperties(data,equDo);
+            equSaveList.add(equDo);
+        });
+        apsProcessOperationBackupDos.forEach(data->{
+            ApsProcessOperationDo operationDo= new ApsProcessOperationDo();
+            BeanUtils.copyProperties(data,operationDo);
+            saveList.add(operationDo);
+        });
+        apsProcessOperationService.saveOrUpdateBatch(saveList,100);
+        apsProcessOperationProcessEquService.saveOrUpdateBatch(equSaveList,100);
         return R.ok();
     }
 

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

@@ -2,10 +2,7 @@ package com.rongwei.bscommon.sys.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.rongwei.bscommon.sys.dao.ApsBlankOrderDao;
-import com.rongwei.bscommon.sys.dao.ApsProcessOperationDao;
-import com.rongwei.bscommon.sys.dao.ApsProductDetailDao;
-import com.rongwei.bscommon.sys.dao.ApsProductionOrderDao;
+import com.rongwei.bscommon.sys.dao.*;
 import com.rongwei.bscommon.sys.service.ApsProductionOrderService;
 import com.rongwei.bsentity.domain.ApsProductionOrderDo;
 import com.rongwei.rwcommon.base.R;
@@ -30,6 +27,8 @@ public class ApsProductionOrderServiceImpl extends ServiceImpl<ApsProductionOrde
     private ApsBlankOrderDao apsBlankOrderDao;
     @Autowired
     private ApsProductDetailDao apsProductDetailDao;
+    @Autowired
+    private ApsProcessOperationProcessEquDao apsProcessOperationProcessEquDao;
 
     public static final String ERROR_MSG ="%s上诉订单的排程交货期大于承诺交货期";
 
@@ -51,12 +50,14 @@ public class ApsProductionOrderServiceImpl extends ServiceImpl<ApsProductionOrde
             String collect = list.stream()
                     .map(info -> info.getOrderno() + "-" + info.getCustomname())
                     .collect(Collectors.joining(";"));
-            log.error("存在排程交货期>承诺交货期 的订单：{}",collect);
+            log.error("存在排程交货期大于承诺交货期 的订单：{}",collect);
             return R.error(String.format(ERROR_MSG,collect));
         }
 
         // 更新工序作业的生产状态和是否锁定=是
         apsProcessOperationDao.publish(productionOrderIds);
+
+        apsProcessOperationProcessEquDao.publish(productionOrderIds);
         // 更新坯料计划的生产状态
         apsBlankOrderDao.publish(productionOrderIds);
         // 更新产品明细的生产状态
@@ -75,6 +76,7 @@ public class ApsProductionOrderServiceImpl extends ServiceImpl<ApsProductionOrde
     public R publishCancel(List<String> productionOrderIds) {
         // 更新工序作业的生产状态和是否锁定=是
         apsProcessOperationDao.publishCancel(productionOrderIds);
+        apsProcessOperationProcessEquDao.publishCancel(productionOrderIds);
         // 更新坯料计划的生产状态
         apsBlankOrderDao.publish(productionOrderIds);
         // 更新产品明细的生产状态

cx-aps/cx-aps-common/src/main/resources/mybatis/ApsProcessOperationBackupDao.xml

@@ -187,6 +187,9 @@
                         #{id}
                     </foreach>
                 </if>
+                <if test="blankIds != null and blankIds!=''">
+                    and TENANTID=#{factoryId}
+                </if>
             </where>
     </delete>
     <insert id="processOperationCopy">

cx-aps/cx-aps-common/src/main/resources/mybatis/ApsProcessOperationProcessEquBackupDao.xml

@@ -85,6 +85,9 @@
                     #{id}
                 </foreach>
             </if>
+            <if test="blankIds != null and blankIds!=''">
+                and TENANTID=#{factoryId}
+            </if>
         </where>
     </delete>
     <insert id="processOperationEquCopy">

cx-aps/cx-aps-common/src/main/resources/mybatis/ApsProcessOperationProcessEquDao.xml

@@ -285,4 +285,36 @@
         </foreach>
 
     </update>
+    <update id="publish">
+        UPDATE aps_process_operation_process_equ
+        <set>
+            LOCKMARK ='y',
+            WORKSTATUS='待开工'
+        </set>
+            <where>
+                BLANKID in (
+                select ID from aps_blank_order where PRODUCTIONORDERID IN
+                <foreach collection="productIdList" item="id" open="(" close=")" separator=",">
+                    #{id}
+                </foreach>
+                AND DELETED='0'
+                )
+            </where>
+    </update>
+    <update id="publishCancel">
+        UPDATE aps_process_operation_process_equ
+        <set>
+            LOCKMARK ='n',
+            WORKSTATUS='待开工'
+        </set>
+        <where>
+            BLANKID in (
+            select ID from aps_blank_order where PRODUCTIONORDERID IN
+            <foreach collection="productIdList" item="id" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+            AND DELETED='0'
+            )
+        </where>
+    </update>
 </mapper>

cx-aps/cx-aps-common/src/main/resources/mybatis/ApsProductDetailDao.xml

@@ -84,4 +84,13 @@
 
         </if>
     </update>
+    <update id="updateProductStatusByBlankId">
+        update aps_product_detail set PRODUCTSTATUS =#{productStatus} where ID IN(
+        SELECT distinct PRODUCTID from aps_process_output_product where DELETED='0' AND
+        BLANKID IN
+        <foreach collection="blankIds" open="(" close=")" item="id" separator=";">
+            #{id}
+        </foreach>
+        )
+    </update>
 </mapper>

cx-aps/cx-aps-common/src/main/resources/mybatis/ApsProductionOrderDao.xml

@@ -185,5 +185,6 @@
                                                               #{id}
         </foreach>
         )
+        and SCHEDULEDELIVERYDATE>PROMISEDELIVERYDATE
     </select>
 </mapper>

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

@@ -2,7 +2,6 @@ package com.rongwei.bsserver.controller;
 
 
 import com.rongwei.bscommon.sys.service.ApsBlankOrderService;
-import com.rongwei.bsentity.domain.ApsProductionOrderDo;
 import com.rongwei.bsentity.vo.ApsPlanVo;
 import com.rongwei.bsentity.vo.OrderLockVo;
 import com.rongwei.rwcommon.base.R;
@@ -97,7 +96,8 @@ public class ApsBlankOrderController {
     }
 
     /**
-     * 批量计划发布
+     * 坯料计划发布
+     *
      * @param blankIds
      * @return
      */
@@ -107,7 +107,7 @@ public class ApsBlankOrderController {
     }
 
     /**
-     * 批量计划取消发布
+     * 坯料计划取消发布
      * @param blankIds
      * @return
      */

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

@@ -121,8 +121,8 @@ public class ApsProcessOperationController {
      * @return
      */
     @PostMapping("/backup/restore")
-    public R backupCancelProcessOperation() {
-        return apsProcessOperationService.backupCancelProcessOperation();
+    public R backupRestoreProcessOperation() {
+        return apsProcessOperationService.backupRestoreProcessOperation();
     }
 
 }