From f73a134797baa61655e27bc444e4370a0595590c Mon Sep 17 00:00:00 2001
From: 杨乐 <yang.le.192@qq.com>
Date: 星期四, 06 一月 2022 17:24:26 +0800
Subject: [PATCH] 条码出入库记录 条码库存
---
WebAPI/Controllers/仓存管理/条码库存/KF_ICInventoryList_WMSBillController.cs | 86 +++++++++++++++++++++
WebAPI/Controllers/仓存管理/条码出入库记录/Kf_ICStockInOutBillController.cs | 96 ++++++++++++++++++++++++
WebAPI/WebAPI.csproj | 4 +
3 files changed, 186 insertions(+), 0 deletions(-)
diff --git "a/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\345\207\272\345\205\245\345\272\223\350\256\260\345\275\225/Kf_ICStockInOutBillController.cs" "b/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\345\207\272\345\205\245\345\272\223\350\256\260\345\275\225/Kf_ICStockInOutBillController.cs"
new file mode 100644
index 0000000..a43fdfd
--- /dev/null
+++ "b/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\345\207\272\345\205\245\345\272\223\350\256\260\345\275\225/Kf_ICStockInOutBillController.cs"
@@ -0,0 +1,96 @@
+锘縰sing Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using System.Web;
+using System.Web.Http;
+using WebAPI.Models;
+
+namespace WebAPI.Controllers.浠撳瓨绠＄悊.鏉＄爜鍑哄叆搴撹褰�
+{
+ public class Kf_ICStockInOutBillController : ApiController
+ {
+ public DBUtility.ClsPub.Enum_BillStatus BillStatus;//鍗曟嵁鐘舵�侊紙鏂板锛屼慨鏀癸紝娴忚锛屾洿鏂板崟浠凤紝鍙樻洿锛�
+
+ private json objJsonResult = new json();
+ public DataSet ds = new DataSet();
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+
+ //瀛樺偍杩囩▼ 鏁版嵁 绫�
+ public class Data
+ {
+ public Data()
+ {
+ HStartDate = DateTime.Now.AddMonths(-1);
+ HEndDate = DateTime.Now;
+ BillType = "鍏ㄩ儴";
+ }
+ public DateTime HStartDate;//寮�濮嬫棩鏈�
+ public DateTime HEndDate;//缁撴潫鏃ユ湡
+ public string MaterialName;//鐗╂枡
+ public string sWH;//浠撳簱
+ public string sSP;//浠撲綅
+ public string sBatchNo;//鎵瑰彿
+ public string HBarCode;//鏉″舰鐮�
+ public string BillType;//鍗曟嵁绫诲瀷
+ public string BillNo;//鍗曟嵁鍙�
+ public string SeOrderBillNo;//(閿�鍞鍗曞彿)
+ }
+
+ #region 鍑哄叆搴撹褰曟煡璇�
+ [Route("Kf_ICStockInOutBill/StockInOutBillList")]
+ [HttpGet]
+ public object StockInOutBillList(string sWhere)
+ {
+ List<object> columnNameList = new List<object>();
+ try
+ {
+ var data = JsonConvert.DeserializeObject<Data>(sWhere);
+
+ ds = oCN.RunProcReturn("exec h_p_Kf_BarCodeOutInReport '" +
+ data.HStartDate + "','" + data.HEndDate + "','" + data.MaterialName + "','" + data.sWH + "','" + data.sSP + "','" + data.sBatchNo + "','" + data.HBarCode + "','" + data.BillType + "','" + data.BillNo + "','" + data.SeOrderBillNo
+ + "'", "h_p_Kf_BarCodeOutInReport");
+
+ foreach (DataColumn col in ds.Tables[0].Columns)
+ {
+
+ Type dataType = col.DataType;
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+ columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
+
+ if (ds.Tables[0].Rows.Count > 0)
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = ds.Tables[0].Rows.Count;
+ objJsonResult.Message = "鑾峰彇璧勬簮缁戝畾鏁版嵁鎴愬姛锛�";
+ objJsonResult.data = JsonConvert.DeserializeObject<DataTable>(JsonConvert.SerializeObject(ds.Tables[0], new IsoDateTimeConverter { DateTimeFormat = "yyyy-MM-dd HH:mm:ss" })); //搴忓垪鍖朌ataSet涓殑鏃堕棿鏍煎紡锛岀劧鍚庡啀鍙嶅簭鍒楀寲鍥炴潵
+ objJsonResult.list = columnNameList;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏆傛棤璧勬簮缁戝畾锛�";
+ objJsonResult.data = null;
+ objJsonResult.list = columnNameList;
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = e.Message.ToString();
+ objJsonResult.data = null;
+ objJsonResult.list = columnNameList;
+ }
+ return objJsonResult;
+ }
+ #endregion
+ }
+}
\ No newline at end of file
diff --git "a/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\345\272\223\345\255\230/KF_ICInventoryList_WMSBillController.cs" "b/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\345\272\223\345\255\230/KF_ICInventoryList_WMSBillController.cs"
new file mode 100644
index 0000000..61e26de
--- /dev/null
+++ "b/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\345\272\223\345\255\230/KF_ICInventoryList_WMSBillController.cs"
@@ -0,0 +1,86 @@
+锘縰sing Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using System.Web;
+using System.Web.Http;
+using WebAPI.Models;
+
+namespace WebAPI.Controllers.浠撳瓨绠＄悊.鏉＄爜搴撳瓨
+{
+ public class KF_ICInventoryList_WMSBillController : ApiController
+ {
+ public DBUtility.ClsPub.Enum_BillStatus BillStatus;//鍗曟嵁鐘舵�侊紙鏂板锛屼慨鏀癸紝娴忚锛屾洿鏂板崟浠凤紝鍙樻洿锛�
+
+ private json objJsonResult = new json();
+ public DataSet ds = new DataSet();
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ #region 鏉＄爜搴撳瓨鏌ヨ鍒楄〃
+ [Route("KF_ICInventoryList_WMSBill/GetWMSBillList")]
+ [HttpGet]
+ public object GetWMSBillList(int page, int limit,string sWhere)
+ {
+ //page 椤垫暟
+ //limit 椤甸潰鏄剧ず鐨勮鏁�
+ //sWhere妯＄硦鏌ヨ 鏉′欢
+
+ List<object> columnNameList = new List<object>();
+ try
+ {
+ //鍒嗛〉SQL璇彞
+ string sql = "select top "+limit+ " (select count(*) from h_v_KF_ICInventoryList_WMS) 鎬绘暟, * from (select row_number() over(order by HMaterID asc)" +
+ " as rownumber, * from h_v_KF_ICInventoryList_WMS) temp_row where rownumber >"+((page-1)*limit)+" ";
+
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ ds = oCN.RunProcReturn(sql, "h_v_KF_ICInventoryList_WMS");
+ }
+ else
+ {
+ ds = oCN.RunProcReturn(sql + sWhere, "h_v_KF_ICInventoryList_WMS");
+ }
+
+ //鑾峰彇琛ㄥご瀛楁鍚嶇О
+ foreach (DataColumn col in ds.Tables[0].Columns)
+ {
+
+ Type dataType = col.DataType;
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+ columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
+
+ if (ds.Tables[0].Rows.Count > 0)
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count =int.Parse(ds.Tables[0].Rows[0]["鎬绘暟"].ToString());
+ objJsonResult.Message = "鑾峰彇璧勬簮缁戝畾鏁版嵁鎴愬姛锛�";
+ objJsonResult.data = JsonConvert.DeserializeObject<DataTable>(JsonConvert.SerializeObject(ds.Tables[0], new IsoDateTimeConverter { DateTimeFormat = "yyyy-MM-dd HH:mm:ss" })); //搴忓垪鍖朌ataSet涓殑鏃堕棿鏍煎紡锛岀劧鍚庡啀鍙嶅簭鍒楀寲鍥炴潵
+ objJsonResult.list = columnNameList;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏆傛棤璧勬簮缁戝畾锛�";
+ objJsonResult.data = null;
+ objJsonResult.list = columnNameList;
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = e.Message.ToString();
+ objJsonResult.data = null;
+ objJsonResult.list = columnNameList;
+ }
+ return objJsonResult;
+ }
+ #endregion
+ }
+}
\ No newline at end of file
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index c60c7b5..e094440 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -352,6 +352,8 @@
<Compile Include="Controllers\SCGL\Sc_PackUnionBillController.cs" />
<Compile Include="Controllers\Sc_ProcessMangementController.cs" />
<Compile Include="Controllers\浠撳瓨绠＄悊\鎵爜寮傚父璁板綍\KF_PonderationBillController.cs" />
+ <Compile Include="Controllers\浠撳瓨绠＄悊\鏉＄爜鍑哄叆搴撹褰昞Kf_ICStockInOutBillController.cs" />
+ <Compile Include="Controllers\浠撳瓨绠＄悊\鏉＄爜搴撳瓨\KF_ICInventoryList_WMSBillController.cs" />
<Compile Include="Controllers\浠撳瓨绠＄悊\璋冩嫧鐩樼偣\Kf_MoveStockRequestBillController.cs" />
<Compile Include="Controllers\浠撳瓨绠＄悊\棰嗘枡鍙戣揣\apiController.cs" />
<Compile Include="Controllers\浠撳瓨绠＄悊\棰嗘枡鍙戣揣\Kf_StepFoldOutBillController.cs" />
@@ -722,7 +724,9 @@
<Folder Include="App_Data\" />
<Folder Include="Views\Cg_PurchaseReturn\" />
<Folder Include="Views\Gy_EquipType\" />
+ <Folder Include="Views\KF_ICInventoryList_WMSBill\" />
<Folder Include="Views\Kf_ICStockBillMain\" />
+ <Folder Include="Views\Kf_ICStockInOutBill\" />
<Folder Include="Views\Kf_MoveStockRequestBill\" />
<Folder Include="Views\KF_PonderationBill\" />
<Folder Include="Views\kf_StepFoldinBill\" />
--
Gitblit v1.9.1