From a7d17c8ecf0076d00e1199cfc5ea8e7d44749ac6 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期六, 06 五月 2023 09:17:27 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/MoveStockBillController.cs | 199 +++++++++++++++++++++++++------------------------
1 files changed, 100 insertions(+), 99 deletions(-)
diff --git a/WebAPI/Controllers/MoveStockBillController.cs b/WebAPI/Controllers/MoveStockBillController.cs
index e2e8af1..5da4438 100644
--- a/WebAPI/Controllers/MoveStockBillController.cs
+++ b/WebAPI/Controllers/MoveStockBillController.cs
@@ -546,7 +546,8 @@
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);
- 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);
+ 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)
{
objJsonResult.code = "0";
@@ -687,116 +688,116 @@
/// 瀹夌憺鐩樼偣鍗�
/// </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();
+ //[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";
+ // //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;
+ // 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;
+ // // 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)
- {
+ // 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;
- }
- }
+ // objJsonResult.code = "3";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "涓婁紶澶辫触锛�" + e.ToString();
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ // }
+ //}
--
Gitblit v1.9.1