From 9305340d0d22505ead926186eb5bc441c9cbf76b Mon Sep 17 00:00:00 2001
From: zzr99 <1940172413@qq.com>
Date: 星期五, 27 五月 2022 21:37:14 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/MoveStockBillController.cs | 533 +++++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 394 insertions(+), 139 deletions(-)
diff --git a/WebAPI/Controllers/MoveStockBillController.cs b/WebAPI/Controllers/MoveStockBillController.cs
index f86d8e4..115f384 100644
--- a/WebAPI/Controllers/MoveStockBillController.cs
+++ b/WebAPI/Controllers/MoveStockBillController.cs
@@ -44,7 +44,7 @@
public DataSet ds = new DataSet();
public ClsGy_BarCodeBill_WMS_Model_View oView = new ClsGy_BarCodeBill_WMS_Model_View();
public ClsKF_PonderationBillMain_Temp model = new ClsKF_PonderationBillMain_Temp();
- public JsonResult objJsonResult = new JsonResult();
+ private JsonResult objJsonResult = new JsonResult();
private json objjson = new json();
/// <summary>
@@ -170,7 +170,7 @@
// {
// sQty = sRelQty;
// }
- // else if(sRelQty == 0)
+ // else if (sRelQty == 0)
// {
// objJsonResult.code = "0";
// objJsonResult.count = 0;
@@ -221,16 +221,23 @@
/// <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 sCode, Int64 sInterID, string sBillNo, Double sQty, Int64 HWHID, Int64 HSPID, Int64 SCWhID, Int64 SCSPID, string HMaker, Int64 HOrgID,string HSourceBillNo,string HSourceBillType)
{
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);
+ if (HSourceBillNo == null)
+ {
+ HSourceBillNo = "";
+ }
+ return get_InfoByBarCode_Source_Json_s(sCode, sInterID, sBillNo, sQty, HWHID, HSPID, SCWhID, SCSPID, HMaker, HOrgID, HSourceBillNo, HSourceBillType);
}
else
{
@@ -255,9 +262,11 @@
{
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")
+ //sBarCode_MX = DBUtility.ClsPub.isStrNull(dsTBarCode.Tables[0].Rows[i]["HBarCodeMX"]);
+ sCode = 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, HMaker,HOrgID,HSourceBillNo,HSourceBillType);
+ objJsonResult = (JsonResult)get_InfoByBarCode_Source_Json_s(sCode, sInterID, sBillNo, sQty, HWHID, HSPID, SCWhID, SCSPID, HMaker, HOrgID, HSourceBillNo, HSourceBillType);
+ if (objJsonResult.code == "0")
{
return objJsonResult;
}
@@ -265,7 +274,7 @@
return objJsonResult;
}
}
-
+
}
catch (Exception e)
{
@@ -277,7 +286,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 sCode, Int64 sInterID, string sBillNo, Double sQty, Int64 HWHID, Int64 HSPID, Int64 SCWhID, Int64 SCSPID, string HMaker,Int64 HOrgID,string HSourceBillNo,string HSourceBillType)
{
try
{
@@ -285,8 +294,24 @@
string sErrMsg = "";
bool sBool = false;
double sRelQty = 0;
- double sRelQty2 = 0;
- oView = webserver.get_InfoByBarCode_Source(sCode, sInterID, ref sBool, ref DBUtility.ClsPub.sErrInfo);
+ int sRow = 0;
+ long sHMaterID = 0;
+ long sHAuxPropID = 0;
+
+ string[] NewBarCode;
+ if (sCode.CompareTo("#") > 0)
+ {
+ NewBarCode = sCode.Split(Convert.ToChar("#"));
+ sCode = NewBarCode[0];
+ }
+
+ string sBarCode = sCode.Trim();
+ string sBarCodePrefix = sBarCode.Substring(0, Math.Min(3, sBarCode.Length));//鎴彇鏉＄爜鍓嶄笁浣嶅瓧绗︿覆
+
+ WebS.ClsGy_BarCodeBill_WMS_Model_View oView = new WebS.ClsGy_BarCodeBill_WMS_Model_View();
+ WebS.WebService1 oWebs1 = new WebS.WebService1();
+ oView = oWebs1.get_InfoByBarCode_Source(sCode, sInterID, ref sBool, ref sErrMsg);
+ //oView = webserver.get_InfoByBarCode_Source(sCode, sInterID, ref sBool, ref DBUtility.ClsPub.sErrInfo);
if (oView == null)
{
objJsonResult.code = "0";
@@ -295,24 +320,86 @@
objJsonResult.data = null;
return objJsonResult;
}
-
- if (oView.HBarCodeType == "鍞竴鏉＄爜" && sQty > 0 && oView.HQty < sQty)
+ else {
+ if (HSourceBillNo.Trim() != "")
{
- sRelQty2 = oView.HQty;
+ if (sBool == false)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "1-鍗曟嵁鍙凤細" + sBillNo + "锛屽崟鎹甀D锛�" + sInterID + "璇ョ墿鏂欏苟涓嶅瓨鍦ㄤ簬姝よ皟鎷ㄥ崟,璇风‘璁ょ墿鏂欐棤璇悗閲嶆柊鎵弿锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
}
- else if (sQty > 0)
+ if (oView.HBarCodeType != "鎵樼洏鏉＄爜")
{
- sRelQty2 = sQty;
+ if (oView.HBarCodeType == "鍞竴鏉＄爜" && sQty > 0 && oView.HQty < sQty)
+ {
+ sRelQty = oView.HQty;
+ }
+ else if (sQty > 0)
+ {
+ sRelQty = sQty;
+ }
+ else
+ {
+ sRelQty = oView.HQty;
+ }
+ if (oView.HBarCodeType != "鍞竴鏉＄爜")
+ {
+ if (SCWhID == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "璋冨嚭浠撳簱娌℃湁閫夋嫨锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ if (SCSPID == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "璋冨嚭浠撲綅娌℃湁閫夋嫨锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ }
+
+ //if (webserver.set_SavePonderationBillMain_Temp_Qty(model, sQty, ref DBUtility.ClsPub.sErrInfo))
+ bool flag = oWebs1.Get_CheckQtyByBarCode_GetWhAndSP(model.HInterID, model.HBillType, oView.HBarCode, ref SCWhID, ref SCSPID, sRelQty, ref sRelQty);
+ if (flag)
+ {
+ //sQty = sRelQty;
+ model.HSCWHID = SCWhID;
+ model.HOutStockPlaceID = SCSPID;
+ if (SCWhID <= 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "1-浠撳簱鏃犲簱瀛橈紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ else if (sRelQty == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "2-鏃犲簱瀛橈紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
}
- else
- {
- sRelQty2 = oView.HQty;
- }
+ }
model.HInterID = DBUtility.ClsPub.isLong(sInterID);
model.HBillNo = DBUtility.ClsPub.isStrNull(sBillNo);
model.HBillType = this.HBillType;
- model.HMaker = DBUtility.ClsPub.CurUserName;
+ model.HMaker = HMaker;
//
model.HMaterID = oView.HMaterID;
model.HAuxPropID = oView.HAuxPropID;
@@ -322,9 +409,6 @@
model.HBarCode = oView.HBarCode;
model.HBatchNo = oView.HBatchNo;
model.HMTONo = oView.HMTONo;
-
- //model.HWhID = oView.HWHID;
- //model.HStockPlaceID = oView.HSPID;
model.HWhID = DBUtility.ClsPub.isLong(HWHID);
model.HStockPlaceID = DBUtility.ClsPub.isLong(HSPID);
@@ -340,133 +424,110 @@
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))
- objJsonResult = CheckQtyByBarCode_Json(model.HInterID, model.HBillType, model.HBarCode, ref SCWhID, ref SCSPID, sRelQty2, ref sRelQty);
-
- if (objJsonResult.count == 1)
+ model.HSTOCKORGID = HOrgID;
+ model.HOWNERID = HOrgID;
+ if(sBool)
{
- sQty = sRelQty;
- model.HSCWHID = SCWhID;
- model.HOutStockPlaceID = SCSPID;
+ model.HSourceBillType = HSourceBillType;
}
- else if (objJsonResult.count == 0)
+ if(oWebs1.Get_CheckWhAndSP_BeUpdate(SCWhID,SCSPID,ref DBUtility.ClsPub.sErrInfo))
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "2-鏃犲簱瀛橈紒";
- objJsonResult.data = null;
- return objJsonResult;
- }
-
- if (oWebs.set_SavePonderationBillMain_Temp_Qty(model, sQty, ref DBUtility.ClsPub.sErrInfo))
- {
- objJsonResult.code = "1";
- objJsonResult.count = 1;
- objJsonResult.Message = "3-鎵爜鎴愬姛锛�";
- objJsonResult.data = null;
- return objJsonResult;
+
}
else
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "4-鎵爜澶辫触锛�" + DBUtility.ClsPub.sErrInfo;
- objJsonResult.data = model.HBarCode;
+ objJsonResult.Message = "1-鍗曟嵁鍙凤細" + sBillNo + "锛屽崟鎹甀D锛�" + sInterID + "锛涜皟鍑轰粨搴�," + DBUtility.ClsPub.sErrInfo;
+ objJsonResult.data = null;
return objJsonResult;
}
+ if(model.HWhID == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "1-鍗曟嵁鍙凤細" + sBillNo + "锛屽崟鎹甀D锛�" + sInterID + "锛涜皟鍏ヤ粨搴撴病鏈夐�夋嫨锛�" + DBUtility.ClsPub.sErrInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ WebS.WebService1 oWebs = new WebS.WebService1();
+ if(sBool)
+ {
+ if(oWebs.set_SavePonderationBillMain_Temp_Select_Qty(model, sQty, ref DBUtility.ClsPub.sErrInfo))
+ {
+
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "1-鍗曟嵁鍙凤細" + sBillNo + "锛屽崟鎹甀D锛�" + sInterID + "锛涙壂鎻忓け璐ワ紒" + DBUtility.ClsPub.sErrInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ else
+ {
+ if (oView.HBarCodeType != "鎵樼洏鏉＄爜")
+ {
+ if (HSourceBillType == "涓嬫灦閫氱煡鍗�" && HSourceBillNo != "")
+ {
+ if (oWebs.set_SavePonderationBillMain_Temp_FIFO(model, ref DBUtility.ClsPub.sErrInfo))
+ {
+
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "1-鍗曟嵁鍙凤細" + sBillNo + "锛屽崟鎹甀D锛�" + sInterID + "锛涙壂鎻忓け璐ワ紒" + DBUtility.ClsPub.sErrInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ else
+ {
+ if (oWebs.set_SavePonderationBillMain_Temp_Qty(model, sQty, ref DBUtility.ClsPub.sErrInfo))
+ {
+
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "1-鍗曟嵁鍙凤細" + sBillNo + "锛屽崟鎹甀D锛�" + sInterID + "锛涙壂鎻忓け璐ワ紒" + DBUtility.ClsPub.sErrInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ }
+ else
+ {
+ if (oWebs.set_SavePonderationBillMain_Temp_Qty(model, sQty, ref DBUtility.ClsPub.sErrInfo))
+ {
+
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "1-鍗曟嵁鍙凤細" + sBillNo + "锛屽崟鎹甀D锛�" + sInterID + "锛涙壂鎻忓け璐ワ紒" + DBUtility.ClsPub.sErrInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ }
+ //return objJsonResult;
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鎵爜鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
}
catch (Exception)
{
throw;
- }
- }
-
- //鏍规嵁鏉＄爜 鏁伴噺 鍒ゆ柇鏉＄爜搴撳瓨 鏄惁鍏呰冻 骞朵笖甯﹀嚭 浠撳簱浠撲綅
- public JsonResult CheckQtyByBarCode_Json(long InterID, string sBillType, string sBarCode, ref long HWHID, ref long HSPID, double sQty, ref double sRelQty)
- {
- DataSet DS;
- DataSet DSErp;
- try
- {
- //鍗曟潯鐮侊紝涓�寮犲崟鎹竴鏉℃潯鐮�(鍑尝)
- //DS = oCn.RunProcReturn("exec h_p_KF_ICInventory_WMS_GetWHAndSP_Single " + InterID.ToString() + ",'" + sBillType + "','" + sBarCode + "'," + HWHID.ToString() + "," + HSPID.ToString(), "h_p_KF_ICInventory_WMS_GetWHAndSP_Single", ref DBUtility.ClsPub.sExeReturnInfo);
- //鍒ゆ柇鏉＄爜搴撳瓨
- DS = new SQLHelper.ClsCN().RunProcReturn("exec h_p_KF_ICInventory_WMS_GetWHAndSP " + InterID.ToString() + ",'" + sBillType + "','" + sBarCode + "'," + HWHID.ToString() + "," + HSPID.ToString(), "h_p_KF_ICInventory_WMS_GetWHAndSP", ref DBUtility.ClsPub.sExeReturnInfo);
- if (DS.Tables[0].Rows.Count == 0)
- {
- sRelQty = 0;
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "4-鎵爜澶辫触锛�";
- objJsonResult.data = DS;
- return objJsonResult;
- }
- else
- {
- double sKFQty = 0;
- double sKFQtyErp = 0;
- sKFQty = DBUtility.ClsPub.isDoule(DS.Tables[0].Rows[0]["HKFQty"]);
- HWHID = DBUtility.ClsPub.isLong(DS.Tables[0].Rows[0]["HWhID"]);
- HSPID = DBUtility.ClsPub.isLong(DS.Tables[0].Rows[0]["HSPID"]);
- //鐩存帴杩斿洖999
- DSErp = new SQLHelper.ClsCN().RunProcReturn("exec h_p_IF_ICInventory_WMS_GetWHAndSP " + InterID.ToString() + ",'" + sBillType + "','" + sBarCode + "'," + HWHID.ToString() + "," + HSPID.ToString(), "h_p_IF_ICInventory_WMS_GetWHAndSP", ref DBUtility.ClsPub.sExeReturnInfo);
- if (DSErp.Tables[0].Rows.Count == 0)
- {
- sRelQty = 0;//涓嶄細璧�
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "4-鎵爜澶辫触锛�";
- objJsonResult.data = DS;
- return objJsonResult;
- }
- sKFQtyErp = DBUtility.ClsPub.isDoule(DSErp.Tables[0].Rows[0]["HKFQty"]);//9999
- if (sQty > sKFQty && sQty > sKFQtyErp) //褰撳簱瀛樺皬浜庢爣绛炬暟閲忔椂 鍙栧簱瀛樻暟閲�
- {
- sRelQty = sKFQtyErp;
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "4-鎵爜澶辫触锛�";
- objJsonResult.data = DS;
- return objJsonResult;
- }
- else if (sQty > sKFQty && sQty < sKFQtyErp) //褰撳簱瀛樺皬浜庢爣绛炬暟閲忔椂 鍙栧簱瀛樻暟閲�
- {
- sRelQty = sKFQty;
- objJsonResult.code = "1";
- objJsonResult.count = 1;
- objJsonResult.Message = "4-鎵爜澶辫触锛�";
- objJsonResult.data = DS;
- return objJsonResult;
- }
- else if (sQty < sKFQty && sQty > sKFQtyErp)//鏃犳晥
- {
- sRelQty = sKFQtyErp;
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "4-鎵爜澶辫触锛�";
- objJsonResult.data = DS;
- return objJsonResult;
- }
- else
- {
- sRelQty = sQty;
- objJsonResult.code = "1";
- objJsonResult.count = 1;
- objJsonResult.Message = "4-鎵爜澶辫触锛�";
- objJsonResult.data = DS;
- return objJsonResult;
- }
- }
- }
- catch (Exception e)
- {
- sRelQty = 0;
- throw (e);
}
}
@@ -520,9 +581,9 @@
websLsmain.HStockStyle = "";
websLsmain.HBillType = "1207";
websLsmain.HSupID = 0;
- websLsmain.HGroupID = lsmain[0].HGroupID;
+ //websLsmain.HGroupID = lsmain[0].HGroupID;
- if (webserver.set_SaveMoveStockBill(websLsmain, "-1", ref DBUtility.ClsPub.sErrInfo))
+ if (webserver.set_SaveMoveStockBill(websLsmain, sSourceBillType, ref DBUtility.ClsPub.sErrInfo))
{
objJsonResult.code = "0";
objJsonResult.count = 1;
@@ -549,6 +610,90 @@
return objJsonResult;
}
}
+
+
+
+ /// <summary>
+ /// 鐢熸垚鍒嗗竷寮忚皟鍑哄崟
+ /// </summary>
+ /// <returns></returns>
+ [Route("MoveStockStepOutBill/set_SaveMoveStockStepOutBill_Json")]
+ [HttpPost]
+ public object set_SaveMoveStockStepOutBill_Json([FromBody] JObject oMain)
+ {
+ var _value = oMain["oMain"].ToString();
+ string msg1 = _value.ToString();
+ //List<Model.ClsKf_MoveStockBillMain> lsmain = new List<Model.ClsKf_MoveStockBillMain>();
+ //ListModels oListModels = new ListModels();
+ //lsmain = oListModels.getMoveStockBillMainByJson(msg1);
+ //lsmain[0].HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
+ //lsmain[0].HDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd"));
+ //string sSourceBillType = lsmain[0].HBillType;
+ //BLL.ClsKf_MoveStockBill bll = new BLL.ClsKf_MoveStockBill();
+ //return bll.set_SaveMoveStockBill(lsmain[0], sSourceBillType, ref DBUtility.ClsPub.sErrInfo);
+ try
+ {
+ List<Model.ClsKf_MoveStockStepOutBillMain> lsmain = new List<Model.ClsKf_MoveStockStepOutBillMain>();
+ ListModels oListModels = new ListModels();
+ lsmain = oListModels.getMoveStockStepOutBillMainByJson(msg1);
+ lsmain[0].HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
+ lsmain[0].HDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd"));
+ string sSourceBillType = lsmain[0].HBillType;
+ //string sSourceBillType = "-1";
+
+
+ WebAPI.WebS.ClsKf_MoveStockStepOutBillMain websLsmain = new WebS.ClsKf_MoveStockStepOutBillMain();
+ websLsmain.HInterID = lsmain[0].HInterID;
+ websLsmain.HDate = lsmain[0].HDate;
+ websLsmain.HBillNo = lsmain[0].HBillNo;
+ websLsmain.HDeptID = lsmain[0].HDeptID;
+ websLsmain.HEmpID = lsmain[0].HEmpID;
+ websLsmain.HRemark = lsmain[0].HRemark;
+ websLsmain.HMaker = lsmain[0].HMaker;
+ websLsmain.HWHID = lsmain[0].HWHID;
+ websLsmain.HSCWHID = lsmain[0].HSCWHID;
+ websLsmain.HKeeperID = lsmain[0].HKeeperID;
+ websLsmain.HSecManagerID = lsmain[0].HSecManagerID;
+ websLsmain.HManagerID = 0;
+ websLsmain.HBillerID = 0;
+ websLsmain.HExplanation = "";
+ websLsmain.HInnerBillNo = "";
+ websLsmain.HRedBlueFlag = true;
+ websLsmain.HMainSourceBillType = "-1";
+ websLsmain.HStockStyle = "";
+ websLsmain.HBillType = "1250";
+ websLsmain.HSupID = 0;
+ //websLsmain.HGroupID = lsmain[0].HGroupID;
+
+ if (webserver.set_MoveStockStepOutBill(websLsmain, "-1", ref DBUtility.ClsPub.sErrInfo))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鐢熸垚璋冩嫧鍗曟垚鍔燂紒鍗曟嵁鍙蜂负锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "99";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "涓婁紶澶辫触锛�" + DBUtility.ClsPub.sErrInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+
+ objJsonResult.code = "3";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "涓婁紶澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+
/// <summary>
///
/// </summary>
@@ -602,8 +747,79 @@
{
// DataSet ds = new DataSet();
// WebServer webserver = new WebServer();
+ WebS.WebService1 oWebs = new WebS.WebService1();
+
string sWhere = " Where 鍗曟嵁鍙� like '%" + HSourceBillNo.Trim() + "%'";
- ds = webserver.GetSc_PPBomBillList(sWhere);
+ if (HSourceBillType == "3720")
+ {
+ ds = webserver.GetSc_PPBomBillList(sWhere);
+ }
+ else if (HSourceBillType == "1243")
+ {
+ //ds = webserver.GetKf_MoveStockRequestBillList(sWhere);
+ ds = oWebs.GetKf_MoveStockRequestBillList(sWhere);
+ }
+ 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
+ {
+ //HSupID = DBUtility.ClsPub.isLong(ds.Tables[0].Rows[0]["HSupID"]);
+ //HSupName = Convert.ToString(ds.Tables[0].Rows[0]["HSupName"]);
+ HDeptID = DBUtility.ClsPub.isLong(ds.Tables[0].Rows[0]["HDeptID"]);
+ HDeptName = Convert.ToString(ds.Tables[0].Rows[0]["HDeptName"]);
+ if (webserver.set_SavePonderationBillMain_Temp_Source_Fast(sInterID, sBillNo, HBillType, HSourceBillNo, HSourceBillType, "钃濆瓧", ref DBUtility.ClsPub.sErrInfo))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "杩斿洖璁板綍鎴愬姛锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍐欏叆涓存椂琛ㄥけ璐ワ紒" + DBUtility.ClsPub.sErrInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ }
+ catch (Exception ex)
+ {
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + ex.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+
+ /// <summary>
+ /// 鍐欏叆涓存椂琛� 鎵簮鍗曠殑鏂规硶
+ /// </summary>
+ /// <param name="HSourceBillNo"></param>
+ /// <returns></returns>
+ [Route("MoveStockStepOutBill/set_sourcebill")]
+ [HttpGet]
+ public object set_sourcebill(string HSourceBillType, string HSourceBillNo, Int64 sInterID, string sBillNo)
+ {
+ try
+ {
+ // DataSet ds = new DataSet();
+ // WebServer webserver = new WebServer();
+ string sWhere = " Where 鍗曟嵁鍙� like '%" + HSourceBillNo.Trim() + "%'";
+ ds = webserver.GetXs_SeOutStockBillList(sWhere);
if (ds == null || ds.Tables[0].Rows.Count <= 0)
{
@@ -649,6 +865,45 @@
}
}
+
+
+ /// <summary>
+ /// 鍒嗗竷寮忚皟鍑哄崟鎵爜/鎵潯鐮�/鐩存帴璋冪敤webservice
+ /// </summary>
+ /// <returns></returns>
+ [Route("MoveStockStepOutBill/get_CheckTypeByBarCode_Json")]
+ [HttpGet]
+ public Object get_CheckTypeByBarCode_Json(string sCode, Int64 sInterID, string sBillNo, string sBillType, string sMaker, Int64 WhID, Int64 SPID, Double sQty, bool sRedBlue, bool SourceFlag, string sSourceBillNo, string sSourceType, Int64 HOWNERID)
+ {
+ //if (sRedBlue == true)
+ //{
+ // HBillType = "1245";
+ //}
+ //oBar = webserver.get_CheckTypeByBarCode(sCode, sInterID, sBillType, sBillNo, sMaker, WhID, SPID, sQty, sRedBlue, SourceFlag, sSourceBillNo, sSourceType, HOWNERID, ref DBUtility.ClsPub.sErrInfo);
+ WebS.WebService1 oWebs = new WebS.WebService1();
+ WebS.ClsKf_ICStockBill_WMS WebSoBar = new WebS.ClsKf_ICStockBill_WMS();
+ string sExpressNumber = "";
+ //WebSoBar = oWebs.get_CheckTypeByBarCode_All(sCode, sInterID, HBillType, sBillNo, sMaker, WhID, SPID, sQty, sRedBlue, SourceFlag, sSourceBillNo, sSourceType, HOWNERID, sExpressNumber, ref DBUtility.ClsPub.sErrInfo);
+ WebSoBar = oWebs.get_CheckTypeByBarCode_All(sCode, sInterID, HBillType, sBillNo, sMaker, WhID, SPID, sQty, sRedBlue, SourceFlag, sSourceBillNo, sSourceType, HOWNERID, sExpressNumber, ref DBUtility.ClsPub.sErrInfo);
+ if (WebSoBar == null)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = DBUtility.ClsPub.sErrInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = DBUtility.ClsPub.sErrInfo;
+ objJsonResult.data = WebSoBar;
+ return objJsonResult;
+ }
+ }
+
+
//鍒犻櫎璁板綍
[Route("MoveStock/Delete_Json")]
[HttpGet]
--
Gitblit v1.9.1