From d33be117347967dc7a791b983d9733b3270cceb2 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期五, 23 九月 2022 20:26:26 +0800
Subject: [PATCH] 产品与器具清单控制器及类的添加
---
WebAPI/Controllers/仓存管理/条码出入库记录/Kf_ICStockInOutBillController.cs | 84 +++++++++++++++++++++++++++++++++---------
1 files changed, 66 insertions(+), 18 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"
index fa65874..8ca8eef 100644
--- "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"
@@ -61,24 +61,25 @@
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;
- }
+ //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)
{
@@ -201,5 +202,52 @@
#endregion
#endregion
+ #region 鎵爜璁板綍缂撳瓨鍒楄〃
+ [Route("Kf_ICStockInOutBill/GetKF_PonderationBillMain_Temp")]
+ [HttpGet]
+ public object GetKF_PonderationBillMain_Temp(string sWhere)
+ {
+ try
+ {
+ DataSet ds = new DataSet();
+ string sql1 = string.Format(@"select * from h_v_KF_PonderationBillList_Query where 1=1 ");
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ ds = oCN.RunProcReturn(sql1 + "order by 鍒跺崟鏃ユ湡 desc", "h_v_KF_PonderationBillList_Query");
+ }
+ else
+ {
+ ds = oCN.RunProcReturn(sql1 + sWhere + "order by 鍒跺崟鏃ユ湡 desc", "h_v_KF_PonderationBillList_Query");
+ }
+ if (ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏌ヨ鏁版嵁寮傚父锛岃涓庣鐞嗗憳鑱旂郴锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "杩斿洖璁板綍鎴愬姛锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+
+ }
+ catch (Exception e)
+ {
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = e.Message.ToString();
+ objJsonResult.data = null;
+ }
+ return objJsonResult;
+ }
+ #endregion
+
}
}
\ No newline at end of file
--
Gitblit v1.9.1