From 7e35fc76661ff4a26d24cc8912e2534576be85be Mon Sep 17 00:00:00 2001
From: 王 垚 <1402714037@qq.com>
Date: 星期四, 14 七月 2022 10:27:13 +0800
Subject: [PATCH] 优化
---
WebAPI/Controllers/BarCodeController.cs | 225 +++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 165 insertions(+), 60 deletions(-)
diff --git a/WebAPI/Controllers/BarCodeController.cs b/WebAPI/Controllers/BarCodeController.cs
index 568d55b..e0164a3 100644
--- a/WebAPI/Controllers/BarCodeController.cs
+++ b/WebAPI/Controllers/BarCodeController.cs
@@ -575,42 +575,16 @@
LSH = ClsPub.isInt(Ds.Tables[0].Rows[0][0]);
foreach (Model.ClsGy_MaterialList_WMS_Model oItemSub in ls)
{
- LogService.Write("model鍒濆鍖栵細" + oItemSub.HKFDate);
+ //澶栫
if (ClsPub.isLong(oItemSub.HMaterID) != 0)
{
HNumber = oItemSub.HMaterID.ToString();
- //HNumber = HNumber.Replace(".", "");
- //
-
- //HQty = Math.Ceiling(HBQty + ClsPub.isDoule(oItemSub.HWBQty));
-
HQty = ClsPub.isDoule(oItemSub.HWBQty);
HBQty = ClsPub.isInt(oItemSub.HWBQty);
HMinQty = ClsPub.isDoule(oItemSub.HWXQty);
HSumQty = ClsPub.isDoule(oItemSub.HQty); //HWXQtyCol
for (int i = 0; i < HBQty; i++)
{
- LSH = LSH + 1;
- LSH2 = LSH.ToString();
- while (LSH2.Length < LSHlen) //濡傛灉娴佹按鍙峰皬浜�6浣嶆暟鍓嶉潰琛�0
- {
- LSH2 = "0" + LSH2;
- }
- sDate = ClsPub.GetServerDate(0);
- sYear = ClsPub.isDate(sDate).Year.ToString().Substring(2, 2);
- sPeriod = "0" + ClsPub.isDate(sDate).Month.ToString();
- sPeriod = sPeriod.Substring(sPeriod.Length - 2, 2);
- sDay = "0" + ClsPub.isDate(sDate).Day.ToString();
- sDay = sDay.Substring(sDay.Length - 2, 2);
- //==================================
- TM = HNumber + sYear + sPeriod + sDay + LSH2;
- while (TM.Length < SumLen) //濡傛灉鏉＄爜灏忎簬12浣嶆暟鍓嶉潰琛�0
- {
- TM = "0" + TM;
- }
- //TM = "B" + TM;
- TM = "SRM" + "B" + TM;
-
if (HSumQty - HMinQty > 0)
{
WeiShu = "";
@@ -628,7 +602,8 @@
}
HMinQty = HSumQty;
}
-
+ TM = $"{oItemSub.HMaterID}#{HMinQty}";
+
Model.ClsGy_BarCodeBill_WMS_Model bar = new Model.ClsGy_BarCodeBill_WMS_Model();
bar.HBarCode = TM;
bar.HMaterID = oItemSub.HMaterID;
@@ -660,7 +635,8 @@
}
foreach (Model.ClsGy_BarCodeBill_WMS_Model oItemSub2 in ls2)
{
- LogService.Write("寰幆绗竴娆�:" + oItemSub2.HSupID);
+ //鍐呯
+ //LogService.Write("寰幆绗竴娆�:" + oItemSub2.HSupID);
if (ClsPub.isLong(oItemSub2.HMaterID) != 0)
{
long sMaterID = ClsPub.isLong(oItemSub2.HMaterID);
@@ -720,10 +696,7 @@
TM2 = "0" + TM2;
}
bar2.HMaterID = oItemSub2.HMaterID;
-
-
- bar2.HBarCode = oItemSub2.HBarCode + "-" + TM2;
-
+ bar2.HBarCode = oItemSub2.HBarCode.Split('#')[0] + "#" + HWXQty.ToString();
bar2.HUnitID = oItemSub2.HUnitID;
bar2.HQty = HWXQty;
bar2.HBatchNo = DBUtility.ClsPub.isStrNull(oItemSub2.HBatchNo);
@@ -738,7 +711,7 @@
bar2.HEndQty = WeiShu1;
bar2.HMTONO = oItemSub2.HMTONO;
ls3.Add(bar2);
- LogService.Write("娴嬭瘯鍔�+++" + oItemSub2.HSupID);
+ //LogService.Write("娴嬭瘯鍔�+++" + oItemSub2.HSupID);
}
}
}
@@ -763,7 +736,7 @@
oCn.BeginTran();
foreach (Model.ClsGy_BarCodeBill_WMS_Model oItemSub in ls2)
{
- LogService.Write("寰幆绗簩娆�:" + oItemSub.HSupID);
+ //LogService.Write("寰幆绗簩娆�:" + oItemSub.HSupID);
if (ClsPub.isLong(oItemSub.HMaterID) != 0)
{
HBarCode = oItemSub.HBarCode.ToString();
@@ -774,7 +747,7 @@
HQty2 = ClsPub.isDoule(oItemSub.HQty);
HBatchNo = ClsPub.isStrNull(oItemSub.HBatchNo);
HSupID = oItemSub.HSupID;
- LogService.Write("HSupID:" + oItemSub.HSupID);
+ //LogService.Write("HSupID:" + oItemSub.HSupID);
HKFPeriod = ClsPub.isInt(oItemSub.HKFPeriod);
HKFDate = ClsPub.isStrNull(oItemSub.HKFDate);
HKFDQDate = ClsPub.isStrNull(oItemSub.HKFDQDate);
@@ -790,19 +763,12 @@
+ linterid.ToString() + ",'" + HBarCode + "','" + HBarCodeType + "'," + HMaterID + "," + HUnitID + "," + HQty2 + ",'" + HKFDate + "'," + HKFPeriod + ",'" + HKFDQDate
+ "','" + HBatchNo + "'," + HSupID + "," + HGroupID + ",'" + ClsPub.CurUserName + "','" + DateTime.Today + "'," + HPrintQty + ",'" + HWei + "',1"
+ "," + HSourceInterID + "," + HSourceEntryID + ",'" + HSourceBillNo + "','" + HSourceBillType + "','" + HMTONO + "')");
- LogService.Write("insert into Gy_BarCodeBill (HInterID,HBarCode,HBarCodeType,HMaterID,HUnitID,HQty,HKFDate,HKFPeriod,HKFDQDate" +
- ",HBatchNo,HSupID,HGroupID,HMaker,HMakeDate,HPrintQty,HEndQty,HSupflag" +
- ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HMTONO " +
- ") values ("
- + linterid.ToString() + ",'" + HBarCode + "','" + HBarCodeType + "'," + HMaterID + "," + HUnitID + "," + HQty2 + ",'" + HKFDate + "'," + HKFPeriod + ",'" + HKFDQDate
- + "','" + HBatchNo + "'," + HSupID + "," + HGroupID + ",'" + ClsPub.CurUserName + "','" + DateTime.Today + "'," + HPrintQty + ",'" + HWei + "',1"
- + "," + HSourceInterID + "," + HSourceEntryID + ",'" + HSourceBillNo + "','" + HSourceBillType + "','" + HMTONO + "')");
oCn.RunProc("exec setLSH '" + DateTime.Today + "'");
}
}
foreach (Model.ClsGy_BarCodeBill_WMS_Model oItemSub in ls3)
{
- LogService.Write("寰幆绗笁娆�:" + oItemSub.HSupID);
+ //LogService.Write("寰幆绗笁娆�:" + oItemSub.HSupID);
if (ClsPub.isLong(oItemSub.HMaterID) != 0)
{
HBarCode = oItemSub.HBarCode.ToString();
@@ -1385,7 +1351,7 @@
for (int i = 0; i < HBQty; i++)
{
// 瀹夌憺鏉＄爜瑙勫垯锛氱墿鏂欑紪鐮侊紙绯荤粺浠ｅ叆锛堾鐗╂枡鍚嶇О锛堢郴缁熶唬鍏ワ級@瑙勬牸鍨嬪彿锛堢郴缁熶唬鍏ワ級@鐢熶骇鏃ユ湡锛堟墜宸ヨ緭鍏ワ級@鏁伴噺锛堟墜宸ヨ緭鍏ワ級@澶辨晥鏃ユ湡锛堟墜宸ヨ緭鍏ワ級@鎵规鍙凤紙鎵嬪伐浠ｅ叆锛堾渚涘簲鍟嗗悕绉帮紙绯荤粺浠ｅ叆锛堾閲囪喘璁㈠崟鍙凤紙绯荤粺浠ｅ叆锛�
- TM =$"{oItemSub.HMaterNumber}@{oItemSub.HMaterName}@{oItemSub.HMaterModel}@{oItemSub.HKFDate}@{oItemSub.HQty}@{oItemSub.HKFDQDate}@{oItemSub.HBatchNo}@{oItemSub.HSupName}@{oItemSub.HSourceBillNo}";
+ TM = $"{oItemSub.HMaterNumber}@{oItemSub.HMaterName}@{oItemSub.HMaterModel}@{oItemSub.HKFDate}@{oItemSub.HQty}@{oItemSub.HKFDQDate}@{oItemSub.HBatchNo}@{oItemSub.HSupName}@{oItemSub.HSourceBillNo}";
if (HSumQty - HMinQty > 0)
{
@@ -1561,13 +1527,6 @@
+ "','" + HBatchNo + "'," + HSupID + "," + HGroupID + ",'" + ClsPub.CurUserName + "','" + DateTime.Today + "'," + HPrintQty + ",'" + HWei + "',1"
+ "," + HSourceInterID + "," + HSourceEntryID + ",'" + HSourceBillNo + "','" + HSourceBillType + "','" + HMTONO + "')");
oCn.RunProc("exec setLSH '" + DateTime.Today + "'");
- LogService.Write("insert into Gy_BarCodeBill (HInterID,HBarCode,HBarCodeType,HMaterID,HUnitID,HQty,HKFDate,HKFPeriod,HKFDQDate" +
- ",HBatchNo,HSupID,HGroupID,HMaker,HMakeDate,HPrintQty,HEndQty,HSupflag" +
- ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HMTONO " +
- ") values ("
- + linterid.ToString() + ",'" + HBarCode + "','" + HBarCodeType + "'," + HMaterID + "," + HUnitID + "," + HQty2 + ",'" + HKFDate + "'," + HKFPeriod + ",'" + HKFDQDate
- + "','" + HBatchNo + "'," + HSupID + "," + HGroupID + ",'" + ClsPub.CurUserName + "','" + DateTime.Today + "'," + HPrintQty + ",'" + HWei + "',1"
- + "," + HSourceInterID + "," + HSourceEntryID + ",'" + HSourceBillNo + "','" + HSourceBillType + "','" + HMTONO + "')");
}
}
foreach (Model.ClsGy_BarCodeBill_WMS_Model oItemSub in ls3)
@@ -1597,14 +1556,6 @@
+ linterid.ToString() + ",'" + HBarCode + "','" + HBarCodeType + "'," + HMaterID + "," + HUnitID + "," + HQty2 + ",'" + HKFDate + "'," + HKFPeriod + ",'" + HKFDQDate
+ "','" + HBatchNo + "'," + HSupID + "," + HGroupID + ",'" + ClsPub.CurUserName + "','" + DateTime.Today + "'," + HPrintQty + ",'" + HWei + "',1"
+ "," + HSourceInterID + "," + HSourceEntryID + ",'" + HSourceBillNo + "','" + HSourceBillType + "','" + HMTONO + "')");
- LogService.Write("insert into Gy_BarCodeBill (HInterID,HBarCode,HBarCodeType,HMaterID,HUnitID,HQty,HKFDate,HKFPeriod,HKFDQDate" +
- ",HBatchNo,HSupID,HGroupID,HMaker,HMakeDate,HPrintQty,HEndQty,HSupflag" +
- ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HMTONO " +
- ") values ("
- + linterid.ToString() + ",'" + HBarCode + "','" + HBarCodeType + "'," + HMaterID + "," + HUnitID + "," + HQty2 + ",'" + HKFDate + "'," + HKFPeriod + ",'" + HKFDQDate
- + "','" + HBatchNo + "'," + HSupID + "," + HGroupID + ",'" + ClsPub.CurUserName + "','" + DateTime.Today + "'," + HPrintQty + ",'" + HWei + "',1"
- + "," + HSourceInterID + "," + HSourceEntryID + ",'" + HSourceBillNo + "','" + HSourceBillType + "','" + HMTONO + "')");
-
}
}
//鏆傛椂鍙洖濉叧鑱旀暟閲�
@@ -1629,5 +1580,159 @@
return objJsonResult;
}
#endregion
+
+ #region 濮斿璁㈠崟鏉＄爜鐢熸垚鍔熻兘锛堝畨鐟烇級
+ [Route("GetHBarCodeShowBillMainBywy")]
+ /// <summary>
+ /// 鏉＄爜鐢熸垚琛ㄥご锛堥噰璐鍗曪級
+ /// </summary>
+ /// <param name="sMsg"></param>
+ /// <returns></returns>
+ public object GetHBarCodeShowBillMainBywy(string sMsg)
+ {
+ try
+ {
+ DataSet ds;
+ string s = "";
+ string ShowItem = " * ";//鏄剧ず鐨勫瓧娈�
+ if (DBUtility.ClsPub.isLong(sMsg) == 0)
+ {
+ objjson.code = "0";
+ objjson.count = 0;
+ objjson.Message = "鑾峰彇澶辫触";
+ objjson.data = null;
+ return objjson;
+ }
+ DAL.ClsWeb_BarCodeBill oClsWeb_BarCodeBill = new DAL.ClsWeb_BarCodeBill();
+ string sql = string.Format(@"select * from h_v_SRM_EntrustOrderBillMain_ForWeb2 where HInterID = " + sMsg);
+ ds = oCn.RunProcReturn(sql, "h_v_SRM_EntrustOrderBillMain_ForWeb2");
+ //ds = oClsWeb_BarCodeBill.ShowBillMain1(DBUtility.ClsPub.isLong(sMsg), ShowItem, ref DBUtility.ClsPub.sExeReturnInfo);
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objjson.code = "0";
+ objjson.count = 0;
+ objjson.Message = "鑾峰彇澶辫触";
+ objjson.data = null;
+ return objjson;
+ }
+ else
+ {
+
+ objjson.code = "0";
+ objjson.count = 10000;
+ objjson.Message = "鑾峰彇鎴愬姛";
+ objjson.data = ds.Tables[0];
+ return objjson;
+ }
+ }
+ catch (Exception e)
+ {
+ objjson.code = "0";
+ objjson.count = 0;
+ objjson.Message = "鑾峰彇澶辫触" + e.ToString();
+ objjson.data = null;
+ return objjson;
+ }
+ }
+ [Route("GetHBarCodeShowBillSubBywy")]
+ [HttpGet]
+ /// <summary>
+ /// 鏉＄爜鐢熸垚琛ㄤ綋锛堥噰璐鍗曪級
+ /// </summary>
+ /// <param name="sMsg"></param>
+ /// <returns></returns>
+ public object GetHBarCodeShowBillSubBywy(string sMsg)
+ {
+ try
+ {
+ DataSet ds;
+ string s = "";
+ string ShowItem = " * ";//鏄剧ず鐨勫瓧娈�
+ if (DBUtility.ClsPub.isLong(sMsg) == 0)
+ {
+ objjson.code = "0";
+ objjson.count = 0;
+ objjson.Message = "鑾峰彇澶辫触";
+ objjson.data = null;
+ return objjson;
+ }
+ DAL.ClsWeb_BarCodeBill oClsWeb_BarCodeBill = new DAL.ClsWeb_BarCodeBill();
+ string sql = string.Format(@"select * from h_v_srm_EntrustOrderBillSub_ForWeb2 where HInterID = " + sMsg);
+ ds = oCn.RunProcReturn(sql, "h_v_srm_EntrustOrderBillSub_ForWeb2");
+ //ds = oClsWeb_BarCodeBill.ShowBillSub(DBUtility.ClsPub.isLong(sMsg), ShowItem, ref DBUtility.ClsPub.sExeReturnInfo);
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objjson.code = "0";
+ objjson.count = 0;
+ objjson.Message = "鑾峰彇澶辫触";
+ objjson.data = null;
+ return objjson;
+ }
+ else
+ {
+ objjson.code = "0";
+ objjson.count = 10000;
+ objjson.Message = "鑾峰彇鎴愬姛";
+ objjson.data = ds.Tables[0];
+ return objjson;
+ }
+ }
+ catch (Exception e)
+ {
+ objjson.code = "0";
+ objjson.count = 0;
+ objjson.Message = "鑾峰彇澶辫触" + e.ToString();
+ objjson.data = null;
+ return objjson;
+ }
+ }
+
+ [Route("DeltetBarCodeBill")]
+ [HttpGet]
+ public object DeltetBarCodeBill(string HInterID, string HUserName)
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ try
+ {
+ string sql = "select HBarCode,HSourceInterID,HSourceEntryID,HQty,HBarCodeType,HSourceBillType from Gy_BarCodeBill where HItemID in(" + HInterID + ") ";
+ //LogService.Write("鍒犻櫎sql:" + sql);
+ oCN.BeginTran();
+ DataTable dt = oCN.RunProcReturn(sql, "deleteTable").Tables[0];
+ if (dt.Rows.Count > 0)
+ {
+ foreach (DataRow dr in dt.Rows)
+ {
+ WebAPIController.Add_Log("鏉＄爜妗ｆ鍒犻櫎", HUserName, "鍗曞彿" + dr["HBarCode"].ToString());
+ //鍙嶅啓鎵撳嵃鏁伴噺鍒伴噰璐鍗曞瓙琛�
+ if (dr["HBarCodeType"].ToString() == "绠卞彿鍐呮潯鐮�" && dr["HSourceBillType"].ToString() == "1102")
+ oCN.RunProc($"update Cg_POOrderBillSub set HBarcodeCount -= {dr["HQty"]} where HInterID ={dr["HSourceInterID"]} and HEntryID ={dr["HSourceEntryID"]}");
+ //鍙嶅啓鎵撳嵃鏁伴噺鍒板澶栬鍗�
+ if (dr["HBarCodeType"].ToString() == "绠卞彿鍐呮潯鐮�" && dr["HSourceBillType"].ToString() == "1601")
+ oCN.RunProc($"update WW_EntrustOrderBillSub set HBarcodeCount -= {dr["HQty"]} where HInterID ={dr["HSourceInterID"]} and HEntryID ={dr["HSourceEntryID"]}");
+ //鍙嶅啓鎵撳嵃鏁伴噺鍒伴�佽揣鍗� 锛堜笉闇�瑕佸弽鍐� 閫佽揣鍗曠洿鎺ユ槸鍏宠仈鏌ヨ鍙栫殑鏁伴噺 娌℃湁鍦ㄦ簮鍗曚笂鍋氫繚瀛橈級
+ if (dr["HBarCodeType"].ToString() == "绠卞彿鍐呮潯鐮�" && dr["HSourceBillType"].ToString() == "1103")
+ continue;
+ //oCN.RunProc($"update WW_EntrustOrderBillSub set HBarcodeCount -= {dr["HQty"]} where HInterID ={dr["HSourceInterID"]} and HEntryID ={dr["HSourceEntryID"]}");
+ }
+ }
+ oCN.RunProc("Delete From Gy_BarCodeBill where HItemID in(" + HInterID + ") ");
+ oCN.Commit();
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍒犻櫎鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
}
}
\ No newline at end of file
--
Gitblit v1.9.1