From 5ebf8df590e50db08e018372e3b62bc281d062b5 Mon Sep 17 00:00:00 2001 From: zjj <3272660260@qq.com> Date: 星期一, 12 五月 2025 16:44:52 +0800 Subject: [PATCH] #Agv解绑 --- rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java | 15 ++++++++------- 1 files changed, 8 insertions(+), 7 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 bf17cb3..c012a35 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 @@ -2,7 +2,6 @@ import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.vincent.rsf.framework.common.Cools; import com.vincent.rsf.framework.common.R; import com.vincent.rsf.framework.exception.CoolException; @@ -612,15 +611,15 @@ .setId(isptItem.getId()) .setMatnrCode(isptItem.getMatnrCode()) .setMaktx(isptItem.getMaktx()) - .setDisQty(isptItem.getDisQty()) +// .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()); + .setMemo(isptItem.getMemo()); +// .setSafeQty(isptItem.getSafeQty()); dtos.add(objDto); }); return R.ok(dtos); @@ -630,16 +629,17 @@ * 蹇�熻川妫� * * @param params + * @param loginUserId * @return */ @Override - public R checkUpdate(List<QlyIsptItem> params) { + public R checkUpdate(List<QlyIsptItem> params, Long loginUserId) { if (Objects.isNull(params) || params.isEmpty()) { throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒"); } IsptItemsParams itemsParams = new IsptItemsParams(); itemsParams.setIsptItem(params).setType("0"); - if (qlyIsptItemService.batchUpdate(itemsParams)) { + if (qlyIsptItemService.batchUpdate(itemsParams, loginUserId)) { return R.ok(); } else { return R.error("淇濆瓨澶辫触锛侊紒"); @@ -694,7 +694,8 @@ /**鑾峰彇骞冲簱璁㈠崟*/ AsnOrder order = asnOrderMapper.getOne(new LambdaQueryWrapper<AsnOrder>() .eq(AsnOrder::getId, OrderId) - .eq(AsnOrder::getType, OrderType.ORDER_PLAT_IN.type)); + .eq(AsnOrder::getWkType, OrderWorkType.ORDER_WORK_TYPE_OTHER_IN.type) + .eq(AsnOrder::getType, OrderType.ORDER_IN.type)); if (Objects.isNull(order)) { throw new CoolException("闈炲钩搴撳崟鎹笉鍙墽琛屼汉宸ヤ笂鏋讹紒锛�"); } -- Gitblit v1.9.1