From 4390648d77c2c9d0558e25a41d4ca4c24e5433de Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期四, 17 四月 2025 08:06:11 +0800
Subject: [PATCH] 要料信息导入、提料信息导入：调整
---
WebAPI/Controllers/MoveStockBillController.cs | 919 ++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 814 insertions(+), 105 deletions(-)
diff --git a/WebAPI/Controllers/MoveStockBillController.cs b/WebAPI/Controllers/MoveStockBillController.cs
index c63b643..8b45d3b 100644
--- a/WebAPI/Controllers/MoveStockBillController.cs
+++ b/WebAPI/Controllers/MoveStockBillController.cs
@@ -46,6 +46,7 @@
public ClsKF_PonderationBillMain_Temp model = new ClsKF_PonderationBillMain_Temp();
private JsonResult objJsonResult = new JsonResult();
private json objjson = new json();
+ private object oCn;
/// <summary>
/// 璋冩嫧鍗�/杩斿洖鍑哄叆搴撴潯鐮佷复鏃惰〃/鐩存帴璋冪敤webservice
@@ -100,110 +101,468 @@
/// <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>
+ /// 璋冩嫧鍗�/鎵潯鐮� 锛�20220618澶囦唤鑰佹柟娉曪級
+ /// </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)
+ //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 != "鎵樼洏鏉＄爜")
+ // {
+ // if (HSourceBillNo == null)
+ // {
+ // HSourceBillNo = "";
+ // }
+ // return get_InfoByBarCode_Source_Json_s(sCode, sInterID, sBillNo, sQty, HWHID, HSPID, SCWhID, SCSPID, HMaker, HOrgID, HSourceBillNo, HSourceBillType);
+ // }
+ // 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"]);
+ // 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;
+ // }
+ // }
+ // 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, string HMaker,Int64 HOrgID,string HSourceBillNo,string HSourceBillType)
+ //{
+ // try
+ // {
+ // WebS.ClsKF_PonderationBillMain_Temp model = new WebS.ClsKF_PonderationBillMain_Temp();
+ // string sErrMsg = "";
+ // bool sBool = false;
+ // double sRelQty = 0;
+ // 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";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "1-鍗曟嵁鍙凤細" + sBillNo + "锛屽崟鎹甀D锛�" + sInterID + "锛�" + DBUtility.ClsPub.sErrInfo;
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ // }
+ // else {
+ // if (HSourceBillNo.Trim() != "")
+ // {
+ // if (sBool == false)
+ // {
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "1-鍗曟嵁鍙凤細" + sBillNo + "锛屽崟鎹甀D锛�" + sInterID + "璇ョ墿鏂欏苟涓嶅瓨鍦ㄤ簬姝よ皟鎷ㄥ崟,璇风‘璁ょ墿鏂欐棤璇悗閲嶆柊鎵弿锛�";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ // }
+ // }
+ // if (oView.HBarCodeType != "鎵樼洏鏉＄爜")
+ // {
+ // 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;
+ // }
+ // }
+ // }
+
+ // model.HInterID = DBUtility.ClsPub.isLong(sInterID);
+ // model.HBillNo = DBUtility.ClsPub.isStrNull(sBillNo);
+ // model.HBillType = this.HBillType;
+ // model.HMaker = HMaker;
+ // //
+ // 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 = HOrgID;
+ // model.HOWNERID = HOrgID;
+ // if(sBool)
+ // {
+ // model.HSourceBillType = HSourceBillType;
+ // }
+ // if(oWebs1.Get_CheckWhAndSP_BeUpdate(SCWhID,SCSPID,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;
+ // }
+ // 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 Object get_InfoByBarCode_Source_Json(string sCode, Int64 sInterID, string HBillType, string sBillNo, string sMaker, Int64 WhID, Int64 SPID, Int64 HSCWhID,Int64 HSCSPID,Double sQty, bool SourceFlag, string sSourceBillNo, string sHSourceBillType,Int64 HStockInOrgID,Int64 HStockOutOrgID,string HScanStyle)
{
- try
+ //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 = "";
+
+ var sJXCode = POStockInBillController.JX_Json(sCode, sInterID, HBillType, HStockOutOrgID, sBillNo,sMaker);
+ //WebSoBar = oWebs.get_CheckTypeByBarCode_All(sCode, sInterID, HBillType, sBillNo, sMaker, WhID, SPID, sQty, sRedBlue, SourceFlag, sSourceBillNo, sSourceType, HOWNERID, sExpressNumber, ref DBUtility.ClsPub.sErrInfo);
+ string HCustom1 = "", HCustom2 = "";
+ WebSoBar = oWebs.get_BarCode_MoveStock(sJXCode, sInterID, HBillType, sBillNo, sMaker, WhID, SPID, HSCWhID, HSCSPID, sQty, SourceFlag, sSourceBillNo, sHSourceBillType, HStockInOrgID,HStockOutOrgID,HScanStyle, ref DBUtility.ClsPub.sErrInfo, HCustom1, HCustom2);
+ if (WebSoBar == null)
{
- 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;
- }
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = DBUtility.ClsPub.sErrInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
}
- catch (Exception)
+ else
{
-
- throw;
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = DBUtility.ClsPub.sErrInfo;
+ objJsonResult.data = WebSoBar;
+ return objJsonResult;
}
}
@@ -217,6 +576,10 @@
{
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);
@@ -249,21 +612,53 @@
websLsmain.HKeeperID = lsmain[0].HKeeperID;
websLsmain.HSecManagerID = lsmain[0].HSecManagerID;
websLsmain.HManagerID = 0;
- websLsmain.HBillerID = 0;
+ websLsmain.HBillerID = lsmain[0].HBillerID;
websLsmain.HExplanation = "";
websLsmain.HInnerBillNo = "";
- websLsmain.HRedBlueFlag = true;
+ websLsmain.HRedBlueFlag = false;
websLsmain.HMainSourceBillType = "-1";
websLsmain.HStockStyle = "";
websLsmain.HBillType = "1207";
+ websLsmain.HBillSubType = lsmain[0].HBillSubType;
websLsmain.HSupID = 0;
- websLsmain.HGroupID = lsmain[0].HGroupID;
+ //websLsmain.HGroupID = lsmain[0].HGroupID;
+ string sErrMsg = "";
+ ////涓婁紶鍓嶅垽鏂�
+ //SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
+ //DataSet Ds = oCn.RunProcReturn("exec h_p_WMS_BeforeUpload_MoveStockBill_AR " + websLsmain.HInterID.ToString() + ",'" + websLsmain.HBillNo + "','" + websLsmain.HBillType + "'", "h_p_WMS_BeforeUpload_MoveStockBill_AR");
+ //if (Ds == null || Ds.Tables[0].Rows.Count == 0)
+ //{
+ // sErrMsg = "鏍￠獙涓婁紶鍓嶅垽鏂紝鍙戠敓閿欒锛�";
+ // //return false;
- if (webserver.set_SaveMoveStockBill(websLsmain, "-1", ref DBUtility.ClsPub.sErrInfo))
+ // objJsonResult.code = "99";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "涓婁紶澶辫触锛�" + sErrMsg;
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
+ //else
+ //{
+ // if (DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0][0]) == 1)
+ // {
+ // sErrMsg = "鍗曟嵁鍙凤細" + websLsmain.HBillNo + "锛屽崟鎹甀D锛�" + websLsmain.HInterID + "锛�" + DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HRemark"]);
+ // //return false;
+ // objJsonResult.code = "99";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "涓婁紶澶辫触锛�" + sErrMsg;
+ // objJsonResult.data = null;
+ // return objJsonResult;
+
+ // }
+ //}
+
+
+
+ if (webserver.set_SaveMoveStockBill(websLsmain, sSourceBillType, ref DBUtility.ClsPub.sErrInfo))
{
objJsonResult.code = "0";
objJsonResult.count = 1;
- objJsonResult.Message = "鐢熸垚璋冩嫧鍗曟垚鍔燂紒鍗曟嵁鍙蜂负锛�";
+ objJsonResult.Message = DBUtility.ClsPub.sErrInfo; //鎴愬姛锛�
objJsonResult.data = null;
return objJsonResult;
}
@@ -271,7 +666,8 @@
{
objJsonResult.code = "99";
objJsonResult.count = 0;
- objJsonResult.Message = "涓婁紶澶辫触锛�" + DBUtility.ClsPub.sErrInfo;
+ objJsonResult.Message = DBUtility.ClsPub.sErrInfo; //澶辫触锛�
+ //objJsonResult.Message = "涓婁紶澶辫触锛�" + DBUtility.ClsPub.sErrInfo;
objJsonResult.data = null;
return objJsonResult;
}
@@ -286,6 +682,209 @@
return objJsonResult;
}
}
+
+
+
+ /// <summary>
+ /// 瀹夌憺鐩樼偣鍗�
+ /// </summary>
+ /// <returns></returns>
+ //[Route("MoveStockBill/set_SaveMoveStockBill_PD")]
+ //[HttpPost]
+ //public object set_SaveMoveStockBill_PD([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_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;
+ // //string sSourceBillType = "-1";
+
+
+ // WebAPI.WebS.ClsKf_MoveStockBillMain websLsmain = new WebS.ClsKf_MoveStockBillMain();
+ // 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 = "1207";
+ // websLsmain.HSupID = 0;
+ // //websLsmain.HGroupID = lsmain[0].HGroupID;
+ // //string sErrMsg = "";
+ // //涓婁紶鍓嶅垽鏂�
+ // //SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
+ // //DataSet Ds = oCn.RunProcReturn("exec h_p_WMS_BeforeUpload_MoveStockBill_AR " + websLsmain.HInterID.ToString() + ",'" + websLsmain.HBillNo + "','" + websLsmain.HBillType + "'", "h_p_WMS_BeforeUpload_MoveStockBill_AR");
+ // //if (Ds == null || Ds.Tables[0].Rows.Count == 0)
+ // //{
+ // // sErrMsg = "鏍￠獙涓婁紶鍓嶅垽鏂紝鍙戠敓閿欒锛�";
+ // // //return false;
+
+ // // objJsonResult.code = "99";
+ // // objJsonResult.count = 0;
+ // // objJsonResult.Message = "涓婁紶澶辫触锛�" + sErrMsg;
+ // // objJsonResult.data = null;
+ // // return objJsonResult;
+ // //}
+ // //else
+ // //{
+ // // if (DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0][0]) == 1)
+ // // {
+ // // sErrMsg = "鍗曟嵁鍙凤細" + websLsmain.HBillNo + "锛屽崟鎹甀D锛�" + websLsmain.HInterID + "锛�" + DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HRemark"]);
+ // // //return false;
+ // // objJsonResult.code = "99";
+ // // objJsonResult.count = 0;
+ // // objJsonResult.Message = "涓婁紶澶辫触锛�" + sErrMsg;
+ // // objJsonResult.data = null;
+ // // return objJsonResult;
+
+ // // }
+ // //}
+
+
+
+ // if (webserver.set_SaveMoveStockBill_PD(websLsmain, sSourceBillType, ref DBUtility.ClsPub.sErrInfo))
+ // {
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 1;
+ // objJsonResult.Message = DBUtility.ClsPub.sErrInfo;
+ // 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>
+ /// <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 = DBUtility.ClsPub.sErrInfo; //鎴愬姛锛�
+ //objJsonResult.Message = "鐢熸垚璋冩嫧鍗曟垚鍔燂紒鍗曟嵁鍙蜂负锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "99";
+ objJsonResult.count = 0;
+ objJsonResult.Message = DBUtility.ClsPub.sErrInfo; //澶辫触锛�
+ //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>
@@ -339,8 +938,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)
{
@@ -386,6 +1056,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