diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/mdm/service/impl/MdmToLmsServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/mdm/service/impl/MdmToLmsServiceImpl.java
index 0835476a4..90af9a284 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/mdm/service/impl/MdmToLmsServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/mdm/service/impl/MdmToLmsServiceImpl.java
@@ -19,6 +19,7 @@ import org.nl.wms.ext.mdm.entity.StatusEnum;
import org.nl.wms.ext.mdm.service.MdmToLmsService;
import org.springframework.stereotype.Service;
import java.util.List;
+import java.util.stream.IntStream;
/**
* @Author Eric.Yang
@@ -80,11 +81,14 @@ public class MdmToLmsServiceImpl implements MdmToLmsService {
if (CollectionUtil.isEmpty(parList)) {
throw new BadRequestException("MDM->客户数据核心字段数据为空,缺失字段:[par]!");
}
- JSONObject par = parList.getJSONObject(0);
- //业务员工号
- String empSupplier = par.getString("empSupplier");
- //业务员名称
- String empSupplierDesc = par.getString("empSupplierDesc");
+ JSONObject z1Par = IntStream.range(0, parList.size())
+ .mapToObj(parList::getJSONObject)
+ .filter(p -> "Z1".equals(p.getString("partner")))
+ .findFirst()
+ .orElse(null);
+
+ String empSupplier = z1Par != null ? z1Par.getString("empSupplier") : "";
+ String empSupplierDesc = z1Par != null ? z1Par.getString("empSupplierDesc") : "";
String sales_owner = StrUtil.join("|",empSupplier,empSupplierDesc);
//插入客户表
String currentUserId = SecurityUtils.getCurrentUserId();
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/service/impl/RecutPlanServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/service/impl/RecutPlanServiceImpl.java
index 08fc1c348..942ec5f36 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/service/impl/RecutPlanServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/service/impl/RecutPlanServiceImpl.java
@@ -59,6 +59,10 @@ public class RecutPlanServiceImpl implements RecutPlanService {
if (StrUtil.isNotEmpty(map.get("pcsn"))) {
map.put("pcsn", (String) whereJson.get("pcsn"));
}
+ // 新增木箱查询条件
+ if (StrUtil.isNotEmpty(map.get("package_box_sn"))) {
+ map.put("package_box_sn", (String) whereJson.get("package_box_sn"));
+ }
//获取人员对应的仓库
UserStorServiceImpl userStorService = new UserStorServiceImpl();
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/wql/QST_IVT_PRODUCTPLAN.wql b/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/wql/QST_IVT_PRODUCTPLAN.wql
index c410896b2..0487766bd 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/wql/QST_IVT_PRODUCTPLAN.wql
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/wql/QST_IVT_PRODUCTPLAN.wql
@@ -21,6 +21,7 @@
输入.end_time TYPEAS s_string
输入.begin_time TYPEAS s_string
输入.pcsn TYPEAS s_string
+ 输入.package_box_sn TYPEAS s_string
输入.plan_id TYPEAS s_string
输入.status TYPEAS s_string
输入.in_stor_id TYPEAS f_string
@@ -62,6 +63,11 @@
OPTION 输入.pcsn <> ""
dtl.pcsn = 输入.pcsn
ENDOPTION
+
+ OPTION 输入.package_box_sn <> ""
+ dtl.package_box_sn = 输入.package_box_sn
+ ENDOPTION
+
GROUP BY plan_id
) a ON mst.plan_id = a.plan_id
WHERE
@@ -121,4 +127,4 @@
order by sub.package_box_sn
ENDSELECT
ENDQUERY
- ENDIF
\ No newline at end of file
+ ENDIF
diff --git a/lms/nladmin-ui/src/views/monitor/sysapiLog/index.vue b/lms/nladmin-ui/src/views/monitor/sysapiLog/index.vue
index d96024656..59b05e14e 100644
--- a/lms/nladmin-ui/src/views/monitor/sysapiLog/index.vue
+++ b/lms/nladmin-ui/src/views/monitor/sysapiLog/index.vue
@@ -259,9 +259,11 @@ export default {
tableName: 'sys_api_log',
direction: null,
systemFlag: null,
- bizCode: null, // 关键:提前声明,Vue.observable 才能追踪
+ bizCode: null,
status: null,
- keyword: null
+ keyword: null,
+ requestParams: null,
+ responseStatus: null
}
})
},
diff --git a/lms/nladmin-ui/src/views/wms/st/inStor/reCutPlan/index.vue b/lms/nladmin-ui/src/views/wms/st/inStor/reCutPlan/index.vue
index b216c5929..57648dbb6 100644
--- a/lms/nladmin-ui/src/views/wms/st/inStor/reCutPlan/index.vue
+++ b/lms/nladmin-ui/src/views/wms/st/inStor/reCutPlan/index.vue
@@ -46,7 +46,15 @@
@keyup.enter.native="crud.toQuery"
/>
-
+
+
+