From 0a614f40839659794469960037b3b5121e9746b5 Mon Sep 17 00:00:00 2001 From: wusiyu <2015098864@qq.com> Date: Sat, 23 May 2026 14:40:41 +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?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wms/controller/StGoodsController.java | 13 ++--- .../controller/StWmsRequestController.java | 15 +++-- .../wms/service/IStGoodsService.java | 2 +- .../wms/service/impl/StGoodsServiceImpl.java | 8 +-- .../service/impl/StWmsRequestServiceImpl.java | 56 +++++++++++++------ 5 files changed, 56 insertions(+), 38 deletions(-) diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StGoodsController.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StGoodsController.java index 3ffc17996..6869a9335 100644 --- a/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StGoodsController.java +++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StGoodsController.java @@ -93,9 +93,8 @@ public class StGoodsController extends BladeController { @ApiOperationSupport(order = 4) @ApiLog("物料信息表 新增") @Operation(summary = "新增", description = "传入stGoods") - public R save(@RequestParam String goodsCode) throws Exception{ - stGoodsService.saveGoods(goodsCode); - return R.success(); + public R save(@RequestParam String goodsCode) throws Exception{ + return R.data(stGoodsService.saveGoods(goodsCode)); } /** @@ -110,14 +109,14 @@ public class StGoodsController extends BladeController { } /** - * 物料信息表 新增或修改 + * 物料信息表 新增保存 */ @PostMapping("/submit") @ApiOperationSupport(order = 6) - @ApiLog("物料信息表 新增或修改") - @Operation(summary = "新增或修改", description = "传入stGoods") + @ApiLog("物料信息表 新增保存") + @Operation(summary = "新增保存", description = "传入stGoods") public R submit(@Valid @RequestBody StGoods stGoods) { - return R.status(stGoodsService.saveOrUpdate(stGoods)); + return R.status(stGoodsService.save(stGoods)); } /** diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StWmsRequestController.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StWmsRequestController.java index 1d1aca81c..e66530c1b 100644 --- a/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StWmsRequestController.java +++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StWmsRequestController.java @@ -1,6 +1,5 @@ package org.springblade.wms.controller; -import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; @@ -80,12 +79,12 @@ public class StWmsRequestController extends BladeController { @ApiLog("仓库提请记录 自定义分页") @Operation(summary = "分页", description = "传入stWmsRequest") public R> page(StWmsRequestVO stWmsRequest, Query query) { - BladeUser user = AuthUtil.getUser(); - String userRoleName = user.getRoleName(); - stWmsRequest.setUserRoleName(userRoleName); - if (StrUtil.isNotBlank(userRoleName) && userRoleName.contains("保管员")) { - stWmsRequest.setApprovalStatus(StWmsRequest.APPROVAL_STATUS_CHECKING); - } +// BladeUser user = AuthUtil.getUser(); +// String userRoleName = user.getRoleName(); +// stWmsRequest.setUserRoleName(userRoleName); +// if (StrUtil.isNotBlank(userRoleName) && userRoleName.contains("保管员")) { +// stWmsRequest.setApprovalStatus(StWmsRequest.APPROVAL_STATUS_CHECKING); +// } IPage pages = stWmsRequestService.selectStWmsRequestPage(Condition.getPage(query), stWmsRequest); return R.data(pages); } @@ -109,7 +108,7 @@ public class StWmsRequestController extends BladeController { @ApiLog("仓库提请记录 修改") @Operation(summary = "修改", description = "传入stWmsRequest") public R update(@Valid @RequestBody StWmsRequest stWmsRequest) { - return R.status(stWmsRequestService.updateById(stWmsRequest)); + return R.status(stWmsRequestService.updateByErp(stWmsRequest)); } /** diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStGoodsService.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStGoodsService.java index 0330893cb..df5528c9a 100644 --- a/blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStGoodsService.java +++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStGoodsService.java @@ -40,7 +40,7 @@ public interface IStGoodsService extends BaseService { */ List exportStGoods(Wrapper queryWrapper); - void saveGoods(String goodsCode) throws Exception; + StGoods saveGoods(String goodsCode) throws Exception; StGoods queryByCodeAndVersion(String prtno, String releaseNo); diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StGoodsServiceImpl.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StGoodsServiceImpl.java index 3295fc2ca..b8c61cda6 100644 --- a/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StGoodsServiceImpl.java +++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StGoodsServiceImpl.java @@ -57,19 +57,18 @@ public class StGoodsServiceImpl extends BaseServiceImpl } @Override - public void saveGoods(String goodsCode) throws Exception { + public StGoods saveGoods(String goodsCode) throws Exception { StGoods stGoods = baseMapper.queryByCode(goodsCode); if (stGoods != null) { throw new Exception("该物料已存在！"); } else { List prtnoList = new ArrayList<>(); prtnoList.add(goodsCode); - saveGoodsInfo(prtnoList); - + return saveGoodsInfo(prtnoList); } } - public void saveGoodsInfo(List prtnoList) throws Exception { + public StGoods saveGoodsInfo(List prtnoList) throws Exception { StGoods goods = null; //查询物料信息 List pdmPartInfo = stHttpRequestService.getPdmPartInfo(prtnoList); @@ -124,6 +123,7 @@ public class StGoodsServiceImpl extends BaseServiceImpl } } } + return goods; } @Override 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 5f9aca298..b6176ddd7 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 @@ -17,11 +17,14 @@ import org.springblade.system.feign.ISysClient; import org.springblade.system.feign.IUserClient; import org.springblade.system.pojo.entity.User; import org.springblade.wms.excel.StWmsRequestExcel; +import org.springblade.wms.mapper.StGoodsMapper; import org.springblade.wms.mapper.StWmsRequestMapper; import org.springblade.wms.pojo.entity.StBuyOrder; +import org.springblade.wms.pojo.entity.StGoods; import org.springblade.wms.pojo.entity.StWmsRequest; import org.springblade.wms.pojo.vo.StWmsRequestVO; import org.springblade.wms.service.IStBuyOrderService; +import org.springblade.wms.service.IStGoodsService; import org.springblade.wms.service.IStWmsRequestService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -43,6 +46,8 @@ public class StWmsRequestServiceImpl extends BaseServiceImpl ruser = userClient.userInfoById(stWmsRequest.getCreateUser()); - User user1 = ruser.getData(); - approvalRecord.setCurrentRoleId(Long.valueOf(user1.getRoleId().split(",")[0])); - R roleName = sysClient.getRoleName(approvalRecord.getCurrentRoleId()); - String roleNameData = roleName.getData(); - approvalRecord.setCurrentRoleName(roleNameData); - approvalRecord.setNextRoleName("保管员"); - R roleIdResp = sysClient.getRoleIds("000000", approvalRecord.getNextRoleName()); - String roleId = roleIdResp.getData(); - approvalRecord.setNextRoleId(Long.valueOf(roleId)); - mesApprovalRecordClient.save(approvalRecord); +// MesApprovalRecordEntity approvalRecord = new MesApprovalRecordEntity(); +// approvalRecord.setBizId(stWmsRequest.getId()); +// approvalRecord.setBizType("仓库提请审批"); +// approvalRecord.setContent("仓库提请审批"); +// R ruser = userClient.userInfoById(stWmsRequest.getCreateUser()); +// User user1 = ruser.getData(); +// approvalRecord.setCurrentRoleId(Long.valueOf(user1.getRoleId().split(",")[0])); +// R roleName = sysClient.getRoleName(approvalRecord.getCurrentRoleId()); +// String roleNameData = roleName.getData(); +// approvalRecord.setCurrentRoleName(roleNameData); +// approvalRecord.setNextRoleName("保管员"); +// R roleIdResp = sysClient.getRoleIds("000000", approvalRecord.getNextRoleName()); +// String roleId = roleIdResp.getData(); +// approvalRecord.setNextRoleId(Long.valueOf(roleId)); +// mesApprovalRecordClient.save(approvalRecord); } /* 更新采购订单已提请数量（原逻辑） */ -// bo.setDrawQuantity(afterQty); -// bo.setSurDrawQty(bo.getBuyQty() - afterQty); -// stBuyOrderService.updateById(bo); + bo.setDrawQuantity(afterQty); + bo.setSurDrawQty(bo.getBuyQty() - afterQty); + stBuyOrderService.updateById(bo); + this.updateStatusByKeyId(stWmsRequest.getId(), StWmsRequest.APPROVAL_STATUS_CHECKED); } @Override @@ -219,6 +225,20 @@ public class StWmsRequestServiceImpl extends BaseServiceImpl exportStWmsRequest(Wrapper queryWrapper) { List stWmsRequestList = baseMapper.exportStWmsRequest(queryWrapper);