From a733075e961b5c21c9ad146089785d8435d55dfa Mon Sep 17 00:00:00 2001
From: yxj <yxj@hz-kingdee.com>
Date: 星期二, 12 三月 2024 14:17:50 +0800
Subject: [PATCH] 新增PDA出门确认单扫码模块调用方法，缓存列表已上传列表调用方法
---
Model/销售管理/ClsXs_OutDoorCheckBillMain.cs | 12 +++
WebAPI/ListModels.cs | 12 +++
WebAPI/Controllers/条码管理/WEBSController.cs | 202 ++++++++++++++++++++++++++++++++++++++++++++++++++
Model/Model.csproj | 1
4 files changed, 227 insertions(+), 0 deletions(-)
diff --git a/Model/Model.csproj b/Model/Model.csproj
index 2dcbb71..ec5d3df 100644
--- a/Model/Model.csproj
+++ b/Model/Model.csproj
@@ -969,6 +969,7 @@
<Compile Include="閿�鍞鐞哱ClsXs_SellPlanBillSub.cs" />
<Compile Include="閿�鍞鐞哱ClsXs_SellPlanExecuteBillMain.cs" />
<Compile Include="閿�鍞鐞哱ClsXs_SellPlanExecuteBillSub.cs" />
+ <Compile Include="閿�鍞鐞哱ClsXs_OutDoorCheckBillMain.cs" />
<Compile Include="閿�鍞鐞哱ClsXs_SeQuotation_ccjgBillMain.cs" />
<Compile Include="閿�鍞鐞哱ClsXs_SeQuotation_ccjgBillSub.cs" />
<Compile Include="閿�鍞鐞哱ClsXs_SeDownStockBillMain.cs" />
diff --git "a/Model/\351\224\200\345\224\256\347\256\241\347\220\206/ClsXs_OutDoorCheckBillMain.cs" "b/Model/\351\224\200\345\224\256\347\256\241\347\220\206/ClsXs_OutDoorCheckBillMain.cs"
new file mode 100644
index 0000000..77b0e10
--- /dev/null
+++ "b/Model/\351\224\200\345\224\256\347\256\241\347\220\206/ClsXs_OutDoorCheckBillMain.cs"
@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Model
+{
+ public class ClsXs_OutDoorCheckBillMain:DBUtility.ClsXt_BaseBillMain
+ {
+ public string HExplanation; // varchar(200) --出门说明
+
+ }
+}
diff --git "a/WebAPI/Controllers/\346\235\241\347\240\201\347\256\241\347\220\206/WEBSController.cs" "b/WebAPI/Controllers/\346\235\241\347\240\201\347\256\241\347\220\206/WEBSController.cs"
index 279d1bd..6b40952 100644
--- "a/WebAPI/Controllers/\346\235\241\347\240\201\347\256\241\347\220\206/WEBSController.cs"
+++ "b/WebAPI/Controllers/\346\235\241\347\240\201\347\256\241\347\220\206/WEBSController.cs"
@@ -1327,6 +1327,53 @@
}
}
+ /// <summary>
+ /// 宸蹭笂浼犳煡璇㈢晫闈紝鏍规嵁鍗曟嵁绫诲瀷銆佸崟鎹彿銆佹簮鍗曞彿銆佺敤鎴枫�佽嚜瀹氫箟瀛楁鏌ヨ宸蹭笂浼犲崟鎹俊鎭�
+ /// </summary>
+ /// <returns></returns>
+ [Route("WEBSController/GetKf_ICStockBillList_Json")]
+ [HttpGet]
+ public object GetKf_ICStockBillList_Json(string HBillType, string HBillNo, string HSourceBillNo, string HMaker, Int64 HStockOrgID, string sWhere)
+ {
+ try
+ {
+ ds = oCn.RunProcReturn("exec h_p_Kf_ICStockBillQueryList_New '" + HBillType + "','" + HBillNo + "','" + HSourceBillNo + "','" + HMaker + "'," + HStockOrgID.ToString() + ",'" + sWhere+"'", "h_p_Kf_ICStockBillQueryList_New");
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏌ヨ涓嶅埌璇ュ崟鎹褰曪紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ List<object> columnNameList = new List<object>();
+ //娣诲姞鍒楀悕
+ 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鍒楀璞＄殑鍒楀悕
+ }
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鑾峰彇鍗曟嵁淇℃伅鎴愬姛锛�";
+ objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = columnNameList;
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鑾峰彇宸蹭笂浼犲崟鎹俊鎭け璐ワ紒" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
#endregion
@@ -4970,6 +5017,161 @@
#endregion
+ #region 鍑洪棬纭鍗曟ā鍧楄皟鐢ㄦ柟娉� 20240308
+
+ #region 鎵弿鍗曟嵁鍙锋潯鐮佽皟鐢�
+
+ /// <summary>
+ /// 鎵弿鍗曟嵁鍙锋潯鐮�
+ /// </summary>
+ /// <returns></returns>
+ [Route("WEBSController/Get_SourceBarCode_OutDoorCheck_Json")]
+ [HttpGet]
+ public object Get_SourceBarCode_OutDoorCheck_Json(string HBarCode, Int64 HStockOrgID)
+ {
+ try
+ {
+ ds = oCn.RunProcReturn("exec h_p_WMS_AddSourceBarCode_OutDoorCheck '" + HBarCode + "'," + HStockOrgID.ToString(), "h_p_WMS_AddSourceBarCode_OutDoorCheck");
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎵弿鍗曟嵁鍙锋潯鐮佸垽鏂け璐ワ紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ if (DBUtility.ClsPub.isLong(ds.Tables[0].Rows[0][0]) == 0)
+ {
+ List<object> columnNameList = new List<object>();
+ //娣诲姞鍒楀悕
+ 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鍒楀璞＄殑鍒楀悕
+ }
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鎴愬姛锛�";
+ objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = columnNameList;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎵弿鍗曟嵁鍙锋潯鐮佸け璐ワ紒" + DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HRemark"]);
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鑾峰彇鍗曟嵁鍙锋潯鐮佷俊鎭け璐ワ紒" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ #endregion
+
+ #region 鍑洪棬纭鍗� 涓婁紶鐢熷崟
+
+ /// <summary>
+ /// 鏂板鐢熸垚鍑洪棬纭鍗�
+ /// </summary>
+ /// <returns></returns>
+ [Route("WEBSController/set_SaveOutDoorCheckBill_Json")]
+ [HttpPost]
+ public object set_SaveOutDoorCheckBill_Json([FromBody] JObject sMainSub)
+ {
+ var _value = sMainSub["sMainSub"].ToString();
+ string msg1 = _value.ToString();
+ try
+ {
+ List<Model.ClsXs_OutDoorCheckBillMain> lsmain = new List<Model.ClsXs_OutDoorCheckBillMain>();
+ ListModels oListModels = new ListModels();
+ lsmain = oListModels.getOutDoorCheckBillMainByJson(msg1);
+ ClsXs_OutDoorCheckBillMain oMain = new ClsXs_OutDoorCheckBillMain();
+ string sSourceType = lsmain[0].HMainSourceBillType;
+ oMain.HInterID = lsmain[0].HInterID;
+ oMain.HBillNo = lsmain[0].HBillNo;
+ oMain.HBillType = lsmain[0].HBillType;
+ oMain.HDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString());
+ oMain.HMainSourceBillType = lsmain[0].HMainSourceBillType;
+ oMain.HMainSourceInterID = lsmain[0].HMainSourceInterID;
+ oMain.HMainSourceEntryID = lsmain[0].HMainSourceEntryID;
+ oMain.HMainSourceBillNo = lsmain[0].HMainSourceBillNo;
+ oMain.HExplanation = lsmain[0].HExplanation;
+ oMain.HRemark = lsmain[0].HRemark;
+ oMain.HMaker = lsmain[0].HMaker;
+ oMain.HSTOCKORGID = lsmain[0].HSTOCKORGID;
+
+ //鍒ゆ柇浼氳鏈熸槸鍚﹀悎鐞�
+ string s = "";
+ int sYear = 0;
+ int sPeriod = 0;
+ if (DBUtility.Xt_BaseBillFun.Fun_AllowYearPeriod(oMain.HDate, ref sYear, ref sPeriod, ref s) == false)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = s;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ oMain.HYear = sYear;
+ oMain.HPeriod = sPeriod;
+ }
+
+ oCn.BeginTran();
+ //鐢熸垚鍑洪棬纭鍗曪紙鍙渶鐢熸垚涓昏〃鏁版嵁锛�
+ //鎻掑叆涓昏〃
+ oCn.RunProc("Insert Into Xs_OutDoorCheckBillMain " +
+ "(HBillType,HBillSubType,HInterID,HBillNo,HDate" +
+ ",HYear,HPeriod,HBillStatus,HRemark,HMaker,HMakeDate" +
+ ",HMainSourceBillType,HMainSourceInterID,HMainSourceEntryID,HMainSourceBillNo" +
+ ",HExplanation,HSTOCKORGID" +
+ ") " +
+ " values('" + oMain.HBillType + "','" + oMain.HBillType + "'," + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "','" + oMain.HDate.ToShortDateString() + "'" +
+ ", " + oMain.HYear.ToString() + "," + oMain.HPeriod.ToString() + ",1,'" + oMain.HRemark + "','" + oMain.HMaker + "',getdate()" +
+ ",'" + oMain.HMainSourceBillType + "'," + oMain.HMainSourceInterID.ToString() + "," + oMain.HMainSourceEntryID.ToString() + ",'" + oMain.HMainSourceBillNo + "'" +
+ ",'" + oMain.HExplanation + "'," + oMain.HSTOCKORGID.ToString() +
+ ") ");
+
+ //瀹℃牳鍗曟嵁
+ oCn.RunProc("Update Xs_OutDoorCheckBillMain Set HChecker='" + oMain.HMaker + "',HCheckDate=getdate(),HBillStatus=2 where HInterID= " + oMain.HInterID.ToString());
+
+ oCn.Commit();
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鐢熸垚骞跺鏍稿嚭闂ㄧ‘璁ゅ崟鎴愬姛锛佸崟鎹彿涓猴細" + oMain.HBillNo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ oCn.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍑洪棬纭鍗曚笂浼犲け璐ワ紒" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ #endregion
+
+ #endregion
+
+
#region 澶勭悊鏂规硶
diff --git a/WebAPI/ListModels.cs b/WebAPI/ListModels.cs
index 04b5e19..722a262 100644
--- a/WebAPI/ListModels.cs
+++ b/WebAPI/ListModels.cs
@@ -3570,5 +3570,17 @@
return list;
}
+ /// <summary>
+ /// 鍑洪棬纭鍗曞弽搴忓垪鍖�
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<Model.ClsXs_OutDoorCheckBillMain> getOutDoorCheckBillMainByJson(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Model.ClsXs_OutDoorCheckBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsXs_OutDoorCheckBillMain>>(jsonString);
+ return list;
+ }
+
}
}
\ No newline at end of file
--
Gitblit v1.9.1