diff --git a/src/main/java/com/yem/or/api/AssepcDynamic.java b/src/main/java/com/yem/or/api/AssepcDynamic.java index e110142f..376cccee 100644 --- a/src/main/java/com/yem/or/api/AssepcDynamic.java +++ b/src/main/java/com/yem/or/api/AssepcDynamic.java @@ -185,9 +185,11 @@ public class AssepcDynamic { //查询零件明细表 根据零件编码过滤n qFilters.add(new QFilter("yem_model.yem_products.number", QCP.equals, number)); if (YEM.isNotEmpty(custom)) { - qFilters.add(new QFilter("yem_customer.number", QCP.equals, custom)); + if ((!StringUtils.containsIgnoreCase(custom, "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); 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());