From c05f1964fc49bebb9ea64e189400337f8d4f0c42 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期四, 12 九月 2024 10:04:25 +0800
Subject: [PATCH] 批量修改ClsCN；添康科技生成条码时设置为批次码；
---
WebAPI/MyHub.cs | 2
WebAPI/Controllers/WebAPIController.cs | 24 ++++----
WebAPI/DLL/DAL.dll | 0
WebAPI/Controllers/POInStockController.cs | 31 ++++++----
WebAPI/BLL/WebServer.cs | 2
WebAPI/Controllers/POStockInBillController.cs | 2
WebAPI/DLL/Model.dll | 0
WebAPI/Controllers/BarCodeController.cs | 77 ++++++++++++++++++++-----
WebAPI/Controllers/ReportController.cs | 6 +-
WebAPI/Controllers/POInStockBackController.cs | 4
WebAPI/Controllers/POStockOutBillController.cs | 2
WebAPI/Controllers/POOrderController.cs | 4
WebAPI/Controllers/POOrderBillExcelController.cs | 2
WebAPI/Controllers/EntrustOrderController.cs | 4
WebAPI/Controllers/PODemandPlanController.cs | 2
15 files changed, 105 insertions(+), 57 deletions(-)
diff --git a/WebAPI/BLL/WebServer.cs b/WebAPI/BLL/WebServer.cs
index e209cbb..524d376 100644
--- a/WebAPI/BLL/WebServer.cs
+++ b/WebAPI/BLL/WebServer.cs
@@ -11,7 +11,7 @@
{
public class WebServer
{
- SQLHelper.ClsCNSRM oCn = new SQLHelper.ClsCNSRM();
+ SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
#region 鍩虹璧勬枡
/// <summary>
diff --git a/WebAPI/Controllers/BarCodeController.cs b/WebAPI/Controllers/BarCodeController.cs
index fe0ca61..b2a2bcf 100644
--- a/WebAPI/Controllers/BarCodeController.cs
+++ b/WebAPI/Controllers/BarCodeController.cs
@@ -23,7 +23,7 @@
{
private JsonResult objJsonResult = new JsonResult();
private json objjson = new json();
- public new ClsCNSRM oCn = new ClsCNSRM();
+ public new ClsCN oCn = new ClsCN();
//鑾峰彇绯荤粺鍙傛暟
Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();
public T ScriptDeserialize<T>(string strJson)
@@ -47,7 +47,7 @@
string msg1 = _value.ToString();
try
{
- SQLHelper.ClsCNSRM oCn = new SQLHelper.ClsCNSRM();
+ SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
oCn.RunProc("exec H_p_SRM_BarCodeBill_PrintQty '" + msg1 + "'");
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -132,7 +132,7 @@
string WeiShu = ""; //灏炬暟
//string sKFDate = DateTime.Now.ToString("yyyy-MM-dd");
DataSet Ds;
- SQLHelper.ClsCNSRM oCn = new SQLHelper.ClsCNSRM();
+ SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
foreach (Model.ClsGy_MaterialList_WMS_Model oItemSub in ls)
{
if (ClsPub.isLong(oItemSub.HMaterID) != 0)
@@ -339,7 +339,7 @@
string WeiShu = ""; //灏炬暟
//string sKFDate = DateTime.Now.ToString("yyyy-MM-dd");
DataSet Ds;
- SQLHelper.ClsCNSRM oCn = new SQLHelper.ClsCNSRM();
+ SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
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)
@@ -551,7 +551,7 @@
string sDay = ""; //鏃�
string WeiShu = ""; //灏炬暟
DataSet Ds;
- SQLHelper.ClsCNSRM oCn = new SQLHelper.ClsCNSRM();
+ SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
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)
@@ -585,7 +585,7 @@
TM = "0" + TM;
}
//TM = "B" + TM;
- TM = "SRM" + "B" + TM;
+ TM = "SRM" + "B" + TM;
if (HSumQty - HMinQty > 0)
{
@@ -604,6 +604,13 @@
}
HMinQty = HSumQty;
}
+
+ if (FCusName.Contains("娣诲悍绉戞妧"))
+ {
+ //澶栫鎵规鏉＄爜瑙勫垯锛歋RMB+缁勭粐+鏂欏彿+鎵规+锛�+鏁伴噺
+ TM = "SRMB" + "100" + oItemSub.HMaterNumber + oItemSub.HBatchNo + "锛�" + HMinQty;
+ }
+
Model.ClsGy_BarCodeBill_WMS_Model bar = new Model.ClsGy_BarCodeBill_WMS_Model();
bar.HBarCode = TM;
bar.HMaterID = oItemSub.HMaterID;
@@ -632,6 +639,7 @@
bar.HSupBatchNo = oItemSub.HSupBatchNo;
bar.HSupMaterNumber = oItemSub.HSupMaterNumber;
bar.HISKFPERIOD = oItemSub.HISKFPERIOD;
+ bar.HMaterNumber = oItemSub.HMaterNumber;
ls2.Add(bar);
}
}
@@ -697,8 +705,19 @@
{
TM2 = "0" + TM2;
}
- bar2.HMaterID = oItemSub2.HMaterID;
- bar2.HBarCode = oItemSub2.HBarCode + "-" + TM2;
+
+ if (FCusName.Contains("娣诲悍绉戞妧"))
+ {
+ //鍐呯鎵规鏉＄爜瑙勫垯锛歋RM+缁勭粐+鏂欏彿+鎵规+锛�+鏁伴噺
+ TM2 = "SRM" + "100" + oItemSub2.HMaterNumber + oItemSub2.HBatchNo + "锛�" + HWXQty;
+ bar2.HBarCode = TM2;
+ }
+ else
+ {
+ bar2.HBarCode = oItemSub2.HBarCode + "-" + TM2;
+ }
+
+ bar2.HMaterID = oItemSub2.HMaterID;
bar2.HUnitID = oItemSub2.HUnitID;
bar2.HQty = HWXQty;
bar2.HBatchNo = DBUtility.ClsPub.isStrNull(oItemSub2.HBatchNo);
@@ -779,6 +798,12 @@
HBarCode = $"{oItemSub.HMaterID}";
HBarCodeType = "鍝佺鐮乢澶栫";
}
+
+ if (FCusName.Contains("娣诲悍绉戞妧"))
+ {
+ //HBarCodeType = "鎵规鏉＄爜";
+ }
+
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,HSupBatchNo,HSupMaterNumber,HProduceDate,HExpiryDate,HISKFPERIOD " +
@@ -823,6 +848,12 @@
HBarCode = $"{oItemSub.HMaterID}";
HBarCodeType = "鍝佺鐮�";
}
+
+ if (FCusName.Contains("娣诲悍绉戞妧"))
+ {
+ //HBarCodeType = "鎵规鏉＄爜";
+ }
+
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 ,HSupBatchNo,HSupMaterNumber,HProduceDate,HExpiryDate,HISKFPERIOD" +
@@ -927,7 +958,7 @@
string sPeriod = ""; //鏈�
string sDay = ""; //鏃�
DataSet Ds;
- SQLHelper.ClsCNSRM oCn = new SQLHelper.ClsCNSRM();
+ SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
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)
@@ -1375,7 +1406,7 @@
{
string VsWhere = "";
string PcWhere = "";
- SQLHelper.ClsCNSRM oCn = new SQLHelper.ClsCNSRM();
+ SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
DataSet ds;
string sql = " Where hsupid in (select HSupID from h_v_Gy_UserSupplierList where 鐢ㄦ埛=''" + HSupNo.Trim() + "'') " + sqlWhere;
@@ -1395,7 +1426,7 @@
{
objjson.code = "0";
objjson.count = 0;
- objjson.Message = "鑾峰彇澶辫触";
+ objjson.Message = "鏃犵浉鍏虫潯鐮佷俊鎭紒";
objjson.data = null;
return objjson;
}
@@ -1596,7 +1627,7 @@
string sDay = ""; //鏃�
string WeiShu = ""; //灏炬暟
DataSet Ds;
- SQLHelper.ClsCNSRM oCn = new SQLHelper.ClsCNSRM();
+ SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
oCn.BeginTran();
Ds = oCn.RunProcReturn("exec GetLSH '" + DateTime.Today + "'", "GetLSH");
LSH = ClsPub.isInt(Ds.Tables[0].Rows[0][0]);
@@ -1873,6 +1904,7 @@
+ "','" + HBatchNo + "','" + SubModel.Count + "','" + count + "'," + HSupID + "," + HGroupID + ",'" + ClsPub.CurUserName + "','" + DateTime.Today + "'," + HPrintQty + ",'" + HWei + "',1"
+ "," + HSourceInterID + "," + HSourceEntryID + ",'" + HSourceBillNo + "','" + HSourceBillType + "','" + HMTONO + "','"
+ HKFDate + "','" + HKFDQDate + "'," + HISKFPERIOD + ")";
+ LogService.Write("鐢熸垚澶栫鏉＄爜锛� " + sql);
oCn.RunProc(sql);
oCn.RunProc("exec setLSH '" + DateTime.Today + "'");
count++;
@@ -1919,6 +1951,7 @@
+ "','" + HBatchNo + "','" + SubModel.Count + "','" + _count + "'," + HSupID + "," + HGroupID + ",'" + ClsPub.CurUserName + "','" + DateTime.Today + "'," + HPrintQty + ",'" + HWei + "',1"
+ "," + HSourceInterID + "," + HSourceEntryID + ",'" + HSourceBillNo + "','" + HSourceBillType + "','" + HMTONO + "','"
+ HKFDate + "','" + HKFDQDate + "'," + HISKFPERIOD + ")";
+ LogService.Write("鐢熸垚鍐呯鏉＄爜锛� "+ sql);
oCn.RunProc(sql);
_count++;
}
@@ -1951,6 +1984,7 @@
}
catch (Exception e)
{
+ LogService.Write("鐢熸垚鏉＄爜鍙戠敓閿欒锛� " + e);
objJsonResult.code = "0";
objJsonResult.count = 0;
objJsonResult.Message = "" + e.Message + DBUtility.ClsPub.sExeReturnInfo;
@@ -2105,11 +2139,20 @@
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($"update WW_EntrustOrderBillSub set HBarcodeCount -= {dr["HQty"]} where HInterID ={dr["HSourceInterID"]} and HEntryID ={dr["HSourceEntryID"]}");
+ if (FCusName.Contains("娣诲悍绉戞妧"))
+ {
+ _HBarCodeType = "绠卞彿鍐呮潯鐮�";
+ if (dr["HSourceBillType"].ToString() == "1103" && dr["HBarCodeType"].ToString() == _HBarCodeType)
+ oCN.RunProc($"update Cg_POInStockBillSub set HRelationBarCodeQty -= {dr["HQty"]} where HInterID ={dr["HSourceInterID"]} and HEntryID ={dr["HSourceEntryID"]}");
+ }
+ else
+ {
+ //鍙嶅啓鎵撳嵃鏁伴噺鍒伴�佽揣鍗� 锛堜笉闇�瑕佸弽鍐� 閫佽揣鍗曠洿鎺ユ槸鍏宠仈鏌ヨ鍙栫殑鏁伴噺 娌℃湁鍦ㄦ簮鍗曚笂鍋氫繚瀛橈級
+ 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 + ") ");
diff --git a/WebAPI/Controllers/EntrustOrderController.cs b/WebAPI/Controllers/EntrustOrderController.cs
index 630e611..813b707 100644
--- a/WebAPI/Controllers/EntrustOrderController.cs
+++ b/WebAPI/Controllers/EntrustOrderController.cs
@@ -18,7 +18,7 @@
{
private JsonResult objJsonResult = new JsonResult();
private json objjson = new json();
- SQLHelper.ClsCNSRM oCn = new SQLHelper.ClsCNSRM();
+ SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
/// <summary>
/// 閲囪喘鍗曞垪琛�
@@ -36,7 +36,7 @@
{
string VsWhere = "";
string PcWhere = "";
- SQLHelper.ClsCNSRM oCn = new SQLHelper.ClsCNSRM();
+ SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
DataSet ds;
string sql = " Where hsupid in (select HSupID from h_v_Gy_UserSupplierList where 鐢ㄦ埛=^^" + HSupNo.Trim() + "^^) " + sqlWhere;
if (Common.SQLtoChange(sql, ref VsWhere, ref PcWhere) == false)
diff --git a/WebAPI/Controllers/PODemandPlanController.cs b/WebAPI/Controllers/PODemandPlanController.cs
index 8b97857..46bf448 100644
--- a/WebAPI/Controllers/PODemandPlanController.cs
+++ b/WebAPI/Controllers/PODemandPlanController.cs
@@ -36,7 +36,7 @@
{
string VsWhere = "";
string PcWhere = "";
- SQLHelper.ClsCNSRM oCn = new SQLHelper.ClsCNSRM();
+ SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
DataSet ds;
//鍏朵粬杩囨护
string sql = " Where hsupid in (select HSupID from h_v_Gy_UserSupplierList where 鐢ㄦ埛=^^" + HSupNo.Trim() + "^^) " + sqlWhere;
diff --git a/WebAPI/Controllers/POInStockBackController.cs b/WebAPI/Controllers/POInStockBackController.cs
index 8f3a9c2..f419a50 100644
--- a/WebAPI/Controllers/POInStockBackController.cs
+++ b/WebAPI/Controllers/POInStockBackController.cs
@@ -36,7 +36,7 @@
{
string VsWhere = "";
string PcWhere = "";
- SQLHelper.ClsCNSRM oCn = new SQLHelper.ClsCNSRM();
+ SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
DataSet ds;
//鍏朵粬杩囨护
string sql = " Where hsupid in (select HSupID from h_v_Gy_UserSupplierList where 鐢ㄦ埛=''" + HSupNo.Trim() + "'') " + sqlWhere;
@@ -95,7 +95,7 @@
{
string VsWhere = "";
string PcWhere = "";
- SQLHelper.ClsCNSRM oCn = new SQLHelper.ClsCNSRM();
+ SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
DataSet ds;
string sql = " Where hsupid in (select HSupID from h_v_Gy_UserSupplierList where 鐢ㄦ埛 = ^^" + HSupNo.Trim() + "^^) " + sqlWhere;
//杞崲鐗规畩瀛楃
diff --git a/WebAPI/Controllers/POInStockController.cs b/WebAPI/Controllers/POInStockController.cs
index fb9a568..5251654 100644
--- a/WebAPI/Controllers/POInStockController.cs
+++ b/WebAPI/Controllers/POInStockController.cs
@@ -37,7 +37,7 @@
{
try
{
- SQLHelper.ClsCNSRM oCn = new SQLHelper.ClsCNSRM();
+ SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
//鍐欏叆 System_Log 鎿嶄綔鏃ュ織琛�
WebAPIController.Add_Log("閫佽揣鍗曟墦鍗�", CurUserName, "閫佽揣鍗曟墦鍗�");
oCn.RunProc("exec H_p_SRM_POInStockBill_PrintQty " + msg.ToString());
@@ -256,7 +256,7 @@
try
{
string sql = $"update銆�Cg_POInStockBillMain銆� set HDeliveryNo ='{HDeliveryNo}' where HInterID in ({HmainId})";
- SQLHelper.ClsCNSRM oCn = new SQLHelper.ClsCNSRM();
+ SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
oCn.RunProc(sql);
objJsonResult.code = "1";
@@ -283,7 +283,7 @@
[HttpPost]
public object SaverPOInStock([FromBody] JObject msg)
{
- SQLHelper.ClsCNSRM oCn = new SQLHelper.ClsCNSRM();
+ SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
var _value = msg["msg"].ToString();
string msg1 = _value.ToString();
string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
@@ -482,7 +482,7 @@
sw.Start();//寮�濮嬭鏃�
string VsWhere = "";
string PcWhere = "";
- SQLHelper.ClsCNSRM oCn = new SQLHelper.ClsCNSRM();
+ SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
DataSet ds;
//鍏朵粬杩囨护
string sql = " Where hsupid in (select HSupID from h_v_Gy_UserSupplierList where 鐢ㄦ埛 =^^" + HSupNo.Trim() + "^^) " + sqlWhere;
@@ -639,7 +639,7 @@
public object AuditPOInStockBill(string HInterID, string CurUserName, string HBillNo)
{
json objjson = new json();
- SQLHelper.ClsCNSRM oCn = new SQLHelper.ClsCNSRM();
+ SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
try
{
//閲囪喘璁㈠崟 鐢熸垚閫佽揣鍗曞垪琛�
@@ -1195,6 +1195,7 @@
//LogService.Write(result);
if (JObject.Parse(result)["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() == "TRUE")
{
+ LogService.Write("SRM-鏀舵枡閫氱煡鍗曞鏍稿け璐SON锛�" + jsonRoot.ToString());
//鏇存柊閫佽揣鍗� 涓昏〃 ERP鍗曟嵁鍙� 浠ュ強 ERP涓诲唴鐜�
string FBillNo = JObject.Parse(result)["Result"]["Number"].ToString();
string FID = JObject.Parse(result)["Result"]["Id"].ToString();
@@ -1212,6 +1213,8 @@
}
else
{
+ LogService.Write("SRM-鏀舵枡閫氱煡鍗曞鏍稿け璐SON锛�" + jsonRoot.ToString() );
+
objjson.code = "0";
objjson.count = 0;
objjson.Message = result;
@@ -1303,7 +1306,7 @@
}
public int GetHinterIDByBillNo(string HBillNo, string type)
{
- SQLHelper.ClsCNSRM oCn = new SQLHelper.ClsCNSRM();
+ SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
int HInterID = 0;
string sql = "select HInterID from CG_POINSTOCKBILLMAIN where HBILLNO = '" + HBillNo + "'";
//if (type == "Print")
@@ -1321,7 +1324,7 @@
try
{
DAL.ClsCg_POInStockBill oBill = new DAL.ClsCg_POInStockBill();
- SQLHelper.ClsCNSRM oCn = new SQLHelper.ClsCNSRM();
+ SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
//鑾峰彇瀹㈡埛鍚嶇О
string FCusName = oSystemParameter.GetSingleSystemParameter("WMS_CampanyName", ref DBUtility.ClsPub.sExeReturnInfo);
//澶忓疂闇�瑕佸厛鍦ㄩ噾铦跺垹闄ゆ敹鏂欓�氱煡鍗曞悗鎵嶈兘鍦ㄤ緵搴斿晢鍗忓悓骞冲彴鍒犻櫎閫佽揣鍗�
@@ -1526,7 +1529,7 @@
{
List<string> mylist = new List<string>(ids.Split(','));//.Distinct()
List<string> entryList = new List<string>(entryids.Split(','));//.Distinct()
- SQLHelper.ClsCNSRM oCn = new SQLHelper.ClsCNSRM();
+ SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
string FCusName = oSystemParameter.GetSingleSystemParameter("WMS_CampanyName", ref DBUtility.ClsPub.sExeReturnInfo);
if (FCusName == "澶忓疂鐢靛櫒" && mylist.Count > 1)
{
@@ -1562,6 +1565,7 @@
if (DBUtility.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HBack"]) != "0")
{
+ LogService.Write("閫佽揣鏁伴噺鍚屾杩涘叆鍥炴粴");
oCn.RollBack(); //鍥炴粴浜嬬墿
objjson.code = "0";
objjson.count = 0;
@@ -1576,12 +1580,13 @@
//鏇存柊鍏宠仈鏁伴噺
var HinterID = mylist[i].ToString();
var HEntryID = entryList[i].ToString();
+ LogService.Write("閫佽揣鏁伴噺鍚屾锛� exec h_p_SRM_UpDatePPBomRelationQty" + HinterID + "," + HEntryID);
oCn.RunProc($"exec h_p_SRM_UpDatePPBomRelationQty {HinterID},{HEntryID},{i+1}");
}
//鍒ゆ柇鏈叧鑱旀暟閲忔槸鍚︿负0
- //瀹夌憺锛欰IS20220914133941 鐟炰笌鐞細AIS20220308151944 鏈湴锛欰IS20210811135644 澶忓疂锛欰IS20211130140219 鍑礉锛欰IS20210820164804
- DataSet ds = oCn.RunProcReturn($"select T1.hqty-T1.hrelationqty+q.FMRBQTY as hqty,q.FRemainReceiveQty as 鍓╀綑鏀舵枡鏁伴噺,T1.hrelationqty as 宸插彂璐ф暟閲�,T1.hqty as 璁㈠崟鏁伴噺,鍗曟嵁鍙�,鐗╂枡缂栫爜 from H_v_SRM_POOrderBillList t1 left join AIS20210820164804..T_PUR_POORDERENTRY_R q on q.FENTRYID=t1.HEntryID where hentryid in ({string.Join(", ", entryList)})", "H_v_SRM_POOrderBillList");
+ //瀹夌憺锛欰IS20220914133941 鐟炰笌鐞細AIS20220308151944 鏈湴锛欰IS20210811135644 澶忓疂锛欰IS20211130140219 鍑礉锛欰IS20210820164804 娣诲悍锛欰IS20240809105013
+ DataSet ds = oCn.RunProcReturn($"select T1.hqty-T1.hrelationqty+q.FMRBQTY as hqty,q.FRemainReceiveQty as 鍓╀綑鏀舵枡鏁伴噺,T1.hrelationqty as 宸插彂璐ф暟閲�,T1.hqty as 璁㈠崟鏁伴噺,鍗曟嵁鍙�,鐗╂枡缂栫爜 from H_v_SRM_POOrderBillList t1 left join AIS20240809105013..T_PUR_POORDERENTRY_R q on q.FENTRYID=t1.HEntryID where hentryid in ({string.Join(", ", entryList)})", "H_v_SRM_POOrderBillList");
DataTable dt = ds.Tables[0];
if (dt.Rows.Count > 0)
{
@@ -1621,7 +1626,7 @@
/// <returns></returns>
public JsonResult TestPOOrder(string entryids)
{
- SQLHelper.ClsCNSRM oCn = new SQLHelper.ClsCNSRM();
+ SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
try
{
var kdTbaleName = Util.GetConfigKey(AppDomain.CurrentDomain.BaseDirectory + "/Config/kdapi.config", "DataBaseName");
@@ -1717,7 +1722,7 @@
{
try
{
- SQLHelper.ClsCNSRM oCn = new SQLHelper.ClsCNSRM();
+ SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
//鏌ヨ涓昏〃
DataSet Ds;
Ds = oCn.RunProcReturn(" exec h_p_SRM_POInStockBillMain_ForWeb " + lngBillKey.ToString() + ",'" + HBillType + "'", "h_p_SRM_POInStockBillMain_ForWeb");
@@ -1750,7 +1755,7 @@
string s = "";
try
{
- SQLHelper.ClsCNSRM oCn = new SQLHelper.ClsCNSRM();
+ SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
//鏌ヨ涓昏〃
DataSet Ds;
Ds = oCn.RunProcReturn(" exec h_p_SRM_POInStockBillSub_ForWeb '" + lngBillKey2 + "','" + HBillType + "'", "h_p_SRM_POInStockBillSub_ForWeb");
diff --git a/WebAPI/Controllers/POOrderBillExcelController.cs b/WebAPI/Controllers/POOrderBillExcelController.cs
index 9fba44d..097e66e 100644
--- a/WebAPI/Controllers/POOrderBillExcelController.cs
+++ b/WebAPI/Controllers/POOrderBillExcelController.cs
@@ -14,7 +14,7 @@
public class POOrderBillExcelController : ApiController
{
private JsonResult objJsonResult = new JsonResult();
- SQLHelper.ClsCNSRM oCn = new SQLHelper.ClsCNSRM();
+ SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
#region 閲囪喘璁㈠崟 鏌ヨ
[Route("POOrderBillExcel/POOrderBillExcelList")]
diff --git a/WebAPI/Controllers/POOrderController.cs b/WebAPI/Controllers/POOrderController.cs
index d7f9490..6d15889 100644
--- a/WebAPI/Controllers/POOrderController.cs
+++ b/WebAPI/Controllers/POOrderController.cs
@@ -19,7 +19,7 @@
{
private JsonResult objJsonResult = new JsonResult();
private json objjson = new json();
- SQLHelper.ClsCNSRM oCn = new SQLHelper.ClsCNSRM();
+ SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
/// <summary>
/// 閲囪喘鍗曞垪琛�
@@ -39,7 +39,7 @@
{
string VsWhere = "";
string PcWhere = "";
- SQLHelper.ClsCNSRM oCn = new SQLHelper.ClsCNSRM();
+ SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
DataSet ds;
string sql = " Where hsupid in (select HSupID from h_v_Gy_UserSupplierList where 鐢ㄦ埛 = ^^" + HSupNo.Trim() + "^^) " + sqlWhere;
//杞崲鐗规畩瀛楃
diff --git a/WebAPI/Controllers/POStockInBillController.cs b/WebAPI/Controllers/POStockInBillController.cs
index 157390b..00843c4 100644
--- a/WebAPI/Controllers/POStockInBillController.cs
+++ b/WebAPI/Controllers/POStockInBillController.cs
@@ -45,7 +45,7 @@
{
string VsWhere = "";
string PcWhere = "";
- SQLHelper.ClsCNSRM oCn = new SQLHelper.ClsCNSRM();
+ SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
DataSet ds;
if (HSupNo != "Admin")
{
diff --git a/WebAPI/Controllers/POStockOutBillController.cs b/WebAPI/Controllers/POStockOutBillController.cs
index aa249cb..b745ac7 100644
--- a/WebAPI/Controllers/POStockOutBillController.cs
+++ b/WebAPI/Controllers/POStockOutBillController.cs
@@ -45,7 +45,7 @@
{
string VsWhere = "";
string PcWhere = "";
- SQLHelper.ClsCNSRM oCn = new SQLHelper.ClsCNSRM();
+ SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
DataSet ds;
if (HSupNo != "Admin")
{
diff --git a/WebAPI/Controllers/ReportController.cs b/WebAPI/Controllers/ReportController.cs
index fdfefd9..cb219b1 100644
--- a/WebAPI/Controllers/ReportController.cs
+++ b/WebAPI/Controllers/ReportController.cs
@@ -39,7 +39,7 @@
{
string VsWhere = "";
string PcWhere = "";
- SQLHelper.ClsCNSRM oCn = new SQLHelper.ClsCNSRM();
+ SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
DataSet ds;
//鍏朵粬杩囨护
if (msg.Trim() == "")
@@ -107,7 +107,7 @@
{
string VsWhere = "";
string PcWhere = "";
- SQLHelper.ClsCNSRM oCn = new SQLHelper.ClsCNSRM();
+ SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
DataSet ds;
//鍏朵粬杩囨护
if (msg.Trim() == "")
@@ -177,7 +177,7 @@
{
string VsWhere = "";
string PcWhere = "";
- SQLHelper.ClsCNSRM oCn = new SQLHelper.ClsCNSRM();
+ SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
DataSet ds;
//鍏朵粬杩囨护
if (msg.Trim() == "")
diff --git a/WebAPI/Controllers/WebAPIController.cs b/WebAPI/Controllers/WebAPIController.cs
index 30eead2..48f1ae6 100644
--- a/WebAPI/Controllers/WebAPIController.cs
+++ b/WebAPI/Controllers/WebAPIController.cs
@@ -52,7 +52,7 @@
string ComputerName;
IPAddress = DBUtility.ClsPub.IPAddress;
ComputerName = DBUtility.ClsPub.ComputerName;
- ClsCNSRM oCnLoc = new ClsCNSRM();
+ ClsCN oCnLoc = new ClsCN();
try
{
oCnLoc.RunProc("Insert into System_Log(GeginDate,userid,WorkstationName,WorkList,SystemName,NetUserName,State) values " +
@@ -85,7 +85,7 @@
{
string VsWhere = "";
string PcWhere = "";
- SQLHelper.ClsCNSRM oCn = new SQLHelper.ClsCNSRM();
+ SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
DataSet ds;
//鍏朵粬杩囨护
if (msg.Trim() == "")
@@ -183,7 +183,7 @@
try
{
DataSet ds = null;
- ClsCNSRM oCnLoc = new ClsCNSRM();
+ ClsCN oCnLoc = new ClsCN();
DAL.ClsUser oUser = new DAL.ClsUser();
Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();
//LogService.Write("娴嬭瘯1锛�"+ DBUtility.ClsPub.sExeReturnInfo);
@@ -229,7 +229,7 @@
DataSet DS;
try
{
- SQLHelper.ClsCNSRM oCn = new SQLHelper.ClsCNSRM();
+ SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
DS = oCn.RunProcReturn("select * from Gy_Czygl where Czybm='" + MainID + "' and Czmm='" + sPsd + "' ", "Gy_Czygl");
if (DS.Tables[0].Rows.Count == 0)
return null;
@@ -245,7 +245,7 @@
}
public DataSet CheckCzymc(string sUser, string sPsd)
{
- SQLHelper.ClsCNSRM oCn = new SQLHelper.ClsCNSRM();
+ SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
SqlParameter[] prams ={oCn.MakeInParam("@Czymc",SqlDbType.VarChar,100,sUser ),
oCn.MakeInParam("@Czmm",SqlDbType.VarChar ,100,sPsd ),
};
@@ -264,7 +264,7 @@
{
try
{
- ClsCNSRM oCn = new ClsCNSRM();
+ ClsCN oCn = new ClsCN();
DataSet oDs = new DataSet();
//==========
if (PassWord.Trim() != Repassword.Trim())
@@ -408,7 +408,7 @@
[HttpGet]
public object SaveOpenTmp(string HNumber, string HName)
{
- ClsCNSRM oCn = new ClsCNSRM();
+ ClsCN oCn = new ClsCN();
try
{
@@ -445,7 +445,7 @@
[HttpGet]
public object DelOpenTmp(string HItemID)
{
- ClsCNSRM oCn = new ClsCNSRM();
+ ClsCN oCn = new ClsCN();
try
{
//oCn.BeginTran();
@@ -792,7 +792,7 @@
[HttpPost]
public object MsgCount()
{
- ClsCNSRM oCn = new ClsCNSRM();
+ ClsCN oCn = new ClsCN();
DataSet oDs = new DataSet();
oDs = oCn.RunProcReturn("select * from Gy_Message", "Gy_Message");
objJsonResult.code = "0";
@@ -808,7 +808,7 @@
[HttpGet]
public object MsgData(string sWhere)
{
- ClsCNSRM oCn = new ClsCNSRM();
+ ClsCN oCn = new ClsCN();
DataSet oDs = new DataSet();
var sql = "select A.HInterID,b.HEntryID,A.HContext,A.HDeptID,D.HName HDeptName, A.HSendMan, B.HReceiveMan,A.HLevel,A.HDescription,case when B.HReadFlag=0 then '鏈槄' when B.HReadFlag=1 then '宸查槄' end HReadFlag,A.HDate" +
" from OA_InformBillMain A inner join OA_InformBillSub B on A.HInterID=B.HInterID left join Gy_Department D on A.HDeptID=D.HItemID where 1=1 " + sWhere;
@@ -836,7 +836,7 @@
[HttpGet]
public object UpdateMessage(string UserName, string HInterID, string HEntryID)
{
- ClsCNSRM oCn = new ClsCNSRM();
+ ClsCN oCn = new ClsCN();
oCn.BeginTran();
oCn.RunProc("Update OA_InformBillSub set HReadFlag=1 HUpDater='" + UserName + "',HUpDateDate=getdate() where HInterID='" + HInterID + "' and HEntryID='" + HEntryID + "'", ref Pub_Class.ClsPub.sExeReturnInfo);
oCn.Commit();
@@ -857,7 +857,7 @@
var postMesseege = _linterid + ";" + _huserName;
//HttpHelper.PostData("http://localhost:8082/ZYMES/layuiAdmin.std-v1.2.1/src/views/SRM/Api/SRM_Web_PoBarCodeBillApi.ashx", postMesseege);
HttpHelper.PostData("http://60.191.21.115:9090/layuiAdmin.std-v1.2.1/src/views/SRM/Api/SRM_Web_PoBarCodeBillApi.ashx", postMesseege);
- SQLHelper.ClsCNSRM oCn = new SQLHelper.ClsCNSRM();
+ SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
string sql = $"Update Gy_BarCodeBill set HPrintQty=isnull(HPrintQty,0) + 1 where HItemID in ({_linterid})";
oCn.RunProc(sql);
objJsonResult.code = "0";
diff --git a/WebAPI/DLL/DAL.dll b/WebAPI/DLL/DAL.dll
index 05689a7..32ea0ea 100644
--- a/WebAPI/DLL/DAL.dll
+++ b/WebAPI/DLL/DAL.dll
Binary files differ
diff --git a/WebAPI/DLL/Model.dll b/WebAPI/DLL/Model.dll
index 8c3df5c..4278da6 100644
--- a/WebAPI/DLL/Model.dll
+++ b/WebAPI/DLL/Model.dll
Binary files differ
diff --git a/WebAPI/MyHub.cs b/WebAPI/MyHub.cs
index fd2a958..8688f2d 100644
--- a/WebAPI/MyHub.cs
+++ b/WebAPI/MyHub.cs
@@ -11,7 +11,7 @@
[HubName("chatHub")]
public class MyHub : Hub
{
- SQLHelper.ClsCNSRM oCn = new SQLHelper.ClsCNSRM();
+ SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
public void Send(string title, string message)
{
this.InsertMsg(title, message);
--
Gitblit v1.9.1