From e1d42208d39262728267034c020dc8bdf2268ef1 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期一, 07 四月 2025 09:56:19 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/ProductInController.cs | 615 +++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 549 insertions(+), 66 deletions(-)
diff --git a/WebAPI/Controllers/ProductInController.cs b/WebAPI/Controllers/ProductInController.cs
index a347b73..23d2708 100644
--- a/WebAPI/Controllers/ProductInController.cs
+++ b/WebAPI/Controllers/ProductInController.cs
@@ -42,6 +42,7 @@
public ClsGy_BarCodeBill_WMS_Model_View oView =new ClsGy_BarCodeBill_WMS_Model_View();
public ClsKF_PonderationBillMain_Temp model = new ClsKF_PonderationBillMain_Temp();
public ClsKf_ICStockBill_WMS oBar = new Model.ClsKf_ICStockBill_WMS();
+ Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();
//public ClsKf_ICStockBill_WMS oBar = new ClsKf_ICStockBill_WMS();
public double sRelQty = 0;
// private DataBaseServices objDataBaseServices = new DataBaseServices();
@@ -168,6 +169,47 @@
}
}
+ //缂撳瓨鍒楄〃鏌ヨ鍔熻兘
+ [Route("ProductInBillList/list1")]
+ [HttpGet]
+ public object list1(string BillType, string HBillNo, string HSourceBillNo)
+ {
+ try
+ {
+ if (HSourceBillNo == null)
+ {
+ HSourceBillNo = "";
+ }
+ WebS.WebService1 oWebs = new WebS.WebService1();
+ ds = oWebs.GetKf_ICStockBillQueryList(BillType, HBillNo, HSourceBillNo);
+ 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
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
/// <summary>
/// 鍏朵粬鍑哄簱鏍￠獙鎵弿鍗曟嵁鍙�/鐩存帴璋冪敤webservice
@@ -222,9 +264,52 @@
//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);
+
+ Kf_MateOutBillController obill = new Kf_MateOutBillController();
+ //閲嶆柊鍚屾鐢熶骇棰嗘枡鍗�
+ objJsonResult = obill.GetKf_MateOutBill_Sync_Json(HBillNo, HBillType);
+
WebSoBar = oWebs.get_BillBarCode_MateOutCheck(HBillNo, HBillType, HMaker, HOwnerID, 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;
+ }
+ }
+
+ /// <summary>
+ /// 鐩存帴璋冩嫧鍗曟牎楠屾壂鎻忓崟鎹彿/鐩存帴璋冪敤webservice
+ /// </summary>
+ /// <returns></returns>
+ //[Route("OtherOutBill_Check_New/BillNo")]
+ [Route("MoveStockBill/BillNo2")]
+ [HttpGet]
+ public Object BillNo2(string HBillNo, string HBillType, string HMaker, 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();
+
+ Kf_MoveStockBillController obill = new Kf_MoveStockBillController();
+ //閲嶆柊鍚屾鐩存帴璋冩嫧鍗�
+ objJsonResult = obill.GetKf_MoveStockBill_Sync_Json(HBillNo, HBillType);
+
+ WebSoBar = oWebs.get_BillBarCode_MoveStockCheck(HBillNo, HBillType, HMaker, HOwnerID, ref DBUtility.ClsPub.sErrInfo);
if (WebSoBar == null)
{
objJsonResult.code = "0";
@@ -249,27 +334,148 @@
/// <returns></returns>
[Route("OtherOutBill_Check_New/get_InfoByBarCode_Source_Json")]
[HttpGet]
- public Object get_InfoByBarCode_Source_Json(string sCode, Int64 sInterID, string HBillType,string sBillNo, string sMaker, Int64 WhID, Int64 SPID, Int64 sQty, Int64 HOWNERID)
+ //public Object get_InfoByBarCode_Source_Json(string sCode, Int64 sInterID, string HBillType,string sBillNo, string sMaker, Int64 WhID, Int64 SPID, Int64 sQty, Int64 HOWNERID)
+ //{
+ // 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, HOWNERID, 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);
+ // WebSoBar = oWebs.get_CheckTypeByBarCode_BillCheck(sJXCode, sInterID, HBillType, sBillNo, sMaker, WhID, SPID, sQty, HOWNERID, 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;
+ // }
+ //}
+
+ public object get_InfoByBarCode_Source_Json(string sCode, long sInterID, string HBillType, string sBillNo, string sMaker, long WhID, long SPID, long sQty, long HOWNERID)
{
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_BillCheck(sCode, sInterID, HBillType, sBillNo, sMaker, WhID, SPID, sQty, HOWNERID, ref DBUtility.ClsPub.sErrInfo);
- if (WebSoBar == null)
+ //鑾峰彇绯荤粺鍙傛暟
+ string sErrMsg = "";
+ string sJXCode = "";
+ if (oSystemParameter.ShowBill(ref sErrMsg) == true)
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = DBUtility.ClsPub.sErrInfo;
- objJsonResult.data = null;
- return objJsonResult;
+ if (oSystemParameter.omodel.WMS_CampanyName == "瀹夌憺") //绯荤粺鍙傛暟 瀹㈡埛瀹氬埗鍖栧悕绉� 绌虹櫧涓洪�氱敤
+ {
+ sJXCode = POStockInBillController.JX_Json(sCode, sInterID, HBillType, HOWNERID, sBillNo, sMaker);
+ }
+ else
+ {
+ sJXCode = sCode;
+ }
+ try
+ {
+ WebSoBar = oWebs.get_CheckTypeByBarCode_BillCheck(sJXCode, sInterID, HBillType, sBillNo, sMaker, WhID, SPID, (double)sQty, HOWNERID, ref 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;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎵弿鏉＄爜澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
}
else
{
objJsonResult.code = "0";
- objJsonResult.count = 1;
- objJsonResult.Message = DBUtility.ClsPub.sErrInfo;
- objJsonResult.data = WebSoBar;
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鑾峰彇绯荤粺鍙傛暟澶辫触锛� " + sErrMsg;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+
+ /// <summary>
+ /// 鐩存帴璋冩嫧鏍￠獙鎵弿鏉＄爜/鐩存帴璋冪敤webservice
+ /// </summary>
+ /// <returns></returns>
+ [Route("MoveStockBill_Check_New/get_InfoByBarCode_Source_Json1")]
+ [HttpGet]
+ public Object get_InfoByBarCode_Source_Json1(string sCode, Int64 sInterID, string HBillType, string sBillNo, string sMaker, Int64 WhID, Int64 SPID, Int64 SCWhID, Int64 SCSPID, Int64 sQty, Int64 HOWNERID)
+ {
+ WebS.WebService1 oWebs = new WebS.WebService1();
+ WebS.ClsKf_ICStockBill_WMS WebSoBar = new WebS.ClsKf_ICStockBill_WMS();
+ //鑾峰彇绯荤粺鍙傛暟
+ string sErrMsg = "";
+ string sJXCode = "";
+ if (oSystemParameter.ShowBill(ref sErrMsg) == true)
+ {
+ if (oSystemParameter.omodel.WMS_CampanyName == "瀹夌憺") //绯荤粺鍙傛暟 瀹㈡埛瀹氬埗鍖栧悕绉� 绌虹櫧涓洪�氱敤
+ {
+ sJXCode = POStockInBillController.JX_Json(sCode, sInterID, HBillType, HOWNERID, sBillNo, sMaker);
+ }
+ else
+ {
+ sJXCode = sCode;
+ }
+ try
+ {
+ WebSoBar = oWebs.get_BarCode_MoveStockBillCheck(sJXCode, sInterID, HBillType, sBillNo, sMaker, WhID, SPID, SCWhID, SCSPID, sQty, HOWNERID, 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;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎵弿鏉＄爜澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鑾峰彇绯荤粺鍙傛暟澶辫触锛� " + sErrMsg;
+ objJsonResult.data = null;
return objJsonResult;
}
}
@@ -570,7 +776,17 @@
{
try
{
- ds = webserver.GetBarCode_Temp(HInterID, HMaterID, HAuxPropID, HMTONo, HWhID, HSPID, HSCWhID, HSCSPID, HBatchNo, HSourceInterID, HSourceEntryID, sBillType, sWhere);
+
+ if (HMTONo == null)
+ {
+ HMTONo = "";
+ }
+ if (HBatchNo == null)
+ {
+ HBatchNo = "";
+ }
+ WebS.WebService1 oWebs = new WebS.WebService1();
+ ds = oWebs.GetBarCode_Temp(HInterID, HMaterID, HAuxPropID, HMTONo, HWhID, HSPID, HSCWhID, HSCSPID, HBatchNo, HSourceInterID, HSourceEntryID, sBillType, sWhere);
if (ds == null || ds.Tables[0].Rows.Count <= 0)
{
objJsonResult.code = "0";
@@ -599,6 +815,47 @@
return objJsonResult;
}
}
+
+
+
+ #region 鐐瑰嚮缂栬緫鎸夐挳杩斿洖鍙傛暟淇℃伅
+ /// <summary>
+ /// 鐐瑰嚮缂栬緫鎸夐挳杩斿洖鍙傛暟淇℃伅
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("Kf_BarCodeEditDlg/Kf_BarCodeEditDlg_Json")]
+ [HttpGet]
+ public object Kf_BarCodeEditDlg_Json(string sWhere)
+ {
+ DataSet ds;
+ try
+ {
+
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+
+ string sql1 = "select * from KF_PonderationBillMain_Temp Where HQty<>0 ";
+ string sql = sql1 + sWhere + " order by hinterid desc";
+ ds = oCN.RunProcReturn(sql, "KF_PonderationBillMain_Temp");
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ #endregion
+
//鐐瑰嚮缂栬緫 鍏敤绐椾綋鍒犻櫎鏂规硶
[Route("Kf_BarCodeEditDlg/DeltetBill")]
@@ -973,66 +1230,143 @@
[HttpPost]
public object set_SaveProductInBill_Json([FromBody]JObject oMain)
{
- var _value = oMain["oMain"].ToString();
- string msg1 = _value.ToString();
- //List<Model.ClsKf_ProductInBillMain> lsmain = new List<Model.ClsKf_ProductInBillMain>();
- //ListModels oListModels = new ListModels();
- //lsmain = oListModels.getProductInBillMainByJson(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_ProductInBill bll = new BLL.ClsKf_ProductInBill();
- //return bll.set_SaveProductInBill_New(lsmain[0], sSourceBillType, ref DBUtility.ClsPub.sErrInfo);
-
+ //var _value = oMain["oMain"].ToString();
+ //string msg1 = _value.ToString();
+ ////List<Model.ClsKf_ProductInBillMain> lsmain = new List<Model.ClsKf_ProductInBillMain>();
+ ////ListModels oListModels = new ListModels();
+ ////lsmain = oListModels.getProductInBillMainByJson(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_ProductInBill bll = new BLL.ClsKf_ProductInBill();
+ ////return bll.set_SaveProductInBill_New(lsmain[0], sSourceBillType, ref DBUtility.ClsPub.sErrInfo);
+
+ //try
+ //{
+ // List<Model.ClsKf_ProductInBillMain> lsmain = new List<Model.ClsKf_ProductInBillMain>();
+ // ListModels oListModels = new ListModels();
+ // lsmain = oListModels.getProductInBillMainByJson(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;
+
+ // WebAPI.WebS.ClsKf_ProductInBillMain websLsmain = new WebS.ClsKf_ProductInBillMain();
+
+ // 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.HKeeperID= lsmain[0].HKeeperID;
+ // websLsmain.HRemark = lsmain[0].HRemark;
+ // websLsmain.HMaker = lsmain[0].HMaker;
+ // websLsmain.HWHID = lsmain[0].HWHID;
+ // websLsmain.HSupID = lsmain[0].HSupID;
+ // websLsmain.HExplanation = lsmain[0].HExplanation;
+ // websLsmain.HBillType = "1202";//鍥哄畾鍊�
+
+
+ // if (webserver.set_SaveProductInBill_New(websLsmain, sSourceBillType, 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 e)
+ //{
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "涓婁紶澶辫触锛�" + e.ToString();
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
+
+
+
+
+
+ string text = oMain["oMain"].ToString();
+ string jsonString = text.ToString();
+ object result;
try
{
- List<Model.ClsKf_ProductInBillMain> lsmain = new List<Model.ClsKf_ProductInBillMain>();
- ListModels oListModels = new ListModels();
- lsmain = oListModels.getProductInBillMainByJson(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;
-
- WebAPI.WebS.ClsKf_ProductInBillMain websLsmain = new WebS.ClsKf_ProductInBillMain();
-
- 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.HKeeperID= lsmain[0].HKeeperID;
- websLsmain.HRemark = lsmain[0].HRemark;
- websLsmain.HMaker = lsmain[0].HMaker;
- websLsmain.HWHID = lsmain[0].HWHID;
- websLsmain.HSupID = lsmain[0].HSupID;
- websLsmain.HExplanation = lsmain[0].HExplanation;
-
-
- if (webserver.set_SaveProductInBill_New(websLsmain, sSourceBillType, ref DBUtility.ClsPub.sErrInfo))
+ List<ClsKf_ProductInBillMain> list = new List<ClsKf_ProductInBillMain>();
+ ListModels listModels = new ListModels();
+ list = listModels.getProductInBillMainByJson(jsonString);
+ //list[0].HYear = ClsPub.isLong(DateTime.Now.Year);
+ //list[0].HDate = ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd"));
+ string hbillType = list[0].HBillType;
+ WebAPI.WebS.ClsKf_ProductInBillMain clsKf_ProductInBillMain = new WebAPI.WebS.ClsKf_ProductInBillMain();
+ clsKf_ProductInBillMain.HInterID = list[0].HInterID;
+ clsKf_ProductInBillMain.HDate = list[0].HDate;
+ clsKf_ProductInBillMain.HBillNo = list[0].HBillNo;
+ clsKf_ProductInBillMain.HDeptID = list[0].HDeptID;
+ clsKf_ProductInBillMain.HEmpID = list[0].HEmpID;
+ clsKf_ProductInBillMain.HKeeperID = list[0].HKeeperID;
+ clsKf_ProductInBillMain.HSecManagerID = list[0].HSecManagerID;
+ clsKf_ProductInBillMain.HRemark = list[0].HRemark;
+ clsKf_ProductInBillMain.HMaker = list[0].HMaker;
+ clsKf_ProductInBillMain.HBillerID = list[0].HBillerID;
+ clsKf_ProductInBillMain.HWHID = list[0].HWHID;
+ clsKf_ProductInBillMain.HSupID = list[0].HSupID;
+ clsKf_ProductInBillMain.HExplanation = list[0].HExplanation;
+ clsKf_ProductInBillMain.HBillType = "1202";
+ if (list[0].HBillType == "3714")
{
- objJsonResult.code = "0";
- objJsonResult.count = 1;
- objJsonResult.Message = "鐢熸垚浜у搧鍏ュ簱鍗曟垚鍔燂紒鍗曟嵁鍙蜂负锛�";
- objJsonResult.data = null;
- return objJsonResult;
+ clsKf_ProductInBillMain.HMainSourceBillType = "宸ュ簭姹囨姤鍗�";
+ }
+ else if (list[0].HBillType == "3711")
+ {
+ clsKf_ProductInBillMain.HMainSourceBillType = "鐢熶骇姹囨姤鍗�";
+ }
+ else if (list[0].HBillType == "3710")
+ {
+ clsKf_ProductInBillMain.HMainSourceBillType = "鐢熶骇璁㈠崟";
}
else
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "涓婁紶澶辫触锛�" + DBUtility.ClsPub.sErrInfo;
- objJsonResult.data = null;
- return objJsonResult;
+ clsKf_ProductInBillMain.HMainSourceBillType = "鎵嬪伐褰曞叆";
+ }
+ bool flag = this.webserver.set_SaveProductInBill_New(clsKf_ProductInBillMain, hbillType, ref ClsPub.sErrInfo);
+ if (flag)
+ {
+ this.objJsonResult.code = "0";
+ this.objJsonResult.count = 1;
+ objJsonResult.Message = DBUtility.ClsPub.sErrInfo; //鎴愬姛锛�
+ //this.objJsonResult.Message = "鐢熸垚浜у搧鍏ュ簱鍗曟垚鍔燂紒鍗曟嵁鍙蜂负锛�";
+ this.objJsonResult.data = null;
+ result = this.objJsonResult;
+ }
+ else
+ {
+ this.objJsonResult.code = "0";
+ this.objJsonResult.count = 0;
+ objJsonResult.Message = DBUtility.ClsPub.sErrInfo; //澶辫触锛�
+ //this.objJsonResult.Message = "涓婁紶澶辫触锛�" + ClsPub.sErrInfo;
+ this.objJsonResult.data = null;
+ result = this.objJsonResult;
}
}
- catch (Exception e)
+ catch (Exception ex)
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "涓婁紶澶辫触锛�" + e.ToString();
- objJsonResult.data = null;
- return objJsonResult;
+ this.objJsonResult.code = "0";
+ this.objJsonResult.count = 0;
+ this.objJsonResult.Message = "涓婁紶澶辫触锛�" + ex.ToString();
+ this.objJsonResult.data = null;
+ result = this.objJsonResult;
}
+ return result;
}
/// <summary>
@@ -1139,6 +1473,69 @@
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 e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "涓婁紶澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+
+ /// <summary>
+ /// 鐢熶骇璋冩嫧鏍￠獙
+ /// </summary>
+ /// <returns></returns>
+ [Route("MoveStockBill_Check_New/set_SaveMoveStockBill_Check_Json")]
+ [HttpPost]
+ public object set_SaveMoveStockBill_Check_Json([FromBody] JObject oMain)
+ {
+ var _value = oMain["oMain"].ToString();
+ string msg1 = _value.ToString();
+ //List<Model.ClsKf_ProductInBillMain> lsmain = new List<Model.ClsKf_ProductInBillMain>();
+ //ListModels oListModels = new ListModels();
+ //lsmain = oListModels.getProductInBillMainByJson(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_ProductInBill bll = new BLL.ClsKf_ProductInBill();
+ //return bll.set_SaveProductInBill_New(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;
+
+ WebAPI.WebS.ClsKf_MoveStockBillMain websLsmain = new WebS.ClsKf_MoveStockBillMain();
+
+ websLsmain.HInterID = lsmain[0].HInterID;
+ websLsmain.HBillNo = lsmain[0].HBillNo;
+ websLsmain.HBillType = "1207";
+
+ WebS.WebService1 oWebs = new WebS.WebService1();
+ if (oWebs.set_SaveMoveStockBill_BillCheck(websLsmain, ref DBUtility.ClsPub.sErrInfo))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鐩存帴璋冩嫧鍗曟牎楠屾垚鍔燂紒鍗曟嵁鍙蜂负锛�";
objJsonResult.data = null;
return objJsonResult;
}
@@ -1345,6 +1742,92 @@
}
+ /// <summary>
+ /// 鏉＄爜缂栬緫鐣岄潰 缂栬緫鎸夐挳鏂规硶
+ /// </summary>
+ /// <returns></returns>
+ [Route("Kf_BarCodeEditDlg/GetCheckQtyByBarCodeBill")]
+ [HttpGet]
+ public object GetCheckQtyByBarCodeBill(Int64 HInterID, string HBillType, string sBatchNo,string sBarCode,Int64 sSCWhID
+ ,Int64 sSCSPID, Int64 sAuxPropID,string sMTONo,double iQty,Int64 HMaterID
+ ,Int64 sWhID,Int64 sSPID,Int64 HSourceInterID,Int64 HSourceEntryID, double EndQty, double sQty)
+ {
+ try
+ {
+ if (sBatchNo == null)
+ {
+ sBatchNo = "";
+ }
+ if (sMTONo == null)
+ {
+ sMTONo = "";
+ }
+ if ( HBillType == "1204" || HBillType == "1205" || HBillType == "1206" || HBillType == "1211" || HBillType == "1213")
+ {
+ WebS.WebService1 oWebs = new WebS.WebService1();
+ if (webserver.Get_CheckQtyByBarCode(sBarCode, sWhID, sSPID, sAuxPropID, sBatchNo, sMTONo, iQty, ref sRelQty))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "搴撳瓨瓒冲锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else if (sRelQty == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犲簱瀛橈紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ EndQty = sRelQty - sQty;
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "搴撳瓨涓嶈冻锛屽凡鑾峰彇瀹為檯搴撳瓨鏁伴噺锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ else if (HBillType == "1203" || HBillType == "1205" || HBillType == "1202")
+ {
+ WebS.WebService1 oWebs = new WebS.WebService1();
+ if (oWebs.set_SavePonderationBillMain_Temp_ChangGui(HInterID, HMaterID, sAuxPropID, sMTONo, sWhID, sSPID, sSCWhID, sSCSPID, sBatchNo, HSourceInterID, HSourceEntryID, sBarCode, HBillType, EndQty, 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 = 1;
+ objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
}
}
\ No newline at end of file
--
Gitblit v1.9.1