From b13bd277ba9506a78b96e0809bba0a254f40f7e5 Mon Sep 17 00:00:00 2001 From: "[li_she]" <[li.she@xujiesoft.com]> Date: Tue, 3 Jan 2023 11:34:57 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E7=AE=B1=E5=AD=90,=E9=80=80?= =?UTF-8?q?=E5=9B=9E=E5=8D=B7=20=202022=E5=B9=B412=E6=9C=8829=E6=97=A5=20?= =?UTF-8?q?=20sxm?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/AuditController.java | 8 +++---- .../service/CRollinfoService.java | 11 +++++++-- .../service/impl/CRollinfoServiceImpl.java | 23 ++++++++++++------- .../impl/SoReceiveBoxesServiceImpl.java | 20 ++++++---------- .../modules/sys/service/SysMsgService.java | 4 +--- 5 files changed, 35 insertions(+), 31 deletions(-) diff --git a/src/main/java/com/gaotao/modules/auditManagement/controller/AuditController.java b/src/main/java/com/gaotao/modules/auditManagement/controller/AuditController.java index 55977b8..f46b6c7 100644 --- a/src/main/java/com/gaotao/modules/auditManagement/controller/AuditController.java +++ b/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 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)); } /** diff --git a/src/main/java/com/gaotao/modules/finishedProduct/service/CRollinfoService.java b/src/main/java/com/gaotao/modules/finishedProduct/service/CRollinfoService.java index a94e295..b773d9c 100644 --- a/src/main/java/com/gaotao/modules/finishedProduct/service/CRollinfoService.java +++ b/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 { R outRollno(CRollinfoEntity rollno); + /** + * @author: sxm + * @description: 删除箱子 退回卷 + * @param [cRollinfoEntityList] + * @return: void + * @date: 2023/1/3 11:33 + */ + void batchBoxRollUpdateStatus(List cRollinfoEntityList); + } \ No newline at end of file diff --git a/src/main/java/com/gaotao/modules/finishedProduct/service/impl/CRollinfoServiceImpl.java b/src/main/java/com/gaotao/modules/finishedProduct/service/impl/CRollinfoServiceImpl.java index 5ded828..8171135 100644 --- a/src/main/java/com/gaotao/modules/finishedProduct/service/impl/CRollinfoServiceImpl.java +++ b/src/main/java/com/gaotao/modules/finishedProduct/service/impl/CRollinfoServiceImpl.java @@ -817,13 +817,20 @@ public class CRollinfoServiceImpl extends ServiceImpl= Integer.valueOf(rollValidDays.getParamValue())){ - return R.error("该卷超过管控天数不允许出库"); - } - }*/ + + @Override + @Transactional + public void batchBoxRollUpdateStatus(List 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(); + }); + } } \ No newline at end of file diff --git a/src/main/java/com/gaotao/modules/finishedProduct/service/impl/SoReceiveBoxesServiceImpl.java b/src/main/java/com/gaotao/modules/finishedProduct/service/impl/SoReceiveBoxesServiceImpl.java index 0df2c9f..5fe70ac 100644 --- a/src/main/java/com/gaotao/modules/finishedProduct/service/impl/SoReceiveBoxesServiceImpl.java +++ b/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 implements SoReceiveBoxesService { @@ -149,7 +143,7 @@ public class SoReceiveBoxesServiceImpl extends ServiceImpl().eq("box_no", soReceiveBoxesEntity.getBoxNo())); diff --git a/src/main/java/com/gaotao/modules/sys/service/SysMsgService.java b/src/main/java/com/gaotao/modules/sys/service/SysMsgService.java index 8bafb46..64326ca 100644 --- a/src/main/java/com/gaotao/modules/sys/service/SysMsgService.java +++ b/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);