From 00e25e4a9c9bd2fc91558c3c1a68f47db6d08b1d Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期一, 08 七月 2024 18:57:35 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/OtherOutBillController.cs | 196 +++++++++++++++++++++++++++++++++++++++---------
1 files changed, 157 insertions(+), 39 deletions(-)
diff --git a/WebAPI/Controllers/OtherOutBillController.cs b/WebAPI/Controllers/OtherOutBillController.cs
index 624909e..22f4781 100644
--- a/WebAPI/Controllers/OtherOutBillController.cs
+++ b/WebAPI/Controllers/OtherOutBillController.cs
@@ -47,6 +47,8 @@
// private DataBaseServices objDataBaseServices = new DataBaseServices();
private JsonResult objJsonResult = new JsonResult();
public ClsKf_ICStockBill_WMS oBar = new Model.ClsKf_ICStockBill_WMS();
+ SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
+ Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();
// private string msgModel = "{{\"count\":{0},\"code\":{0},\"message\":\"{1}\",\"result\":{2}}}";
public static string GetSession(string sMsg)
{
@@ -67,47 +69,96 @@
/// <returns></returns>
[Route("OtherOutBill/get_CheckTypeByBarCode_Out_Json")]
[HttpGet]
- public Object get_CheckTypeByBarCode_Out_Json(string sCode, Int64 sInterID,string HBillType, string sBillNo, string sMaker, Int64 WhID, Int64 SPID, Double sQty, bool sRedBlue, bool SourceFlag, string sSourceBillNo, string sSourceType, Int64 HOWNERID)
+ //public Object get_CheckTypeByBarCode_Out_Json(string sCode, Int64 sInterID,string HBillType, string sBillNo, string sMaker, Int64 WhID, Int64 SPID, Double sQty, bool sRedBlue, bool SourceFlag, string sSourceBillNo, string sSourceType, Int64 HOWNERID, string HScanStyle)
+ //{
+ // //oBar = webserver.get_CheckTypeByBarCode_Out(sCode, sInterID, HBillType, sBillNo, sMaker, WhID, SPID, sQty, sRedBlue, SourceFlag, sSourceBillNo, sSourceType, HOWNERID, ref DBUtility.ClsPub.sErrInfo);
+ // //if (oBar == 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 = "鎵爜鎴愬姛锛�";
+ // // //objJsonResult.Message = DBUtility.ClsPub.sErrInfo;
+ // // objJsonResult.data = oBar;
+ // // return objJsonResult;
+ // //}
+
+
+ // string sErrMsg = "";
+ // string sJXCode = "";
+ // if (oSystemParameter.omodel.WMS_CampanyName == "瀹夌憺") //绯荤粺鍙傛暟 瀹㈡埛瀹氬埗鍖栧悕绉� 绌虹櫧涓洪�氱敤
+ // {
+ // sJXCode = POStockInBillController.JX_Json(sCode, sInterID, HBillType, HOWNERID, sBillNo, sMaker);
+ // SourceFlag = true;
+ // }
+ // else
+ // {
+ // sJXCode = sCode;
+ // }
+
+
+
+ // 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);
+ // SourceFlag = true;
+ // //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_All(sCode, sInterID, HBillType, sBillNo, sMaker, WhID, SPID, sQty, sRedBlue, SourceFlag, sSourceBillNo, sSourceType, HOWNERID, sExpressNumber, ref DBUtility.ClsPub.sErrInfo);
+ // WebSoBar = oWebs.get_CheckTypeByBarCode_New(sJXCode, sInterID, HBillType, sBillNo, sMaker, WhID, SPID, sQty, sRedBlue, SourceFlag, sSourceBillNo, sSourceType, HOWNERID, sExpressNumber, HScanStyle, 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_CheckTypeByBarCode_Out_Json(string sCode, long sInterID, string sBillNo, string sMaker, long WhID, long SPID, double sQty, bool sRedBlue, bool SourceFlag, string sSourceBillNo, string sSourceType, long HOWNERID)
{
- //oBar = webserver.get_CheckTypeByBarCode_Out(sCode, sInterID, HBillType, sBillNo, sMaker, WhID, SPID, sQty, sRedBlue, SourceFlag, sSourceBillNo, sSourceType, HOWNERID, ref DBUtility.ClsPub.sErrInfo);
- //if (oBar == 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 = "鎵爜鎴愬姛锛�";
- // //objJsonResult.Message = DBUtility.ClsPub.sErrInfo;
- // objJsonResult.data = oBar;
- // return objJsonResult;
- //}
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_All(sCode, sInterID, HBillType, sBillNo, sMaker, WhID, SPID, sQty, sRedBlue, SourceFlag, sSourceBillNo, sSourceType, HOWNERID, sExpressNumber, ref DBUtility.ClsPub.sErrInfo);
- if (WebSoBar == null)
+ WebAPI.WebS.ClsKf_ICStockBill_WMS clsKf_ICStockBill_WMS = new WebAPI.WebS.ClsKf_ICStockBill_WMS();
+ string hexpressNumber = "";
+ clsKf_ICStockBill_WMS = oWebs.get_CheckTypeByBarCode_All(sCode, sInterID, this.HBillType, sBillNo, sMaker, WhID, SPID, sQty, sRedBlue, SourceFlag, sSourceBillNo, sSourceType, HOWNERID, hexpressNumber, ref ClsPub.sErrInfo);
+ bool flag = clsKf_ICStockBill_WMS == 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 = clsKf_ICStockBill_WMS;
+ result = this.objJsonResult;
}
+ return result;
}
/// <summary>
@@ -376,6 +427,36 @@
}
}
+ [Route("OtherOutBill/set_SavePonderationBillMain_Temp_Source_Fast_Json1")]
+ [HttpGet]
+ public object set_SavePonderationBillMain_Temp_Source_Fast_Json1(Int64 sInterID, string SBillNo, string HBillType, string sSourceBillNo, string sSourceType,bool sRedBlue, string sMaker, Int64 sHOWNERID)
+ {
+
+ 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_CheckTypeBySource_New(sInterID, SBillNo, HBillType, sSourceBillNo, sSourceType,sRedBlue, sMaker, sHOWNERID, 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>
/// 鐢熸垚鍏朵粬鍏ュ簱鍗�
/// </summary>
@@ -391,28 +472,33 @@
List<Model.ClsKf_OtherOutBillMain> lsmain = new List<Model.ClsKf_OtherOutBillMain>();
ListModels oListModels = new ListModels();
lsmain = oListModels.getOtherOutBillMainByJson(msg1);
- lsmain[0].HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
- lsmain[0].HDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd"));
+ //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_OtherOutBillMain websLsmain = new WebS.ClsKf_OtherOutBillMain();
websLsmain.HInterID = lsmain[0].HInterID;
websLsmain.HDate = lsmain[0].HDate;
websLsmain.HBillNo = lsmain[0].HBillNo;
+ websLsmain.HSupID = lsmain[0].HSupID;
websLsmain.HDeptID = lsmain[0].HDeptID;
websLsmain.HEmpID = lsmain[0].HEmpID;
+ websLsmain.HKeeperID = lsmain[0].HKeeperID;
+ websLsmain.HSecManagerID = lsmain[0].HSecManagerID;
websLsmain.HRemark = lsmain[0].HRemark;
websLsmain.HMaker = lsmain[0].HMaker;
+ websLsmain.HBillerID = lsmain[0].HBillerID;
websLsmain.HSTOCKORGID = lsmain[0].HSTOCKORGID;
websLsmain.HOWNERID = lsmain[0].HOWNERID;
websLsmain.HBillType = "1206";//鍥哄畾鍊�
+ websLsmain.HBillSubType = lsmain[0].HBillSubType;
WebS.WebService1 oWebs = new WebS.WebService1();
WebS.ClsXt_SystemParameterMain oSystemParameterMain = new WebS.ClsXt_SystemParameterMain();
if (oWebs.set_SaveOtherOutBill_New(websLsmain, sSourceBillType, ref DBUtility.ClsPub.sErrInfo))
{
objJsonResult.code = "0";
objJsonResult.count = 1;
- objJsonResult.Message = DBUtility.ClsPub.sErrInfo;
+ objJsonResult.Message = DBUtility.ClsPub.sErrInfo; //鎴愬姛锛�
objJsonResult.data = null;
return objJsonResult;
}
@@ -420,7 +506,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "涓婁紶澶辫触锛�" + DBUtility.ClsPub.sErrInfo;
+ objJsonResult.Message = DBUtility.ClsPub.sErrInfo; //澶辫触锛�
objJsonResult.data = null;
return objJsonResult;
}
@@ -616,6 +702,38 @@
return objJsonResult;
}
}
- }
+ #region PDA鍏朵粬鍑哄簱
+ //PDA鍏朵粬鍑哄簱鏁存墭鍒犻櫎
+ [Route("OtherOutBillList/OtherOutBillSDeleCode")]
+ [HttpGet]
+ public object OtherOutBillSDeleCode(string HBarCode, string HInterID)
+ {
+ try
+ {
+ //鏍规嵁鏉＄爜鍦ㄦ潯鐮佹。妗堜腑鎵惧埌瀵瑰簲鐨勬墭鏉＄爜锛屽啀鍦ㄤ复鏃惰〃涓垹闄よ鎵樻潯鐮佺殑鍏ㄩ儴璁板綍
+ string sql = string.Format(@"delete from KF_PonderationBillMain_Temp where HBillType=1206 and HInterID=" + HInterID + " and HBarCode" +
+ " in (select HBarCode from Gy_BarCodeBill where HBarCode_Pack = (select HBarCode_Pack from Gy_BarCodeBill where HBarCode = '" + HBarCode + "'))");
+ oCn.RunProc(sql);
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鏁存墭鍒犻櫎鎴愬姛锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ }
+ #endregion
+
+
+ }
}
--
Gitblit v1.9.1