From 22971886a0e1897aabf62b228215bbee3f2d5a6c Mon Sep 17 00:00:00 2001
From: ch <37327@LLOOCCY>
Date: 星期二, 24 五月 2022 13:16:31 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/MoveStockBillController.cs | 249 ++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 201 insertions(+), 48 deletions(-)
diff --git a/WebAPI/Controllers/MoveStockBillController.cs b/WebAPI/Controllers/MoveStockBillController.cs
index dae3db8..115f384 100644
--- a/WebAPI/Controllers/MoveStockBillController.cs
+++ b/WebAPI/Controllers/MoveStockBillController.cs
@@ -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, string HMaker, Int64 HOrgID)
+ 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, HMaker, HOrgID);
+ if (HSourceBillNo == null)
+ {
+ HSourceBillNo = "";
+ }
+ return get_InfoByBarCode_Source_Json_s(sCode, sInterID, sBillNo, sQty, HWHID, HSPID, SCWhID, SCSPID, HMaker, HOrgID, HSourceBillNo, HSourceBillType);
}
else
{
@@ -255,8 +262,10 @@
{
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, HMaker,HOrgID);
+ //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;
@@ -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, string HMaker,Int64 HOrgID)
+ 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,7 +294,24 @@
string sErrMsg = "";
bool sBool = false;
double sRelQty = 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";
@@ -294,18 +320,81 @@
objJsonResult.data = null;
return objJsonResult;
}
- if (oView.HBarCodeType == "鍞竴鏉＄爜" && sQty > 0 && oView.HQty < sQty)
+ else {
+ if (HSourceBillNo.Trim() != "")
{
- sRelQty = 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 != "鎵樼洏鏉＄爜")
{
- sRelQty = 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
- {
- sRelQty = oView.HQty;
- }
+ }
model.HInterID = DBUtility.ClsPub.isLong(sInterID);
model.HBillNo = DBUtility.ClsPub.isStrNull(sBillNo);
@@ -337,49 +426,103 @@
model.HPieceQty = 1;
model.HSTOCKORGID = HOrgID;
model.HOWNERID = HOrgID;
-
- 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)
+ if(sBool)
{
- //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;
- }
+ model.HSourceBillType = HSourceBillType;
}
- else if (sRelQty == 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.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)
{
@@ -604,8 +747,18 @@
{
// 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)
{
@@ -627,7 +780,7 @@
objJsonResult.code = "0";
objJsonResult.count = 1;
objJsonResult.Message = "杩斿洖璁板綍鎴愬姛锛�";
- objJsonResult.data = null;
+ objJsonResult.data = ds.Tables[0];
return objJsonResult;
}
else
--
Gitblit v1.9.1