From 6e3a6edf27dda15e99e0d0917eea77f561e7a18f Mon Sep 17 00:00:00 2001
From: zzr99 <1940172413@qq.com>
Date: 星期四, 25 十一月 2021 19:10:32 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/MoveStockBillController.cs | 204 ++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 192 insertions(+), 12 deletions(-)
diff --git a/WebAPI/Controllers/MoveStockBillController.cs b/WebAPI/Controllers/MoveStockBillController.cs
index 7169082..03e7443 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 sCode, Int64 sInterID, string sBillNo, Double sQty, Int64 HWHID, Int64 HSPID, Int64 SCWhID, Int64 SCSPID, string HMaker, Int64 HOrgID)
{
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(sCode, sInterID, sBillNo, sQty, HWHID, HSPID, SCWhID, SCSPID, HMaker, HOrgID);
}
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(sBarCode_MX, sInterID, sBillNo, sQty, HWHID, HSPID, SCWhID, SCSPID, HMaker,HOrgID);
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 sCode, Int64 sInterID, string sBillNo, Double sQty, Int64 HWHID, Int64 HSPID, Int64 SCWhID, Int64 SCSPID, string HMaker,Int64 HOrgID)
{
try
{
@@ -310,7 +310,7 @@
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;
@@ -335,8 +335,8 @@
model.HSourceBillType = oView.HSourceBillType;
model.HRedBlueFlag = false;
model.HPieceQty = 1;
- //model.HSTOCKORGID = DBUtility.ClsPub.HORGANIZATIONSID;
- //model.HOWNERID = DBUtility.ClsPub.HORGANIZATIONSID;
+ model.HSTOCKORGID = HOrgID;
+ model.HOWNERID = HOrgID;
WebS.WebService1 oWebs = new WebS.WebService1();
//if (webserver.set_SavePonderationBillMain_Temp_Qty(model, sQty, ref DBUtility.ClsPub.sErrInfo))
@@ -363,10 +363,6 @@
objJsonResult.data = null;
return objJsonResult;
}
- //else
- //{
- // sQty = sRelQty;
- //}
if (oWebs.set_SavePonderationBillMain_Temp_Qty(model, sQty, ref DBUtility.ClsPub.sErrInfo))
{
@@ -442,7 +438,7 @@
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))
{
@@ -471,6 +467,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>
@@ -571,6 +651,106 @@
}
}
+
+ /// <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)
+ {
+
+ 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 = null;
+ 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>
+ /// 鍒嗗竷寮忚皟鍑哄崟鎵爜/鎵潯鐮�/鐩存帴璋冪敤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