From bdf99389b5eff2dcee875d89c19cf9d319e00b42 Mon Sep 17 00:00:00 2001
From: zgq <519541279@qq.com>
Date: 星期三, 10 三月 2021 19:50:18 +0800
Subject: [PATCH] 2021-03-10统一更新
---
WebAPI/Controllers/LookingForBillController.cs | 266 ++++++++++++++++++++++++++++++++++---
WebAPI/Properties/PublishProfiles/WEBAPI.pubxml.user | 6
WebAPI/Web References/WebS/Reference.cs | 2
WebAPI/Web.config | 4
WebAPI/Controllers/Kf_EntrustInBillController.cs | 2
WebAPI/WebServer.cs | 71 ++++++++--
WebAPI/Controllers/WebAPIController.cs | 31 ++++
WebAPI/Controllers/ProductInController.cs | 2
WebAPI/Controllers/POStockInBillController.cs | 2
9 files changed, 340 insertions(+), 46 deletions(-)
diff --git a/WebAPI/Controllers/Kf_EntrustInBillController.cs b/WebAPI/Controllers/Kf_EntrustInBillController.cs
index d8da958..5fff9e5 100644
--- a/WebAPI/Controllers/Kf_EntrustInBillController.cs
+++ b/WebAPI/Controllers/Kf_EntrustInBillController.cs
@@ -288,7 +288,7 @@
websLsmain.HMainSourceBillType = "1103";
websLsmain.HMangerID = lsmain[0].HMangerID;
websLsmain.HWHID = lsmain[0].HWHID;
- websLsmain.HExplanation = "";
+ websLsmain.HExplanation = lsmain[0].HExplanation;
string sSourceBillType = "1103";
diff --git a/WebAPI/Controllers/LookingForBillController.cs b/WebAPI/Controllers/LookingForBillController.cs
index 8bbba99..119212f 100644
--- a/WebAPI/Controllers/LookingForBillController.cs
+++ b/WebAPI/Controllers/LookingForBillController.cs
@@ -186,19 +186,25 @@
ListModels oListModels = new ListModels();
List<LookingForBill> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<LookingForBill>>(oMainData);
oCN.BeginTran();
- var mainSql = "Insert Into LookingForBillMain " +
- "(HInterID,HBillNo,HSourceInterID,HSourceBillNo,HCreateBy)" +
+ //var mainSql1 = "Insert Into Kf_LookingForReturnBillMain " +
+ // "(HInterID,HBillNo,HSourceInterID,HSourceBillNo,HCreateBy)" +
+ // " values" +
+ // "(" + list[0].HInterID + ",'" + list[0].HBillNo + "'," + list[0].HSourceInterID + ",'" + list[0].HSourceBillNo + "','" + list[0].HMaker + "')";
+ var mainSql = "Insert Into Kf_LookingForBillMain " +
+ "(HInterID,HBillNo,HSourceInterID,HSourceBillNo,HWhID,HWhName,HSPID,HSPName,HGroupID,HGroup" +
+ ",HSourceID,HSource,HCreateBy)" +
" values" +
- "(" + list[0].HInterID + ",'" + list[0].HBillNo + "'," + list[0].HSourceInterID + ",'" + list[0].HSourceBillNo + "','" + list[0].HMaker + "')";
+ "(" + list[0].HInterID + ",'" + list[0].HBillNo + "'," + list[0].HSourceInterID+ ",'" + list[0].HSourceBillNo + "'," + list[0].HWHID + ",'" + list[0].HWHName + "'," + list[0].HSPID + ",'" + list[0].HSPName + "'," + list[0].HGroupID + ",'" + list[0].HGroup + "',"
+ + list[0].HSourceID + ",'" + list[0].HSource + "','" + list[0].HMaker + "')";
oCN.RunProc(mainSql);
for (int i = 0; i < list.Count; i++)
{
- var subSql = "Insert Into LookingForBillSub " +
- "(HWHID,HWHName,HSPID,HSPName,HBillType,HMTONo,HQty,HMaterID,HMaterName,HMaterNumber,HMaterModel,HBarCode,HGroupID,HGroup,HSourceID,HSource,HIsStatus,HStatus,HCreateBy,HMainItemID)" +
+ var subSql = "Insert Into Kf_LookingForBillSub " +
+ "(HWHID,HWHName,HSPID,HSPName,HMTONo,HQty,HMaterID,HMaterName,HMaterNumber,HMaterModel,HBarCode,HGroupID,HGroup,HSourceID,HSource,HCreateBy,HMainItemID)" +
" values" +
- "(" + list[i].HWHID + ",'" + list[i].HWHName + "'," + list[i].HSPID + ",'" + list[i].HSPName + "','1253','" + list[i].HMTONo + "',"+ list[i].HQty + ","
+ "(" + list[i].HWHID + ",'" + list[i].HWHName + "'," + list[i].HSPID + ",'" + list[i].HSPName + "','" + list[i].HMTONo + "',"+ list[i].HQty + ","
+ list[i].HMaterID + ",'"+ list[i].HMaterName + "','"+ list[i].HMaterNumber + "','"+ list[i].HMaterModel + "','" + list[i].HBarCode + "',"
- + list[i].HGroupID + ",'"+ list[i].HGroup + "',"+ list[i].HSourceID + ",'" + list[i].HSource + "',' ',' ','"+ list[i].HMaker + "',(select HItemID from LookingForBillMain where HBillNo = '"+ list[i].HBillNo + "'))";
+ + list[i].HGroupID + ",'"+ list[i].HGroup + "',"+ list[i].HSourceID + ",'" + list[i].HSource + "','"+ list[i].HMaker + "',(select HItemID from Kf_LookingForBillMain where HBillNo = '" + list[i].HBillNo + "'))";
oCN.RunProc(subSql);
var barCodeSql = "update Gy_BarCodeBill set HStatus='瑁佸垏涓�-" + list[i].HSource + "' where HBarCode = '"+ list[i].HBarCode + "'";
oCN.RunProc(barCodeSql);
@@ -237,23 +243,40 @@
List<LookingForBill> lsmain = new List<LookingForBill>();
ListModels oListModels = new ListModels();
List<LookingForBill> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<LookingForBill>>(oMainData);
+ string flag = "";
oCN.BeginTran();
- var mainSql = "Insert Into LookingForBillMain " +
- "(HInterID,HBillNo,HSourceInterID,HSourceBillNo,HCreateBy)" +
+ var mainSql = "Insert Into Kf_LookingForReturnBillMain " +
+ "(HInterID,HBillNo,HWhID,HWhName,HSPID,HSPName,HGroupID,HGroup" +
+ ",HSourceID,HSource,HCreateBy)" +
" values" +
- "(" + list[0].HInterID + ",'" + list[0].HBillNo + "'," + list[0].HSourceInterID + ",'" + list[0].HSourceBillNo + "','" + list[0].HMaker + "')";
+ "(" + list[0].HInterID + ",'" + list[0].HBillNo + "'," + list[0].HWHID + ",'" + list[0].HWHName + "'," + list[0].HSPID + ",'" + list[0].HSPName + "'," + list[0].HGroupID + ",'" + list[0].HGroup + "',"
+ + list[0].HSourceID + ",'" + list[0].HSource + "','" + list[0].HMaker + "')";
oCN.RunProc(mainSql);
for (int i = 0; i < list.Count; i++)
{
- var subSql = "Insert Into LookingForBillSub " +
- "(HWHID,HWHName,HSPID,HSPName,HBillType,HMTONo,HQty,HMaterID,HMaterName,HMaterNumber,HMaterModel,HBarCode,HGroupID,HGroup,HSourceID,HSource,HIsStatus,HStatus,HCreateBy,HMainItemID)" +
+ var subSql = "Insert Into Kf_LookingForReturnBillSub " +
+ "(HWHID,HWHName,HSPID,HSPName,HMTONo,HQty,HMaterID,HMaterName,HMaterNumber,HMaterModel,HBarCode,HGroupID,HGroup,HSourceID,HSource,HCreateBy,HMainItemID)" +
" values" +
- "(" + list[i].HWHID + ",'" + list[i].HWHName + "'," + list[i].HSPID + ",'" + list[i].HSPName + "','1252','" + list[i].HMTONo + "'," + list[i].HQty + ","
+ "(" + list[i].HWHID + ",'" + list[i].HWHName + "'," + list[i].HSPID + ",'" + list[i].HSPName + "','" + list[i].HMTONo + "'," + list[i].HQty + ","
+ list[i].HMaterID + ",'" + list[i].HMaterName + "','" + list[i].HMaterNumber + "','" + list[i].HMaterModel + "','" + list[i].HBarCode + "',"
- + list[i].HGroupID + ",'" + list[i].HGroup + "'," + list[i].HSourceID + ",'" + list[i].HSource + "',' ',' ','" + list[i].HMaker + "',(select HItemID from LookingForBillMain where HBillNo = '" + list[i].HBillNo + "'))";
+ + list[i].HGroupID + ",'" + list[i].HGroup + "'," + list[i].HSourceID + ",'" + list[i].HSource + "','" + list[i].HMaker + "',(select HItemID from Kf_LookingForReturnBillMain where HBillNo = '" + list[i].HBillNo + "'))";
oCN.RunProc(subSql);
- var barCodeSql = "update Gy_BarCodeBill set HStatus='鍦ㄥ簱' where HBarCode = '" + list[i].HBarCode + "'";
+ var barCodeSql = "update Gy_BarCodeBill set HStatus='" + list[i].HSPName + "-" + list[i].HWHName + "' where HBarCode = '" + list[i].HBarCode + "'";
oCN.RunProc(barCodeSql);
+ //鍒ゆ柇鏄惁鏄墭鏉＄爜
+ if (JudgeIsBarCode_s(list[i].HBarCode))
+ {
+ //濡傛灉鏄墭鏉＄爜鏇存柊鎵樻潯鐮佷腑鐨勫疄鐗╂潯鐮�
+ //杩斿洖鎵樻潯鐮佷腑鐨勫疄鐗╂潯鐮�
+ ds = GetHBarCode_s(list[i].HBarCode);
+ int HCount = Pub_Class.ClsPub.isInt(ds.Tables[0].Rows.Count);
+ for (int j = 0; j < HCount; j++)
+ {
+ string HSonBarCode = Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[j][0]);
+ var SonBarCodeSql = "update Gy_BarCodeBill set HStatus='" + list[i].HSPName + "-" + list[i].HWHName + "' where HBarCode = '" + HSonBarCode + "'";
+ oCN.RunProc(SonBarCodeSql);
+ }
+ }
}
oCN.Commit();
objJsonResult.code = "1";
@@ -286,7 +309,7 @@
string[] sArray = HBarCode.Remove(0, 3).Split(';');
long HSpID = DBUtility.ClsPub.isLong(sArray[1]);
long HWHID = DBUtility.ClsPub.isLong(sArray[0]);
- string sWhere = " Where HWHID = " + HWHID + " and HItemID = "+ HSpID + "";
+ string sWhere = " Where HWHID = " + HWHID + " and HItemID = " + HSpID + "";
ds = getSpName_Json_s(sWhere);
if (ds == null || ds.Tables[0].Rows.Count <= 0)
{
@@ -316,16 +339,138 @@
}
/// <summary>
- /// 寰呭彂鍖烘壘璐ф牴鎹簮鍗曞彿 杩斿洖鐩稿叧淇℃伅
+ /// 鍚敤mes浠撲綅锛屾牴鎹�佷粨搴撹浆鎹㈡垚鏂颁粨搴�
/// </summary>
/// <returns></returns>
- [Route("LookingFor/getWaitingLookingFor")]
+ [Route("LookingFor/GetSpNameMES_Json")]
[HttpGet]
- public object GetWaitingLookingFor(string HBillType,string HBillNo,string HSourceBillNo,string HCreateBy,string BenginHCreateDate,string EndHCreateDate)
+ public object GetSpNameMES_Json(string HERPWHID)
{
try
{
- ds = GetWaitingLookingFor_s(HBillType, HBillNo, HSourceBillNo, HCreateBy, BenginHCreateDate, EndHCreateDate);
+ ds = GetSpNameMES_Json_s(HERPWHID);
+ if (ds == null || ds.Tables[0].Rows.Count <= 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "璇风淮鎶ゆ柊鑰佷粨搴撳搴旇〃锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "杩斿洖璁板綍鎴愬姛锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ }
+ catch (Exception ex)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + ex.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ /// <summary>
+ /// 寰呭彂鍖烘壘璐ф牴鎹簮鍗曞彿 杩斿洖鐩稿叧淇℃伅
+ /// </summary>
+ /// <returns></returns>
+ //[Route("LookingFor/getWaitingLookingFor")]
+ //[HttpGet]
+ //public object GetWaitingLookingFor(string HBillType,string HBillNo,string HSourceBillNo,string HCreateBy,string BenginHCreateDate,string EndHCreateDate)
+ //{
+ // try
+ // {
+ // ds = GetWaitingLookingFor_s(HBillType, HBillNo, HSourceBillNo, HCreateBy, BenginHCreateDate, EndHCreateDate);
+ // if (ds == null || ds.Tables[0].Rows.Count <= 0)
+ // {
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ // }
+ // else
+ // {
+ // objJsonResult.code = "1";
+ // objJsonResult.count = 1;
+ // objJsonResult.Message = "杩斿洖璁板綍鎴愬姛锛�";
+ // objJsonResult.data = ds.Tables[0];
+ // return objJsonResult;
+ // }
+ // }
+ // catch (Exception ex)
+ // {
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + ex.ToString();
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ // }
+ //}
+
+ /// <summary>
+ /// 涓婁笅鏋跺崟鍒楄〃
+ /// </summary>
+ /// <returns></returns>
+ [Route("LookingFor/GetLookingForBillList")]
+ [HttpGet]
+ public object GetLookingForBillList(string HBillType, string sWhere)
+ {
+ try
+ {
+ if (HBillType == "ZHXJ")
+ {
+ ds = GetLookingForBillListXJ_s(sWhere);
+ }
+ else if (HBillType == "ZHSJ")
+ {
+ ds = GetLookingForBillListSJ_s(sWhere);
+ }
+ else
+ {
+ ds = GetLookingForBillList_s(sWhere);
+ }
+ if (ds == null || ds.Tables[0].Rows.Count <= 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "杩斿洖璁板綍鎴愬姛锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ }
+ catch (Exception ex)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + ex.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ //閿�鍞嚭搴撴簮鍗曟煡璐�-鏍规嵁閿�鍞鍗曟煡鎵惧疄鐗╂墍鍦ㄥ簱浣�
+ [Route("LookingFor/GetSellOutFindSP")]
+ [HttpGet]
+ public object GetSellOutFindSP(string HbillNo)//h_p_Xs_SellOutFindSP
+ {
+ try
+ {
+ ds = GetSellOutFindSP_s(HbillNo);
if (ds == null || ds.Tables[0].Rows.Count <= 0)
{
objJsonResult.code = "0";
@@ -368,6 +513,7 @@
public static DataSet getSellOrderList_s(string HSourceBillNo)
{
+ //鍚屾閿�鍞鍗�
new SQLHelper.ClsCN().RunProcReturn("EXEC h_p_IFCLD_ERPSourceBillToLocal_SEOrderToICMO '" + HSourceBillNo+ "'", "h_p_IFCLD_ERPSourceBillToLocal_SEOrderToICMO");
string sWhere = " Where HSourceBillNo = '" + HSourceBillNo.Trim() + "'";
return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_getSellOrderList_s " + sWhere, "h_v_getSellOrderList_s");
@@ -378,15 +524,89 @@
return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_getBarCodeDetails_s " + sWhere, "h_v_getBarCodeDetails_s");
}
+ //鏍规嵁浠撲綅浜岀淮鐮佸甫鍑轰粨搴撲粨浣嶇浉鍏充俊鎭�
public static DataSet getSpName_Json_s(string sWhere)
{
- return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_IF_StockPlace " + sWhere, "h_v_IF_StockPlace");
+ return new SQLHelper.ClsCN().RunProcReturn("select HWHID,* from h_v_IF_StockPlace " + sWhere, "h_v_IF_StockPlace");
}
- public static DataSet GetWaitingLookingFor_s(string HBillType, string HBillNo, string HSourceBillNo,string HCreateBy,string BenginHCreateDate,string EndHCreateDate)
+
+ //鍚敤mes浠撲綅锛屾牴鎹�佷粨搴撹浆鎹㈡垚鏂颁粨搴�
+ public static DataSet GetSpNameMES_Json_s(string HERPWHID)
{
- return new SQLHelper.ClsCN().RunProcReturn("EXEC h_p_lookForBillList " + "'" + HBillType + "','" + HBillNo + "','" + HSourceBillNo + "','" + HCreateBy + "','" + HCreateBy + "','" + HCreateBy + "','" + BenginHCreateDate + "','" + EndHCreateDate + "'", "h_p_lookForBillList");
+ return new SQLHelper.ClsCN().RunProcReturn("select HMESWHID,HMESWHNAME from Gy_ERPWHRelationMESWH where HERPWHID = " + HERPWHID + "", "Gy_ERPWHRelationMESWH");
}
+ //涓嬫灦鎵捐揣鍗曞垪琛�
+ public static DataSet GetLookingForBillListXJ_s(string sWhere)
+ {
+ return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_lookForBillListXJ ", "h_v_lookForBillListXJ");
+ }
+
+ //涓婃灦褰掕繕鍗曞垪琛�
+ public static DataSet GetLookingForBillListSJ_s(string sWhere)
+ {
+ return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_lookForBillListSJ ", "h_v_lookForBillListSJ");
+ }
+
+ //涓婁笅鏋跺崟鍒楄〃
+ public static DataSet GetLookingForBillList_s(string sWhere)
+ {
+ return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_lookForBillList where 1 = 1 " + sWhere, "h_v_lookForBillList");
+ }
+
+ //鍒ゆ柇鏄惁鏄墭鏉＄爜
+ public static bool JudgeIsBarCode_s(string HBarCode)
+ {
+ DataSet ds;
+ ds = new SQLHelper.ClsCN().RunProcReturn("Select HBarCodeType from Gy_BarCodeBill WITH (NOLOCK) Where HBarCode='" + HBarCode + "'", "Gy_BarCodeBill");
+ if (Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0][0]) == "鎵樼洏鏉＄爜")
+ return true;
+ else
+ {
+ return false;
+ }
+ }
+
+ //杩斿洖鎵樻潯鐮佷腑鐨勫疄鐗╂潯鐮�
+ public static DataSet GetHBarCode_s(string HBarCode)
+ {
+ return new SQLHelper.ClsCN().RunProcReturn("select HBarCode from Sc_PackUnionBillMain a inner join Sc_PackUnionBillSub b on a.HInterID = b.HInterID Where a.HBarCode_Pack = '" + HBarCode + "'", "Sc_PackUnionBillMain");
+ }
+
+ //鏍规嵁閿�鍞鍗曟煡鎵惧疄鐗╂墍鍦ㄥ簱浣�
+ public static DataSet GetSellOutFindSP_s(string HbillNo)
+ {
+ return new SQLHelper.ClsCN().RunProcReturn("EXEC h_p_Xs_SellOutFindSP '" + HbillNo + "'", "h_p_Xs_SellOutFindSP");
+ }
+
+ //娴嬭瘯涓撶敤鎺ュ彛
+ [Route("LookingFor/Test")]
+ [HttpGet]
+ public object Test(string HbillNo)//h_p_Xs_SellOutFindSP
+ {
+ DataSet ds;
+ ds = new SQLHelper.ClsCN().RunProcReturn("EXEC h_p_Xs_SellOutFindSP '" + HbillNo + "'", "h_p_Xs_SellOutFindSP");
+
+ if (Pub_Class.ClsPub.isLong(ds.Tables[0].Rows.Count) >= 0 )
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "true锛�";
+ objJsonResult.data = ds.Tables[0];//ds.Tables[0].Rows[1][0]
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "false锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+
+
#endregion
}
diff --git a/WebAPI/Controllers/POStockInBillController.cs b/WebAPI/Controllers/POStockInBillController.cs
index 401da54..f058753 100644
--- a/WebAPI/Controllers/POStockInBillController.cs
+++ b/WebAPI/Controllers/POStockInBillController.cs
@@ -572,10 +572,10 @@
websLsmain.HManagerID = 0;
websLsmain.HBillerID = lsmain[0].HBillerID;
websLsmain.HRemark = "";
- websLsmain.HExplanation = "";
websLsmain.HInnerBillNo = "";
websLsmain.HRedBlueFlag = false;//false钃濆瓧 true绾㈠瓧
websLsmain.HMainSourceBillType = lsmain[0].HBillType;
+ websLsmain.HExplanation = lsmain[0].HExplanation;
if (webserver.set_SavePOStockInBill_New(websLsmain, sSourceBillType, ref DBUtility.ClsPub.sErrInfo))
diff --git a/WebAPI/Controllers/ProductInController.cs b/WebAPI/Controllers/ProductInController.cs
index af06fd8..03e4b12 100644
--- a/WebAPI/Controllers/ProductInController.cs
+++ b/WebAPI/Controllers/ProductInController.cs
@@ -485,6 +485,8 @@
websLsmain.HMaker = lsmain[0].HMaker;
websLsmain.HWHID = lsmain[0].HWHID;
websLsmain.HSupID = lsmain[0].HSupID;
+ websLsmain.HExplanation = lsmain[0].HExplanation;
+
if (webserver.set_SaveProductInBill_New(websLsmain, sSourceBillType, ref DBUtility.ClsPub.sErrInfo))
{
diff --git a/WebAPI/Controllers/WebAPIController.cs b/WebAPI/Controllers/WebAPIController.cs
index d73605a..8e6f6a2 100644
--- a/WebAPI/Controllers/WebAPIController.cs
+++ b/WebAPI/Controllers/WebAPIController.cs
@@ -748,6 +748,37 @@
return objjson;
}
}
+
+ /// <summary>
+ /// 鑾峰彇褰撳墠鏁版嵁搴撳悕
+ /// </summary>
+ /// <returns></returns>
+ [Route("Web/GetDataBases")]
+ [HttpGet]
+ public object GetDataBases()
+ {
+ try
+ {
+ ClsCN oCn = new ClsCN();
+ DataSet oDs = new DataSet();
+ //==========
+ oDs = oCn.RunProcReturn("Select Name From Master..SysDataBases Where DbId=(Select Dbid From Master..SysProcesses Where Spid = @@spid)", "SysDataBases");
+ objjson.code = "1";
+ objjson.count = 1;
+ objjson.Message = "鑾峰彇鎴愬姛锛�";
+ objjson.data = oDs.Tables[0];
+ return objjson; ;
+ }
+ catch (Exception e)
+ {
+
+ objjson.code = "0";
+ objjson.count = 0;
+ objjson.Message = "鑾峰彇澶辫触锛佸紓甯�" + e.ToString();
+ objjson.data = null;
+ return objjson; ;
+ }
+ }
#endregion
}
diff --git a/WebAPI/Properties/PublishProfiles/WEBAPI.pubxml.user b/WebAPI/Properties/PublishProfiles/WEBAPI.pubxml.user
index 617b0d2..d4c48d6 100644
--- a/WebAPI/Properties/PublishProfiles/WEBAPI.pubxml.user
+++ b/WebAPI/Properties/PublishProfiles/WEBAPI.pubxml.user
@@ -157,10 +157,10 @@
<publishTime>11/24/2014 11:18:48</publishTime>
</File>
<File Include="bin/WebAPI.dll">
- <publishTime>02/25/2021 22:10:11</publishTime>
+ <publishTime>03/10/2021 19:29:51</publishTime>
</File>
<File Include="bin/WebAPI.pdb">
- <publishTime>02/25/2021 22:10:11</publishTime>
+ <publishTime>03/10/2021 19:29:51</publishTime>
</File>
<File Include="bin/WebAPI.XmlSerializers.dll">
<publishTime>02/04/2021 21:35:21</publishTime>
@@ -334,7 +334,7 @@
<publishTime>02/22/2021 09:25:20</publishTime>
</File>
<File Include="Web.config">
- <publishTime>02/25/2021 22:10:21</publishTime>
+ <publishTime>03/10/2021 19:30:04</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/WebAPI/Web References/WebS/Reference.cs b/WebAPI/Web References/WebS/Reference.cs
index 99a7ea4..b2e5ee5 100644
--- a/WebAPI/Web References/WebS/Reference.cs
+++ b/WebAPI/Web References/WebS/Reference.cs
@@ -30709,7 +30709,7 @@
private string hInnerBillNoField;
private bool hRedBlueFlagField;
-
+
/// <remarks/>
public string HDateForWeb {
get {
diff --git a/WebAPI/Web.config b/WebAPI/Web.config
index 9febd30..fcdb48a 100644
--- a/WebAPI/Web.config
+++ b/WebAPI/Web.config
@@ -11,8 +11,8 @@
</configSections>
<connectionStrings>
- <!--<add name="YqnConn" connectionString="Data Source=192.168.0.175;Initial Catalog=HX_LimsSys_Test;User Id=HX_USER,Password=lc@841022;Integrated Security=True" />-->
- <add name="YqnConn" connectionString="Data Source=.;Initial Catalog=HX_LimsSys_Test;Integrated Security=True" />
+ <!--<add name="YqnConn" connectionString="Data Source=192.168.0.175;Initial Catalog=HX_LimsSys;User Id=HX_USER,Password=lc@841022;Integrated Security=True" />-->
+ <add name="YqnConn" connectionString="Data Source=.;Initial Catalog=HX_LimsSys;Integrated Security=True" />
</connectionStrings>
<appSettings>
diff --git a/WebAPI/WebServer.cs b/WebAPI/WebServer.cs
index b4871e7..743d1af 100644
--- a/WebAPI/WebServer.cs
+++ b/WebAPI/WebServer.cs
@@ -4438,8 +4438,17 @@
WebS.WebService1 oWebs = new WebS.WebService1();
if (oWebs.set_SavePOStockInBill_New(oMain, sHSourceType, ref sErrMsg))
{
- sErrMsg = "淇濆瓨鎴愬姛锛�" + oMain.HBillNo;
- return true;
+ //鍒ゆ柇鏄惁鍙嶅啓鎴愬姛
+ if (set_UpdateHStatus(oMain.HInterID, oMain.HExplanation.ToString()))
+ {
+ sErrMsg = "淇濆瓨鎴愬姛锛�" + oMain.HBillNo;
+ return true;
+ }
+ else
+ {
+ sErrMsg = "淇濆瓨鎴愬姛锛�" + oMain.HBillNo + "鐘舵�佸弽鍐欏け璐ワ紒";
+ return true;
+ }
}
else
{
@@ -4790,8 +4799,17 @@
WebS.WebService1 oWebs = new WebS.WebService1();
if (oWebs.set_SaveProductInBill_New(oMain, sHSourceType, ref sErrMsg))
{
- sErrMsg = "淇濆瓨鎴愬姛锛�" + oMain.HBillNo;
- return true;
+ //鍒ゆ柇鏄惁鍙嶅啓鎴愬姛
+ if (set_UpdateHStatus(oMain.HInterID,oMain.HExplanation.ToString()))
+ {
+ sErrMsg = "淇濆瓨鎴愬姛锛�" + oMain.HBillNo;
+ return true;
+ }
+ else
+ {
+ sErrMsg = "淇濆瓨鎴愬姛锛�" + oMain.HBillNo + "鐘舵�佸弽鍐欏け璐ワ紒";
+ return true;
+ }
}
else
{
@@ -4800,15 +4818,29 @@
}
}
+ //鏍规嵁id鍙嶅啓鏉＄爜妗ｆ琛ㄧ姸鎬�
+ public bool set_UpdateHStatus(long HinterID, string HMESSPName)
+ {
+ try
+ {
+ new SQLHelper.ClsCN().RunProcReturn("EXEC h_p_WMS_UpdateMESSPtoBarCode " + HinterID + "," + "'" + HMESSPName + "'", "h_p_WMS_UpdateMESSPtoBarCode");
+ return true;
+ }
+ catch (Exception ex)
+ {
+ return false;
+ }
+ }
- /// <summary>
- /// 鐢熸垚浜у搧鍏ュ簱鍗�
- /// </summary>
- /// <param name="oMain"></param>
- /// <param name="sHSourceType"></param>
- /// <param name="sErrMsg"></param>
- /// <returns></returns>
- public bool set_SaveProductInBill(Model.ClsKf_ProductInBillMain oMain, ref string sErrMsg)
+
+ /// <summary>
+ /// 鐢熸垚浜у搧鍏ュ簱鍗�
+ /// </summary>
+ /// <param name="oMain"></param>
+ /// <param name="sHSourceType"></param>
+ /// <param name="sErrMsg"></param>
+ /// <returns></returns>
+ public bool set_SaveProductInBill(Model.ClsKf_ProductInBillMain oMain, ref string sErrMsg)
{
DAL.ClsKf_ProductInBill dal = new DAL.ClsKf_ProductInBill();
dal.omodel = oMain;
@@ -5313,9 +5345,18 @@
WebS.WebService1 oWebs = new WebS.WebService1();
if (oWebs.set_SaveEntrustInBill_New(oMain, sHSourceType, ref sErrMsg))
{
- sErrMsg = "淇濆瓨鎴愬姛锛�" + oMain.HBillNo;
- return true;
- }
+ //鍒ゆ柇鏄惁鍙嶅啓鎴愬姛
+ if (set_UpdateHStatus(oMain.HInterID, oMain.HExplanation.ToString()))
+ {
+ sErrMsg = "淇濆瓨鎴愬姛锛�" + oMain.HBillNo;
+ return true;
+ }
+ else
+ {
+ sErrMsg = "淇濆瓨鎴愬姛锛�" + oMain.HBillNo + "鐘舵�佸弽鍐欏け璐ワ紒";
+ return true;
+ }
+ }
else
{
sErrMsg = "鍗曟嵁鍙凤細" + oMain.HBillNo + ", 鍗曟嵁ID锛�" + oMain.HInterID + ";" + sErrMsg;
--
Gitblit v1.9.1