From 2a225d84f5a14caddb853d3c07b26907d1cb1428 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期五, 15 十一月 2024 10:11:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/test/DataTestController.java | 75 +++++++++++++++++++++++++++++++++++++
1 files changed, 74 insertions(+), 1 deletions(-)
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/test/DataTestController.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/test/DataTestController.java
index f71bb1b..3572bcc 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/test/DataTestController.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/test/DataTestController.java
@@ -46,7 +46,9 @@
/**
* 鑾峰彇ebom淇℃伅
- * @param parentOid 涓婄骇淇℃伅
+ * @param productNo 浜у搧缂栧彿
+ * @param productOid 浜у搧涓婚敭
+ * @param parentOid 涓婄骇闆朵欢涓婚敭
* @return
*/
@VciUnCheckRight
@@ -123,4 +125,75 @@
baseResult.setCode(200);
return baseResult;
}
+
+ /**
+ * 鑾峰彇涓嬬骇闆朵欢淇℃伅
+ * @param productOid 浜у搧涓婚敭
+ * @param parentOid 涓婄骇闆朵欢涓婚敭
+ * @return
+ */
+ @VciUnCheckRight
+ @GetMapping("/getChildInfo")
+ public BaseResult getChildInfo(String productOid, String parentOid){
+ if(StringUtils.isBlank(productOid)){
+ return BaseResult.fail("浜у搧涓婚敭涓虹┖锛�");
+ }
+ if(StringUtils.isBlank(parentOid)){
+ return BaseResult.fail("闆朵欢涓婄骇涓婚敭涓虹┖锛�");
+ }
+ String sql = "select p.*,e.oid as eoid from platformbtm_part p left join platformlt_ebom e on p.oid = e.t_oid \n" +
+ "where e.f_oid = '"+parentOid+"' and e.workcontextoid = '"+productOid+"' \n" +
+ "and p.islastr = '1' and p.islastv = '1' order by p.code asc";
+ List<Map> ebomList = boServiceI.queryByOnlySqlForMap(sql);
+ BaseResult baseResult = new BaseResult();
+ baseResult.setData(ebomList);
+ baseResult.setSuccess(true);
+ return baseResult;
+ }
+
+ /**
+ * 鑾峰彇闆朵欢瀹炰緥淇℃伅
+ * @param productOid 浜у搧涓婚敭
+ * @param partOid 闆朵欢涓婚敭
+ * @param eoid 鏍戣妭鐐逛笂鐨勬墿灞曞睘鎬oid鐨勫��
+ * @return
+ */
+ @VciUnCheckRight
+ @GetMapping("/getPartInstance")
+ public BaseResult getPartInstance(String productOid, String partOid, String eoid){
+ if(StringUtils.isBlank(productOid)){
+ return BaseResult.fail("浜у搧涓婚敭涓虹┖锛�");
+ }
+ if(StringUtils.isBlank(partOid)){
+ return BaseResult.fail("闆朵欢涓婚敭涓虹┖锛�");
+ }
+ if(StringUtils.isBlank(eoid)){
+ return BaseResult.fail("EBOM鍏崇郴涓婚敭涓虹┖锛�");
+ }
+ String sql = "select t.* from platformbtm_partinstance t where t.partoid = '"+partOid+"' \n" +
+ "and t.workcontextoid = '"+productOid+"' and t.ebomoid = '"+eoid+"'";
+ List<Map> mapList = boServiceI.queryByOnlySqlForMap(sql);
+ BaseResult baseResult = new BaseResult();
+ baseResult.setData(mapList);
+ baseResult.setSuccess(true);
+ return baseResult;
+ }
+
+ /**
+ * 鑾峰彇闆朵欢鍩烘湰淇℃伅
+ * @param partOid 闆朵欢涓婚敭
+ * @return
+ */
+ @GetMapping("/getPartInfo")
+ public BaseResult getPartInfo(String partOid){
+ if(StringUtils.isBlank(partOid)){
+ return BaseResult.fail("闆朵欢涓婚敭涓虹┖锛�");
+ }
+ String sql = "select * from platformbtm_part where oid = '"+partOid+"'";
+ List<Map> mapList = boServiceI.queryByOnlySqlForMap(sql);
+ BaseResult baseResult = new BaseResult();
+ baseResult.setData(mapList);
+ baseResult.setSuccess(true);
+ return baseResult;
+ }
}
--
Gitblit v1.9.3