From f165ef7e3b194d59d05e999d4106953aca05f55a Mon Sep 17 00:00:00 2001
From: 王 垚 <1402714037@qq.com>
Date: 星期三, 10 八月 2022 20:06:57 +0800
Subject: [PATCH] 优化 送货单批量删除
---
WebAPI/Controllers/BarCodeController.cs | 502 +++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 443 insertions(+), 59 deletions(-)
diff --git a/WebAPI/Controllers/BarCodeController.cs b/WebAPI/Controllers/BarCodeController.cs
index 8184ca0..9665667 100644
--- a/WebAPI/Controllers/BarCodeController.cs
+++ b/WebAPI/Controllers/BarCodeController.cs
@@ -575,15 +575,10 @@
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);
@@ -610,7 +605,7 @@
}
//TM = "B" + TM;
TM = "SRM" + "B" + TM;
-
+
if (HSumQty - HMinQty > 0)
{
WeiShu = "";
@@ -628,7 +623,6 @@
}
HMinQty = HSumQty;
}
-
Model.ClsGy_BarCodeBill_WMS_Model bar = new Model.ClsGy_BarCodeBill_WMS_Model();
bar.HBarCode = TM;
bar.HMaterID = oItemSub.HMaterID;
@@ -660,7 +654,7 @@
}
foreach (Model.ClsGy_BarCodeBill_WMS_Model oItemSub2 in ls2)
{
- LogService.Write("寰幆绗竴娆�:" + oItemSub2.HSupID);
+ //鍐呯
if (ClsPub.isLong(oItemSub2.HMaterID) != 0)
{
long sMaterID = ClsPub.isLong(oItemSub2.HMaterID);
@@ -720,10 +714,7 @@
TM2 = "0" + TM2;
}
bar2.HMaterID = oItemSub2.HMaterID;
-
-
bar2.HBarCode = oItemSub2.HBarCode + "-" + TM2;
-
bar2.HUnitID = oItemSub2.HUnitID;
bar2.HQty = HWXQty;
bar2.HBatchNo = DBUtility.ClsPub.isStrNull(oItemSub2.HBatchNo);
@@ -738,7 +729,7 @@
bar2.HEndQty = WeiShu1;
bar2.HMTONO = oItemSub2.HMTONO;
ls3.Add(bar2);
- LogService.Write("娴嬭瘯鍔�+++" + oItemSub2.HSupID);
+ //LogService.Write("娴嬭瘯鍔�+++" + oItemSub2.HSupID);
}
}
}
@@ -763,7 +754,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 +765,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);
@@ -783,26 +774,23 @@
HSourceBillNo = ClsPub.isStrNull(oItemSub.HSourceBillNo);
HSourceBillType = ClsPub.isStrNull(oItemSub.HSourceBillType);
HWei = ClsPub.isStrNull(oItemSub.HEndQty);
- oCn.RunProc("insert into Gy_BarCodeBill (HInterID,HBarCode,HBarCodeType,HMaterID,HUnitID,HQty,HKFDate,HKFPeriod,HKFDQDate" +
+ string sql = "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 + "')");
- 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 + "'");
+ + "," + HSourceInterID + "," + HSourceEntryID + ",'" + HSourceBillNo + "','" + HSourceBillType + "','" + HMTONO + "')";
+ oCn.RunProc(sql);
+ //LogService.Write(sql);
+ sql = "exec setLSH '" + DateTime.Today + "'";
+ oCn.RunProc(sql);
+ //LogService.Write(sql);
}
}
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();
@@ -821,19 +809,263 @@
HSourceBillNo = ClsPub.isStrNull(oItemSub.HSourceBillNo);
HSourceBillType = ClsPub.isStrNull(oItemSub.HSourceBillType);
HWei = ClsPub.isStrNull(oItemSub.HEndQty);
- oCn.RunProc("insert into Gy_BarCodeBill (HInterID,HBarCode,HBarCodeType,HMaterID,HUnitID,HQty,HKFDate,HKFPeriod,HKFDQDate" +
+ string sql = "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 + "')");
+ + "," + HSourceInterID + "," + HSourceEntryID + ",'" + HSourceBillNo + "','" + HSourceBillType + "','" + HMTONO + "')";
+ oCn.RunProc(sql);
+ //LogService.Write(sql);
}
}
//鏆傛椂鍙洖濉叧鑱旀暟閲�
- oCn.RunProc("exec H_p_SRM_BarCodeBill_Update_UpdateBillRelateData " + linterid.ToString());
+ string _sql = "exec H_p_SRM_BarCodeBill_Update_UpdateBillRelateData " + linterid.ToString();
+ //LogService.Write(_sql);
+ oCn.RunProc(_sql);
oCn.Commit();
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "" + e.Message + DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鐢熸垚鏉＄爜鎴愬姛锛�";
+ WebAPIController.Add_Log("鏉＄爜涓嬫帹", UserName, "鐢熸垚鏉＄爜");
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ //妫�鏌ユ槸鍚﹀凡缁忕敓鎴愭潯鐮�
+ public bool CheckBarCode(Int64 HSourceInterID, Int64 HSourceEntryID)
+ {
+ DataSet Ds;
+ Ds = oCn.RunProcReturn("select * from Gy_BarCodeBill where HSourceInterID=" + HSourceInterID + " and HSourceEntryID=" + HSourceEntryID, "Gy_BarCodeBill");
+ if (Ds == null)
+ {
+ return false;
+ }
+ if (Ds.Tables[0].Rows.Count == 0)
+ {
+ return true;
+ }
+ else
+ {
+ return false;
+ }
+ }
+
+ [Route("GetBarcodeSaveBillOnlyInnerBox")]
+ [HttpPost]
+ /// <summary>
+ /// 鐢熸垚鏉＄爜(浠呭唴绠�)
+ /// </summary>
+ /// <param name="msg"></param>
+ /// <param name="msg2"></param>
+ /// <returns></returns>
+ public object GetBarcodeSaveBillOnlyInnerBox([FromBody] JObject msg)
+ {
+ var _value = msg["msg"].ToString();
+ string msg1 = _value.ToString();
+ string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ string msg2 = sArray[0].ToString();
+ string msg3 = sArray[1].ToString();
+ //LogService.Write(msg3);
+ string UserName = "";
+ ListModels oListModels = new ListModels();
+ try
+ {
+ List<Model.ClsCg_POInStockBillMain> lsmain = new List<Model.ClsCg_POInStockBillMain>();
+ msg2 = msg2.Replace("\\", "");
+ msg2 = msg2.Replace("\n", ""); //\n
+ lsmain = oListModels.getObjectByJson_POInStockMain(msg2);
+ foreach (Model.ClsCg_POInStockBillMain oItem in lsmain)
+ {
+ UserName = oItem.HMaker;
+ }
+ DAL.ClsWeb_BarCodeBill oBill = new DAL.ClsWeb_BarCodeBill();
+
+ msg3 = msg3.Substring(1, msg3.Length - 2);
+ msg3 = msg3.Replace("\\", "");
+ msg3 = msg3.Replace("\n", ""); //\n
+
+ List<Model.ClsGy_MaterialList_WMS_Model> ls = new List<Model.ClsGy_MaterialList_WMS_Model>();
+ List<Model.ClsGy_BarCodeBill_WMS_Model> ls2 = new List<Model.ClsGy_BarCodeBill_WMS_Model>();
+ List<Model.ClsGy_BarCodeBill_WMS_Model> ls3 = new List<Model.ClsGy_BarCodeBill_WMS_Model>();
+ ls = oListModels.getObjectByJson_MaterialList(msg3);
+
+ foreach (Model.ClsGy_MaterialList_WMS_Model oItemSub in ls)
+ {
+ if (CheckBarCode(oItemSub.HSourceInterID, oItemSub.HSourceEntryID) == false)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "宸插瓨鍦ㄦ潯鐮侊紝涓嶅厑璁搁噸澶嶇敓鎴愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (msg2 != string.Empty)
+ {
+ if (oItemSub.HBQty == 0 || oItemSub.HMinQty == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍐呯鍖呰鏁颁笉鑳戒负0锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ }
+ }
+ long linterid = Pub_Class.ClsPub.CreateBillID_SRMProd("8888", ref DBUtility.ClsPub.sExeReturnInfo);
+ int LSHlen = 6; //娴佹按鍙烽暱搴�
+ int SumLen = 10; //鎬婚暱搴�
+ string TM = ""; //鏉＄爜
+ int LSH = 0; //娴佹按鍙�
+ string LSH2 = ""; //娴佹按鍙疯浆鎹㈡垚瀛楃
+ string sDate = ""; //鏃ユ湡
+ string sYear = ""; //骞�
+ string sPeriod = ""; //鏈�
+ string sDay = ""; //鏃�
+ DataSet Ds;
+ SQLHelper.ClsCNSRM oCn = new SQLHelper.ClsCNSRM();
+ Ds = oCn.RunProcReturn("exec GetLSH '" + DateTime.Today + "'", "GetLSH");
+ LSH = ClsPub.isInt(Ds.Tables[0].Rows[0][0]);
+ foreach (Model.ClsGy_MaterialList_WMS_Model oItemSub in ls)
+ {
+ //鍐呯
+ if (ClsPub.isLong(oItemSub.HMaterID) != 0)
+ {
+ var WeiShu = "";
+ var HNumber = oItemSub.HMaterID.ToString();
+ var HSumQty = ClsPub.isDoule(oItemSub.HQty);//浜у搧鏁伴噺
+ var HMinQty = ClsPub.isDoule(oItemSub.HMinQty);//鍐呯鍖呰鏁伴噺
+ var HBQty = ClsPub.isDoule(oItemSub.HBQty); //鍐呯鏁�
+ for (int i = 1; i <= HBQty; i++)
+ {
+ if ((double)i == HBQty)
+ {
+ WeiShu = "灏炬暟";
+ HMinQty = HSumQty - (HBQty - 1) * HMinQty;
+ }
+ //TM = $"{oItemSub.HMaterID}#{HMinQty}";
+ TM = $"{oItemSub.HMaterID}";
+ Model.ClsGy_BarCodeBill_WMS_Model bar = new Model.ClsGy_BarCodeBill_WMS_Model();
+ bar.HBarCode = TM;
+ bar.HMaterID = oItemSub.HMaterID;
+ bar.HUnitID = oItemSub.HUnitID;
+ bar.HQty = HMinQty;
+ bar.HBatchNo = oItemSub.HBatchNo;
+ bar.HKFDate = oItemSub.HKFDate;
+ bar.HKFPeriod = oItemSub.HKFPeriod;
+ bar.HKFDQDate = oItemSub.HKFDQDate;
+ bar.HSourceInterID = oItemSub.HSourceInterID;
+ bar.HSourceEntryID = oItemSub.HSourceEntryID;
+ bar.HSourceBillNo = oItemSub.HSourceBillNo;
+ bar.HSourceBillType = oItemSub.HSourceBillType;
+ bar.HMinQty = oItemSub.HMinQty;
+ bar.HSupID = oItemSub.HSupID;
+ bar.HEndQty = WeiShu;
+ bar.HMTONO = oItemSub.HMTONO;
+ ls2.Add(bar);
+ }
+ }
+ }
+ string HBarCode = "";
+ string HBarCodeType = "";
+ Int64 HMaterID = 0;
+ Int64 HUnitID = 0;
+ double HQty2 = 0;
+ string HBatchNo = "";
+ Int64 HSupID = 0;
+ Int64 HGroupID = 0;
+ int HPrintQty = 0;
+ Int64 HSourceInterID = 0;
+ Int64 HSourceEntryID = 0;
+ string HSourceBillNo = "";
+ string HSourceBillType = "";
+ Int64 HKFPeriod = 0;
+ string HKFDate = "";
+ string HKFDQDate = "";
+ string HWei = "";
+ string HMTONO = "";
+ oCn.BeginTran();
+ foreach (Model.ClsGy_BarCodeBill_WMS_Model oItemSub in ls2)
+ {
+ if (ClsPub.isLong(oItemSub.HMaterID) != 0)
+ {
+ HBarCode = oItemSub.HBarCode.ToString();
+ HMTONO = ClsPub.isStrNull(oItemSub.HMTONO);
+ HBarCodeType = "鍝佺鐮�";
+ HMaterID = ClsPub.isLong(oItemSub.HMaterID);
+ HUnitID = ClsPub.isLong(oItemSub.HUnitID);
+ HQty2 = ClsPub.isDoule(oItemSub.HQty);
+ HBatchNo = ClsPub.isStrNull(oItemSub.HBatchNo);
+ HSupID = oItemSub.HSupID;
+ //LogService.Write("HSupID:" + oItemSub.HSupID);
+ HKFPeriod = ClsPub.isInt(oItemSub.HKFPeriod);
+ HKFDate = ClsPub.isStrNull(oItemSub.HKFDate);
+ HKFDQDate = ClsPub.isStrNull(oItemSub.HKFDQDate);
+ HSourceInterID = ClsPub.isLong(oItemSub.HSourceInterID);
+ HSourceEntryID = ClsPub.isLong(oItemSub.HSourceEntryID);
+ HSourceBillNo = ClsPub.isStrNull(oItemSub.HSourceBillNo);
+ HSourceBillType = ClsPub.isStrNull(oItemSub.HSourceBillType);
+ HWei = ClsPub.isStrNull(oItemSub.HEndQty);
+ string sql = "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(sql);
+ sql = "exec setLSH '" + DateTime.Today + "'";
+ oCn.RunProc(sql);
+ }
+ }
+ foreach (Model.ClsGy_BarCodeBill_WMS_Model oItemSub in ls3)
+ {
+ //LogService.Write("寰幆绗笁娆�:" + oItemSub.HSupID);
+ if (ClsPub.isLong(oItemSub.HMaterID) != 0)
+ {
+ HBarCode = oItemSub.HBarCode.ToString();
+ HMTONO = ClsPub.isStrNull(oItemSub.HMTONO);
+ HBarCodeType = "绠卞彿鍐呮潯鐮�";
+ HMaterID = ClsPub.isLong(oItemSub.HMaterID);
+ HUnitID = ClsPub.isLong(oItemSub.HUnitID);
+ HQty2 = ClsPub.isDoule(oItemSub.HQty);
+ HBatchNo = ClsPub.isStrNull(oItemSub.HBatchNo);
+ HSupID = oItemSub.HSupID;
+ HKFPeriod = ClsPub.isInt(oItemSub.HKFPeriod);
+ HKFDate = ClsPub.isStrNull(oItemSub.HKFDate);
+ HKFDQDate = ClsPub.isStrNull(oItemSub.HKFDQDate);
+ HSourceInterID = ClsPub.isLong(oItemSub.HSourceInterID);
+ HSourceEntryID = ClsPub.isLong(oItemSub.HSourceEntryID);
+ HSourceBillNo = ClsPub.isStrNull(oItemSub.HSourceBillNo);
+ HSourceBillType = ClsPub.isStrNull(oItemSub.HSourceBillType);
+ HWei = ClsPub.isStrNull(oItemSub.HEndQty);
+ string sql = "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(sql);
+ }
+ }
+ //鏆傛椂鍙洖濉叧鑱旀暟閲�
+ string _sql = "exec H_p_SRM_BarCodeBill_Update_UpdateBillRelateData " + linterid.ToString();
+ oCn.RunProc(_sql);
+ oCn.Commit();
}
catch (Exception e)
{
@@ -976,7 +1208,7 @@
return objjson;
}
DAL.ClsWeb_BarCodeBill oClsWeb_BarCodeBill = new DAL.ClsWeb_BarCodeBill();
- ds = oClsWeb_BarCodeBill.ShowBillSub6(DBUtility.ClsPub.isLong(sMsg), ShowItem, ref DBUtility.ClsPub.sExeReturnInfo);
+ ds = ShowBillSub6(DBUtility.ClsPub.isLong(sMsg), ShowItem, ref DBUtility.ClsPub.sExeReturnInfo);
if (ds == null || ds.Tables[0].Rows.Count == 0)
{
objjson.code = "0";
@@ -1002,6 +1234,28 @@
objjson.Message = "鑾峰彇鍗曟嵁琛ㄤ綋澶辫触:" + e.Message;
objjson.data = null;
return objjson;
+ }
+ }
+ public DataSet ShowBillSub6(long lngBillKey, string sShowItem, ref string sReturn)
+ {
+ string str = "";
+ try
+ {
+ string MvarItemKeySubForWeb4 = "h_v_Web_BarCodeBill_ForWeb2";
+ str = string.Concat(new object[] { "Select ", sShowItem, " from ", MvarItemKeySubForWeb4, " Where HInterID=", lngBillKey.ToString(), " order by HEntryID " });
+ DataSet set = oCn.RunProcReturn(string.Concat(new object[] { "Select ", sShowItem, " from ", MvarItemKeySubForWeb4, " Where HInterID=", lngBillKey.ToString(), " order by HEntryID " }), MvarItemKeySubForWeb4);
+ if ((set == null) || (set.Tables[0].Rows.Count == 0))
+ {
+ sReturn = "鍗曟嵁浣撴湭鎵惧埌锛�";
+ return null;
+ }
+ sReturn = "鏄剧ず鍗曟嵁浣撴垚鍔燂紒";
+ return set;
+ }
+ catch (Exception exception)
+ {
+ sReturn = exception.Message + str;
+ return null;
}
}
[Route("GetHBarCodeShowBillMain")]
@@ -1377,36 +1631,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 +1666,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;
@@ -1618,7 +1849,6 @@
//鏆傛椂鍙洖濉叧鑱旀暟閲�
oCn.RunProc("exec H_p_SRM_BarCodeBill_Update_UpdateBillRelateData " + linterid.ToString());
oCn.Commit();
-
}
catch (Exception e)
{
@@ -1637,5 +1867,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 HItemID,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["HSourceBillType"].ToString() == "1103")
+ oCN.RunProc("Delete From Gy_BarCodeBill where HItemID in(" + dr["HItemID"] + ") ");
+ //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