From ad7bec1313df110892242c6dab7848b8df61a1e0 Mon Sep 17 00:00:00 2001
From: zgq <519541279@qq.com>
Date: 星期三, 30 六月 2021 09:08:21 +0800
Subject: [PATCH] 调拨单新增参数‘源单号’
---
WebAPI/Properties/PublishProfiles/WEBAPI.pubxml.user | 6 +-
WebAPI/Controllers/MoveStockBillController.cs | 20 ++++++++--
WebAPI/Controllers/Xs_CutWorkSendBillController.cs | 45 +++++++++++++++++++++-
3 files changed, 62 insertions(+), 9 deletions(-)
diff --git a/WebAPI/Controllers/MoveStockBillController.cs b/WebAPI/Controllers/MoveStockBillController.cs
index 9435fc4..f87c455 100644
--- a/WebAPI/Controllers/MoveStockBillController.cs
+++ b/WebAPI/Controllers/MoveStockBillController.cs
@@ -221,7 +221,7 @@
/// <returns></returns>
[Route("MoveStockBill/get_InfoByBarCode_Source_Json")]
[HttpGet]
- public object get_InfoByBarCode_Source_Json(string sCode, Int64 sInterID, string sBillNo, Double sQty, Int64 HWHID, Int64 HSPID, Int64 SCWhID, Int64 SCSPID)
+ public object get_InfoByBarCode_Source_Json(string HSourceBillNo, string sCode, Int64 sInterID, string sBillNo, Double sQty, Int64 HWHID, Int64 HSPID, Int64 SCWhID, Int64 SCSPID)
{
try
{
@@ -230,7 +230,7 @@
dal.GetInfoByNumber_View(sCode);
if (dal.omodel_View.HBarCodeType != "鎵樼洏鏉＄爜")
{
- return get_InfoByBarCode_Source_Json_s(sCode, sInterID, sBillNo, sQty, HWHID, HSPID, SCWhID, SCSPID);
+ return get_InfoByBarCode_Source_Json_s(HSourceBillNo, sCode, sInterID, sBillNo, sQty, HWHID, HSPID, SCWhID, SCSPID);
}
else
{
@@ -256,7 +256,7 @@
for (int i = 0; i < dsTBarCode.Tables[0].Rows.Count; i++)
{
sBarCode_MX = DBUtility.ClsPub.isStrNull(dsTBarCode.Tables[0].Rows[i]["HBarCodeMX"]);
- objJsonResult = (JsonResult)get_InfoByBarCode_Source_Json_s(sBarCode_MX, sInterID, sBillNo, sQty, HWHID, HSPID, SCWhID, SCSPID);
+ objJsonResult = (JsonResult)get_InfoByBarCode_Source_Json_s(HSourceBillNo, sBarCode_MX, sInterID, sBillNo, sQty, HWHID, HSPID, SCWhID, SCSPID);
if (objJsonResult.code == "0")
{
return objJsonResult;
@@ -277,7 +277,7 @@
}
}
- public object get_InfoByBarCode_Source_Json_s(string sCode, Int64 sInterID, string sBillNo, Double sQty, Int64 HWHID, Int64 HSPID, Int64 SCWhID, Int64 SCSPID)
+ public object get_InfoByBarCode_Source_Json_s(string HSourceBillNo, string sCode, Int64 sInterID, string sBillNo, Double sQty, Int64 HWHID, Int64 HSPID, Int64 SCWhID, Int64 SCSPID)
{
try
{
@@ -294,6 +294,18 @@
objJsonResult.data = null;
return objJsonResult;
}
+ //鏈夋簮鍗� 鍒ゆ柇鍒楄〃涓槸鍚﹀瓨鍦ㄦ墍鎵弿鐨勭墿鏂�
+ if (Pub_Class.ClsPub.isStrNull(HSourceBillNo) != "")
+ {
+ if (sBool == false)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鍙凤細" + sBillNo + "锛屽崟鎹甀D锛�" + sInterID + "锛涜鐗╂枡骞朵笉瀛樺湪浜庢璋冩嫧鍗曚腑锛岃纭鐗╂枡鏃犺鍚庨噸鏂版壂鎻忥紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
if (oView.HBarCodeType == "鍞竴鏉＄爜" && sQty > 0 && oView.HQty < sQty)
{
sRelQty = oView.HQty;
diff --git a/WebAPI/Controllers/Xs_CutWorkSendBillController.cs b/WebAPI/Controllers/Xs_CutWorkSendBillController.cs
index a8319b0..61b1388 100644
--- a/WebAPI/Controllers/Xs_CutWorkSendBillController.cs
+++ b/WebAPI/Controllers/Xs_CutWorkSendBillController.cs
@@ -101,7 +101,7 @@
+ list[i].HMainSourceBillNo + "'," + list[i].HMainSourceInterID + ")";
oCN.RunProc(subSql);
//鍙嶅啓閲戣澏閿�鍞鍗曠殑瑁佸垏娲惧伐鐝粍
- var HGroupSql = "update AIS20200908101915zs..T_SAL_ORDER set F_XSDD_PGSJ=GETDATE(),F_XSDD_PGBZ=(select HName from Gy_Group where HItemID=" + list[i].HGroupID + ") where FID = " + list[i].HMainSourceInterID + "";
+ var HGroupSql = "update AIS20200908101915zs..T_SAL_ORDERENTRY set F_XSDD_PGSJ=GETDATE(),F_XSDD_PGBZ=(select HName from Gy_Group where HItemID=" + list[i].HGroupID + ") where FID = " + list[i].HMainSourceInterID + "";
oCN.RunProc(HGroupSql);
}
oCN.Commit();
@@ -122,6 +122,44 @@
}
}
+ /// <summary>
+ /// 涓婁笅鏋跺崟鍒楄〃
+ /// </summary>
+ /// <returns></returns>
+ [Route("Xs_CutWorkSendBill/List")]
+ [HttpGet]
+ public object List(string sWhere)
+ {
+ try
+ {
+ ds = List_s(sWhere);
+ if (ds == null || 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 ex)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + ex.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
#region sql璇彞
@@ -132,7 +170,10 @@
"select FID HMainSourceInterID,FBILLNO HMainSourceBillNo,1 pages,'' HMaker from AIS20200908101915zs..T_SAL_ORDER where FBILLNO ='" + HSEOrderBillNo + "'"
, "AIS20200908101915zs..T_SAL_ORDER");
}
-
+ public static DataSet List_s(string sWhere)
+ {
+ return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Xs_CutWorkSendBillList where 1=1 " + sWhere , "h_v_Xs_CutWorkSendBillList");
+ }
#endregion
diff --git a/WebAPI/Properties/PublishProfiles/WEBAPI.pubxml.user b/WebAPI/Properties/PublishProfiles/WEBAPI.pubxml.user
index 99244d4..b7ccf2f 100644
--- a/WebAPI/Properties/PublishProfiles/WEBAPI.pubxml.user
+++ b/WebAPI/Properties/PublishProfiles/WEBAPI.pubxml.user
@@ -157,10 +157,10 @@
<publishTime>11/24/2014 11:18:48</publishTime>
</File>
<File Include="bin/WebAPI.dll">
- <publishTime>06/10/2021 10:32:01</publishTime>
+ <publishTime>06/29/2021 17:37:49</publishTime>
</File>
<File Include="bin/WebAPI.pdb">
- <publishTime>06/10/2021 10:32:01</publishTime>
+ <publishTime>06/29/2021 17:37:49</publishTime>
</File>
<File Include="bin/WebAPI.XmlSerializers.dll">
<publishTime>02/04/2021 21:35:21</publishTime>
@@ -334,7 +334,7 @@
<publishTime>04/23/2021 13:11:40</publishTime>
</File>
<File Include="Web.config">
- <publishTime>06/10/2021 10:32:25</publishTime>
+ <publishTime>06/29/2021 17:37:52</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
--
Gitblit v1.9.1