From ed0df936cf207478583687c2e590b3c59ad5c25c Mon Sep 17 00:00:00 2001
From: cy <1664593601@qq.com>
Date: 星期二, 21 十一月 2023 13:50:52 +0800
Subject: [PATCH] feat: 根据型号查询物品信息
---
consum-base/src/main/java/com/consum/base/service/LWhWarningConfigServiceImpl.java | 2 +-
consum-base/src/main/java/com/consum/base/service/BaseGoodsModelsServiceImpl.java | 22 ++++++++++++++++++++--
consum-base/src/main/java/com/consum/base/controller/BaseGoodsModelsController.java | 18 +++++++++++-------
3 files changed, 32 insertions(+), 10 deletions(-)
diff --git a/consum-base/src/main/java/com/consum/base/controller/BaseGoodsModelsController.java b/consum-base/src/main/java/com/consum/base/controller/BaseGoodsModelsController.java
index e4ce6b3..b43e991 100644
--- a/consum-base/src/main/java/com/consum/base/controller/BaseGoodsModelsController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/BaseGoodsModelsController.java
@@ -7,14 +7,10 @@
import com.walker.db.page.GenericPager;
import com.walker.infrastructure.utils.StringUtils;
import com.walker.web.ResponseValue;
-import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
/**
* @Description 瑙勬牸鍨嬪彿
@@ -122,5 +118,13 @@
List<BaseGoodsModels> result = this.baseGoodsModelsService.select(baseGoodsModels);
return ResponseValue.success(result);
}
+
+ @GetMapping("queryGoodsModelInfo")
+ public ResponseValue queryGoodsModelInfo(Long baseGoodsModelsId) {
+ if (baseGoodsModelsId== null){
+ return ResponseValue.error("鍙傛暟涓嶈兘涓虹┖锛�");
+ }
+ return ResponseValue.success(baseGoodsModelsService.queryGoodsModelInfo(baseGoodsModelsId));
+ }
}
diff --git a/consum-base/src/main/java/com/consum/base/service/BaseGoodsModelsServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/BaseGoodsModelsServiceImpl.java
index 88d68c3..496f910 100644
--- a/consum-base/src/main/java/com/consum/base/service/BaseGoodsModelsServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/service/BaseGoodsModelsServiceImpl.java
@@ -2,14 +2,17 @@
import com.consum.base.Constants;
import com.consum.base.core.utils.IdUtil;
+import com.consum.base.core.utils.MapperUtil;
import com.consum.model.po.BaseGoodsModels;
import com.walker.db.page.GenericPager;
import com.walker.infrastructure.utils.DateUtils;
import com.walker.jdbc.service.BaseServiceImpl;
-import java.util.HashMap;
-import java.util.List;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
/**
* @Description 鐗╁搧妯℃澘
@@ -123,5 +126,20 @@
return this.select(baseGoodsModels);
}
+ /**
+ * 鏍规嵁鐗╁搧鍨嬪彿id 鏌ヨ鐗╁搧淇℃伅
+ *
+ * @param baseGoodsModelsId
+ * @return
+ */
+ private String QUERY_GOODS_MODEL_INFO = "SELECT goodsTemp.CATEGORY_ID,goodsTemp.CATEGORY_NAME,goodsTemp.id goods_Id,goodsTemp.GOODS_NAME,model.MODEL_NAME,model.id base_Goods_Models_Id,model.UNIT FROM BASE_GOODS_MODELS model LEFT JOIN BASE_GOODS_TEMPLATE goodsTemp ON model.GOODS_TEMPLATES_ID=goodsTemp.id";
+
+ public List<Map<String, Object>> queryGoodsModelInfo(Long baseGoodsModelsId) {
+ StringBuilder sql = new StringBuilder(QUERY_GOODS_MODEL_INFO);
+ HashMap<String, Object> paramts = new HashMap<>();
+ sql.append(" where model.id=:baseGoodsModelsId");
+ paramts.put("baseGoodsModelsId", baseGoodsModelsId);
+ return select(sql.toString(), paramts, new MapperUtil());
+ }
}
diff --git a/consum-base/src/main/java/com/consum/base/service/LWhWarningConfigServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/LWhWarningConfigServiceImpl.java
index a5b8bda..25cb395 100644
--- a/consum-base/src/main/java/com/consum/base/service/LWhWarningConfigServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/service/LWhWarningConfigServiceImpl.java
@@ -46,7 +46,7 @@
paramts.put("warehouseType", param.getWarehouseType());
}
if (param.getBaseWarehouseId() != null) {
- sql.append(" AND wareConf.WAREHOUSE_ID = :warehouseId");
+ sql.append(" AND wareConf.BASE_WAREHOUSE_ID = :warehouseId");
paramts.put("warehouseId", param.getBaseWarehouseId());
}
//鐗╁搧鍚嶇О
--
Gitblit v1.9.1