From 61b200ce0b631387fe45dd18fef7fb056d30e838 Mon Sep 17 00:00:00 2001 From: zzs Date: Sat, 21 Dec 2024 11:52:37 +0800 Subject: [PATCH 1/4] =?UTF-8?q?feat:=E4=B8=8B=E5=8D=95=E5=B9=B3=E5=8F=B0?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=91=98=E7=94=A8=E6=88=B7=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=89=80=E6=9C=89=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/yem/or/api/AssepcDynamic.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/yem/or/api/AssepcDynamic.java b/src/main/java/com/yem/or/api/AssepcDynamic.java index e110142f..b3dce481 100644 --- a/src/main/java/com/yem/or/api/AssepcDynamic.java +++ b/src/main/java/com/yem/or/api/AssepcDynamic.java @@ -184,10 +184,10 @@ public class AssepcDynamic { String algoKey = this.getClass().getName(); //查询零件明细表 根据零件编码过滤n qFilters.add(new QFilter("yem_model.yem_products.number", QCP.equals, number)); - if (YEM.isNotEmpty(custom)) { + if (YEM.isNotEmpty(custom) &&(!StringUtils.containsIgnoreCase(number, "admin"))) { qFilters.add(new QFilter("yem_customer.number", QCP.equals, custom)); } else { - return CustomApiResult.fail("501", "客户编码必传"); + return CustomApiResult.fail("501", "客户编码为空！"); } extracted(algoKey, qFilters, jsonArray); // fillMissInfo(algoKey, number, jsonArray); From ecc285745af62655d80f2f58a3f75d2db40ec068 Mon Sep 17 00:00:00 2001 From: zzs Date: Sat, 21 Dec 2024 11:54:43 +0800 Subject: [PATCH 2/4] =?UTF-8?q?feat:=E4=B8=8B=E5=8D=95=E5=B9=B3=E5=8F=B0?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=91=98=E7=94=A8=E6=88=B7=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=89=80=E6=9C=89=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/yem/or/api/AssepcDynamic.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/yem/or/api/AssepcDynamic.java b/src/main/java/com/yem/or/api/AssepcDynamic.java index b3dce481..6250eac3 100644 --- a/src/main/java/com/yem/or/api/AssepcDynamic.java +++ b/src/main/java/com/yem/or/api/AssepcDynamic.java @@ -184,8 +184,10 @@ public class AssepcDynamic { String algoKey = this.getClass().getName(); //查询零件明细表 根据零件编码过滤n qFilters.add(new QFilter("yem_model.yem_products.number", QCP.equals, number)); - if (YEM.isNotEmpty(custom) &&(!StringUtils.containsIgnoreCase(number, "admin"))) { - qFilters.add(new QFilter("yem_customer.number", QCP.equals, custom)); + if (YEM.isNotEmpty(custom)) { + if ((!StringUtils.containsIgnoreCase(number, "admin"))) { + qFilters.add(new QFilter("yem_customer.number", QCP.equals, custom)); + } } else { return CustomApiResult.fail("501", "客户编码为空！"); } From 58ff914ac5ebc1070f9f21726387493b749267a3 Mon Sep 17 00:00:00 2001 From: zzs Date: Sat, 21 Dec 2024 14:53:37 +0800 Subject: [PATCH 3/4] =?UTF-8?q?fix:=E4=BA=91=E4=B9=8B=E5=AE=B6=E5=9B=9E?= =?UTF-8?q?=E5=86=99=E7=8A=B6=E6=80=81=E6=9C=AA=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wm/syn/eas/api/controller/YZJAuditController.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/yem/wm/syn/eas/api/controller/YZJAuditController.java b/src/main/java/com/yem/wm/syn/eas/api/controller/YZJAuditController.java index f26ebd41..7b898431 100644 --- a/src/main/java/com/yem/wm/syn/eas/api/controller/YZJAuditController.java +++ b/src/main/java/com/yem/wm/syn/eas/api/controller/YZJAuditController.java @@ -93,7 +93,16 @@ public class YZJAuditController { logger.info("获取审批单据，查询条件：{}，{}", bos_entityobjectnum, formInstId); //获取单据 - billObj = BusinessDataServiceHelper.loadSingle(bos_entityobjectnum, new QFilter[]{new QFilter("yem_forminstid", QCP.equals, formInstId)}); + QFilter qFilter = new QFilter("yem_forminstid", QCP.equals, formInstId); + DynamicObject[] load = BusinessDataServiceHelper.load(bos_entityobjectnum, "id, billno", qFilter.toArray()); + logger.info("查询到审批单据： {} 条", load.length); + for (DynamicObject d : load) { + logger.info("审批单据：{}", d.getString("billno")); + } + if (load.length > 0) { + DynamicObject object = load[0]; + billObj = BusinessDataServiceHelper.loadSingle(object.getPkValue(), object.getDataEntityType().getName()); + } } catch (Exception e) { e.printStackTrace(); return CustomApiResult.fail("501", e.getMessage()); From 14f54229ecb463459c418ea3fec8a986ca876546 Mon Sep 17 00:00:00 2001 From: zzs Date: Mon, 23 Dec 2024 09:21:00 +0800 Subject: [PATCH 4/4] =?UTF-8?q?feat:=E4=B8=8B=E5=8D=95=E5=B9=B3=E5=8F=B0?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=91=98=E7=94=A8=E6=88=B7=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=89=80=E6=9C=89=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/yem/or/api/AssepcDynamic.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/yem/or/api/AssepcDynamic.java b/src/main/java/com/yem/or/api/AssepcDynamic.java index 6250eac3..376cccee 100644 --- a/src/main/java/com/yem/or/api/AssepcDynamic.java +++ b/src/main/java/com/yem/or/api/AssepcDynamic.java @@ -185,7 +185,7 @@ public class AssepcDynamic { //查询零件明细表 根据零件编码过滤n qFilters.add(new QFilter("yem_model.yem_products.number", QCP.equals, number)); if (YEM.isNotEmpty(custom)) { - if ((!StringUtils.containsIgnoreCase(number, "admin"))) { + if ((!StringUtils.containsIgnoreCase(custom, "admin"))) { qFilters.add(new QFilter("yem_customer.number", QCP.equals, custom)); } } else {