From 1db1c64dc628d2053617ba2c3cc78fb94b518d2c Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期一, 27 二月 2023 08:57:55 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/MoveStockBillController.cs | 156 +++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 155 insertions(+), 1 deletions(-)
diff --git a/WebAPI/Controllers/MoveStockBillController.cs b/WebAPI/Controllers/MoveStockBillController.cs
index f6586c8..fa54883 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
@@ -574,6 +575,128 @@
{
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.HBillSubType = lsmain[0].HBillSubType;
+ 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(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("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);
@@ -615,8 +738,39 @@
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;
- if (webserver.set_SaveMoveStockBill(websLsmain, sSourceBillType, 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_PD(websLsmain, sSourceBillType, ref DBUtility.ClsPub.sErrInfo))
{
objJsonResult.code = "0";
objJsonResult.count = 1;
--
Gitblit v1.9.1