From 8f394d3076eaf1fab4ed2c64e1db1ffc850835bf Mon Sep 17 00:00:00 2001
From: zgq <519541279@qq.com>
Date: 星期日, 21 二月 2021 18:28:05 +0800
Subject: [PATCH] 调拨单增加扫托盘条码功能
---
WebAPI/Controllers/LookingForBillController.cs | 2
WebAPI/Properties/PublishProfiles/WEBAPI.pubxml.user | 6
WebAPI/Controllers/MoveStockBillController.cs | 189 +++++++++++++++++++++++++++++++++++++++++++++-
WebAPI/Controllers/ProductInController.cs | 2
4 files changed, 189 insertions(+), 10 deletions(-)
diff --git a/WebAPI/Controllers/LookingForBillController.cs b/WebAPI/Controllers/LookingForBillController.cs
index 620b90b..c2d6662 100644
--- a/WebAPI/Controllers/LookingForBillController.cs
+++ b/WebAPI/Controllers/LookingForBillController.cs
@@ -14,6 +14,8 @@
private json objJsonResult = new json();
public DataSet ds = new DataSet();
public WebServer webserver = new WebServer();
+
+
/// <summary>
/// 鏍规嵁鍖呰鍗� 杩斿洖姝ゅ寘瑁呭崟鍐呯殑鐩稿叧淇℃伅
/// </summary>
diff --git a/WebAPI/Controllers/MoveStockBillController.cs b/WebAPI/Controllers/MoveStockBillController.cs
index c63b643..0116978 100644
--- a/WebAPI/Controllers/MoveStockBillController.cs
+++ b/WebAPI/Controllers/MoveStockBillController.cs
@@ -100,9 +100,184 @@
/// <param name="SCWhID"></param>
/// <param name="SCSPID"></param>
/// <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)
+ //{
+ // try
+ // {
+ // WebS.ClsKF_PonderationBillMain_Temp model = new WebS.ClsKF_PonderationBillMain_Temp();
+ // string sErrMsg = "";
+ // bool sBool = false;
+ // double sRelQty = 0;
+ // oView = webserver.get_InfoByBarCode_Source(sCode, sInterID, ref sBool, ref DBUtility.ClsPub.sErrInfo);
+ // if (oView == null)
+ // {
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "鍗曟嵁鍙凤細" + sBillNo + "锛屽崟鎹甀D锛�" + sInterID + "锛�" + DBUtility.ClsPub.sErrInfo;
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ // }
+ // if (oView.HBarCodeType == "鍞竴鏉＄爜" && sQty > 0 && oView.HQty < sQty)
+ // {
+ // sRelQty = oView.HQty;
+ // }
+ // else if (sQty > 0)
+ // {
+ // sRelQty = sQty;
+ // }
+ // else
+ // {
+ // sRelQty = oView.HQty;
+ // }
+
+ // model.HInterID = DBUtility.ClsPub.isLong(sInterID);
+ // model.HBillNo = DBUtility.ClsPub.isStrNull(sBillNo);
+ // model.HBillType = this.HBillType;
+ // model.HMaker = DBUtility.ClsPub.CurUserName;
+ // //
+ // model.HMaterID = oView.HMaterID;
+ // model.HAuxPropID = oView.HAuxPropID;
+ // model.HErpClsID = oView.HErpClsID;
+ // model.HQty = oView.HQty;
+ // model.HQtyMust = oView.HinitQty;
+ // model.HBarCode = oView.HBarCode;
+ // model.HBatchNo = oView.HBatchNo;
+ // model.HMTONo = oView.HMTONo;
+
+ // model.HWhID = DBUtility.ClsPub.isLong(HWHID);
+ // model.HStockPlaceID = DBUtility.ClsPub.isLong(HSPID);
+ // model.HSCWHID = SCWhID;
+ // model.HOutStockPlaceID = SCSPID;
+ // //model.HVDAPack = txtHVDAPack2.Text.Trim();
+ // //model.HVDAMaterNum = txtHVDAMaterID.Text.Trim();
+ // //model.HVDAQty = DBUtility.ClsPub.ObjToDouble(txtHVDAQty.Text.Trim());
+ // //
+ // model.HSourceInterID = oView.HSourceInterID;
+ // model.HSourceEntryID = oView.HSourceEntryID;
+ // model.HSourceBillNo = oView.HSourceBillNo;
+ // model.HSourceBillType = oView.HSourceBillType;
+ // model.HRedBlueFlag = false;
+ // model.HPieceQty = 1;
+ // //model.HSTOCKORGID = DBUtility.ClsPub.HORGANIZATIONSID;
+ // //model.HOWNERID = DBUtility.ClsPub.HORGANIZATIONSID;
+
+ // WebS.WebService1 oWebs = new WebS.WebService1();
+ // //if (webserver.set_SavePonderationBillMain_Temp_Qty(model, sQty, ref DBUtility.ClsPub.sErrInfo))
+ // bool flag = oWebs.Get_CheckQtyByBarCode_GetWhAndSP(model.HInterID, model.HBillType, model.HBarCode, ref SCWhID, ref SCSPID, sRelQty, ref sRelQty);
+ // if (flag)
+ // {
+ // sQty = sRelQty;
+ // }
+ // else if(sRelQty == 0)
+ // {
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "鏃犲簱瀛橈紒";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ // }
+ // else
+ // {
+ // sQty = sRelQty;
+ // }
+
+ // if (oWebs.set_SavePonderationBillMain_Temp_Qty(model, sQty, ref DBUtility.ClsPub.sErrInfo))
+ // {
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 1;
+ // objJsonResult.Message = "鎵爜鎴愬姛锛�";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ // }
+ // else
+ // {
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "鎵爜澶辫触锛�" + DBUtility.ClsPub.sErrInfo;
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ // }
+ // }
+ // catch (Exception)
+ // {
+
+ // throw;
+ // }
+ //}
+
+ /// <summary>
+ /// 璋冩嫧鍗�/鎵潯鐮�
+ /// </summary>
+ /// <param name="sCode"></param>
+ /// <param name="sInterID"></param>
+ /// <param name="sBillNo"></param>
+ /// <param name="sQty"></param>
+ /// <param name="HWHID"></param>
+ /// <param name="HSPID"></param>
+ /// <param name="SCWhID"></param>
+ /// <param name="SCSPID"></param>
+ /// <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)
+ {
+ try
+ {
+ DAL.ClsGy_BarCodeBill_View dal = new DAL.ClsGy_BarCodeBill_View();
+ SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
+ dal.GetInfoByNumber_View(sCode);
+ if (dal.omodel_View.HBarCodeType != "鎵樼洏鏉＄爜")
+ {
+ return get_InfoByBarCode_Source_Json_s(sCode, sInterID, sBillNo, sQty, HWHID, HSPID, SCWhID, SCSPID);
+ }
+ else
+ {
+ //濡傛灉鏄泤鐞鍒欐墭鐩樻潯鐮佸垎瑙ｅ苟妯℃嫙鎵爜
+
+ //鍒嗚В鎵樻潯鐮佸緱鍒版槑缁嗘潯鐮佷俊鎭啓鍏ュ嚭鍏ュ簱鏉＄爜涓存椂琛�
+ DataSet dsTBarCode;
+ string sBarCode_MX;
+ dsTBarCode = oCn.RunProcReturn("select b.HBarCode HBarCodeMX from Sc_PackUnionBillMain a " +
+ " inner join Sc_PackUnionBillSub b on a.HInterID = b.HInterID " +
+ " Where a.HBarCode_Pack = '" + sCode + "'", "Sc_PackUnionBillMain");
+ if (dsTBarCode == null || dsTBarCode.Tables[0].Rows.Count == 0)
+ {
+ //sErrMsg = "娌℃湁鎵惧埌鎵樼洏鏉＄爜锛�";
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎵爜澶辫触锛佹病鏈夋壘鍒版墭鐩樻潯鐮侊紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ 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);
+ if(objJsonResult.code == "0")
+ {
+ return objJsonResult;
+ }
+ }
+ return objJsonResult;
+ }
+ }
+
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎵爜澶辫触锛�" + DBUtility.ClsPub.isStrNull(e);
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ public object get_InfoByBarCode_Source_Json_s(string sCode, Int64 sInterID, string sBillNo, Double sQty, Int64 HWHID, Int64 HSPID, Int64 SCWhID, Int64 SCSPID)
{
try
{
@@ -115,7 +290,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鍗曟嵁鍙凤細" + sBillNo + "锛屽崟鎹甀D锛�" + sInterID + "锛�" + DBUtility.ClsPub.sErrInfo;
+ objJsonResult.Message = "1-鍗曟嵁鍙凤細" + sBillNo + "锛屽崟鎹甀D锛�" + sInterID + "锛�" + DBUtility.ClsPub.sErrInfo;
objJsonResult.data = null;
return objJsonResult;
}
@@ -170,11 +345,11 @@
{
sQty = sRelQty;
}
- else if(sRelQty == 0)
+ else if (sRelQty == 0)
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鏃犲簱瀛橈紒";
+ objJsonResult.Message = "2-鏃犲簱瀛橈紒";
objJsonResult.data = null;
return objJsonResult;
}
@@ -185,9 +360,9 @@
if (oWebs.set_SavePonderationBillMain_Temp_Qty(model, sQty, ref DBUtility.ClsPub.sErrInfo))
{
- objJsonResult.code = "0";
+ objJsonResult.code = "1";
objJsonResult.count = 1;
- objJsonResult.Message = "鎵爜鎴愬姛锛�";
+ objJsonResult.Message = "3-鎵爜鎴愬姛锛�";
objJsonResult.data = null;
return objJsonResult;
}
@@ -195,14 +370,14 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鎵爜澶辫触锛�" + DBUtility.ClsPub.sErrInfo;
+ objJsonResult.Message = "4-鎵爜澶辫触锛�" + DBUtility.ClsPub.sErrInfo;
objJsonResult.data = null;
return objJsonResult;
}
}
catch (Exception)
{
-
+
throw;
}
}
diff --git a/WebAPI/Controllers/ProductInController.cs b/WebAPI/Controllers/ProductInController.cs
index 92b7145..af06fd8 100644
--- a/WebAPI/Controllers/ProductInController.cs
+++ b/WebAPI/Controllers/ProductInController.cs
@@ -483,6 +483,8 @@
websLsmain.HEmpID = lsmain[0].HEmpID;
websLsmain.HRemark = lsmain[0].HRemark;
websLsmain.HMaker = lsmain[0].HMaker;
+ websLsmain.HWHID = lsmain[0].HWHID;
+ websLsmain.HSupID = lsmain[0].HSupID;
if (webserver.set_SaveProductInBill_New(websLsmain, sSourceBillType, ref DBUtility.ClsPub.sErrInfo))
{
diff --git a/WebAPI/Properties/PublishProfiles/WEBAPI.pubxml.user b/WebAPI/Properties/PublishProfiles/WEBAPI.pubxml.user
index 3002138..c09c677 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>02/18/2021 18:04:50</publishTime>
+ <publishTime>02/21/2021 11:56:27</publishTime>
</File>
<File Include="bin/WebAPI.pdb">
- <publishTime>02/18/2021 18:04:50</publishTime>
+ <publishTime>02/21/2021 11:56:27</publishTime>
</File>
<File Include="bin/WebAPI.XmlSerializers.dll">
<publishTime>02/04/2021 21:35:21</publishTime>
@@ -334,7 +334,7 @@
<publishTime>02/05/2021 20:24:19</publishTime>
</File>
<File Include="Web.config">
- <publishTime>02/18/2021 18:04:54</publishTime>
+ <publishTime>02/21/2021 12:21:03</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
--
Gitblit v1.9.1