From 049c3c4a946f1c17db6c5b1c6ecf4504f283f267 Mon Sep 17 00:00:00 2001 From: wusiyu <2015098864@qq.com> Date: Mon, 27 Apr 2026 15:42:47 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=93=E5=BA=93=E7=AE=A1=E7=90=86=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wms/pojo/entity/StOtherOutRecord.java | 5 + .../controller/StClassRequestController.java | 2 +- .../StOtherOutRecordController.java | 2 +- .../StOtherReceiptRecordController.java | 33 +++--- .../wms/mapper/StClassRequestMapper.xml | 2 +- .../wms/mapper/StOtherOutRecordMapper.xml | 8 +- .../wms/mapper/StOtherReceiptRecordMapper.xml | 1 + .../wms/mapper/StStorageLocationMapper.java | 2 + .../wms/mapper/StStorageLocationMapper.xml | 13 +++ .../service/IStStorageLocationService.java | 1 + .../service/impl/StBuyOrderServiceImpl.java | 7 +- .../impl/StClassRequestServiceImpl.java | 16 ++- .../impl/StGlassCakeOutServiceImpl.java | 107 ++++++++++-------- .../impl/StOtherOutRecordServiceImpl.java | 22 ++-- .../impl/StStorageLocationServiceImpl.java | 5 + .../service/impl/StWmsRequestServiceImpl.java | 7 +- 16 files changed, 142 insertions(+), 91 deletions(-) diff --git a/blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/pojo/entity/StOtherOutRecord.java b/blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/pojo/entity/StOtherOutRecord.java index 7ad0b797..90412d78 100644 --- a/blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/pojo/entity/StOtherOutRecord.java +++ b/blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/pojo/entity/StOtherOutRecord.java @@ -110,6 +110,11 @@ public class StOtherOutRecord extends TenantEntity { */ @Schema(description = "出库数量") private Double outQty; + /** + * 领料人ID + */ + @Schema(description = "领料人ID") + private Long picker; /*0:报废出库,1:料头出库,2.超额出库,3复检出库,4领用出库,5库转移,6退货出库,11不合格退库*/ public static final Short OUT_TYPE_SCRAP = 0; diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StClassRequestController.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StClassRequestController.java index a561ba15..119b4e7c 100644 --- a/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StClassRequestController.java +++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StClassRequestController.java @@ -102,7 +102,7 @@ public class StClassRequestController extends BladeController { // } String userRoleName = user.getRoleName(); stClassRequest.setUserRoleName(userRoleName); - if (StrUtil.isNotBlank(userRoleName) && userRoleName.contains("process_engineer")) { + if (StrUtil.isNotBlank(userRoleName) && userRoleName.contains("rb_craft")) { // 可查询审批状态为「审批中」的数据 stClassRequest.setApprovalStatus(StClassRequest.APPROVAL_STATUS_CHECKING); } diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StOtherOutRecordController.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StOtherOutRecordController.java index c48555b8..4566aec0 100644 --- a/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StOtherOutRecordController.java +++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StOtherOutRecordController.java @@ -121,7 +121,7 @@ public class StOtherOutRecordController extends BladeController { String userRoleName = user.getRoleName(); stOtherOutRecord.setUserRoleName(userRoleName); - if (StrUtil.isNotBlank(userRoleName) && userRoleName.contains("process_engineer")) { + if (StrUtil.isNotBlank(userRoleName) && userRoleName.contains("rb_craft")) { // 工艺员：可查询审批状态为「审批中」的数据 stOtherOutRecord.setApprovalStatus(StOtherOutRecord.APPROVAL_STATUS_CHECKING); } diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StOtherReceiptRecordController.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StOtherReceiptRecordController.java index 6d7f1dc6..72ea9ff3 100644 --- a/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StOtherReceiptRecordController.java +++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StOtherReceiptRecordController.java @@ -313,22 +313,8 @@ public class StOtherReceiptRecordController extends BladeController { } Long shId = storehouse.getId(); - // 库位处理（不存在则新建，加入批量集合） - String goodsCode = excelDTO.getGoodsCode(); - String location = excelDTO.getLocation(); - StStorageLocation storageLocation = stStorageLocationService.findByGoodsCode(goodsCode); - if (storageLocation == null) { - storageLocation = new StStorageLocation(); - storageLocation.setShId(shId); - storageLocation.setIsDeleted(0); - storageLocation.setLocation(location); - storageLocation.setGoodsCode(excelDTO.getGoodsCode()); - locationSaveList.add(storageLocation); // 加入批量集合，不立即保存 - } - Long slId = storageLocation.getId(); - // 物料处理（不存在则新建） -// String goodsCode = excelDTO.getGoodsCode(); + String goodsCode = excelDTO.getGoodsCode(); StGoods goods = Optional.ofNullable(stGoodsService.queryByCode(goodsCode)) .orElseGet(() -> { try { @@ -344,6 +330,22 @@ public class StOtherReceiptRecordController extends BladeController { } Long goodsId = goods.getId(); + // 库位处理（不存在则新建，加入批量集合） + String location = excelDTO.getLocation(); + StStorageLocation storageLocation = stStorageLocationService.getLocation(goodsCode,shId,location); + if (storageLocation == null) { + storageLocation = new StStorageLocation(); + storageLocation.setShId(shId); + storageLocation.setIsDeleted(0); + storageLocation.setLocation(location); + storageLocation.setGoodsCode(excelDTO.getGoodsCode()); + storageLocation.setGoodsName(goods.getGoodsName()); + storageLocation.setMaterialModel(goods.getMaterialModel()); + storageLocation.setSpecifications(goods.getSpecifications()); + locationSaveList.add(storageLocation); // 加入批量集合，不立即保存 + } + Long slId = storageLocation.getId(); + // 构建出入库单 StStockInoutRecord stockInoutRecord = new StStockInoutRecord(); stockInoutRecord.setDeptId(deptId); @@ -358,6 +360,7 @@ public class StOtherReceiptRecordController extends BladeController { stockInoutRecord.setQuantity(excelDTO.getQuantity()); stockInoutRecord.setCheckNo(excelDTO.getCheckCode()); stockInoutRecord.setUnitPrice(excelDTO.getBalanceMoney()); + stockInoutRecord.setSirMoney(excelDTO.getBalanceMoney()*excelDTO.getQuantity()); stockInoutRecord.setSlId(slId); stockInoutRecord.setThickness(excelDTO.getThickness()); inoutSaveList.add(stockInoutRecord); // 加入批量集合，不立即保存 diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StClassRequestMapper.xml b/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StClassRequestMapper.xml index 149a56f8..aca06729 100644 --- a/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StClassRequestMapper.xml +++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StClassRequestMapper.xml @@ -56,7 +56,7 @@ AND t.goods_code = #{stClassRequest.goodsCode} - + AND t.approval_status = 0 diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StOtherOutRecordMapper.xml b/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StOtherOutRecordMapper.xml index 9e87303c..0a93cd12 100644 --- a/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StOtherOutRecordMapper.xml +++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StOtherOutRecordMapper.xml @@ -24,6 +24,7 @@ + @@ -39,7 +40,6 @@ sir.sir_code , sir.in_out_date , sir.in_out_reason , - c.picker , -- 库房表：出库仓库名称 sh.sh_name AS shName, -- 制单人姓名（主表create_by关联用户表） @@ -57,7 +57,7 @@ -- 左关联制单人用户表：主表create_by关联用户表id LEFT JOIN BLADE_USER cu ON soor.create_user = cu.id -- 左关联领料人用户表：凭证表picker关联用户表id - LEFT JOIN BLADE_USER pu ON c.picker = pu.id + LEFT JOIN BLADE_USER pu ON soor.picker = pu.id -- 左关联审批人用户表：主表approver关联用户表id LEFT JOIN BLADE_USER au ON soor.approver = au.id -- 主表过滤条件：未删除 @@ -69,10 +69,10 @@ - AND sir.cr_code LIKE '%' || #{stOtherOutRecord.crCode} || '%' + AND soor.cr_code LIKE '%' || #{stOtherOutRecord.crCode} || '%' - + AND soor.approval_status = 0 diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StOtherReceiptRecordMapper.xml b/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StOtherReceiptRecordMapper.xml index ef905aa0..f58c2d0d 100644 --- a/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StOtherReceiptRecordMapper.xml +++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StOtherReceiptRecordMapper.xml @@ -29,6 +29,7 @@ t3.goods_name , t3.material_model , t6.check_code , + t2.check_no as checkCode, t2.pi_no , t2.stove_pi_no , t2.quantity_level , diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StStorageLocationMapper.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StStorageLocationMapper.java index 8d9a7087..fc86dfcd 100644 --- a/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StStorageLocationMapper.java +++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StStorageLocationMapper.java @@ -48,5 +48,7 @@ public interface StStorageLocationMapper extends BaseMapper { StStorageLocation findByLocation(String location); List selectStStorageLocationAllPage(IPage page, StStorageLocationVO stStorageLocation); + + StStorageLocation getLocation(String goodsCode, Long shId, String location); } diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StStorageLocationMapper.xml b/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StStorageLocationMapper.xml index 0fd673ea..0a625963 100644 --- a/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StStorageLocationMapper.xml +++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StStorageLocationMapper.xml @@ -82,6 +82,19 @@ AND ROWNUM = 1 + + diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStStorageLocationService.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStStorageLocationService.java index 5b82f32e..8cdc5b1d 100644 --- a/blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStStorageLocationService.java +++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStStorageLocationService.java @@ -51,5 +51,6 @@ public interface IStStorageLocationService extends BaseService selectStStorageLocationAllPage(IPage page, StStorageLocationVO stStorageLocation); + StStorageLocation getLocation(String goodsCode, Long shId, String location); } diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StBuyOrderServiceImpl.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StBuyOrderServiceImpl.java index ac8113da..006be589 100644 --- a/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StBuyOrderServiceImpl.java +++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StBuyOrderServiceImpl.java @@ -179,7 +179,7 @@ public class StBuyOrderServiceImpl extends BaseServiceImpl ruser = userClient.userInfoById(buyOrder.getDeclareMan()); User user1 = ruser.getData(); - approvalRecord.setCurrentRoleId(Long.valueOf(user1.getRoleId())); + approvalRecord.setCurrentRoleId(Long.valueOf(user1.getRoleId().split(",")[0])); R roleName = sysClient.getRoleName(approvalRecord.getCurrentRoleId()); String roleNameData = roleName.getData(); approvalRecord.setCurrentRoleName(roleNameData); @@ -224,11 +224,14 @@ public class StBuyOrderServiceImpl extends BaseServiceImpl roleIdResp = sysClient.getRoleIds("000000", "保管员"); + String roleId = roleIdResp.getData(); + MesApprovalRecordEntity updateRecord = new MesApprovalRecordEntity(); updateRecord.setBizId(orderId); updateRecord.setBizType("额外提请审批"); updateRecord.setOpinion(""); - updateRecord.setNextRoleId(Long.valueOf(approver.getRoleId())); + updateRecord.setNextRoleId(Long.valueOf(roleId)); updateRecord.setStatus(Integer.valueOf(approvalResult)); mesApprovalRecordClient.update(updateRecord); diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StClassRequestServiceImpl.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StClassRequestServiceImpl.java index 0e9b9b7e..8839a7b3 100644 --- a/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StClassRequestServiceImpl.java +++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StClassRequestServiceImpl.java @@ -86,6 +86,7 @@ public class StClassRequestServiceImpl extends BaseServiceImpl ruser = userClient.userInfoById(ccr.getCrMan()); User user1 = ruser.getData(); - approvalRecord.setCurrentRoleId(Long.valueOf(user1.getRoleId())); + approvalRecord.setCurrentRoleId(Long.valueOf(user1.getRoleId().split(",")[0])); R roleName = sysClient.getRoleName(approvalRecord.getCurrentRoleId()); String roleNameData = roleName.getData(); approvalRecord.setCurrentRoleName(roleNameData); @@ -105,12 +106,14 @@ public class StClassRequestServiceImpl extends BaseServiceImpl roleIdResp = sysClient.getRoleIds("000000", approvalRecord.getNextRoleName()); String roleId = roleIdResp.getData(); approvalRecord.setNextRoleId(Long.valueOf(roleId)); + mesApprovalRecordClient.save(approvalRecord); } else { // 普通物料：无需审批，状态设为【无需审批】+ 直接发布 ccr.setApprovalStatus(StClassRequest.APPROVAL_STATUS_NONE); ccr.setCurStatus(StClassRequest.CURSTATUS_RELEASED); // 直接生效 } + this.updateById(ccr); // PfFlow pfFlow = this.getByCode("FLOW_ST_001"); // if (pfFlow != null && pfFlow.getUsed() && Boolean.TRUE.equals(ccr.getSpecial())) { @@ -146,11 +149,12 @@ public class StClassRequestServiceImpl extends BaseServiceImpl roleIdResp = sysClient.getRoleIds("000000", "热表-工艺员"); + String roleId = roleIdResp.getData(); + MesApprovalRecordEntity updateRecord = new MesApprovalRecordEntity(); updateRecord.setBizId(id); updateRecord.setBizType("班组提请审批"); updateRecord.setOpinion(""); - updateRecord.setNextRoleId(Long.valueOf(approver.getRoleId())); + updateRecord.setNextRoleId(Long.valueOf(roleId)); updateRecord.setStatus(Integer.valueOf(approvalResult)); mesApprovalRecordClient.update(updateRecord); @@ -368,6 +375,7 @@ public class StClassRequestServiceImpl extends BaseServiceImpl partRelationEntityList = partClient.getSubPart(partOne.getId()); -// WorkOrder workOrder = workOrderMapper.getWorkOrderByCardNo(dto.getCardNo(),s1); + List glassCakePartList = new ArrayList<>(); + if (!CollectionUtils.isEmpty(partRelationEntityList)) { + // 步骤1：提取所有非空的childPartId并去重（避免null和重复ID，减少查询压力） + List childPartIdList = partRelationEntityList.stream() + .map(DsPartRelationEntity::getChildPartId) // 提取子件ID + .filter(Objects::nonNull) // 过滤null的ID + .distinct() // 去重，避免重复查询 + .collect(Collectors.toList()); + + // 步骤2：批量查询DS_PART表（一次SQL，性能最优） + if (!CollectionUtils.isEmpty(childPartIdList)) { + // 调用dsPartService的批量查询方法（根据ID列表查DS_PART） + List allChildPartList = partClient.batchParts(childPartIdList); + + // 步骤3：筛选出IS_CLASS_CAKE为"玻璃饼"的记录（核心过滤） + if (!CollectionUtils.isEmpty(allChildPartList)) { + glassCakePartList = allChildPartList.stream() + .filter(part -> Boolean.TRUE.equals(part.getIsGlassCake())) + .collect(Collectors.toList()); + } + } + } + +// WorkOrder workOrder = new WorkOrder(); +// workOrder.setCardNo(dto.getCardNo()); // 卡号（与DTO的cardNo一致） +// workOrder.setWoCode("WO-202602110001"); // 工单号 +// workOrder.setPartCode("PART-MAIN001"); // 主零件编码 +// workOrder.setMakeQty(3.0); // 生产数量：100台 // -// DsPartEntity partOne = dsPartService.selectDsPartByPatCodeAndVersion(workOrder.getPartCode()); -// List partRelationEntityList = partRelationService.selectDsPartRelationByPartId(partOne.getId()); +// DsPartEntity partOne = new DsPartEntity(); +// partOne.setId(1001L); // 主零件ID +// partOne.setPartCode(workOrder.getPartCode()); // 与工单主零件编码一致 +// partOne.setPartName("XX设备-主组装件"); // -// List glassCakePartList = new ArrayList<>(); -// if (!CollectionUtils.isEmpty(partRelationEntityList)) { -// // 步骤1：提取所有非空的childPartId并去重（避免null和重复ID，减少查询压力） -// List childPartIdList = partRelationEntityList.stream() -// .map(DsPartRelationEntity::getChildPartId) // 提取子件ID -// .filter(Objects::nonNull) // 过滤null的ID -// .distinct() // 去重，避免重复查询 -// .collect(Collectors.toList()); // -// // 步骤2：批量查询DS_PART表（一次SQL，性能最优） -// if (!CollectionUtils.isEmpty(childPartIdList)) { -// // 调用dsPartService的批量查询方法（根据ID列表查DS_PART） -// List allChildPartList = dsPartService.selectDsPartByIds(childPartIdList); +// List glassCakePartList = new ArrayList<>(); // -// // 步骤3：筛选出IS_CLASS_CAKE为"玻璃饼"的记录（核心过滤） -// if (!CollectionUtils.isEmpty(allChildPartList)) { -// glassCakePartList = allChildPartList.stream() -// .filter(part -> Boolean.TRUE.equals(part.getIsClassCake())) -// .collect(Collectors.toList()); -// } -// } -// } - - WorkOrder workOrder = new WorkOrder(); - workOrder.setCardNo(dto.getCardNo()); // 卡号（与DTO的cardNo一致） - workOrder.setWoCode("WO-202602110001"); // 工单号 - workOrder.setPartCode("PART-MAIN001"); // 主零件编码 - workOrder.setMakeQty(3.0); // 生产数量：100台 - - DsPartEntity partOne = new DsPartEntity(); - partOne.setId(1001L); // 主零件ID - partOne.setPartCode(workOrder.getPartCode()); // 与工单主零件编码一致 - partOne.setPartName("XX设备-主组装件"); - - - List glassCakePartList = new ArrayList<>(); - - // 玻璃饼1：印字Y，粉重500g，材料号MAT001，厚度5mm，定额0.5/台 - DsPartEntity cake1 = new DsPartEntity(); - cake1.setId(2001L); - cake1.setPartCode("03-07-65-39-B3"); - cake1.setPartName("玻璃饼-500g-印字Y-5mm"); - cake1.setIsPrint("1"); // 印字 - cake1.setPowderWeight(new BigDecimal("2.5")); // 粉重 - cake1.setMaterial("kk1"); // 材料号 - cake1.setFormingThickness(new BigDecimal("3.5")); // 成型厚度 - cake1.setQuota(5.0); // 定额：每台产品用0.5个 - glassCakePartList.add(cake1); +// // 玻璃饼1：印字Y，粉重500g，材料号MAT001，厚度5mm，定额0.5/台 +// DsPartEntity cake1 = new DsPartEntity(); +// cake1.setId(2001L); +// cake1.setPartCode("03-07-65-39-B3"); +// cake1.setPartName("玻璃饼-500g-印字Y-5mm"); +// cake1.setIsPrint("1"); // 印字 +// cake1.setPowderWeight(new BigDecimal("2.5")); // 粉重 +// cake1.setMaterial("kk1"); // 材料号 +// cake1.setFormingThickness(new BigDecimal("3.5")); // 成型厚度 +// cake1.setQuota(5.0); // 定额：每台产品用0.5个 +// glassCakePartList.add(cake1); // 3. 初始化预出库列表（收集所有库存充足的预出库实体） List preOutStockList = new ArrayList<>(); diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StOtherOutRecordServiceImpl.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StOtherOutRecordServiceImpl.java index 026db628..45c81063 100644 --- a/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StOtherOutRecordServiceImpl.java +++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StOtherOutRecordServiceImpl.java @@ -1,16 +1,12 @@ package org.springblade.wms.service.impl; -import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; import jakarta.annotation.Resource; import org.springblade.core.log.exception.ServiceException; import org.springblade.core.mp.base.BaseServiceImpl; import org.springblade.core.secure.BladeUser; import org.springblade.core.tool.api.R; -import org.springblade.core.tool.utils.DateUtil; import org.springblade.desk.common.feign.IMesApprovalRecordClient; import org.springblade.desk.common.pojo.entity.MesApprovalRecordEntity; import org.springblade.system.feign.ISysClient; @@ -18,18 +14,16 @@ import org.springblade.system.feign.IUserClient; import org.springblade.system.pojo.entity.User; import org.springblade.wms.excel.StOtherOutRecordExcel; import org.springblade.wms.mapper.StOtherOutRecordMapper; -import org.springblade.wms.pojo.dto.StOtherOutRecordDTO; -import org.springblade.wms.pojo.entity.*; +import org.springblade.wms.pojo.entity.StOtherOutRecord; +import org.springblade.wms.pojo.entity.StRealtimeStock; +import org.springblade.wms.pojo.entity.StStockInoutRecord; import org.springblade.wms.pojo.vo.StOtherOutRecordVO; -import org.springblade.wms.pojo.vo.StRealtimeStockVO; import org.springblade.wms.service.IStOtherOutRecordService; import org.springblade.wms.service.IStRealtimeStockService; import org.springblade.wms.service.IStStockInoutRecordService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.math.BigDecimal; -import java.time.LocalDateTime; import java.util.*; import java.util.function.Function; import java.util.stream.Collectors; @@ -84,7 +78,7 @@ public class StOtherOutRecordServiceImpl extends BaseServiceImpl ruser = userClient.userInfoById(stOtherOutRecord.getCreateUser()); User user1 = ruser.getData(); - approvalRecord.setCurrentRoleId(Long.valueOf(user1.getRoleId())); + approvalRecord.setCurrentRoleId(Long.valueOf(user1.getRoleId().split(",")[0])); R roleName = sysClient.getRoleName(approvalRecord.getCurrentRoleId()); String roleNameData = roleName.getData(); approvalRecord.setCurrentRoleName(roleNameData); @@ -100,7 +94,7 @@ public class StOtherOutRecordServiceImpl extends BaseServiceImpl roleIdResp = sysClient.getRoleIds("000000", "热表-工艺员"); + String roleId = roleIdResp.getData(); + MesApprovalRecordEntity updateRecord = new MesApprovalRecordEntity(); updateRecord.setBizId(id); updateRecord.setBizType("报废审批"); updateRecord.setOpinion(""); - updateRecord.setNextRoleId(Long.valueOf(approver.getRoleId())); + updateRecord.setNextRoleId(Long.valueOf(roleId)); updateRecord.setStatus(Integer.valueOf(approvalResult)); mesApprovalRecordClient.update(updateRecord); @@ -278,6 +275,7 @@ public class StOtherOutRecordServiceImpl extends BaseServiceImpl exportStStorageLocation(Wrapper queryWrapper) { List stStorageLocationList = baseMapper.exportStStorageLocation(queryWrapper); diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StWmsRequestServiceImpl.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StWmsRequestServiceImpl.java index 12b44525..aed75859 100644 --- a/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StWmsRequestServiceImpl.java +++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StWmsRequestServiceImpl.java @@ -96,7 +96,7 @@ public class StWmsRequestServiceImpl extends BaseServiceImpl ruser = userClient.userInfoById(stWmsRequest.getCreateUser()); User user1 = ruser.getData(); - approvalRecord.setCurrentRoleId(Long.valueOf(user1.getRoleId())); + approvalRecord.setCurrentRoleId(Long.valueOf(user1.getRoleId().split(",")[0])); R roleName = sysClient.getRoleName(approvalRecord.getCurrentRoleId()); String roleNameData = roleName.getData(); approvalRecord.setCurrentRoleName(roleNameData); @@ -139,11 +139,14 @@ public class StWmsRequestServiceImpl extends BaseServiceImpl roleIdResp = sysClient.getRoleIds("000000", "保管员"); + String roleId = roleIdResp.getData(); + MesApprovalRecordEntity updateRecord = new MesApprovalRecordEntity(); updateRecord.setBizId(id); updateRecord.setBizType("仓库提请审批"); updateRecord.setOpinion(""); - updateRecord.setNextRoleId(Long.valueOf(approver.getRoleId())); + updateRecord.setNextRoleId(Long.valueOf(roleId)); updateRecord.setStatus(Integer.valueOf(approvalResult)); mesApprovalRecordClient.update(updateRecord);