From 1741fb54409b5eb8da7e2b200295e6fa8f3ebcb7 Mon Sep 17 00:00:00 2001
From: yxj <yxj@hz-kingdee.com>
Date: 星期四, 20 六月 2024 16:48:25 +0800
Subject: [PATCH] 桌面版工序流转卡单据号获取方法修改，PDA出入库缓存列表删除、撤销，模具缓存列表删除调用方法增加写入日志
---
WebAPI/Controllers/条码管理/WEBSController.cs | 96 +++++++++++++++++++++++
WebAPI/Web.config | 6
WorkM/流转卡管理/Sc_ProcessExchangeBill.cs | 109 +++++++++++++-------------
WebAPI/Controllers/条码管理/MouldController.cs | 14 +++
4 files changed, 165 insertions(+), 60 deletions(-)
diff --git "a/WebAPI/Controllers/\346\235\241\347\240\201\347\256\241\347\220\206/MouldController.cs" "b/WebAPI/Controllers/\346\235\241\347\240\201\347\256\241\347\220\206/MouldController.cs"
index 6a5a6b5..43cfb6d 100644
--- "a/WebAPI/Controllers/\346\235\241\347\240\201\347\256\241\347\220\206/MouldController.cs"
+++ "b/WebAPI/Controllers/\346\235\241\347\240\201\347\256\241\347\220\206/MouldController.cs"
@@ -26,6 +26,7 @@
private json objJsonResult = new json();
SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();
+ string ComputerName = SystemInformation.ComputerName; //璁惧鍚嶇О
#region 鍣ㄥ叿鎵爜妯″潡璋冪敤鏂规硶
@@ -358,19 +359,28 @@
/// <returns></returns>
[Route("MouldController/set_DeleteMouldBillList_Json")]
[HttpGet]
- public object set_DeleteMouldBillList_Json(long HInterID, string HBillType)
+ public object set_DeleteMouldBillList_Json(long HInterID, string HBillNo, string HBillType, string HMaker, string MvarReportTitle)
{
try
{
+ string WorkList = "鍒犻櫎缂撳瓨鍗曟嵁锛屽崟鎹彿锛�" + HBillNo;
+ string SystemName = "WMS-" + MvarReportTitle + "妯″潡";
+ oCn.BeginTran();
oCn.RunProc("Delete from Sc_MouldStockBillMain_Temp where HInterID=" + HInterID.ToString() + " and HBillType='" + HBillType + "'", ref DBUtility.ClsPub.sExeReturnInfo);
+ //鍐欏叆鏃ュ織
+ oCn.RunProc("Insert into System_Log(GeginDate,userid,WorkstationName,WorkList,SystemName,NetUserName,State) values " +
+ "(getdate(),'" + HMaker + "','" + ComputerName + "','" + WorkList + "','" + SystemName + "','','鍒犻櫎')"
+ );
+ oCn.Commit();
objJsonResult.code = "0";
objJsonResult.count = 1;
- objJsonResult.Message = "鍒犻櫎鎴愬姛";
+ objJsonResult.Message = "鍗曟嵁鍙凤細" + HBillNo + " 鍒犻櫎鎴愬姛";
objJsonResult.data = null;
return objJsonResult;
}
catch (Exception e)
{
+ oCn.RollBack();
objJsonResult.code = "0";
objJsonResult.count = 0;
objJsonResult.Message = "鍒犻櫎鍣ㄥ叿缂撳瓨鍒楄〃鍗曟嵁澶辫触锛�" + e.ToString();
diff --git "a/WebAPI/Controllers/\346\235\241\347\240\201\347\256\241\347\220\206/WEBSController.cs" "b/WebAPI/Controllers/\346\235\241\347\240\201\347\256\241\347\220\206/WEBSController.cs"
index 63e66fe..d9ca5fa 100644
--- "a/WebAPI/Controllers/\346\235\241\347\240\201\347\256\241\347\220\206/WEBSController.cs"
+++ "b/WebAPI/Controllers/\346\235\241\347\240\201\347\256\241\347\220\206/WEBSController.cs"
@@ -31,6 +31,7 @@
public WebS.WebService1 oWebs = new WebS.WebService1();
public WebS.ClsKf_ICStockBill_WMS WebSoBar = new WebS.ClsKf_ICStockBill_WMS();
Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();
+ string ComputerName = SystemInformation.ComputerName; //璁惧鍚嶇О
WebS.ClsXt_SystemParameterMain oSystemParameterMain = new WebS.ClsXt_SystemParameterMain();
@@ -127,7 +128,7 @@
if (oSystemParameter.ShowBill(ref sErrMsg) == true)
{
//鍒ゆ柇鏉冮檺
- if (!DBUtility.ClsPub.Security_Log(ModRightName, 1, false, HUserName))
+ if (!DBUtility.ClsPub.Security_Log(ModRightName, 3, false, HUserName))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -1517,6 +1518,63 @@
/// 宸蹭笂浼犲垪琛ㄧ晫闈紝鎾ら攢鍔熻兘锛屽垹闄MS琛ㄥ拰鏈湴鍑哄叆搴撳崟璁板綍锛屽苟鏇存柊TEMP琛ㄤ腑鐨勪笂浼犲瓧娈� HRelationInterID=0
/// </summary>
/// <returns></returns>
+ [Route("WEBSController/set_DeleteICStockBillAndWMS_Json")]
+ [HttpGet]
+ public object set_DeleteICStockBillAndWMS_Json(Int64 HInterID, string HBillNo, string HBillType, string HMaker, string MvarReportTitle)
+ {
+ try
+ {
+ string WorkList = "鎾ら攢宸蹭笂浼犲崟鎹紝鍗曟嵁鍙凤細" + HBillNo;
+ string SystemName = "WMS-" + MvarReportTitle + "妯″潡";
+ oCn.BeginTran();
+ ds = oCn.RunProcReturn("exec h_p_WMS_ICStockBillAndWMS_Delete " + HInterID + ",'" + HBillNo + "','" + HBillType + "'", "h_p_WMS_ICStockBillAndWMS_Delete");
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ oCn.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎾ら攢鍗曟嵁宸蹭笂浼犺褰曞け璐ワ紝鎾ら攢鍗曟嵁鍒ゆ柇閿欒锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else if (DBUtility.ClsPub.isLong(ds.Tables[0].Rows[0]["HBack"]) == 1)
+ {
+ oCn.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0; //澶辫触锛�
+ objJsonResult.Message = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HRemark"]);
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ //鍐欏叆鏃ュ織
+ oCn.RunProc("Insert into System_Log(GeginDate,userid,WorkstationName,WorkList,SystemName,NetUserName,State) values " +
+ "(getdate(),'" + HMaker + "','" + ComputerName + "','" + WorkList + "','" + SystemName + "','','鎾ら攢')"
+ );
+ oCn.Commit();
+ objJsonResult.code = "0";
+ objJsonResult.count = 1; //鎴愬姛锛�
+ objJsonResult.Message = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HRemark"]);
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ oCn.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎾ら攢鍗曟嵁宸蹭笂浼犺褰曞け璐ワ紒" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ /// <summary>
+ /// 宸蹭笂浼犲垪琛ㄧ晫闈紝鎾ら攢鍔熻兘锛屽垹闄MS琛ㄥ拰鏈湴鍑哄叆搴撳崟璁板綍锛屽苟鏇存柊TEMP琛ㄤ腑鐨勪笂浼犲瓧娈� HRelationInterID=0
+ /// </summary>
+ /// <returns></returns>
[Route("WEBSController/DeleteICStockBillAndWMS_Json")]
[HttpGet]
public object DeleteICStockBillAndWMS_Json(Int64 HInterID, string HBillNo, string HBillType)
@@ -1556,6 +1614,42 @@
#region 鏉＄爜鍑哄叆搴撶紦瀛樺垪琛ㄦā鍧� 鍒犻櫎缂撳瓨鍒楄〃鍗曟嵁
/// <summary>
+ /// 鍒犻櫎缂撳瓨鍒楄〃鍗曟嵁锛屽啓鍏ユ棩蹇� 20240619
+ /// </summary>
+ /// <returns></returns>
+ [Route("WEBSController/set_DelPonderationBillMain_Temp_New_Json")]
+ [HttpGet]
+ public object set_DelPonderationBillMain_Temp_New_Json(long HInterID, string HBillNo, string HBillType, string HMaker, string MvarReportTitle)
+ {
+ try
+ {
+ string WorkList = "鍒犻櫎缂撳瓨鍗曟嵁锛屽崟鎹彿锛�" + HBillNo;
+ string SystemName = "WMS-" + MvarReportTitle + "妯″潡";
+ oCn.BeginTran();
+ oCn.RunProc("Delete from KF_PonderationBillMain_Temp where HInterID=" + HInterID.ToString() + " and HBillType='" + HBillType + "'", ref DBUtility.ClsPub.sExeReturnInfo);
+ //鍐欏叆鏃ュ織
+ oCn.RunProc("Insert into System_Log(GeginDate,userid,WorkstationName,WorkList,SystemName,NetUserName,State) values " +
+ "(getdate(),'" + HMaker + "','" + ComputerName + "','" + WorkList + "','" + SystemName + "','','鍒犻櫎')"
+ );
+ oCn.Commit();
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍗曟嵁鍙凤細" + HBillNo + " 鍒犻櫎鎴愬姛";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ oCn.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍒犻櫎鏉＄爜鍑哄叆搴撶紦瀛樺垪琛ㄥ崟鎹け璐ワ紒" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ /// <summary>
/// 鍒犻櫎缂撳瓨鍒楄〃鍗曟嵁
/// </summary>
/// <returns></returns>
diff --git a/WebAPI/Web.config b/WebAPI/Web.config
index c32c903..289a89d 100644
--- a/WebAPI/Web.config
+++ b/WebAPI/Web.config
@@ -22,7 +22,7 @@
<!--<add key="FileIP" value="http://localhost:8082/LuBaoAPI"/>-->
<!--<add key="FileIP" value="http://localhost:8080/" />-->
<!--<add key="sUrl" value="http://183.129.128.86:9090/WEBS-WMSTest/WebService1.asmx"/> -->
- <!--<add key="sUrl" value="http://192.168.0.81/WEBS-WMS/WebService1.asmx"/> --><!--棰滃彴寮忔満-->
+ <add key="sUrl" value="http://192.168.0.81/WEBS-WMS/WebService1.asmx"/> <!--棰滃彴寮忔満-->
<!--<add key="sUrl" value="http://60.190.4.42:9003/WebService/WebService1.asmx" /> 澶忓疂-->
<!--<add key="sUrl" value="http://60.190.4.42:9003/WebService/WebService1.asmx" /> -->
<!--<add key="sUrl" value="http://10.10.130.181/WEBS-WMS/WebService1.asmx"/> 鍗氭棩绉戞妧-->
@@ -106,7 +106,7 @@
</basicHttpBinding>
</bindings>
<client>
- <endpoint address="http://61.130.182.102:18181/WEBSCS/WebService1.asmx" binding="basicHttpBinding"
+ <endpoint address="http://192.168.0.81/WEBS-WMS/WebService1.asmx" binding="basicHttpBinding"
bindingConfiguration="WebService1Soap" contract="Webs1.WebService1Soap"
name="WebService1Soap" />
</client>
@@ -115,7 +115,7 @@
<applicationSettings>
<WebAPI.Properties.Settings>
<setting name="WebAPI_WebS_WebService1" serializeAs="String">
- <value>http://61.130.182.102:18181/WEBSCS/WebService1.asmx</value>
+ <value>http://192.168.0.81/WEBS-WMS/WebService1.asmx</value>
</setting>
</WebAPI.Properties.Settings>
</applicationSettings>
diff --git "a/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/Sc_ProcessExchangeBill.cs" "b/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/Sc_ProcessExchangeBill.cs"
index 3b24b89..77962cb 100644
--- "a/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/Sc_ProcessExchangeBill.cs"
+++ "b/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/Sc_ProcessExchangeBill.cs"
@@ -752,7 +752,8 @@
this.BillStatus = DBUtility.ClsPub.Enum_BillStatus.BillStatus_AddNew;
this.Sub_OperStatus();//璁剧疆TOOLBAR
this.Sub_ClearBill();//娓呯┖鐣岄潰
- this.txtHBillNo.Text = ClsPub.CreateBillCode(BillNew.BillType, ref ClsPub.sExeReturnInfo, true);//寰楀埌鏂板崟鍙�
+ //this.txtHBillNo.Text = ClsPub.CreateBillCode(BillNew.BillType, ref ClsPub.sExeReturnInfo, true);//寰楀埌鏂板崟鍙�
+ this.txtHBillNo.Text = ClsPub.CreateBillCode_Prod(BillNew.BillType, ref ClsPub.sExeReturnInfo, true);//寰楀埌鏂板崟鍙� 20240620杩斿洖鍊兼敼鍙栧瓨鍌ㄨ繃绋�
this.txtHBillNo.Enabled = true;
this.txtHBillNo.Focus();
//鐏板害婧愬崟绫诲瀷
@@ -3368,62 +3369,62 @@
string sNo = "";
int row = oTable.Rows.Count - 1;
- //鑾峰彇绯荤粺鍙傛暟 瀹㈡埛瀹氬埗鍖栧悕绉�
- Ds = oCn.RunProcReturn("select HValue from Xt_SystemParameter with(nolock) where HKey='WMS_CampanyName'", "Xt_SystemParameter", ref DBUtility.ClsPub.sExeReturnInfo);
- if (Ds == null || Ds.Tables[0].Rows.Count == 0)
- {
- MessageBox.Show("鑾峰彇绯荤粺鍙傛暟澶辫触锛佸師鍥�:" + DBUtility.ClsPub.sExeReturnInfo, "鎻愮ず");
- return;
- }
- else
- {
- CampanyName = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HValue"]);
- }
- if (CampanyName == "鍑礉濂堢壒") //绯荤粺鍙傛暟 瀹㈡埛瀹氬埗鍖栧悕绉�
- {
+ ////鑾峰彇绯荤粺鍙傛暟 瀹㈡埛瀹氬埗鍖栧悕绉�
+ //Ds = oCn.RunProcReturn("select HValue from Xt_SystemParameter with(nolock) where HKey='WMS_CampanyName'", "Xt_SystemParameter", ref DBUtility.ClsPub.sExeReturnInfo);
+ //if (Ds == null || Ds.Tables[0].Rows.Count == 0)
+ //{
+ // MessageBox.Show("鑾峰彇绯荤粺鍙傛暟澶辫触锛佸師鍥�:" + DBUtility.ClsPub.sExeReturnInfo, "鎻愮ず");
+ // return;
+ //}
+ //else
+ //{
+ // CampanyName = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HValue"]);
+ //}
+ //if (CampanyName == "鍑礉濂堢壒") //绯荤粺鍙傛暟 瀹㈡埛瀹氬埗鍖栧悕绉�
+ //{
- }
- else
- {
- //鑾峰彇褰撳墠鏀圭敓浜ц鍗� 鏈�澶ф祦杞崱鍙凤紝骞剁疮璁″鍔�1銆�
- //鏅鸿鍗曞彿- 骞存湀鏃�20200701+001
- string sOldNo = "";
- //Ds = oCn.RunProcReturn("select top 1 HBillNo from Sc_ProcessExchangeBillmain where hicmointerid=" + oTable.Rows[row]["hmainid"].ToString() + " order by LEN(HBillno) desc, HbillNo desc ", "Sc_ProcessExchangeBillmain");
+ //}
+ //else
+ //{
+ // //鑾峰彇褰撳墠鏀圭敓浜ц鍗� 鏈�澶ф祦杞崱鍙凤紝骞剁疮璁″鍔�1銆�
+ // //鏅鸿鍗曞彿- 骞存湀鏃�20200701+001
+ // string sOldNo = "";
+ // //Ds = oCn.RunProcReturn("select top 1 HBillNo from Sc_ProcessExchangeBillmain where hicmointerid=" + oTable.Rows[row]["hmainid"].ToString() + " order by LEN(HBillno) desc, HbillNo desc ", "Sc_ProcessExchangeBillmain");
- Ds = oCn.RunProcReturn("select top 1 HBillNo from Sc_ProcessExchangeBillmain where HDate='" + dtpHDate.Value.ToShortDateString() + "' and HBillSubType<>'Split' order by HbillNo desc ", "Sc_ProcessExchangeBillmain");
- if (Ds == null || Ds.Tables[0].Rows.Count == 0)
- {
- sNo = "001";
- }
- else
- {
- sOldNo = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HBillNo"]);
- sOldNo = sOldNo.Substring(sOldNo.Length - 3, 3);
- //if (sOldNo.Substring(0, 1) == "0" || sOldNo.Substring(0, 1) == "-")
- //{
- // sOldNo = sOldNo.Substring(sOldNo.Length - 2, 2);
- // if (sOldNo.Substring(0, 1) == "0")
- // {
- // sOldNo = sOldNo.Substring(sOldNo.Length - 1, 1);
- // }
- //}
- sNo = "0000" + DBUtility.ClsPub.isStrNull(DBUtility.ClsPub.isLong(sOldNo) + 1);
- }
+ // Ds = oCn.RunProcReturn("select top 1 HBillNo from Sc_ProcessExchangeBillmain where HDate='" + dtpHDate.Value.ToShortDateString() + "' and HBillSubType<>'Split' order by HbillNo desc ", "Sc_ProcessExchangeBillmain");
+ // if (Ds == null || Ds.Tables[0].Rows.Count == 0)
+ // {
+ // sNo = "001";
+ // }
+ // else
+ // {
+ // sOldNo = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HBillNo"]);
+ // sOldNo = sOldNo.Substring(sOldNo.Length - 3, 3);
+ // //if (sOldNo.Substring(0, 1) == "0" || sOldNo.Substring(0, 1) == "-")
+ // //{
+ // // sOldNo = sOldNo.Substring(sOldNo.Length - 2, 2);
+ // // if (sOldNo.Substring(0, 1) == "0")
+ // // {
+ // // sOldNo = sOldNo.Substring(sOldNo.Length - 1, 1);
+ // // }
+ // //}
+ // sNo = "0000" + DBUtility.ClsPub.isStrNull(DBUtility.ClsPub.isLong(sOldNo) + 1);
+ // }
- sNo = sNo.Substring(sNo.Length - 3, 3);
- //initGrid();
- //initGrid_Sub();
- //string sBillNo = oTable.Rows[row]["鐢熶骇璁㈠崟鍙�"].ToString();
- string sYear = dtpHDate.Value.Year.ToString();
- string sMonth = "00" + dtpHDate.Value.Month.ToString();
- string sDay = "00" + dtpHDate.Value.Day.ToString();
- string sBillNo = sYear + sMonth.Substring(sMonth.Length - 2, 2) + sDay.Substring(sDay.Length - 2, 2);
- //sBillNo = sBillNo.Replace("WORKX", "");
- //sBillNo = sBillNo.Replace("WORK", "");
- //sBillNo = sBillNo.Replace("_", "-");
- sBillNo = sBillNo + "-" + sNo;
- txtHBillNo.Text = sBillNo;
- }
+ // sNo = sNo.Substring(sNo.Length - 3, 3);
+ // //initGrid();
+ // //initGrid_Sub();
+ // //string sBillNo = oTable.Rows[row]["鐢熶骇璁㈠崟鍙�"].ToString();
+ // string sYear = dtpHDate.Value.Year.ToString();
+ // string sMonth = "00" + dtpHDate.Value.Month.ToString();
+ // string sDay = "00" + dtpHDate.Value.Day.ToString();
+ // string sBillNo = sYear + sMonth.Substring(sMonth.Length - 2, 2) + sDay.Substring(sDay.Length - 2, 2);
+ // //sBillNo = sBillNo.Replace("WORKX", "");
+ // //sBillNo = sBillNo.Replace("WORK", "");
+ // //sBillNo = sBillNo.Replace("_", "-");
+ // sBillNo = sBillNo + "-" + sNo;
+ // txtHBillNo.Text = sBillNo;
+ //}
--
Gitblit v1.9.1