From e65b5933adf62f3e7f042845f8c8c0a2de2d57ca Mon Sep 17 00:00:00 2001 From: "1009473166@qq.com" <草拟吗23> Date: Wed, 18 Mar 2026 20:28:14 +0800 Subject: [PATCH] =?UTF-8?q?2026.3.18=20=E6=99=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/CheckStockinController.java | 38 +++++++++---------- .../service/ICheckStockinService.java | 2 +- .../service/impl/CheckStockinServiceImpl.java | 14 +++---- .../resources/mapper/job/MydoJobMapper.xml | 8 ++-- .../mapper/out/OutStockoutMapper.xml | 4 +- ruoyi-ui/src/views/check/create/index.vue | 10 ++++- 6 files changed, 37 insertions(+), 39 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/check/stockcheck/controller/CheckStockinController.java b/ruoyi-admin/src/main/java/com/ruoyi/check/stockcheck/controller/CheckStockinController.java index 9b67a92..b8f87ca 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/check/stockcheck/controller/CheckStockinController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/check/stockcheck/controller/CheckStockinController.java @@ -27,25 +27,23 @@ import java.util.List; */ @RestController @RequestMapping("/check/stockCheck") -public class CheckStockinController extends BaseController -{ +public class CheckStockinController extends BaseController { @Autowired private ICheckStockinService checkStockinService; @Autowired - private ICheckStockinFinishService checkStockinFinishService; + private ICheckStockinFinishService checkStockinFinishService; /** * 查询盘库单据主信息列表 */ @PreAuthorize("@ss.hasPermi('check:stockCheck:list')") @GetMapping("/list") - public TableDataInfo list(CheckStockin checkStockin) - { + public TableDataInfo list(CheckStockin checkStockin) { startPage(); List list = new ArrayList<>(); - if (checkStockin.getStatus() == null || Convert.toInt(checkStockin.getStatus())<4){ - list = checkStockinService.selectCheckStockinList(checkStockin); - }else { + if (checkStockin.getStatus() == null || Convert.toInt(checkStockin.getStatus()) < 4) { + list = checkStockinService.selectCheckStockinList(checkStockin); + } else { list = checkStockinFinishService.selectCheckStockinList(checkStockin); } @@ -58,8 +56,7 @@ public class CheckStockinController extends BaseController @PreAuthorize("@ss.hasPermi('check:stockCheck:export')") @Log(title = "盘库单据主信息", businessType = BusinessType.EXPORT) @PostMapping("/export") - public void export(HttpServletResponse response, CheckStockin checkStockin) - { + public void export(HttpServletResponse response, CheckStockin checkStockin) { List list = checkStockinService.selectCheckStockinList(checkStockin); ExcelUtil util = new ExcelUtil(CheckStockin.class); util.exportExcel(response, list, "盘库单据主信息数据"); @@ -70,8 +67,7 @@ public class CheckStockinController extends BaseController */ @PreAuthorize("@ss.hasPermi('check:stockCheck:query')") @GetMapping(value = "/{stockGuid}") - public AjaxResult getInfo(@PathVariable("stockGuid") String stockGuid) - { + public AjaxResult getInfo(@PathVariable("stockGuid") String stockGuid) { return success(checkStockinService.selectCheckStockinByStockGuid(stockGuid)); } @@ -81,8 +77,7 @@ public class CheckStockinController extends BaseController @PreAuthorize("@ss.hasPermi('check:stockCheck:add')") @Log(title = "盘库单据主信息", businessType = BusinessType.INSERT) @PostMapping - public AjaxResult add(@RequestBody CheckStockin checkStockin) - { + public AjaxResult add(@RequestBody CheckStockin checkStockin) { return toAjax(checkStockinService.insertCheckStockin(checkStockin)); } @@ -92,8 +87,7 @@ public class CheckStockinController extends BaseController @PreAuthorize("@ss.hasPermi('check:stockCheck:edit')") @Log(title = "盘库单据主信息", businessType = BusinessType.UPDATE) @PutMapping - public AjaxResult edit(@RequestBody CheckStockin checkStockin) - { + public AjaxResult edit(@RequestBody CheckStockin checkStockin) { return checkStockinService.updateCheckStockin(checkStockin); } @@ -102,9 +96,8 @@ public class CheckStockinController extends BaseController */ @PreAuthorize("@ss.hasPermi('check:stockCheck:remove')") @Log(title = "盘库单据主信息", businessType = BusinessType.DELETE) - @DeleteMapping("/{stockGuids}") - public AjaxResult remove(@PathVariable String[] stockGuids) - { + @DeleteMapping("/{stockGuids}") + public AjaxResult remove(@PathVariable String[] stockGuids) { return toAjax(checkStockinService.deleteCheckStockinByStockGuids(stockGuids)); } @@ -119,12 +112,15 @@ public class CheckStockinController extends BaseController @PreAuthorize("@ss.hasPermi('check:stockCheck:saveBill')") @ResponseBody public AjaxResult saveBill(@RequestBody CheckStockVo checkStockVo) { - String stockOutId = checkStockinService.saveBill(checkStockVo); - return AjaxResult.success(stockOutId); + return checkStockinService.saveBill(checkStockVo); + + + } /** * 盘点自动分配 + * * @param checkStockin * @return */ diff --git a/ruoyi-admin/src/main/java/com/ruoyi/check/stockcheck/service/ICheckStockinService.java b/ruoyi-admin/src/main/java/com/ruoyi/check/stockcheck/service/ICheckStockinService.java index 536a042..6eb6d90 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/check/stockcheck/service/ICheckStockinService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/check/stockcheck/service/ICheckStockinService.java @@ -62,7 +62,7 @@ public interface ICheckStockinService */ public int deleteCheckStockinByStockGuid(String stockGuid); - String saveBill(CheckStockVo outStockoutVo); + AjaxResult saveBill(CheckStockVo outStockoutVo); /** * 盘点自动分配 diff --git a/ruoyi-admin/src/main/java/com/ruoyi/check/stockcheck/service/impl/CheckStockinServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/check/stockcheck/service/impl/CheckStockinServiceImpl.java index 8aca668..db4b439 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/check/stockcheck/service/impl/CheckStockinServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/check/stockcheck/service/impl/CheckStockinServiceImpl.java @@ -162,7 +162,7 @@ public class CheckStockinServiceImpl implements ICheckStockinService { @Override @Transactional(rollbackFor = Exception.class) - public String saveBill(CheckStockVo checkStockVo) { + public AjaxResult saveBill(CheckStockVo checkStockVo) { CheckStockin checkStockin = checkStockVo.getCheckStockin(); List detailList = checkStockVo.getDetailList(); @@ -183,6 +183,9 @@ public class CheckStockinServiceImpl implements ICheckStockinService { checkStockinDetail.setStockCheckDetailId(stockCheckId + "-" + (i + 1)); checkStockinDetail.setStockCheckId(stockCheckId); BasProduct basProduct = productService.selectBasProductByProductId(checkStockinDetail.getProductId()); + if (basProduct==null){ + throw new RuntimeException(checkStockinDetail.getProductId()+",系统内无该物料，请检查！"); + } checkStockinDetail.setProductGuid(basProduct.getProductGuid()); checkStockinDetail.setStockCheckGuid(checkStockin.getStockGuid()); checkStockinDetail.setScanNum("0"); @@ -193,13 +196,6 @@ public class CheckStockinServiceImpl implements ICheckStockinService { } else if ("2".equals(checkStockin.getCheckType())) { //货位盘点 for (int i = 0; i < detailList.size(); i++) { -// BasStock param = new BasStock(); -// param.setCargoSpaceId(detailList.get(i).getSpare1()); -// List basStocks = basStockService.selectBasStockList(param); -// Integer quantity = 0; -// for (BasStock basStock : basStocks) { -// quantity += Convert.toInt(basStock.getQuantity()); -// } CheckStockinDetail checkStockinDetail = detailList.get(i); checkStockinDetail.setStockCheckDetailId(stockCheckId + "-" + (i + 1)); checkStockinDetail.setStockCheckId(stockCheckId); @@ -211,7 +207,7 @@ public class CheckStockinServiceImpl implements ICheckStockinService { } checkStockinMapper.insertCheckStockin(checkStockin); - return stockCheckId; + return AjaxResult.success("单据创建成功",stockCheckId); } @Override diff --git a/ruoyi-admin/src/main/resources/mapper/job/MydoJobMapper.xml b/ruoyi-admin/src/main/resources/mapper/job/MydoJobMapper.xml index 8a34d9a..a695118 100644 --- a/ruoyi-admin/src/main/resources/mapper/job/MydoJobMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/job/MydoJobMapper.xml @@ -243,10 +243,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" diff --git a/ruoyi-admin/src/main/resources/mapper/out/OutStockoutMapper.xml b/ruoyi-admin/src/main/resources/mapper/out/OutStockoutMapper.xml index 45cbb25..195a2a2 100644 --- a/ruoyi-admin/src/main/resources/mapper/out/OutStockoutMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/out/OutStockoutMapper.xml @@ -181,8 +181,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{status,mode=IN,jdbcType=VARCHAR}, #{newStatus,mode=IN,jdbcType=VARCHAR}, #{exitId,mode=IN,jdbcType=VARCHAR}, - #{v_result,mode=OUT,jdbcType=VARCHAR}, - #{v_resultString,mode=OUT,jdbcType=VARCHAR} + #{v_result,mode=OUT,jdbcType=INTEGER}, + #{v_resultmsg,mode=OUT,jdbcType=VARCHAR} ) } diff --git a/ruoyi-ui/src/views/check/create/index.vue b/ruoyi-ui/src/views/check/create/index.vue index 8df60cb..9344b79 100644 --- a/ruoyi-ui/src/views/check/create/index.vue +++ b/ruoyi-ui/src/views/check/create/index.vue @@ -670,9 +670,15 @@ export default { console.log(data) // 这里需要调用保存接口 saveCheckStock(data).then(response => { + if (response.code==200){ + this.$modal.msgSuccess('保存成功：' + response.msg); + this.$tab.refreshPage(this.$route); + } + else { + this.$modal.msgError('建单失败：' + response.msg); + } + - this.$modal.msgSuccess('保存成功：' + response.msg); - this.$tab.refreshPage(this.$route); // this.reset(); }); }