From 16bb2f7b48cf2c3cfbb6a026c265d4e52d22eca4 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期六, 29 十月 2022 17:11:14 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/ProductInController.cs | 313 ++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 312 insertions(+), 1 deletions(-)
diff --git a/WebAPI/Controllers/ProductInController.cs b/WebAPI/Controllers/ProductInController.cs
index a347b73..2c655bb 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
@@ -244,6 +285,43 @@
}
/// <summary>
+ /// 鐩存帴璋冩嫧鍗曟牎楠屾壂鎻忓崟鎹彿/鐩存帴璋冪敤webservice
+ /// </summary>
+ /// <returns></returns>
+ //[Route("OtherOutBill_Check_New/BillNo")]
+ [Route("MoveStockBill/BillNo2")]
+ [HttpGet]
+ public Object BillNo2(string HBillNo, string HBillType, string HMaker, Int64 HOwnerID)
+ {
+ //if (sRedBlue == true)
+ //{
+ // HBillType = "1245";
+ //}
+ //oBar = webserver.get_CheckTypeByBarCode(sCode, sInterID, sBillType, sBillNo, sMaker, WhID, SPID, sQty, sRedBlue, SourceFlag, sSourceBillNo, sSourceType, HOWNERID, ref DBUtility.ClsPub.sErrInfo);
+ 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_BillBarCode_MoveStockCheck(HBillNo, HBillType, HMaker, 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;
+ }
+ }
+
+ /// <summary>
/// 鍏朵粬鍑哄簱鏍￠獙鎵弿鏉＄爜/鐩存帴璋冪敤webservice
/// </summary>
/// <returns></returns>
@@ -256,6 +334,38 @@
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)
+ {
+ 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>
+ /// 鐩存帴璋冩嫧鏍￠獙鎵弿鏉＄爜/鐩存帴璋冪敤webservice
+ /// </summary>
+ /// <returns></returns>
+ [Route("MoveStockBill_Check_New/get_InfoByBarCode_Source_Json1")]
+ [HttpGet]
+ public Object get_InfoByBarCode_Source_Json1(string sCode, Int64 sInterID, string HBillType, string sBillNo, string sMaker, Int64 WhID, Int64 SPID, Int64 SCWhID, Int64 SCSPID, Int64 sQty, Int64 HOWNERID)
+ {
+ 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)
{
objJsonResult.code = "0";
@@ -570,7 +680,17 @@
{
try
{
- ds = webserver.GetBarCode_Temp(HInterID, HMaterID, HAuxPropID, HMTONo, HWhID, HSPID, HSCWhID, HSCSPID, HBatchNo, HSourceInterID, HSourceEntryID, sBillType, sWhere);
+
+ if (HMTONo == null)
+ {
+ HMTONo = "";
+ }
+ if (HBatchNo == null)
+ {
+ HBatchNo = "";
+ }
+ WebS.WebService1 oWebs = new WebS.WebService1();
+ ds = oWebs.GetBarCode_Temp(HInterID, HMaterID, HAuxPropID, HMTONo, HWhID, HSPID, HSCWhID, HSCSPID, HBatchNo, HSourceInterID, HSourceEntryID, sBillType, sWhere);
if (ds == null || ds.Tables[0].Rows.Count <= 0)
{
objJsonResult.code = "0";
@@ -599,6 +719,47 @@
return objJsonResult;
}
}
+
+
+
+ #region 鐐瑰嚮缂栬緫鎸夐挳杩斿洖鍙傛暟淇℃伅
+ /// <summary>
+ /// 鐐瑰嚮缂栬緫鎸夐挳杩斿洖鍙傛暟淇℃伅
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("Kf_BarCodeEditDlg/Kf_BarCodeEditDlg_Json")]
+ [HttpGet]
+ public object Kf_BarCodeEditDlg_Json(string sWhere)
+ {
+ DataSet ds;
+ try
+ {
+
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+
+ string sql1 = "select * from KF_PonderationBillMain_Temp Where HQty<>0 ";
+ string sql = sql1 + sWhere + " order by hinterid desc";
+ ds = oCN.RunProcReturn(sql, "KF_PonderationBillMain_Temp");
+
+ 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;
+ }
+ }
+
+ #endregion
+
//鐐瑰嚮缂栬緫 鍏敤绐椾綋鍒犻櫎鏂规硶
[Route("Kf_BarCodeEditDlg/DeltetBill")]
@@ -1006,6 +1167,7 @@
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))
@@ -1139,6 +1301,69 @@
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;
+ }
+ }
+
+
+ /// <summary>
+ /// 鐢熶骇璋冩嫧鏍￠獙
+ /// </summary>
+ /// <returns></returns>
+ [Route("MoveStockBill_Check_New/set_SaveMoveStockBill_Check_Json")]
+ [HttpPost]
+ public object set_SaveMoveStockBill_Check_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);
+
+ 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;
+
+ WebAPI.WebS.ClsKf_MoveStockBillMain websLsmain = new WebS.ClsKf_MoveStockBillMain();
+
+ websLsmain.HInterID = lsmain[0].HInterID;
+ websLsmain.HBillNo = lsmain[0].HBillNo;
+ websLsmain.HBillType = "1207";
+
+ WebS.WebService1 oWebs = new WebS.WebService1();
+ if (oWebs.set_SaveMoveStockBill_BillCheck(websLsmain, ref DBUtility.ClsPub.sErrInfo))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鐩存帴璋冩嫧鍗曟牎楠屾垚鍔燂紒鍗曟嵁鍙蜂负锛�";
objJsonResult.data = null;
return objJsonResult;
}
@@ -1345,6 +1570,92 @@
}
+ /// <summary>
+ /// 鏉＄爜缂栬緫鐣岄潰 缂栬緫鎸夐挳鏂规硶
+ /// </summary>
+ /// <returns></returns>
+ [Route("Kf_BarCodeEditDlg/GetCheckQtyByBarCodeBill")]
+ [HttpGet]
+ public object GetCheckQtyByBarCodeBill(Int64 HInterID, string HBillType, string sBatchNo,string sBarCode,Int64 sSCWhID
+ ,Int64 sSCSPID, Int64 sAuxPropID,string sMTONo,double iQty,Int64 HMaterID
+ ,Int64 sWhID,Int64 sSPID,Int64 HSourceInterID,Int64 HSourceEntryID, double EndQty, double sQty)
+ {
+ try
+ {
+ if (sBatchNo == null)
+ {
+ sBatchNo = "";
+ }
+ if (sMTONo == null)
+ {
+ sMTONo = "";
+ }
+ if ( HBillType == "1204" || HBillType == "1205" || HBillType == "1206" || HBillType == "1211" || HBillType == "1213")
+ {
+ WebS.WebService1 oWebs = new WebS.WebService1();
+ if (webserver.Get_CheckQtyByBarCode(sBarCode, sWhID, sSPID, sAuxPropID, sBatchNo, sMTONo, iQty, ref sRelQty))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "搴撳瓨瓒冲锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else if (sRelQty == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犲簱瀛橈紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ EndQty = sRelQty - sQty;
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "搴撳瓨涓嶈冻锛屽凡鑾峰彇瀹為檯搴撳瓨鏁伴噺锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ else if (HBillType == "1203" || HBillType == "1205" || HBillType == "1202")
+ {
+ WebS.WebService1 oWebs = new WebS.WebService1();
+ if (oWebs.set_SavePonderationBillMain_Temp_ChangGui(HInterID, HMaterID, sAuxPropID, sMTONo, sWhID, sSPID, sSCWhID, sSCSPID, sBatchNo, HSourceInterID, HSourceEntryID, sBarCode, HBillType, EndQty, 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;
+ }
+ }
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
}
}
\ No newline at end of file
--
Gitblit v1.9.1