From 1c54a6ae33a15cf0c426e1e9c7ae07398a1e65e5 Mon Sep 17 00:00:00 2001 From: skyouc Date: 星期三, 02 四月 2025 15:17:54 +0800 Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop --- rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java | 109 ++++++++++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 101 insertions(+), 8 deletions(-) diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java index f970056..90a66e0 100644 --- a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java +++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java @@ -4,8 +4,10 @@ import com.vincent.rsf.framework.common.Cools; import com.vincent.rsf.framework.common.R; import com.vincent.rsf.framework.exception.CoolException; +import com.vincent.rsf.server.api.controller.params.CheckObjParams; import com.vincent.rsf.server.api.controller.params.OtherReceiptParams; import com.vincent.rsf.server.api.controller.params.ReceiptParams; +import com.vincent.rsf.server.api.entity.dto.CheckObjDto; import com.vincent.rsf.server.api.entity.dto.InspectDetlDto; import com.vincent.rsf.server.api.entity.dto.InspectItemDto; import com.vincent.rsf.server.api.entity.dto.ReceiptDetlsDto; @@ -16,6 +18,7 @@ import com.vincent.rsf.server.common.security.JwtSubject; import com.vincent.rsf.server.common.utils.CommonUtil; import com.vincent.rsf.server.common.utils.JwtUtil; +import com.vincent.rsf.server.manager.controller.params.IsptItemsParams; import com.vincent.rsf.server.manager.controller.params.WaitPakinParam; import com.vincent.rsf.server.manager.entity.*; import com.vincent.rsf.server.manager.mapper.*; @@ -72,12 +75,14 @@ private WarehouseAreasService warehouseAreasService; @Resource private AsnOrderItemMapper asnOrderItemMapper; - @Resource - private AsnOrderMapper asnOrderMapper; + @Autowired + private AsnOrderService asnOrderMapper; @Resource private MatnrMapper matnrMapper; @Resource private QlyInspectMapper qlyInspectMapper; + @Autowired + private QlyIsptItemService qlyIsptItemService; @Resource private StockItemMapper stockItemMapper; @Resource @@ -192,14 +197,14 @@ String asnCode = receipts.stream().findFirst().get().getAsnCode(); - AsnOrder asnOrder = asnOrderMapper.selectOne(new LambdaQueryWrapper<AsnOrder>() + AsnOrder asnOrder = asnOrderMapper.getOne(new LambdaQueryWrapper<AsnOrder>() .eq(AsnOrder::getCode, asnCode)); if (Objects.isNull(asnOrder)) { throw new CoolException("鏁版嵁閿欒锛氫富鍗曚笉瀛樺湪锛侊紒"); } asnOrder.setQty(receiptQty); - if (asnOrderMapper.updateById(asnOrder) < 1) { + if (!asnOrderMapper.updateById(asnOrder)) { throw new CoolException("宸叉敹璐ф暟閲忎慨鏀瑰け璐ワ紒锛�"); } @@ -312,7 +317,7 @@ * @time 2025/3/19 19:53 */ private void operateOrderLogs(AsnOrder asnOrder) { - if (asnOrderMapper.deleteById(asnOrder.getId()) < 1) { + if (!asnOrderMapper.removeById(asnOrder.getId())) { throw new CoolException("鍘熷崟鎹垹闄ゅけ璐ワ紒锛�"); } @@ -374,7 +379,7 @@ */ @Override public List<AsnOrder> getAllAsnOrders() { - List<AsnOrder> asnOrders = asnOrderMapper.selectList(new LambdaQueryWrapper<AsnOrder>().eq(AsnOrder::getWkType, OrderWorkType.ORDER_PURCHASE_IN.type)); + List<AsnOrder> asnOrders = asnOrderMapper.list(new LambdaQueryWrapper<AsnOrder>().eq(AsnOrder::getWkType, OrderWorkType.ORDER_PURCHASE_IN.type)); return asnOrders; } @@ -432,12 +437,12 @@ */ @Override public R inspect(String code, Long loginUserId) { - AsnOrder asnOrders = asnOrderMapper.selectOne(new LambdaQueryWrapper<AsnOrder>().eq(AsnOrder::getCode, code)); + AsnOrder asnOrders = asnOrderMapper.getOne(new LambdaQueryWrapper<AsnOrder>().eq(AsnOrder::getCode, code)); if (Objects.isNull(asnOrders)) { throw new CoolException("鍗曟嵁涓嶅瓨鍦紒锛�"); } InspectDetlDto detlDto = new InspectDetlDto(); - detlDto.setCode(asnOrders.getCode()).setPoCode(asnOrders.getPoCode()); + detlDto.setCode(asnOrders.getCode()).setId(asnOrders.getId()).setPoCode(asnOrders.getPoCode()); List<AsnOrderItem> orderItems = asnOrderItemMapper.selectList(new LambdaQueryWrapper<AsnOrderItem>().eq(AsnOrderItem::getAsnCode, code)); if (orderItems.isEmpty()) { detlDto.setItems(new ArrayList<>()); @@ -466,6 +471,94 @@ } /** + * @author Ryan + * @description 鎻愪氦鎶ユ + * @param + * @return + * @time 2025/4/1 16:47 + */ + @Override + public R confirmIspt(String id) { + if (org.apache.commons.lang3.StringUtils.isBlank(id)) { + throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒"); + } + AsnOrder asnOrder = asnOrderMapper.getById(id); + if (Objects.isNull(asnOrder)) { + throw new CoolException("鍗曟嵁涓嶅瓨鍦紒锛�"); + } + List<AsnOrder> orders = new ArrayList<>(); + orders.add(asnOrder); + if (asnOrderMapper.notifyInspect(orders)) { + return R.ok("涓婃姤鎴愬姛锛侊紒"); + }else { + return R.error("涓婃姤澶辫触锛侊紒"); + } + } + + /** + * 閫氳繃鐗╂枡锛岃川妫�鍗曡幏鍙栭渶瑕佽川妫�鍗曟嵁 + * @param params + * @return + */ + @Override + public R checkObjs(CheckObjParams params) { + if (Objects.isNull(params.getIsptCode())) { + throw new CoolException("璐ㄦ鍗曚笉鑳戒负绌�"); + } + if (Objects.isNull(params.getMatnrCode())) { + throw new CoolException("鐗╂枡缂栫爜涓嶈兘涓虹┖锛�"); + } + QlyInspect inspect = qlyInspectMapper.selectOne(new LambdaQueryWrapper<QlyInspect>().eq(QlyInspect::getCode, params.getIsptCode())); + if (Objects.isNull(inspect)) { + throw new CoolException("璐ㄦ鍗曟嵁涓嶅瓨鍦紒!"); + } + QlyIsptItem isptItem = qlyIsptItemService.getOne(new LambdaQueryWrapper<QlyIsptItem>() + .eq(QlyIsptItem::getMatnrCode, params.getMatnrCode()) + .eq(QlyIsptItem::getIspectId, inspect.getId())); + if (Objects.isNull(isptItem)) { + throw new CoolException("璐ㄦ鍗曟槑缁嗕笉瀛樺湪锛侊紒"); + } + + CheckObjDto objDto = new CheckObjDto(); + objDto.setIsptCode(inspect.getCode()) + .setAsnCode(inspect.getAsnCode()) + .setId(isptItem.getId()) + .setMatnrCode(isptItem.getMatnrCode()) + .setMaktx(isptItem.getMaktx()) + .setDisQty(isptItem.getDisQty()) + .setDlyQty(isptItem.getDlyQty()) + .setRcptQty(isptItem.getRcptQty()) + .setIsptResult(isptItem.getIsptResult()) + .setSplrBatch(isptItem.getSplrBatch()) + .setSplrName(isptItem.getSplrName()) + .setPicPath(isptItem.getPicPath()) + .setMemo(isptItem.getMemo()) + .setSafeQty(isptItem.getSafeQty()); + return R.ok(objDto); + } + + /** + * 蹇�熻川妫� + * @param params + * @return + */ + @Override + public R checkUpdate(QlyIsptItem params) { + if (Objects.isNull(params.getId()) || Objects.isNull(params.getIspectId())) { + throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒"); + } + IsptItemsParams itemsParams = new IsptItemsParams(); + List<QlyIsptItem> items = new ArrayList<>(); + items.add(params); + itemsParams.setIsptItem(items).setType("0"); + if (qlyIsptItemService.batchUpdate(itemsParams)) { + return R.ok(); + } else { + return R.error("淇濆瓨澶辫触锛侊紒"); + } + } + + /** * 鑾峰彇ReceiptDetlsDtos */ private R getAsnOrderItem(List<AsnOrderItem> items) { -- Gitblit v1.9.1