From 669fe984048785873c20fbd0ce8abb3cd52c1fce Mon Sep 17 00:00:00 2001 From: skyouc Date: 星期二, 29 四月 2025 15:22:24 +0800 Subject: [PATCH] 新增出库单优化 --- rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/QlyInspectServiceImpl.java | 35 ++++++++++++++++++++++++++++++++--- 1 files changed, 32 insertions(+), 3 deletions(-) diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/QlyInspectServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/QlyInspectServiceImpl.java index d01599b..568cf81 100644 --- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/QlyInspectServiceImpl.java +++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/QlyInspectServiceImpl.java @@ -1,6 +1,7 @@ package com.vincent.rsf.server.manager.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.vincent.rsf.framework.common.R; import com.vincent.rsf.framework.exception.CoolException; import com.vincent.rsf.server.manager.controller.params.IsptOrderParam; @@ -101,15 +102,21 @@ * @return * @time 2025/3/31 10:12 */ - @Override public List<AsnOrder> getUnInspect(Map<String, Object> params) { List<AsnOrder> asnOrders = asnOrderService.list(new LambdaQueryWrapper<AsnOrder>() .eq(AsnOrder::getStatus, 1) - .eq(!Objects.isNull(params.get("asnCode")), AsnOrder::getCode, !Objects.isNull(params.get("asnCode")) ? params.get("asnCode").toString() : "") - .eq(AsnOrder::getNtyStatus, 0)); + .eq(!Objects.isNull(params.get("asnCode")) && StringUtils.isNotBlank(params.get("asnCode").toString()), AsnOrder::getCode, StringUtils.isNotBlank(params.get("asnCode").toString()) ? params.get("asnCode").toString() : null)); return asnOrders; } + + /** + * @author Ryan + * @description 淇濆瓨 + * @param + * @return + * @time 2025/3/31 14:54 + */ @Override @Transactional(rollbackFor = Exception.class) @@ -164,6 +171,28 @@ throw new CoolException("鏄庣粏淇濆瓨澶辫触锛侊紒"); } } + if (!asnOrderService.update(new LambdaUpdateWrapper<AsnOrder>().in(AsnOrder::getId, param.getIds()).set(AsnOrder::getNtyStatus, 1))) { + throw new CoolException("鎶ユ鐘舵�佷慨鏀瑰け璐ワ紒锛�"); + } return R.ok("淇濆瓨鎴愬姛锛侊紒"); } + + @Override + public boolean qlySave(QlyInspect qlyInspect) { + String code = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_INSPECT_CODE, qlyInspect); + if (Objects.isNull(code) || StringUtils.isBlank(code)) { + throw new CoolException("缂栫爜瑙勫垯閿欒锛�" + "璇锋鏌ョ紪鐮侊細" + "銆孲YS_INSPECT_CODE銆�" + "鏄惁璁剧疆鎴愬姛锛侊紒"); + } + qlyInspect.setCode(code); + if (Objects.isNull(qlyInspect.getAsnCode()) || StringUtils.isBlank(qlyInspect.getAsnCode())) { + throw new CoolException("鏀惰揣鍗曞彿涓嶈兘涓虹┖锛侊紒"); + } + AsnOrder asnOrder = asnOrderService.getOne(new LambdaQueryWrapper<AsnOrder>().eq(AsnOrder::getId, qlyInspect.getAsnCode())); + if (Objects.isNull(asnOrder)) { + throw new CoolException("鏀惰揣鍗曚笉瀛樺湪锛侊紒"); + } + qlyInspect.setAsnCode(asnOrder.getCode()).setAsnId(asnOrder.getId()); + + return this.save(qlyInspect); + } } -- Gitblit v1.9.1