删除箱子,退回卷 2022年12月29日 sxm

src/main/java/com/gaotao/modules/auditManagement/controller/AuditController.java

@@ -11,7 +11,6 @@ import com.gaotao.modules.auditManagement.query.UserBusinessRoleQuery;
 import com.gaotao.modules.auditManagement.service.AuthGroupService;
 import com.gaotao.modules.auditManagement.service.BusinessRoleListService;
 import com.gaotao.modules.sys.controller.AbstractController;
-import com.gaotao.modules.sys.dao.SysMsgDao;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -35,8 +34,7 @@ public class AuditController extends AbstractController {
     @Autowired
     private AuthGroupService authGroupService;
 
-    @Autowired
-    private SysMsgDao sysMsgDao;
+
 
 // --------------------------------------------- 审核权限 ------------------------------------------------------------
 
@@ -109,7 +107,7 @@ public class AuditController extends AbstractController {
     @PostMapping("saveUserBusinessRole")
     public R insertUserBusinessRole(@RequestBody List<UserBusinessRoleQuery> list){
         businessRoleListService.insertUserBusinessRole(list);
-        return R.ok().put("msg",getLanguageMsg(SysMsgConstant.OBJECT_ID_200001));
+        return R.ok().put("msg",getLanguageMsg( SysMsgConstant.OBJECT_ID_200001));
     }
 
     // --------------------------------------------- 审核组 ------------------------------------------------------------
@@ -149,7 +147,7 @@ public class AuditController extends AbstractController {
     @PostMapping("deleteById")
     public R deleteById(@RequestBody AuthGroupQuery authGroupQuery){
         authGroupService.deleteById(authGroupQuery);
-        return R.ok().put("msg",sysMsgDao.getLanguageMsg(getUser().getLanguageDefault(), SysMsgConstant.OBJECT_TYPE,SysMsgConstant.OBJECT_ID_200000));
+        return R.ok().put("msg",getLanguageMsg( SysMsgConstant.OBJECT_ID_200000));
     }
 
     /**

src/main/java/com/gaotao/modules/finishedProduct/service/CRollinfoService.java

@@ -2,7 +2,6 @@ package com.gaotao.modules.finishedProduct.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.gaotao.common.utils.PageUtils;
-import com.gaotao.common.utils.QueryList;
 import com.gaotao.common.utils.R;
 import com.gaotao.modules.finishedProduct.dto.ExcelRollInfoDTO;
 import com.gaotao.modules.finishedProduct.entity.CRollinfoEntity;
@@ -12,7 +11,6 @@ import com.gaotao.modules.finishedProduct.vo.PackingVo;
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.List;
-import java.util.Map;
 
 /**
  * ${comments}
@@ -167,4 +165,13 @@ public interface CRollinfoService extends IService<CRollinfoEntity> {
     R outRollno(CRollinfoEntity rollno);
 
 
+    /**
+     * @author: sxm
+     * @description: 删除箱子 退回卷
+     * @param [cRollinfoEntityList]
+     * @return: void
+     * @date: 2023/1/3 11:33
+     */
+    void batchBoxRollUpdateStatus(List<CRollinfoEntity> cRollinfoEntityList);
+
 }

src/main/java/com/gaotao/modules/finishedProduct/service/impl/CRollinfoServiceImpl.java

@@ -817,13 +817,20 @@ public class CRollinfoServiceImpl extends ServiceImpl<CRollinfoDao, CRollinfoEnt
         return R.ok().put("cRollinfo", cRollInfo);
     }
 
-/*
-     int i = DateUtils.differentDays(new Date(),rollno.getRolldate());
-        SysConfigEntity rollValidDays = sysConfigDao.queryByKey("rollValidDays");
-        if (rollValidDays != null && StringUtils.isNotEmpty(rollValidDays.getParamValue())) {
-            if (i>= Integer.valueOf(rollValidDays.getParamValue())){
-                return R.error("该卷超过管控天数不允许出库");
-            }
-        }*/
 
+
+    @Override
+    @Transactional
+    public void batchBoxRollUpdateStatus(List<CRollinfoEntity> cRollinfoList) {
+        // 修改卷状态
+        cRollinfoList.forEach(rollInfo -> {
+            lambdaUpdate().set(CRollinfoEntity::getStatus, rollInfo.getStatus())
+                    .set(CRollinfoEntity::getStatusDb, rollInfo.getStatusDb())
+                    .set(StringUtils.isNotEmpty(rollInfo.getSynchronizedflag()), CRollinfoEntity::getSynchronizedflag, rollInfo.getSynchronizedflag())
+                    .set(CRollinfoEntity::getNeedsynchronizeflag,"N")
+                    .eq(StringUtils.isNotEmpty(rollInfo.getSite()), CRollinfoEntity::getSite, rollInfo.getSite())
+                    .eq(CRollinfoEntity::getRollno, rollInfo.getRollno())
+                    .update();
+        });
+    }
 }

src/main/java/com/gaotao/modules/finishedProduct/service/impl/SoReceiveBoxesServiceImpl.java

@@ -1,31 +1,25 @@
 package com.gaotao.modules.finishedProduct.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.gaotao.modules.finishedProduct.dao.SoReceiveBoxesDao;
 import com.gaotao.modules.finishedProduct.entity.CRollinfoEntity;
 import com.gaotao.modules.finishedProduct.entity.SoReceiveBoxRollsEntity;
+import com.gaotao.modules.finishedProduct.entity.SoReceiveBoxesEntity;
 import com.gaotao.modules.finishedProduct.service.CRollinfoService;
 import com.gaotao.modules.finishedProduct.service.SoReceiveBoxRollsService;
+import com.gaotao.modules.finishedProduct.service.SoReceiveBoxesService;
 import com.gaotao.modules.finishedProduct.vo.BoxVo;
 import com.gaotao.modules.finishedProduct.vo.OrderPartQtyVo;
 import com.gaotao.modules.finishedProduct.vo.PackingVo;
 import com.gaotao.modules.finishedProduct.vo.SoReceiveBoxesEntityVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
-import java.util.Map;
 import java.util.stream.Collectors;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gaotao.common.utils.PageUtils;
-import com.gaotao.common.utils.Query;
-
-import com.gaotao.modules.finishedProduct.dao.SoReceiveBoxesDao;
-import com.gaotao.modules.finishedProduct.entity.SoReceiveBoxesEntity;
-import com.gaotao.modules.finishedProduct.service.SoReceiveBoxesService;
-import org.springframework.transaction.annotation.Transactional;
-
 
 @Service("soReceiveBoxesService")
 public class SoReceiveBoxesServiceImpl extends ServiceImpl<SoReceiveBoxesDao, SoReceiveBoxesEntity> implements SoReceiveBoxesService {
@@ -149,7 +143,7 @@ public class SoReceiveBoxesServiceImpl extends ServiceImpl<SoReceiveBoxesDao, So
                 cRollinfoEntity.setStatus("已入库");
                 return cRollinfoEntity;
             }).collect(Collectors.toList());
-            cRollinfoService.batchRollUpdateStatus(cRollinfoEntityList);
+            cRollinfoService.batchBoxRollUpdateStatus(cRollinfoEntityList);
         }
         // 删除该箱下对应的卷
         soReceiveBoxRollsService.remove(new QueryWrapper<SoReceiveBoxRollsEntity>().eq("box_no", soReceiveBoxesEntity.getBoxNo()));

src/main/java/com/gaotao/modules/sys/service/SysMsgService.java

@@ -3,14 +3,12 @@
 package com.gaotao.modules.sys.service;
 
 
-import org.apache.ibatis.annotations.Mapper;
-
 /**
  * 系统日志
  *
  *  
  */
-@Mapper
+
 public interface SysMsgService {
 
     String getLanguageMsg( String objectId);