From e3bff146a97648a9e2b7ec988cfc1ebe4c19b372 Mon Sep 17 00:00:00 2001
From: zzr99 <1940172413@qq.com>
Date: 星期五, 17 十二月 2021 17:54:26 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/基础资料/基础资料/Gy_StockCheckItemBillController.cs | 169 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 169 insertions(+), 0 deletions(-)
diff --git "a/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StockCheckItemBillController.cs" "b/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StockCheckItemBillController.cs"
index 6be9f4d..9787f05 100644
--- "a/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StockCheckItemBillController.cs"
+++ "b/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StockCheckItemBillController.cs"
@@ -250,5 +250,174 @@
}
}
#endregion
+
+ #region 鐩樼偣鍒嗘瀽鍒楄〃
+ [Route("Gy_StockCheckItemBill/Get_InventoryAnalysisList")]
+ [HttpGet]
+ public object Get_InventoryAnalysisList(string sWhere)
+ {
+ DataSet ds;
+ List<object> list = new List<object>();
+ List<object> list1 = new List<object>();
+ List<object> list2 = new List<object>();
+ List<object> list3 = new List<object>();
+ List<object> list4 = new List<object>();
+ List<object> list5 = new List<object>();
+ List<object> list6 = new List<object>();
+ List<object> list7 = new List<object>();
+ try
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ string sql;
+ if (sWhere != null&&sWhere!="")
+ {
+ sql = string.Format(@"select k.HBarCode 鏉$爜,s.HName 鐩樼偣鏂规,
+ case when k.HCorrespondentTypeID=1 then '渚涘簲鍟�' when k.HCorrespondentTypeID=2 then '瀹㈡埛' when k.HCorrespondentTypeID=4 then '浠撳簱' end 瀹為檯浣嶇疆绫诲瀷,
+ case when k.HCorrespondentTypeID=1 then p.HName when k.HCorrespondentTypeID=2 then c.HName when k.HCorrespondentTypeID=4 then w.HName end 瀹為檯浣嶇疆,
+ case when m.HNowSupTypeID=1 then '渚涘簲鍟�' when m.HNowSupTypeID=2 then '瀹㈡埛' when m.HNowSupTypeID=4 then '浠撳簱' end 璐﹂潰浣嶇疆绫诲瀷,
+ case when m.HNowSupTypeID=1 then p1.HName when m.HNowSupTypeID=2 then c1.HName when m.HNowSupTypeID=4 then w1.HName end 璐﹂潰浣嶇疆
+ from Sc_MouldStockBillMain_Temp k
+ left join Gy_MouldFileMain m on k.HBarCode=m.HBarCode
+ left join Gy_StockCheckItem s on k.HSourceInterID=s.HItemID
+ left join Gy_Supplier p on k.HCorrespondentID=p.HItemID
+ left join Gy_Supplier p1 on m.HNowSupTypeID=p1.HItemID
+ left join Gy_Customer c on k.HCorrespondentID=c.HItemID
+ left join Gy_Customer c1 on m.HNowSupTypeID=c1.HItemID
+ left join Gy_Warehouse w on k.HSourceInterID=w.HItemID
+ left join Gy_Warehouse w1 on m.HNowSupTypeID=w1.HItemID
+ where (select HEndDate from Gy_StockCheckItem where Hitemid=(select top 1 HSourceInterID from Sc_MouldStockBillMain_Temp WHERE HSourceInterID=0))<getdate()");
+ }
+ else
+ {
+ sql = string.Format(@"select k.HBarCode 鏉$爜,s.HName 鐩樼偣鏂规,
+ case when k.HCorrespondentTypeID=1 then '渚涘簲鍟�' when k.HCorrespondentTypeID=2 then '瀹㈡埛' when k.HCorrespondentTypeID=4 then '浠撳簱' end 瀹為檯浣嶇疆绫诲瀷,
+ case when k.HCorrespondentTypeID=1 then p.HName when k.HCorrespondentTypeID=2 then c.HName when k.HCorrespondentTypeID=4 then w.HName end 瀹為檯浣嶇疆,
+ case when m.HNowSupTypeID=1 then '渚涘簲鍟�' when m.HNowSupTypeID=2 then '瀹㈡埛' when m.HNowSupTypeID=4 then '浠撳簱' end 璐﹂潰浣嶇疆绫诲瀷,
+ case when m.HNowSupTypeID=1 then p1.HName when m.HNowSupTypeID=2 then c1.HName when m.HNowSupTypeID=4 then w1.HName end 璐﹂潰浣嶇疆
+ from Sc_MouldStockBillMain_Temp k
+ left join Gy_MouldFileMain m on k.HBarCode=m.HBarCode
+ left join Gy_StockCheckItem s on k.HSourceInterID=s.HItemID
+ left join Gy_Supplier p on k.HCorrespondentID=p.HItemID
+ left join Gy_Supplier p1 on m.HNowSupTypeID=p1.HItemID
+ left join Gy_Customer c on k.HCorrespondentID=c.HItemID
+ left join Gy_Customer c1 on m.HNowSupTypeID=c1.HItemID
+ left join Gy_Warehouse w on k.HSourceInterID=w.HItemID
+ left join Gy_Warehouse w1 on m.HNowSupTypeID=w1.HItemID");
+ }
+ ds = oCN.RunProcReturn(sql, "Sc_MouldStockBillMain_Temp");
+ DataTable dt = ds.Tables[0];
+ if (dt.Rows.Count > 0)
+ {
+ foreach (DataRow dr in dt.Rows)
+ {
+ if (dr["瀹為檯浣嶇疆绫诲瀷"].ToString()== dr["璐﹂潰浣嶇疆绫诲瀷"].ToString()&& dr["瀹為檯浣嶇疆绫诲瀷"].ToString()=="渚涘簲鍟�")
+ {
+ //姝e父
+ if (dr["瀹為檯浣嶇疆"].ToString() == dr["璐﹂潰浣嶇疆"].ToString())
+ {
+ list1.Add(dr);
+ }
+ //鐩樼泩 瀹炵墿鍦ˋ渚涘簲鍟嗭紝浣嗘槸鍦ㄨ处闈笂娌℃湁杩欎釜鍙拌溅
+ if (dr["瀹為檯浣嶇疆"].ToString() !=""|| dr["瀹為檯浣嶇疆"].ToString() != null && dr["璐﹂潰浣嶇疆"].ToString()==""|| dr["璐﹂潰浣嶇疆"].ToString() == null)
+ {
+ list5.Add(dr);
+ }
+ //鐩樹簭 A渚涘簲鍟嗘病鏈夎繖涓彴杞︼紝浣嗘槸鍦ㄨ处闈笂鏈夎繖涓彴杞�
+ if (dr["瀹為檯浣嶇疆"].ToString() == "" || dr["瀹為檯浣嶇疆"].ToString() == null && dr["璐﹂潰浣嶇疆"].ToString() != "" || dr["璐﹂潰浣嶇疆"].ToString() != null)
+ {
+ list6.Add(dr);
+ }
+ //鍏堝仛棰嗙敤閫�搴撳崟锛屽啀鍋氶鐢ㄥ嚭搴撳崟 鍙拌溅鍦ˋ渚涘簲鍟�/瀹㈡埛锛屼絾鏄处闈笂鍙拌溅鍦˙渚涘簲鍟�/瀹㈡埛
+ if (dr["瀹為檯浣嶇疆绫诲瀷"].ToString()=="瀹㈡埛"&& dr["瀹為檯浣嶇疆"].ToString() != dr["瀹為檯浣嶇疆"].ToString())
+ {
+ list4.Add(dr);
+ }
+ //鍑哄簱
+ if (dr["瀹為檯浣嶇疆绫诲瀷"].ToString() == "渚涘簲鍟�" && dr["璐﹂潰浣嶇疆绫诲瀷"].ToString() == "浠撳簱")
+ {
+ list3.Add(dr);
+ }
+ }
+ if (dr["瀹為檯浣嶇疆绫诲瀷"].ToString() == dr["璐﹂潰浣嶇疆绫诲瀷"].ToString() && dr["瀹為檯浣嶇疆绫诲瀷"].ToString() == "瀹㈡埛")
+ {
+ //姝e父
+ if (dr["瀹為檯浣嶇疆"].ToString() == dr["璐﹂潰浣嶇疆"].ToString())
+ {
+ list1.Add(dr);
+ }
+ //鐩樼泩 瀹炵墿鍦ˋ渚涘簲鍟嗭紝浣嗘槸鍦ㄨ处闈笂娌℃湁杩欎釜鍙拌溅
+ if (dr["瀹為檯浣嶇疆"].ToString() != "" || dr["瀹為檯浣嶇疆"].ToString() != null && dr["璐﹂潰浣嶇疆"].ToString() == "" || dr["璐﹂潰浣嶇疆"].ToString() == null)
+ {
+ list5.Add(dr);
+ }
+ //鐩樹簭 A渚涘簲鍟嗘病鏈夎繖涓彴杞︼紝浣嗘槸鍦ㄨ处闈笂鏈夎繖涓彴杞�
+ if (dr["瀹為檯浣嶇疆"].ToString() == "" || dr["瀹為檯浣嶇疆"].ToString() == null && dr["璐﹂潰浣嶇疆"].ToString() != "" || dr["璐﹂潰浣嶇疆"].ToString() != null)
+ {
+ list6.Add(dr);
+ }
+ //鍑哄簱
+ if (dr["瀹為檯浣嶇疆绫诲瀷"].ToString() == "瀹㈡埛" && dr["璐﹂潰浣嶇疆绫诲瀷"].ToString() == "浠撳簱")
+ {
+ list3.Add(dr);
+ }
+ //鍏堝仛棰嗙敤閫�搴撳崟锛屽啀鍋氶鐢ㄥ嚭搴撳崟 鍙拌溅鍦ˋ渚涘簲鍟�/瀹㈡埛锛屼絾鏄处闈笂鍙拌溅鍦˙渚涘簲鍟�/瀹㈡埛
+ if (dr["瀹為檯浣嶇疆绫诲瀷"].ToString() == "渚涘簲鍟�" && dr["瀹為檯浣嶇疆"].ToString() != dr["瀹為檯浣嶇疆"].ToString())
+ {
+ list4.Add(dr);
+ }
+ }
+ if (dr["瀹為檯浣嶇疆绫诲瀷"].ToString() == dr["璐﹂潰浣嶇疆绫诲瀷"].ToString() && dr["瀹為檯浣嶇疆绫诲瀷"].ToString() == "浠撳簱")
+ {
+ //姝e父
+ if (dr["瀹為檯浣嶇疆"].ToString() == dr["璐﹂潰浣嶇疆"].ToString())
+ {
+ list1.Add(dr);
+ }
+ //鐩樼泩 瀹炵墿鍦ˋ渚涘簲鍟嗭紝浣嗘槸鍦ㄨ处闈笂娌℃湁杩欎釜鍙拌溅
+ if (dr["瀹為檯浣嶇疆"].ToString() != "" || dr["瀹為檯浣嶇疆"].ToString() != null && dr["璐﹂潰浣嶇疆"].ToString() == "" || dr["璐﹂潰浣嶇疆"].ToString() == null)
+ {
+ list5.Add(dr);
+ }
+ //鐩樹簭 A渚涘簲鍟嗘病鏈夎繖涓彴杞︼紝浣嗘槸鍦ㄨ处闈笂鏈夎繖涓彴杞�
+ if (dr["瀹為檯浣嶇疆"].ToString() == "" || dr["瀹為檯浣嶇疆"].ToString() == null && dr["璐﹂潰浣嶇疆"].ToString() != "" || dr["璐﹂潰浣嶇疆"].ToString() != null)
+ {
+ list6.Add(dr);
+ }
+ //閫�搴�
+ if (dr["璐﹂潰浣嶇疆绫诲瀷"].ToString()=="渚涘簲鍟�"|| dr["璐﹂潰浣嶇疆绫诲瀷"].ToString() == "瀹㈡埛")
+ {
+ list7.Add(dr);
+ }
+ //璋冩嫧
+ if (dr["瀹為檯浣嶇疆"].ToString() != dr["璐﹂潰浣嶇疆"].ToString())
+ {
+ list2.Add(dr);
+ }
+ }
+ }
+ list.Add(list1);
+ list.Add(list2);
+ list.Add(list3);
+ list.Add(list4);
+ list.Add(list5);
+ list.Add(list6);
+ list.Add(list7);
+ }
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�";
+ objJsonResult.list = list;
+ return objJsonResult;
+ }
+ catch (Exception ex)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏌ヨ鏁版嵁寮傚父锛岃涓庣鐞嗗憳鑱旂郴锛�" + ex.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
}
}
--
Gitblit v1.9.1