From 204f95f610a8f3b1f67848f36dc1ef62ad8e10ad Mon Sep 17 00:00:00 2001 From: chenhc <2369838784@qq.com> Date: Tue, 27 Aug 2024 16:57:56 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=BA=93=E5=AD=98=E9=A2=84=E8=AD=A6?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/entity/collect/IoCollectOrder.java | 2 +- .../api/entity/collect/IoCollectOrderBiz.java | 2 +- .../res/collect/IoCollectOrderResponse.java | 6 + .../collect/IoCollectOrderService.java | 28 +- .../service/inout/IoSplitFifoCodeService.java | 266 ++++++++++++++---- .../mapper/collect/IoCollectOrderMapper.xml | 1 + 6 files changed, 239 insertions(+), 66 deletions(-) diff --git a/src/main/java/com/glxp/api/entity/collect/IoCollectOrder.java b/src/main/java/com/glxp/api/entity/collect/IoCollectOrder.java index 7f7e48066..19645a33a 100644 --- a/src/main/java/com/glxp/api/entity/collect/IoCollectOrder.java +++ b/src/main/java/com/glxp/api/entity/collect/IoCollectOrder.java @@ -210,7 +210,7 @@ public class IoCollectOrder implements Serializable { /** - * 库存预警： 1:正常; 2:不足 + * 库存预警： 1:上锁正常; 2:上锁不足；3:已释放锁 */ @TableField(value = "invAlert") private Integer invAlert; diff --git a/src/main/java/com/glxp/api/entity/collect/IoCollectOrderBiz.java b/src/main/java/com/glxp/api/entity/collect/IoCollectOrderBiz.java index 4194fe75f..8c8fd1aa4 100644 --- a/src/main/java/com/glxp/api/entity/collect/IoCollectOrderBiz.java +++ b/src/main/java/com/glxp/api/entity/collect/IoCollectOrderBiz.java @@ -186,7 +186,7 @@ public class IoCollectOrderBiz implements Serializable { /** - * 自动扫描分配的工位存量 + * 自动扫描分配的工位存量 锁数量 */ @TableField(value = "autoResCount") @ApiModelProperty(value = "自动扫描分配的工位存量") diff --git a/src/main/java/com/glxp/api/res/collect/IoCollectOrderResponse.java b/src/main/java/com/glxp/api/res/collect/IoCollectOrderResponse.java index d49ef7208..5934bc64c 100644 --- a/src/main/java/com/glxp/api/res/collect/IoCollectOrderResponse.java +++ b/src/main/java/com/glxp/api/res/collect/IoCollectOrderResponse.java @@ -148,6 +148,12 @@ public class IoCollectOrderResponse { */ private Integer orderSequence; + /** + * 库存预警： 1:上锁正常; 2:上锁不足；3:已释放锁 + */ + @TableField(value = "invAlert") + private Integer invAlert; + public String getFromName() { if (StrUtil.isNotEmpty(fromCorpName)) diff --git a/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java b/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java index 7abbc4629..5d4ff2677 100644 --- a/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java +++ b/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java @@ -297,13 +297,13 @@ public class IoCollectOrderService extends ServiceImpl sysWorkplaceMap = new HashMap<>(); - for (SysWorkplaceResponse sysWorkplace : allWorksList) { - sysWorkplaceMap.put(sysWorkplace.getId(), sysWorkplace); - } - for (SysWorkplaceResponse value : sysWorkplaceMap.values()) { - splitFifoCodeService.preAllotInv(value.getWorkplaceId()); - } +// Map sysWorkplaceMap = new HashMap<>(); +// for (SysWorkplaceResponse sysWorkplace : allWorksList) { +// sysWorkplaceMap.put(sysWorkplace.getId(), sysWorkplace); +// } +// for (SysWorkplaceResponse value : sysWorkplaceMap.values()) { +// splitFifoCodeService.preAllotInv(value.getWorkplaceId()); +// } } @@ -401,13 +401,13 @@ public class IoCollectOrderService extends ServiceImpl sysWorkplaceMap = new HashMap<>(); - for (SysWorkplaceResponse sysWorkplace : allWorksList) { - sysWorkplaceMap.put(sysWorkplace.getId(), sysWorkplace); - } - for (SysWorkplaceResponse value : sysWorkplaceMap.values()) { - splitFifoCodeService.preAllotInv(value.getWorkplaceId()); - } +// Map sysWorkplaceMap = new HashMap<>(); +// for (SysWorkplaceResponse sysWorkplace : allWorksList) { +// sysWorkplaceMap.put(sysWorkplace.getId(), sysWorkplace); +// } +// for (SysWorkplaceResponse value : sysWorkplaceMap.values()) { +// splitFifoCodeService.preAllotInv(value.getWorkplaceId()); +// } } diff --git a/src/main/java/com/glxp/api/service/inout/IoSplitFifoCodeService.java b/src/main/java/com/glxp/api/service/inout/IoSplitFifoCodeService.java index 41df48b31..0051a42f8 100644 --- a/src/main/java/com/glxp/api/service/inout/IoSplitFifoCodeService.java +++ b/src/main/java/com/glxp/api/service/inout/IoSplitFifoCodeService.java @@ -9,19 +9,24 @@ import com.glxp.api.dao.auth.SysWorkplaceDao; import com.glxp.api.dao.collect.IoCollectOrderBizMapper; import com.glxp.api.dao.collect.IoCollectOrderMapper; import com.glxp.api.dao.inout.IoSplitFifoCodeMapper; +import com.glxp.api.dao.inout.IoSplitFifoInvMapper; import com.glxp.api.entity.auth.SysWorkplace; import com.glxp.api.entity.basic.UdiRelevanceEntity; import com.glxp.api.entity.inout.IoSplitFifoCodeEntity; +import com.glxp.api.entity.inout.IoSplitFifoInv; import com.glxp.api.exception.JsonException; import com.glxp.api.req.collect.CollectOrderBizRequest; import com.glxp.api.req.collect.CollectOrderRequest; import com.glxp.api.req.dev.DeviceChangeOrderParam; import com.glxp.api.req.inout.IoSplitFifoCodeRequest; +import com.glxp.api.req.inout.IoSplitFifoInvRequest; import com.glxp.api.res.collect.CollectOrderBizResponse; import com.glxp.api.res.collect.IoCollectOrderResponse; import com.glxp.api.res.inout.IoSplitCodeResponse; +import com.glxp.api.res.inout.IoSplitInvResponse; import com.glxp.api.service.auth.SysWorkplaceService; import io.swagger.models.auth.In; +import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -38,6 +43,8 @@ public class IoSplitFifoCodeService extends ServiceImpl invReminds = splitFifoCodeMapper.findInvRemind(workPlaceCode); - if (CollUtil.isEmpty(invReminds)) { + //获取工位下的库存 + IoSplitFifoInvRequest ioSplitFifoInvRequest = new IoSplitFifoInvRequest(); + ioSplitFifoInvRequest.setWorkPlaceCode(workPlaceCode); + List ioSplitInvResponses = splitFifoInvService.filterList(ioSplitFifoInvRequest); + + if (CollUtil.isEmpty(ioSplitInvResponses)) { return "当前工位存量提醒：" + "0"; } - invReminds.forEach(item -> { - Integer groupCount = item.getGroupCount(); - if (groupCount < invRemindNumber) { - String cpmctymc = item.getCpmctymc(); - String batchNo = item.getBatchNo(); - if (StrUtil.isBlank(batchNo)) { - msg[0] = msg[0] + cpmctymc + "存量为：" + groupCount; - } else { - msg[0] = msg[0] + cpmctymc + "[" + batchNo + "]存量为：" + groupCount; + ioSplitInvResponses.forEach(item -> { + Boolean enableRemind = item.getEnableRemind(); + if (enableRemind){ + Integer reCount = item.getReCount(); + Integer invRemindCount = item.getInvRemindCount(); + if (reCount < invRemindCount) { + String cpmctymc = item.getCpmctymc(); + String batchNo = item.getBatchNo(); + if (StrUtil.isBlank(batchNo)) { + msg[0] = msg[0] + cpmctymc + "存量为：" + reCount; + } else { + msg[0] = msg[0] + cpmctymc + "[" + batchNo + "]存量为：" + reCount; + } } } }); @@ -120,50 +134,156 @@ public class IoSplitFifoCodeService extends ServiceImpl ioSplitCodeResponses = this.baseMapper.filterGroupList(splitFifoCodeRequest); - if (CollUtil.isEmpty(ioSplitCodeResponses)) return; - Map> splitMap = ioSplitCodeResponses.stream().collect(Collectors.groupingBy(IoSplitCodeResponse::getRelId)); + if (StrUtil.isEmpty(billNo)) throw new JsonException("单据号不可以为空!"); - //2.遍历当前工位待处理的单据，根据orderTime排序 + //1、获取该单据信息 CollectOrderRequest collectOrderRequest = new CollectOrderRequest(); - collectOrderRequest.setWorkPlaceCode(workPaceCode); - collectOrderRequest.setTagStatus(1); + collectOrderRequest.setBillNo(billNo); List orderList = collectOrderMapper.filterList(collectOrderRequest); - if (CollUtil.isEmpty(orderList)) return; - - //3.为每个单据底下的单据详情分配数量 - for (int i = 0; i < orderList.size(); i++) { - IoCollectOrderResponse order = orderList.get(i); - CollectOrderBizRequest bizRequest = new CollectOrderBizRequest(); - bizRequest.setOrderIdFk(String.valueOf(order.getBillNo())); - List bizList = collectOrderBizMapper.filterList(bizRequest); - if (CollUtil.isNotEmpty(bizList)) { + if (CollUtil.isEmpty(orderList)) throw new JsonException("未找到对应的单据!"); + IoCollectOrderResponse order = orderList.get(0); + Integer invAlert1 = order.getInvAlert(); + + if (lockType == 1){ + if (invAlert1 == 1) throw new JsonException("该单据已锁定库存过请勿重复锁定!"); + }else if (lockType == 2){ + if (invAlert1 != 1) throw new JsonException("该单据未正常锁定库存过不可进行解锁库存操作!"); + } + + //2、获取该单据下的biz明细 + CollectOrderBizRequest bizRequest = new CollectOrderBizRequest(); + bizRequest.setOrderIdFk(String.valueOf(order.getBillNo())); + List bizList = collectOrderBizMapper.filterList(bizRequest); + if (CollUtil.isEmpty(bizList)) throw new JsonException("未找到对应的单据明细!"); + + //3、获取当前工位的下库存数 + Long workPlaceCode = order.getWorkPlaceCode(); + IoSplitFifoInvRequest ioSplitFifoInvRequest = new IoSplitFifoInvRequest(); + ioSplitFifoInvRequest.setWorkPlaceCode(workPlaceCode); + List ioSplitInvResponses = splitFifoInvService.filterList(ioSplitFifoInvRequest); + if (CollUtil.isEmpty(ioSplitInvResponses)) return false; + Map> splitInvMap = ioSplitInvResponses.stream().collect(Collectors.groupingBy(IoSplitInvResponse::getRelId)); + + if (CollUtil.isNotEmpty(bizList)) { + if (lockType == 1){ //自动分配 工位存量、更新splitMap、更新 bizList上的 缺少存量数 - Integer invAlert = autoAllocationWorkPace(splitMap, bizList); + Integer invAlert = autoAllocationBillNoInv(splitInvMap, bizList); collectOrderMapper.updateInvAlert(order.getId(), invAlert); + if (invAlert == 2){ + return false; + }else { + return true; + } + }else if (lockType == 2){ + unAutoAllocationBillNoInv(splitInvMap, bizList); + collectOrderMapper.updateInvAlert(order.getId(), 3); } } + return true; } - /** - * 自动分配 工位存量、更新splitMap、更新 bizList上的 缺少存量数 - * - * @param splitMap - * @param bizList - */ + +// /** +// * 预分配库存 +// */ +// @Transactional(rollbackFor = Exception.class) +// public void preAllotInv(Long workPaceCode) { +// if (workPaceCode == null || workPaceCode == 0l) return; +// +// //1. 查询出当前工位的未分配的库存 +// IoSplitFifoCodeRequest splitFifoCodeRequest = new IoSplitFifoCodeRequest(); +// splitFifoCodeRequest.setWorkPlaceCode(workPaceCode); +// List ioSplitCodeResponses = this.baseMapper.filterGroupList(splitFifoCodeRequest); +// if (CollUtil.isEmpty(ioSplitCodeResponses)) return; +// Map> splitMap = ioSplitCodeResponses.stream().collect(Collectors.groupingBy(IoSplitCodeResponse::getRelId)); +// +// //2.遍历当前工位待处理的单据，根据orderTime排序 +// CollectOrderRequest collectOrderRequest = new CollectOrderRequest(); +// collectOrderRequest.setWorkPlaceCode(workPaceCode); +// collectOrderRequest.setTagStatus(1); +// List orderList = collectOrderMapper.filterList(collectOrderRequest); +// if (CollUtil.isEmpty(orderList)) return; +// +// //3.为每个单据底下的单据详情分配数量 +// for (int i = 0; i < orderList.size(); i++) { +// IoCollectOrderResponse order = orderList.get(i); +// CollectOrderBizRequest bizRequest = new CollectOrderBizRequest(); +// bizRequest.setOrderIdFk(String.valueOf(order.getBillNo())); +// List bizList = collectOrderBizMapper.filterList(bizRequest); +// if (CollUtil.isNotEmpty(bizList)) { +// //自动分配 工位存量、更新splitMap、更新 bizList上的 缺少存量数 +// Integer invAlert = autoAllocationWorkPace(splitMap, bizList); +// collectOrderMapper.updateInvAlert(order.getId(), invAlert); +// } +// } +// +// } + +// /** +// * 自动分配 工位存量、更新splitMap、更新 bizList上的 缺少存量数 +// * +// * @param splitMap +// * @param bizList +// */ +// @Transactional(rollbackFor = Exception.class) +// Integer autoAllocationWorkPace(Map> splitMap, List bizList) { +// Integer invAlert = 1; +// for (int i = 0; i < bizList.size(); i++) { +// CollectOrderBizResponse collectOrderBizResponse = bizList.get(i); +// Long relId = collectOrderBizResponse.getRelId(); +// String batchNo = collectOrderBizResponse.getBatchNo(); +// Integer count = collectOrderBizResponse.getCount(); //当前明细 需要的数量 +// Long bizId = collectOrderBizResponse.getId(); +// +// List ioSplitCodeResponses = splitMap.get(relId); +// List newioSplitCodeResponses = new ArrayList<>(ioSplitCodeResponses.size()); +// +// if (CollUtil.isNotEmpty(ioSplitCodeResponses)) { +// for (int j = 0; j < ioSplitCodeResponses.size(); j++) { +// IoSplitCodeResponse ioSplit = ioSplitCodeResponses.get(j); +// Integer totalCount = ioSplit.getTotalCount(); +// if ((StrUtil.isBlank(batchNo) || batchNo.equals(ioSplit.getBatchNo())) && count > 0 && totalCount > 0) { +// Integer resCount = totalCount - count;//预分配后剩余 工位存量 +// if (resCount >= 0) {//足够分配 +// count = 0; +// ioSplit.setTotalCount(resCount); +// } else {//不够分配 +// count = -resCount; +// ioSplit.setTotalCount(0); +// } +// } +// newioSplitCodeResponses.add(ioSplit); +// } +// +// splitMap.put(relId, newioSplitCodeResponses); +// } +// +// if (count > 0) {//不够分配 +// collectOrderBizMapper.updateAutoResCount(bizId, -count); +// invAlert = 2; +// } else { +// collectOrderBizMapper.updateAutoResCount(bizId, collectOrderBizResponse.getCount()); +// } +// } +// +// return invAlert; +// } + + @Transactional(rollbackFor = Exception.class) - Integer autoAllocationWorkPace(Map> splitMap, List bizList) { + Integer autoAllocationBillNoInv(Map> splitMap, List bizList) { Integer invAlert = 1; + List updateIoSplitFifoInv = new ArrayList<>(); + for (int i = 0; i < bizList.size(); i++) { CollectOrderBizResponse collectOrderBizResponse = bizList.get(i); Long relId = collectOrderBizResponse.getRelId(); @@ -171,26 +291,30 @@ public class IoSplitFifoCodeService extends ServiceImpl ioSplitCodeResponses = splitMap.get(relId); - List newioSplitCodeResponses = new ArrayList<>(ioSplitCodeResponses.size()); + List ioSplitInvResponses = splitMap.get(relId); + List newioSplitCodeResponses = new ArrayList<>(ioSplitInvResponses.size()); + + if (CollUtil.isNotEmpty(newioSplitCodeResponses)) { + for (int j = 0; j < newioSplitCodeResponses.size(); j++) { + IoSplitInvResponse ioSplit = newioSplitCodeResponses.get(j); + Integer reCount = ioSplit.getReCount(); + Integer lockCount = ioSplit.getLockCount(); + Integer totalCount = reCount-lockCount;//剩余可分配数量 - if (CollUtil.isNotEmpty(ioSplitCodeResponses)) { - for (int j = 0; j < ioSplitCodeResponses.size(); j++) { - IoSplitCodeResponse ioSplit = ioSplitCodeResponses.get(j); - Integer totalCount = ioSplit.getTotalCount(); if ((StrUtil.isBlank(batchNo) || batchNo.equals(ioSplit.getBatchNo())) && count > 0 && totalCount > 0) { Integer resCount = totalCount - count;//预分配后剩余 工位存量 if (resCount >= 0) {//足够分配 count = 0; - ioSplit.setTotalCount(resCount); + ioSplit.setLockCount( lockCount + count ); + IoSplitFifoInv bean = new IoSplitFifoInv(); + BeanUtils.copyProperties(ioSplit,bean); + updateIoSplitFifoInv.add(bean); } else {//不够分配 count = -resCount; - ioSplit.setTotalCount(0); } } newioSplitCodeResponses.add(ioSplit); } - splitMap.put(relId, newioSplitCodeResponses); } @@ -202,7 +326,49 @@ public class IoSplitFifoCodeService extends ServiceImpl> splitMap, List bizList) { + List updateIoSplitFifoInv = new ArrayList<>(); + + for (int i = 0; i < bizList.size(); i++) { + CollectOrderBizResponse collectOrderBizResponse = bizList.get(i); + Long relId = collectOrderBizResponse.getRelId(); + String batchNo = collectOrderBizResponse.getBatchNo(); + Integer count = collectOrderBizResponse.getCount(); //当前明细 需要的数量 + Long bizId = collectOrderBizResponse.getId(); + + List ioSplitInvResponses = splitMap.get(relId); + List newioSplitCodeResponses = new ArrayList<>(ioSplitInvResponses.size()); + + if (CollUtil.isNotEmpty(newioSplitCodeResponses)) { + for (int j = 0; j < newioSplitCodeResponses.size(); j++) { + IoSplitInvResponse ioSplit = newioSplitCodeResponses.get(j); + Integer lockCount = ioSplit.getLockCount(); + + if ((StrUtil.isBlank(batchNo) || batchNo.equals(ioSplit.getBatchNo())) && count > 0 ) { + ioSplit.setLockCount( lockCount - count ); + IoSplitFifoInv bean = new IoSplitFifoInv(); + BeanUtils.copyProperties(ioSplit,bean); + updateIoSplitFifoInv.add(bean); + } + newioSplitCodeResponses.add(ioSplit); + } + splitMap.put(relId, newioSplitCodeResponses); + } + + collectOrderBizMapper.updateAutoResCount(bizId, 0); + } + + if (CollUtil.isNotEmpty(updateIoSplitFifoInv)){ + splitFifoInvService.updateBatchById(updateIoSplitFifoInv); + } + } + } diff --git a/src/main/resources/mybatis/mapper/collect/IoCollectOrderMapper.xml b/src/main/resources/mybatis/mapper/collect/IoCollectOrderMapper.xml index 1e2817403..8dbccaf5a 100644 --- a/src/main/resources/mybatis/mapper/collect/IoCollectOrderMapper.xml +++ b/src/main/resources/mybatis/mapper/collect/IoCollectOrderMapper.xml @@ -18,6 +18,7 @@ ico.updateUser, ico.tagStatus, ico.splitStatus, + ico.invAlert, ico.splitMsg , ico.tagMsg,