From cccafa42039b6fca001908b5e2aed4d0d1d9c0e3 Mon Sep 17 00:00:00 2001
From: yxj <1qaz@123>
Date: 星期三, 23 二月 2022 14:46:48 +0800
Subject: [PATCH] 条码生成模块，选择源单收料通知单时增加获取销售订单号、销售订单行号，并写入条码档案表中
---
WebAPI/Controllers/SellOutController.cs | 92 +++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 90 insertions(+), 2 deletions(-)
diff --git a/WebAPI/Controllers/SellOutController.cs b/WebAPI/Controllers/SellOutController.cs
index 2183a49..93914fa 100644
--- a/WebAPI/Controllers/SellOutController.cs
+++ b/WebAPI/Controllers/SellOutController.cs
@@ -64,6 +64,91 @@
}
+ /// <summary>
+ /// 閿�鍞嚭搴撶紦瀛樺垪琛ㄧ紪杈戞寜閽� 鑾峰彇琛ㄤ綋淇℃伅
+ /// </summary>
+ /// <param name="HSourceBillNo"></param>
+ /// <returns></returns>
+ [Route("SellOut/SellOutDetaiNew")]
+ [HttpGet]
+ public object SellOutDetaiNew(string HInterID)
+ {
+
+ DataSet ds;
+ List<object> list = new List<object>();
+ string Swhere = "";
+ try
+ {
+ if (HInterID != "" || HInterID != null)
+ {
+ Swhere = " and hmainid='" + HInterID + "'";
+ }
+ else
+ {
+ Swhere = HInterID;
+ }
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ //鑾峰彇閿�鍞嚭搴撶紪杈戞暟鎹�
+ string sql = "select 鏁伴噺 HQty,搴旀敹鏁伴噺 HQtyMust,鐗╂枡浠ｇ爜 HMaterNumber,鐗╂枡鍚嶇О HMaterName,瑙勬牸鍨嬪彿 HMaterModel,婧愬崟涓诲唴鐮� HSourceInterID,婧愬崟瀛愬唴鐮� HSourceEntryID,婧愬崟鍗曞彿 HSourceBillNo,鎵规 HBatchNo,杈呭姪灞炴�� HAuxPropID,璁″垝璺熻釜鍙� HMTONo,ck HWHID from h_v_SelloutDetail where 1 = 1 " + Swhere + "";
+ ds = oCN.RunProcReturn(sql, "h_v_SelloutDetail");
+
+ list.Add(ds.Tables[0]);
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�";
+ objJsonResult.list = list;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
+ objJsonResult.data = null;
+ }
+ return objJsonResult;
+ }
+
+
+ //宸蹭笂浼犲垪琛ㄥ埛鏂�
+ [Route("Web/DisBillUpdateLoad_Json")]
+ [HttpGet]
+ public object DisBillUpdateLoad_Json(string HBillType, string HMaker, Int64 HOrgID)
+ {
+ try
+ {
+ ds = webserver.GetDisBillUpdateLoad_Json(HBillType, HMaker, HOrgID);
+ if (ds == null || ds.Tables[0].Rows.Count <= 0)
+ {
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ //DBUtility.ClsPub.MessageBeep((int)DBUtility.ClsPub.BeepType.Warning);
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+
+
[Route("SellOut/GetMAXNum")]
[HttpGet]
public object GetMAXNum()
@@ -185,8 +270,10 @@
{
try
{
- // DataSet ds = new DataSet();
- // WebServer webserver = new WebServer();
+ //鍚屾閿�鍞鍗�
+ new SQLHelper.ClsCN().RunProcReturn("EXEC h_p_IFCLD_ERPSourceBillToLocal_SEOrder '" + HSourceBillNo + "'", "h_p_IFCLD_ERPSourceBillToLocal_SEOrder");
+ // DataSet ds = new DataSet();
+ // WebServer webserver = new WebServer();
string sWhere = " Where 鍗曟嵁鍙� like '%" + HSourceBillNo.Trim() + "%'";
//
if (HSourceBillType == "1402")
@@ -448,6 +535,7 @@
websLsmain.HEmpID = lsmain[0].HEmpID;
websLsmain.HRemark = lsmain[0].HRemark;
websLsmain.HMaker = lsmain[0].HMaker;
+ websLsmain.HKeeperID= lsmain[0].HKeeperID;
if (webserver.set_SaveSellOutBill_New(websLsmain, sSourceBillType, ref DBUtility.ClsPub.sErrInfo))
{
--
Gitblit v1.9.1