From e9dda95b4c7b842034cc8737209c0621a50a9cc5 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期三, 30 四月 2025 14:22:29 +0800
Subject: [PATCH] #报检
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderController.java | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderController.java
index fb9005b..6724931 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderController.java
@@ -3,6 +3,7 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.vincent.rsf.framework.common.Cools;
import com.vincent.rsf.framework.common.R;
@@ -52,7 +53,10 @@
public R page(@RequestBody Map<String, Object> map) {
BaseParam baseParam = buildParam(map, BaseParam.class);
PageParam<AsnOrder, BaseParam> pageParam = new PageParam<>(baseParam, AsnOrder.class);
- return R.ok().add(asnOrderService.page(pageParam, pageParam.buildWrapper(true)));
+ QueryWrapper<AsnOrder> queryWrapper = pageParam.buildWrapper(true);
+ List<String> asList = Arrays.asList(OrderType.ORDER_OUT.type);
+ queryWrapper.notIn("type", asList);
+ return R.ok().add(asnOrderService.page(pageParam, queryWrapper));
}
@PreAuthorize("hasAuthority('manager:asnOrder:list')")
@@ -157,10 +161,14 @@
.setWkType(OrderWorkType.getWorkDesc(order.getWkType()))
.setExceStatus(AsnExceStatus.getExceStatus(order.getExceStatus()))
.setAnfme(item.getAnfme() + "")
- .setMaktx(item.getMaktx()).setMemo(item.getMemo())
+ .setMaktx(item.getMaktx())
+ .setMemo(item.getMemo())
.setMatnrCode(item.getMatnrCode())
.setPoCode(item.getPoCode())
+ .setSplrName(item.getSplrName())
.setPoId(order.getPoId() + "")
+ .setTrackCode(item.getTrackCode())
+ .setBarcode(item.getBarcode())
.setPackName(item.getPackName())
.setPlatItemId(item.getPlatItemId())
.setSplrBatch(item.getSplrBatch())
--
Gitblit v1.9.1