From cccafa42039b6fca001908b5e2aed4d0d1d9c0e3 Mon Sep 17 00:00:00 2001
From: yxj <1qaz@123>
Date: 星期三, 23 二月 2022 14:46:48 +0800
Subject: [PATCH] 条码生成模块，选择源单收料通知单时增加获取销售订单号、销售订单行号，并写入条码档案表中
---
WebAPI/Controllers/WebAPIController.cs | 142 +++++++++++++++++++++++++++++++++-------------
1 files changed, 101 insertions(+), 41 deletions(-)
diff --git a/WebAPI/Controllers/WebAPIController.cs b/WebAPI/Controllers/WebAPIController.cs
index 3594e18..472c157 100644
--- a/WebAPI/Controllers/WebAPIController.cs
+++ b/WebAPI/Controllers/WebAPIController.cs
@@ -1270,10 +1270,21 @@
{
DataSet ds;
var _value = msg["msg"].ToString();
- string msg1 = _value.ToString();
- //string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
- //string msg2 = sArray[0].ToString();
- //string msg3 = sArray[1].ToString();
+ string msg3 = _value.ToString();
+ string[] sArray = msg3.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ string msg1 = sArray[0].ToString();
+ string msg2 = sArray[1].ToString();
+
+ //鏌ョ湅鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log("Gy_BadReason_Edit", 1, false, msg2))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
Int64 HItemID = 0;
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
//鑾峰彇鏈�澶D鍊艰祴鍊�
@@ -1469,21 +1480,21 @@
/// <returns></returns>
[Route("DeltetGy_BadReason")]
[HttpGet]
- public object DeltetGy_BadReason(string HItemID)
+ public object DeltetGy_BadReason(string HItemID,string user)
{
DataSet ds;
//string ModRightNameCheck = "Sc_ProcessReport_check";
try
{
//鍒犻櫎鏉冮檺
- //if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, true, CurUserName))
- //{
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "瀹℃牳澶辫触锛佹棤鏉冮檺锛�";
- // objJsonResult.data = null;
- // return objJsonResult;
- //}
+ if (!DBUtility.ClsPub.Security_Log("Gy_BadReason_Delete", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
if (string.IsNullOrWhiteSpace(HItemID))
@@ -1871,7 +1882,7 @@
}
/// <summary>
- /// 鑾峰彇鏍哥畻鏂瑰紡鍒楄〃
+ /// 鑾峰彇鏍哥畻鏂瑰紡缁勫垪琛�
/// </summary>
/// <returns></returns>
[Route("Web/GetClassTimePrjGroupList_Json")]
@@ -2098,50 +2109,99 @@
/// <returns></returns>
[Route("Web/GetSc_ICMOBillListView2")]
[HttpGet]
- public object GetSc_ICMOBillListView2(string ICMOBill, int OrganizationID)
+ public object GetSc_ICMOBillListView2(int page, int limit, string ICMOBill, int OrganizationID)
{
- if (ICMOBill != "")
- {
- sWhere = " where 1=1 and 鍗曟嵁鍙� like '%" + ICMOBill + "%' ";
- }
try
{
- SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
- if (sWhere == null || sWhere.Equals(""))
+ SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
+ int count = 0;
+ int pageNum = page;
+ int pageSize = limit;
+ string sWhere = "";
+ if (ICMOBill == null || ICMOBill.Equals(""))
{
- ds = oCN.RunProcReturn("select * from h_v_Sc_ICMOBillList where 1=1 and isnull(瀹℃牳浜�,'')<>'' order by 鍗曟嵁鍙� desc,hsubid ", "h_v_Sc_ICMOBillList");
+ sWhere = " where 1=1";
}
else
{
- string sql = "select * from h_v_Sc_ICMOBillList " + sWhere + " and isnull(瀹℃牳浜�,'')<>'' order by 鍗曟嵁鍙� desc,hsubid ";
- ds = oCN.RunProcReturn(sql, "h_v_Sc_ICMOBillList");
+ sWhere = " where 1=1 and 鍗曟嵁鍙� like '%" + ICMOBill + "%'";
}
- if (ds == null || ds.Tables[0].Rows.Count <= 0)
+
+ DataSet ds0 = oCn.RunProcReturn("select count(*) CountNum from h_v_Sc_ICMOBillList " + sWhere + "", "h_v_Sc_ICMOBillList");
+ count = int.Parse(ds0.Tables[0].Rows[0]["CountNum"].ToString());
+ //string sql = string.Format(@"select top " + pageSize + " hmainid,鏃ユ湡,鍗曟嵁鍙�,绠卞彿鏉″舰鐮�,鍑�閲�,姣涢噸,鐨噸,鐢熶骇缁勭粐,閮ㄩ棬,鎿嶄綔鍛�,瀹㈡埛鏍囩鍙�,鐗╂枡浠ｇ爜,鐗╂枡鍚嶇О,璁￠噺鍗曚綅浠ｇ爜,璁￠噺鍗曚綅鍚嶇О,鏁伴噺,鍒跺崟浜�,鍒跺崟鏃ユ湡 from(select row_number() over (order by hmainid desc) as RowNumber,hmainid,鏃ユ湡,鍗曟嵁鍙�,绠卞彿鏉″舰鐮�,鍑�閲�,姣涢噸,鐨噸,鐢熶骇缁勭粐,閮ㄩ棬,鎿嶄綔鍛�,瀹㈡埛鏍囩鍙�,鐗╂枡浠ｇ爜,鐗╂枡鍚嶇О,璁￠噺鍗曚綅浠ｇ爜,璁￠噺鍗曚綅鍚嶇О,鏁伴噺,鍒跺崟浜�,鍒跺崟鏃ユ湡 from h_v_PackUnionBillList " + sWhere + ") as A where RowNumber >" + pageSize + " *(" + pageNum + "-1)");
+ string sql = string.Format(@"select * from h_v_Sc_ICMOBillList " + sWhere + " and isnull(瀹℃牳浜�,'')<>'' order by hmainid offset ((" + pageNum + "-1)*" + pageSize + ") rows fetch next " + pageSize + " rows only");
+ ds = new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Sc_ICMOBillList");
+ string aa = ds.Tables[0].Columns[0].ToString();
+
+ if (ds.Tables[0].Rows.Count > 0)
{
- objjson.code = "0";
- objjson.count = 0;
- objjson.Message = "鑾峰彇澶辫触" + DBUtility.ClsPub.sErrInfo;
- objjson.data = null;
- return objjson;
+ objJsonResult.code = "1";
+ objJsonResult.count = count;
+ objJsonResult.Message = "杩斿洖璁板綍鎴愬姛锛�";
+ objJsonResult.data = JsonConvert.DeserializeObject<DataTable>(JsonConvert.SerializeObject(ds.Tables[0], new IsoDateTimeConverter { DateTimeFormat = "yyyy-MM-dd HH:mm:ss" })); //搴忓垪鍖朌ataSet涓殑鏃堕棿鏍煎紡锛岀劧鍚庡啀鍙嶅簭鍒楀寲鍥炴潵
+ return objJsonResult;
}
else
{
- objjson.code = "0";
- objjson.count = 1;
- objjson.Message = "鑾峰彇鎴愬姛!";
- objjson.data = ds.Tables[0];
- return objjson;
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏆傛棤璁板綍锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
}
}
catch (Exception ex)
{
-
- objjson.code = "0";
- objjson.count = 0;
- objjson.Message = "鑾峰彇澶辫触" + ex.ToString();
- objjson.data = null;
- return objjson;
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + ex.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
}
+
+ //if (ICMOBill != "")
+ //{
+ // sWhere = " where 1=1 and 鍗曟嵁鍙� like '%" + ICMOBill + "%' ";
+ //}
+ //try
+ //{
+ // SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ // if (sWhere == null || sWhere.Equals(""))
+ // {
+ // ds = oCN.RunProcReturn("select * from h_v_Sc_ICMOBillList where 1=1 and isnull(瀹℃牳浜�,'')<>'' order by 鍗曟嵁鍙� desc,hsubid ", "h_v_Sc_ICMOBillList");
+ // }
+ // else
+ // {
+ // string sql = "select * from h_v_Sc_ICMOBillList " + sWhere + " and isnull(瀹℃牳浜�,'')<>'' order by 鍗曟嵁鍙� desc,hsubid ";
+ // ds = oCN.RunProcReturn(sql, "h_v_Sc_ICMOBillList");
+ // }
+ // if (ds == null || ds.Tables[0].Rows.Count <= 0)
+ // {
+ // objjson.code = "0";
+ // objjson.count = 0;
+ // objjson.Message = "鑾峰彇澶辫触" + DBUtility.ClsPub.sErrInfo;
+ // objjson.data = null;
+ // return objjson;
+ // }
+ // else
+ // {
+ // objjson.code = "0";
+ // objjson.count = 1;
+ // objjson.Message = "鑾峰彇鎴愬姛!";
+ // objjson.data = ds.Tables[0];
+ // return objjson;
+ // }
+ //}
+ //catch (Exception ex)
+ //{
+
+ // objjson.code = "0";
+ // objjson.count = 0;
+ // objjson.Message = "鑾峰彇澶辫触" + ex.ToString();
+ // objjson.data = null;
+ // return objjson;
+ //}
}
/// <summary>
--
Gitblit v1.9.1