From 8f19d764f9ce5eea37b25f5392507a0d8ed373f5 Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期一, 01 七月 2024 10:16:48 +0800
Subject: [PATCH] 销售订单：多级审批
---
WebAPI/Controllers/ProductInController.cs | 292 +++++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 215 insertions(+), 77 deletions(-)
diff --git a/WebAPI/Controllers/ProductInController.cs b/WebAPI/Controllers/ProductInController.cs
index 2c655bb..81e5847 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();
@@ -327,29 +328,59 @@
/// <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 sBarCode = POStockInBillController.JX_Json(sCode, sInterID, HBillType, HOWNERID, sBillNo, sMaker);
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)
+ WebSoBar = oWebs.get_CheckTypeByBarCode_BillCheck(sBarCode, sInterID, HBillType, sBillNo, sMaker, WhID, SPID, (double)sQty, HOWNERID, ref ClsPub.sErrInfo);
+ bool flag = WebSoBar == null;
+ object result;
+ if (flag)
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = DBUtility.ClsPub.sErrInfo;
- objJsonResult.data = null;
- return objJsonResult;
+ this.objJsonResult.code = "0";
+ this.objJsonResult.count = 0;
+ this.objJsonResult.Message = ClsPub.sErrInfo;
+ this.objJsonResult.data = null;
+ result = this.objJsonResult;
}
else
{
- objJsonResult.code = "0";
- objJsonResult.count = 1;
- objJsonResult.Message = DBUtility.ClsPub.sErrInfo;
- objJsonResult.data = WebSoBar;
- return objJsonResult;
+ this.objJsonResult.code = "0";
+ this.objJsonResult.count = 1;
+ this.objJsonResult.Message = ClsPub.sErrInfo;
+ this.objJsonResult.data = WebSoBar;
+ result = this.objJsonResult;
}
+ return result;
}
@@ -363,23 +394,54 @@
{
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_BarCode_MoveStockBillCheck(sCode, sInterID, HBillType, sBillNo, sMaker, WhID, SPID, SCWhID, SCSPID, 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_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 = 1;
- objJsonResult.Message = DBUtility.ClsPub.sErrInfo;
- objJsonResult.data = WebSoBar;
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鑾峰彇绯荤粺鍙傛暟澶辫触锛� " + sErrMsg;
+ objJsonResult.data = null;
return objJsonResult;
}
}
@@ -1134,67 +1196,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;
- websLsmain.HBillType = "1202";//鍥哄畾鍊�
-
-
- 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>
--
Gitblit v1.9.1