From d4742224ea65141baf32fe8860e87e9b6e11e780 Mon Sep 17 00:00:00 2001
From: 王 垚 <1402714037@qq.com>
Date: 星期一, 03 一月 2022 16:50:18 +0800
Subject: [PATCH] nothing
---
WebAPI/Controllers/BarCodeController.cs | 198 ++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 163 insertions(+), 35 deletions(-)
diff --git a/WebAPI/Controllers/BarCodeController.cs b/WebAPI/Controllers/BarCodeController.cs
index 8184ca0..3cb825b 100644
--- a/WebAPI/Controllers/BarCodeController.cs
+++ b/WebAPI/Controllers/BarCodeController.cs
@@ -575,7 +575,7 @@
LSH = ClsPub.isInt(Ds.Tables[0].Rows[0][0]);
foreach (Model.ClsGy_MaterialList_WMS_Model oItemSub in ls)
{
- LogService.Write("model鍒濆鍖栵細" + oItemSub.HKFDate);
+ //LogService.Write("model鍒濆鍖栵細" + oItemSub.HKFDate);
if (ClsPub.isLong(oItemSub.HMaterID) != 0)
{
HNumber = oItemSub.HMaterID.ToString();
@@ -660,7 +660,7 @@
}
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);
@@ -738,7 +738,7 @@
bar2.HEndQty = WeiShu1;
bar2.HMTONO = oItemSub2.HMTONO;
ls3.Add(bar2);
- LogService.Write("娴嬭瘯鍔�+++" + oItemSub2.HSupID);
+ //LogService.Write("娴嬭瘯鍔�+++" + oItemSub2.HSupID);
}
}
}
@@ -763,7 +763,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 +774,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,7 +790,7 @@
+ 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" +
+ //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 ("
@@ -802,7 +802,7 @@
}
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();
@@ -1377,36 +1377,15 @@
{
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);//鍐呯鏁伴噺
+ HQty = ClsPub.isDoule(oItemSub.HWBQty);//鍐呯鏁�
+ HBQty = ClsPub.isInt(oItemSub.HWBQty);//鍐呯鏁�
HMinQty = ClsPub.isDoule(oItemSub.HWXQty);//澶栫鍖呰鏁�
- HSumQty = ClsPub.isDoule(oItemSub.HQty); //HWXQtyCol
+ HSumQty = ClsPub.isDoule(oItemSub.HQty); //浜у搧鏁伴噺
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;
+ // 瀹夌憺鏉＄爜瑙勫垯锛氱墿鏂欑紪鐮侊紙绯荤粺浠ｅ叆锛堾鐗╂枡鍚嶇О锛堢郴缁熶唬鍏ワ級@瑙勬牸鍨嬪彿锛堢郴缁熶唬鍏ワ級@鐢熶骇鏃ユ湡锛堟墜宸ヨ緭鍏ワ級@鏁伴噺锛堟墜宸ヨ緭鍏ワ級@澶辨晥鏃ユ湡锛堟墜宸ヨ緭鍏ワ級@鎵规鍙凤紙鎵嬪伐浠ｅ叆锛堾渚涘簲鍟嗗悕绉帮紙绯荤粺浠ｅ叆锛堾閲囪喘璁㈠崟鍙凤紙绯荤粺浠ｅ叆锛�
+ TM = $"{oItemSub.HMaterNumber}@{oItemSub.HMaterName}@{oItemSub.HMaterModel}@{oItemSub.HKFDate}@{oItemSub.HQty}@{oItemSub.HKFDQDate}@{oItemSub.HBatchNo}@{oItemSub.HSupName}@{oItemSub.HSourceBillNo}";
if (HSumQty - HMinQty > 0)
{
@@ -1433,11 +1412,9 @@
//bar.HMaterName = oItemSub.HMaterName;
//bar.HMaterModel = oItemSub.HMaterModel;
// bar.HModel2 = oItemSub.HModel;
-
bar.HUnitID = oItemSub.HUnitID;
//bar.HUnitNumber2 = oItemSub.HUnitNumber;
//bar.HUnitName2 = oItemSub.HUnitName;
-
bar.HQty = HMinQty;
bar.HBatchNo = oItemSub.HBatchNo;
bar.HKFDate = oItemSub.HKFDate;
@@ -1584,6 +1561,13 @@
+ "','" + 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)
@@ -1613,6 +1597,14 @@
+ 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 + "')");
+
}
}
//鏆傛椂鍙洖濉叧鑱旀暟閲�
@@ -1637,5 +1629,141 @@
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
+ {
+ WebAPIController.Add_Log("鏉＄爜妗ｆ鍒犻櫎", HUserName, "鏉＄爜妗ｆ鍒犻櫎");
+ oCN.BeginTran();
+ //LogService.Write("Delete From Gy_BarCodeBill where HItemID in(" + HInterID + ")") ;
+ 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