From f0bb2d8bd83bc984a78a9ef8c3c7dd4ef821627f Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期四, 29 六月 2023 15:24:14 +0800
Subject: [PATCH] 1
---
WebAPI/Controllers/ProductInController.cs | 262 +++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 196 insertions(+), 66 deletions(-)
diff --git a/WebAPI/Controllers/ProductInController.cs b/WebAPI/Controllers/ProductInController.cs
index a85280a..d7b2890 100644
--- a/WebAPI/Controllers/ProductInController.cs
+++ b/WebAPI/Controllers/ProductInController.cs
@@ -168,6 +168,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
@@ -286,29 +327,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;
}
@@ -322,9 +393,10 @@
{
WebS.WebService1 oWebs = new WebS.WebService1();
WebS.ClsKf_ICStockBill_WMS WebSoBar = new WebS.ClsKf_ICStockBill_WMS();
+ var sJXCode = 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_BarCode_MoveStockBillCheck(sCode, sInterID, HBillType, sBillNo, sMaker, WhID, SPID, SCWhID, SCSPID, sQty, HOWNERID, ref DBUtility.ClsPub.sErrInfo);
+ 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";
@@ -1093,67 +1165,125 @@
[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.HRemark = list[0].HRemark;
+ clsKf_ProductInBillMain.HMaker = list[0].HMaker;
+ clsKf_ProductInBillMain.HWHID = list[0].HWHID;
+ clsKf_ProductInBillMain.HSupID = list[0].HSupID;
+ clsKf_ProductInBillMain.HExplanation = list[0].HExplanation;
+ clsKf_ProductInBillMain.HBillType = "1202";
+ bool flag = this.webserver.set_SaveProductInBill_New(clsKf_ProductInBillMain, hbillType, ref ClsPub.sErrInfo);
+ if (flag)
{
- objJsonResult.code = "0";
- objJsonResult.count = 1;
- objJsonResult.Message = "鐢熸垚浜у搧鍏ュ簱鍗曟垚鍔燂紒鍗曟嵁鍙蜂负锛�";
- objJsonResult.data = null;
- return objJsonResult;
+ this.objJsonResult.code = "0";
+ this.objJsonResult.count = 1;
+ objJsonResult.Message = DBUtility.ClsPub.sErrInfo; //鎴愬姛锛�
+ //this.objJsonResult.Message = "鐢熸垚浜у搧鍏ュ簱鍗曟垚鍔燂紒鍗曟嵁鍙蜂负锛�";
+ this.objJsonResult.data = null;
+ result = this.objJsonResult;
}
else
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "涓婁紶澶辫触锛�" + DBUtility.ClsPub.sErrInfo;
- objJsonResult.data = null;
- return objJsonResult;
+ 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