From 8a338dfe8f0f09335a361aea9e3a914497675682 Mon Sep 17 00:00:00 2001
From: 354798ggg <1074825718@qq.com>
Date: 星期一, 10 七月 2023 16:08:35 +0800
Subject: [PATCH] Merge branch 'master' of http://nonxin.cn:8090/r/project/qxlw
---
product-server-project-management/src/main/java/com/product/project/management/service/ProjectInfoService.java | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/product-server-project-management/src/main/java/com/product/project/management/service/ProjectInfoService.java b/product-server-project-management/src/main/java/com/product/project/management/service/ProjectInfoService.java
index a7489f0..7b38697 100644
--- a/product-server-project-management/src/main/java/com/product/project/management/service/ProjectInfoService.java
+++ b/product-server-project-management/src/main/java/com/product/project/management/service/ProjectInfoService.java
@@ -6,7 +6,6 @@
import java.util.Map;
import com.alibaba.fastjson.JSONArray;
-import com.product.core.websocket.config.CmnConst;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -213,7 +212,13 @@
public DataTableEntity listMaterialV(String uuid, Integer capge, Integer pageSize) {
return baseDao.listTable("product_project_base_material_v","project_itemize_uuid=?",new String[]{uuid},null,null,pageSize, capge);
}
-
+ /**
+ * 鏇村叿浠撳簱鍜屾潗鏂欒幏鍙栧簱瀛�
+ * @return
+ */
+ public FieldSetEntity findInventoryV(String warehouse_uuid, String material_uuid) {
+ return baseDao.getFieldSetByFilter("product_project_inventory_v","warehouse_uuid=? and uuid=?",new String[]{warehouse_uuid,material_uuid},false);
+ }
/**
* 鏍规嵁椤圭洰uuid鑾峰彇椤圭洰鍒嗛」鏍戠粨鏋�
* @param uuid
--
Gitblit v1.9.2