From 8fa6f2d3686c60088980f2a41b3cc6b64a09ae31 Mon Sep 17 00:00:00 2001
From: zzr99 <1940172413@qq.com>
Date: 星期四, 04 十一月 2021 16:49:12 +0800
Subject: [PATCH] 器具管理所有出入库明细加计量单位显示并保存
---
WebAPI/Controllers/MJGL/Sc_MouldProdInBillController.cs | 33 ++++++++++++++++-----------------
1 files changed, 16 insertions(+), 17 deletions(-)
diff --git a/WebAPI/Controllers/MJGL/Sc_MouldProdInBillController.cs b/WebAPI/Controllers/MJGL/Sc_MouldProdInBillController.cs
index a05f5e8..0541d52 100644
--- a/WebAPI/Controllers/MJGL/Sc_MouldProdInBillController.cs
+++ b/WebAPI/Controllers/MJGL/Sc_MouldProdInBillController.cs
@@ -411,6 +411,7 @@
{
DataSet ds;
DataSet ds1;
+ List<object> list = new List<object>();
try
{
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
@@ -419,18 +420,9 @@
ds = oCN.RunProcReturn(string.Format(@"SELECT HMaterID,妯″叿浠ｇ爜 HMaterCode,妯″叿鍚嶇О HMaterName,瑙勬牸鍨嬪彿 HMaterSpec,
鎵规 HBatchNo,璁捐瀵垮懡 HDesignLife, 鍓╀綑瀵垮懡 HLeaveLife, 浣跨敤瀵垮懡 HUseLife,搴旀敹鏁伴噺 HQtyMust,
瀹炴敹鏁伴噺 HQty, 鍗曚环 HPrice, 閲戦 HMoney,hwhid1 HWHID, 鏀舵枡浠撳簱浠ｇ爜 HWHCode,鏀舵枡浠撳簱 HWHName,
- HSPID, 鏀舵枡浠撲綅浠ｇ爜 HSPCode,鏀舵枡浠撲綅 HSPName,琛ㄤ綋澶囨敞 HRemark,HStockOrgID
+ HSPID, 鏀舵枡浠撲綅浠ｇ爜 HSPCode,鏀舵枡浠撲綅 HSPName,琛ㄤ綋澶囨敞 HRemark,HStockOrgID,HUnitID,璁￠噺鍗曚綅浠ｇ爜,璁￠噺鍗曚綅
FROM h_v_Sc_MouldProdInHouseBillList"), "h_v_Sc_MouldProdInHouseBillList");
- //鏌ユ眹鎬�
- ds1 = oCN.RunProcReturn(string.Format(@"select 妯″叿浠ｇ爜,妯″叿鍚嶇О,鍗曟嵁鍙�,瑙勬牸鍨嬪彿,鎵规,瀹炴敹鏁伴噺,hwhid1,鏀舵枡浠撳簱浠ｇ爜,
- 鏀舵枡浠撳簱,琛ㄤ綋澶囨敞,sum(HMaterID) from h_v_Sc_MouldProdInHouseBillList group by 妯″叿浠ｇ爜,
- 妯″叿鍚嶇О,鍗曟嵁鍙�,瑙勬牸鍨嬪彿,鎵规,瀹炴敹鏁伴噺,hwhid1,鏀舵枡浠撳簱浠ｇ爜,鏀舵枡浠撳簱,琛ㄤ綋澶囨敞"),
- "h_v_Sc_MouldProdInHouseBillList");
-
- objJsonResult.code = "0";
- objJsonResult.count = 1;
- objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�";
- objJsonResult.data = ds.Tables[0];
+
}
else
{
@@ -439,16 +431,23 @@
string sql1 = string.Format(@"SELECT HMaterID,妯″叿浠ｇ爜 HMaterCode,妯″叿鍚嶇О HMaterName,瑙勬牸鍨嬪彿 HMaterSpec,
鎵规 HBatchNo,璁捐瀵垮懡 HDesignLife, 鍓╀綑瀵垮懡 HLeaveLife, 浣跨敤瀵垮懡 HUseLife,搴旀敹鏁伴噺 HQtyMust,
瀹炴敹鏁伴噺 HQty, 鍗曚环 HPrice, 閲戦 HMoney,hwhid1 HWHID, 鏀舵枡浠撳簱浠ｇ爜 HWHCode,鏀舵枡浠撳簱 HWHName,
- HSPID, 鏀舵枡浠撲綅浠ｇ爜 HSPCode,鏀舵枡浠撲綅 HSPName,琛ㄤ綋澶囨敞 HRemark,HStockOrgID
+ HSPID, 鏀舵枡浠撲綅浠ｇ爜 HSPCode,鏀舵枡浠撲綅 HSPName,琛ㄤ綋澶囨敞 HRemark,HStockOrgID,HUnitID,璁￠噺鍗曚綅浠ｇ爜,璁￠噺鍗曚綅
FROM h_v_Sc_MouldProdInHouseBillList where 1=1");
string sql = sql1 + sqlWhere;
ds = oCN.RunProcReturn(sql, "h_v_Sc_MouldProdInHouseBillList");
-
- objJsonResult.code = "0";
- objJsonResult.count = 1;
- objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�";
- objJsonResult.data = ds.Tables[0];
}
+ //鏌ユ眹鎬�
+ ds1 = oCN.RunProcReturn(string.Format(@"select 鐗╂枡浠ｇ爜,max(鐗╂枡鍚嶇О)鐗╂枡鍚嶇О,瑙勬牸鍨嬪彿,max(鍗曟嵁鍙�)鍗曟嵁鍙�,鎵规,sum(瀹炴敹鏁伴噺)瀹炴敹鏁伴噺,
+ hwhid1,max(鏀舵枡浠撳簱浠ｇ爜)鏀舵枡浠撳簱浠ｇ爜,max(鏀舵枡浠撳簱)鏀舵枡浠撳簱,琛ㄤ綋澶囨敞 from h_v_Sc_MouldProdInHouseBillList
+ where 1=1 " + sqlWhere + " group by 鐗╂枡浠ｇ爜,瑙勬牸鍨嬪彿,hwhid1,鎵规,琛ㄤ綋澶囨敞"), "h_v_Sc_MouldProdInHouseBillList");
+
+ list.Add(ds.Tables[0]);
+ list.Add(ds1.Tables[0]);
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�";
+ objJsonResult.list = list;
+
}
catch (Exception e)
{
--
Gitblit v1.9.1