From 3180615984b64c0d7115ae4b202860542375ca9c Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期四, 26 九月 2024 21:05:10 +0800
Subject: [PATCH] 送货单生成条码时，物料、批号相同，合并数量生成条码；送货单ID改为前端页面获取
---
WebAPI/Controllers/POInStockController.cs | 460 +++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 396 insertions(+), 64 deletions(-)
diff --git a/WebAPI/Controllers/POInStockController.cs b/WebAPI/Controllers/POInStockController.cs
index d0e2a51..5e3db2f 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());
@@ -85,20 +85,24 @@
return objjson;
}
string HBillNo, HInnerBillNo, HDate;
+ Int64 HInterID;
HBillNo = DBUtility.ClsPub.CreateBillCode_SRMProd("1103", ref DBUtility.ClsPub.sExeReturnInfo, true);
HInnerBillNo = DBUtility.ClsPub.CreateBillCode_SRMProd("777", ref DBUtility.ClsPub.sExeReturnInfo, true);//閫佽揣鍗曞彿
HDate = DBUtility.ClsPub.isStrNull(DateTime.Now.ToString("yyyy-MM-dd"));
+ HInterID = DBUtility.ClsPub.CreateBillID_SRMProd("1103", ref DBUtility.ClsPub.sExeReturnInfo);
//鍒涘缓涓存椂琛�
DataTable dt = new DataTable();
//鍒涘缓琛ㄤ腑鐨勫垪
dt.Columns.Add("HBillNo", typeof(string));//娣诲姞鍒�
dt.Columns.Add("HInnerBillNo", typeof(string));//娣诲姞鍒�
dt.Columns.Add("HDate", typeof(string));//娣诲姞鍒�
+ dt.Columns.Add("HInterID", typeof(Int64));//娣诲姞鍒�
DataRow row = dt.NewRow();
//缁欏垪璧嬪��
row["HBillNo"] = HBillNo;
row["HInnerBillNo"] = HInnerBillNo;
row["HDate"] = HDate;
+ row["HInterID"] = HInterID;
//鎶婃湁鍊肩殑鍒楁坊鍔犲埌琛�
dt.Rows.Add(row);
//鎶婅〃娣诲姞鍒癲ataset
@@ -256,7 +260,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 +287,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);
@@ -323,7 +327,7 @@
oItem.HCurID = 1;
oItem.HExRate = 1;
oItem.HMainSourceInterID = oItem.HInterID;
- oItem.HInterID = 0;
+ //oItem.HInterID = 0;
//oItem.HInterID = DBUtility.ClsPub.CreateBillID_SRMProd("1103", ref DBUtility.ClsPub.sExeReturnInfo);
if (FCusName.Contains("瀹夌憺")) //绯荤粺鍙傛暟 瀹㈡埛瀹氬埗鍖栧悕绉� 绌虹櫧涓洪�氱敤
{
@@ -359,41 +363,41 @@
int i = 0;
foreach (Model.ClsCg_POInStockBillSub oItemSub in ls)
{
- if (FCusName.Contains("鍑礉濂堢壒")) //绯荤粺鍙傛暟 瀹㈡埛瀹氬埗鍖栧悕绉� 绌虹櫧涓洪�氱敤
- {
- if (oItemSub.HBatChNo.Length < 8 || Regex.IsMatch(oItemSub.HBatChNo, @"^[0-9]+$") == false)
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "淇濆瓨澶辫触锛佺" + i.ToString() + "琛� 鐢熶骇鏃ユ湡D/C 鏍煎紡閿欒鏃犳硶淇濆瓨锛佹纭牸寮忎负8浣嶆暟鐨勭函鏁板瓧鏃ユ湡";
- objJsonResult.data = 1;
- return objJsonResult;
- }
-
- //鑾峰彇骞存湀鏃�
- string year = oItemSub.HBatChNo.Substring(0, 4);
- string month = oItemSub.HBatChNo.Substring(4, 2);
- string day = oItemSub.HBatChNo.Substring(6, 2);
+ //if (FCusName.Contains("鍑礉濂堢壒")) //绯荤粺鍙傛暟 瀹㈡埛瀹氬埗鍖栧悕绉� 绌虹櫧涓洪�氱敤
+ //{
+ // if (oItemSub.HBatChNo.Length != 8 || Regex.IsMatch(oItemSub.HBatChNo, @"^[0-9]+$") == false)
+ // {
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "淇濆瓨澶辫触锛佺" + i.ToString() + "琛� 鐢熶骇鏃ユ湡D/C 鏍煎紡閿欒鏃犳硶淇濆瓨锛佹纭牸寮忎负8浣嶆暟鐨勭函鏁板瓧鏃ユ湡";
+ // objJsonResult.data = 1;
+ // return objJsonResult;
+ // }
- //楠岃瘉鍚堟硶鎬�
- if (Convert.ToInt32(year) < 1900 || Convert.ToInt32(year) > 2100)
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "淇濆瓨澶辫触锛佺" + i.ToString() + "琛� 鐢熶骇鏃ユ湡D/C 鏃ユ湡涓嶅悎娉曟棤娉曚繚瀛橈紒姝ｇ‘鏍煎紡涓�8浣嶆暟鐨勭函鏁板瓧鏃ユ湡";
- objJsonResult.data = 1;
- return objJsonResult;
- }
- if (Convert.ToInt32(month) > 12 || Convert.ToInt32(day) > 31)
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "淇濆瓨澶辫触锛佺" + i.ToString() + "琛� 鐢熶骇鏃ユ湡D/C 鏃ユ湡涓嶅悎娉曟棤娉曚繚瀛橈紒";
- objJsonResult.data = 1;
- return objJsonResult;
- }
+ // //鑾峰彇骞存湀鏃�
+ // string year = oItemSub.HBatChNo.Substring(0, 4);
+ // string month = oItemSub.HBatChNo.Substring(4, 2);
+ // string day = oItemSub.HBatChNo.Substring(6, 2);
- }
+ // //楠岃瘉鍚堟硶鎬�
+ // if (Convert.ToInt32(year) < 1900 || Convert.ToInt32(year) > 2100)
+ // {
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "淇濆瓨澶辫触锛佺" + i.ToString() + "琛� 鐢熶骇鏃ユ湡D/C 鏃ユ湡涓嶅悎娉曟棤娉曚繚瀛橈紒姝ｇ‘鏍煎紡涓�8浣嶆暟鐨勭函鏁板瓧鏃ユ湡";
+ // objJsonResult.data = 1;
+ // return objJsonResult;
+ // }
+ // if (Convert.ToInt32(month) > 12 || Convert.ToInt32(day) > 31)
+ // {
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "淇濆瓨澶辫触锛佺" + i.ToString() + "琛� 鐢熶骇鏃ユ湡D/C 鏃ユ湡涓嶅悎娉曟棤娉曚繚瀛橈紒";
+ // objJsonResult.data = 1;
+ // return objJsonResult;
+ // }
+
+ //}
//鍒ゆ柇閲囪喘璁㈠崟鐘舵��
objJsonResult = TestPOOrder(oItemSub.HPOOrderEntryID.ToString());
if (objJsonResult.code == "0")
@@ -427,7 +431,7 @@
//淇濆瓨
//淇濆瓨瀹屾瘯鍚庡鐞�
bool bResult;
- if (oBill.omodel.HInterID == 0)
+ if (oBill.omodel.HInterID != 0 && oBill.omodel.HInterID.ToString() != null && oBill.omodel.HInterID.ToString() != "undefined")
{
bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
}
@@ -482,7 +486,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;
@@ -499,6 +503,15 @@
Int64 RowTotal = Common.GetRowTotal("H_v_SRM_POInStockBillList", VsWhere, ref DBUtility.ClsPub.sExeReturnInfo);
//鑾峰彇杩斿洖鏁版嵁
ds = oCn.RunProcReturn("exec H_p_SRM_POInStockBillList '" + PcWhere + "'", "H_p_SRM_POInStockBillList");
+
+ List<object> columnNameList = new List<object>();
+ foreach (DataColumn col in ds.Tables[0].Columns)
+ {
+ Type dataType = col.DataType;
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+ columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
+
LogService.Write("閫佽揣鍗曞垪琛ㄥ姞杞絪ql:exec H_p_SRM_POInStockBillList '" + PcWhere + "'");
LogService.Write("鏁版嵁鏌ヨ杩斿洖" + sw.Elapsed);
sw.Stop();//缁撴潫璁℃椂
@@ -506,6 +519,7 @@
objjson.count = 10000;
objjson.Message = "鑾峰彇鎴愬姛";
objjson.data = ds.Tables[0];
+ objjson.list = columnNameList;
return objjson;
}
catch (Exception e)
@@ -629,9 +643,9 @@
public object AuditPOInStockBill(string HInterID, string CurUserName, string HBillNo)
{
json objjson = new json();
+ SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
try
- {
- SQLHelper.ClsCNSRM oCn = new SQLHelper.ClsCNSRM();
+ {
//閲囪喘璁㈠崟 鐢熸垚閫佽揣鍗曞垪琛�
if (!String.IsNullOrEmpty(HBillNo))
HInterID = GetHinterIDByBillNo(HBillNo, "Aduit").ToString();
@@ -651,10 +665,43 @@
string parameterSql = $"select HValue from Xt_SystemParameter where HKey ='Cg_POInStockBill_ErpAduit'";
//var HValue = oCn.RunProcReturn(parameterSql, "dt").Tables[0].Rows[0][0].ToString();
string HValue = "Y";
+ string CustomFields = "";//鑷畾涔夊瓧娈�
+
+ oCn.BeginTran(); //寮�濮嬩簨鐗�
+
if (HValue == "Y")
{
- if (FCusName == "澶忓疂鐢靛櫒")
+ //==================================== Begin 閫佽揣鍗曞鏍稿墠鎺у埗 Begin ====================================
+ DataSet ds;
+
+ string[] sArray = HInterID.Split(new string[] { "," }, StringSplitOptions.RemoveEmptyEntries);
+
+ for (int i = 0; i < sArray.Length; i++)
{
+ ds = oCn.RunProcReturn("exec h_p_SRM_Cg_POInStockBill_BeforeCheckCtrl " + sArray[i] + ",'" + HBillNo + "','" + CurUserName + "'", "h_p_SRM_Cg_POInStockBill_BeforeCheckCtrl");
+ if (ds == null)
+ {
+ oCn.RollBack(); //鍥炴粴浜嬬墿
+ objjson.code = "0";
+ objjson.count = 0;
+ objjson.Message = "瀹℃牳鍓嶅垽鏂け璐ワ紒鏃犳暟鎹繑鍥�";
+ objjson.data = null;
+ return objjson;
+ }
+ if (DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBack"]) != "0")
+ {
+ oCn.RollBack(); //鍥炴粴浜嬬墿
+ objjson.code = "0";
+ objjson.count = 0;
+ objjson.Message = "瀹℃牳澶辫触锛�" + DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HRemarkBack"]);
+ objjson.data = null;
+ return objjson;
+ }
+ }
+
+ //====================================== End 閫佽揣鍗曞鏍稿墠鎺у埗 End ======================================
+ if (FCusName == "澶忓疂鐢靛櫒")
+ {
sql = string.Format(@"
SELECT T3.FNAME AS FTYPENAME,M.HBILLNO,B.HINTERID,B.HENTRYID,C.FID,C.FENTRYID, D.FBILLNO,B.HQTY,CD.FRECEIVEORGID,CDOO.FNUMBER AS FRECEIVENUMBER
,D.FSUPPLIERID,DS.FNUMBER AS FSUPPLIERNUMBER,D.FPURCHASEORGID,DOO.FNUMBER AS FPURCHASEORGNUMBER,CROO.FNUMBER AS FSETTLEORGNUMBER,
@@ -808,15 +855,17 @@
}
}
}
- else
- {
- //鐟炵惇瀛楁
- sql = string.Format(@"
+ else if (FCusName == "鍑礉濂堢壒") {
+ CustomFields = ",D.F_aaaa_Base";
+
+ sql = string.Format(@"
SELECT T3.FNAME AS FTYPENAME,M.HBILLNO,B.HINTERID,B.HENTRYID,C.FID,C.FENTRYID, D.FBILLNO,B.HQTY,CD.FRECEIVEORGID,CDOO.FNUMBER AS FRECEIVENUMBER
,D.FSUPPLIERID,DS.FNUMBER AS FSUPPLIERNUMBER,D.FPURCHASEORGID,DOO.FNUMBER AS FPURCHASEORGNUMBER,CROO.FNUMBER AS FSETTLEORGNUMBER,
E.FPRICETIMEPOINT,E.FSETTLECURRID,EC.FNUMBER AS FSETTLECURRNUMBER,C.FMATERIALID,CM.FNUMBER AS FMATERIALNUMBER ,C.FUNITID
,CU.FNUMBER AS FUNITNUMBER,CR.FPRICE,CR.FTAXPRICE,CR.FTAXRATE,D.FPURCHASERID,isnull(T4.FNUMBER,'') AS FPURCHASERNUMBER
-,B.HExpressNumberSub,B.HExpressSupplierSub,B.HRemark,B.HPlanArrivalDate,B.HBoxNumber,B.HBatChNo,D.FBILLTYPEID
+,B.HExpressNumberSub,B.HExpressSupplierSub,B.HRemark,B.HPlanArrivalDate,B.HBoxNumber,B.HBatChNo,D.FBILLTYPEID
+,isnull(VW.FNUMBER,'') AS FReceiverNUMBER,isnull(B.HKFDate,'') As FProduceDate,B.HTAXPRICE_T AS F_AAAA_PRICE1
+,C.FGiveAway AS FGiveAway
FROM CG_POINSTOCKBILLSUB B
JOIN CG_POINSTOCKBILLMAIN M ON B.HINTERID = M.HINTERID
JOIN {0}..T_PUR_POORDERENTRY C ON B.HSOURCEINTERID = C.FID AND B.HSOURCEENTRYID = C.FENTRYID
@@ -834,8 +883,10 @@
LEFT JOIN {0}..T_ORG_ORGANIZATIONS DOO ON D.FPURCHASEORGID = DOO.FORGID
JOIN {0}..T_PUR_POORDERFIN E ON C.FID =E.FID
LEFT JOIN {0}..T_BD_CURRENCY EC ON E. FSETTLECURRID =EC.FCURRENCYID
+LEFT JOIN {0}..V_BD_WAREHOUSEWORKERS_L VWL ON M.HReceiveGoodsMan = VWL.FNAME
+LEFT JOIN {0}..V_BD_WAREHOUSEWORKERS VW ON VWL.fid = VW.fid
WHERE b.hinterid in ({1}) and M.HERPInterID = 0
-", kdTbaleName, HInterID);
+", kdTbaleName, HInterID, CustomFields);
dt = oCn.RunProcReturn(sql, "sltz").Tables[0];
if (dt.Rows.Count > 0)
{
@@ -881,8 +932,14 @@
//3鍘�
if (dr["FBILLTYPEID"].ToString() == "83d822ca3e374b4ab01e5dd46a0062bd")
{
+ fTypeName = "SLD10_SYS";
+ }
+ //鏍囧噯閲囪喘璁㈠崟
+ if (dr["FBILLTYPEID"].ToString() == "65a5124e3be263")
+ {
fTypeName = "SLD01_SYS";
}
+ model.Add("FReceiverId", new JObject() { ["Fnumber"] = dr["FReceiverNUMBER"].ToString() }); //鏀舵枡鍛�
}
model.Add("FBILLTYPEID", new JObject() { ["Fnumber"] = fTypeName }); //鍗曟嵁绫诲瀷
model.Add("FBusinessType", ywTypeName); //涓氬姟绫诲瀷
@@ -902,6 +959,183 @@
FentityModel.Add("FUnitID", new JObject() { ["Fnumber"] = item["FUNITNUMBER"].ToString() }); // 鍗曚綅
FentityModel.Add("FPreDeliveryDate", DateTime.Now.ToString("yyyy-MM-dd")); //棰勮鍒拌揣鏃ユ湡
FentityModel.Add("FPriceUnitId", new JObject() { ["Fnumber"] = item["FUNITNUMBER"].ToString() }); // 璁′环鍗曚綅
+ FentityModel.Add("FStockUnitID", new JObject() { ["Fnumber"] = item["FUNITNUMBER"].ToString() }); // 搴撳瓨鍗曚綅
+ FentityModel.Add("FStockID", new JObject() { ["Fnumber"] = "BJCK-SH.01.005" }); // 搴撳瓨鍗曚綅
+ FentityModel.Add("FActReceiveQty", Convert.ToDecimal(item["HQTY"])); // 渚涘簲鍟嗛�佽揣鏁伴噺锛堟彁鏂欒鍒掓暟閲� - 宸茬敓鎴愰�佽揣鍗曟暟閲忥級
+ FentityModel.Add("FOwnerTypeId", "BD_OwnerOrg");//璐т富绫诲瀷
+ FentityModel.Add("FOwnerID", new JObject() { ["Fnumber"] = dr["FPURCHASEORGNUMBER"].ToString() });//璐т富
+ FentityModel.Add("FSrcId", item["FID"].ToString());//婧愬崟鍐呯爜
+ FentityModel.Add("FSRCFORMID", "PUR_PurchaseOrder");//婧愬崟绫诲瀷
+ FentityModel.Add("FSrcBillNo", item["FBILLNO"].ToString());//婧愬崟鍗曞彿
+ FentityModel.Add("FSRCENTRYID", item["FENTRYID"].ToString());//婧愬崟鍒嗗綍鍐呯爜
+ FentityModel.Add("FORDERBILLNO", item["FBILLNO"].ToString());//婧愬崟鍗曞彿
+ FentityModel.Add("FPOORDERENTRYID", item["FENTRYID"].ToString());//婧愬崟鍒嗗綍鍐呯爜
+ FentityModel.Add("FSRMENTRYID", item["HENTRYID"].ToString());//SRM hentryid
+ FentityModel.Add("FLot", new JObject() { ["Fnumber"] = item["HBatChNo"].ToString() }); // 鎵瑰彿
+ FentityModel.Add("FProduceDate", item["FProduceDate"].ToString());//鐢熶骇鏃ユ湡
+ FentityModel.Add("F_aaaa_Price1", item["F_aaaa_Price1"].ToString());//鍚◣閲嶉噺鍗曚环/鍚�
+
+ FentityModel.Add("F_bsv_Text1", item["HExpressSupplierSub"].ToString());//鐗╂祦鍗曚綅 (鐟炵惇)
+ FentityModel.Add("F_bsv_Text2", item["HExpressNumberSub"].ToString());//鐗╂祦鍗曞彿 (鐟炵惇)
+ FentityModel.Add("FDescription", item["HRemark"].ToString());//琛ㄤ綋澶囨敞 (鐟炵惇)
+ FentityModel.Add("F_bsv_dhrq", item["HPlanArrivalDate"].ToString());//鍒拌揣鏃ユ湡 (鐟炵惇)
+ FentityModel.Add("F_bsv_xh", item["HBoxNumber"].ToString());//绠卞彿 (鐟炵惇)
+ FentityModel.Add("FPrice", item["FPRICE"].ToString());//鍗曚环
+ FentityModel.Add("FTaxPrice", item["FTAXPRICE"].ToString());//鍚◣鍗曚环
+ FentityModel.Add("FEntryTaxRate", item["FTAXRATE"].ToString());//绋庣巼
+ FentityModel.Add("FGiveAway", item["FGiveAway"].ToString());//鏄惁璧犲搧
+ JArray Fentity2 = new JArray();
+ JObject FentityModel2 = new JObject();
+ FentityModel2.Add("FDetailEntity_Link_FRULEID", "PUR_PurchaseOrder-PUR_ReceiveBill");
+ FentityModel2.Add("FDetailEntity_Link_FSTableName", "t_PUR_POOrderEntry");
+ FentityModel2.Add("FDetailEntity_Link_FSBillId", item["FID"].ToString());
+ FentityModel2.Add("FDetailEntity_Link_FSId", item["FEntryID"].ToString());
+ Fentity2.Add(FentityModel2);
+ FentityModel.Add("FDetailEntity_Link", Fentity2);
+ Fentity.Add(FentityModel);
+ }
+ model.Add("FDetailEntity", Fentity); //鏄庣粏淇℃伅
+
+ JObject _FentityModel = new JObject();
+ _FentityModel.Add("FSettleOrgId", new JObject() { ["Fnumber"] = dr["FSETTLEORGNUMBER"].ToString() }); // 缁撶畻缁勭粐
+ _FentityModel.Add("FSettleCurrId", new JObject() { ["Fnumber"] = dr["FSETTLECURRNUMBER"].ToString() }); // 缁撶畻甯佸埆
+ _FentityModel.Add("FPricePoint", 0); // 瀹氫环鏃剁偣
+ model.Add("FinanceEntity ", _FentityModel);//璐㈠姟淇℃伅
+ JObject jsonRoot = new JObject()
+ {
+ ["Creator"] = "",
+ ["NeedUpDateFields"] = new JArray(),
+ ["NeedReturnFields"] = new JArray(),
+ ["IsDeleteEntry"] = "false",
+ ["SubSystemId"] = "",
+ ["IsVerifyBaseDataField"] = "false",
+ ["Model"] = model
+ };
+ var loginRet = InvokeHelper.Login();
+ var isSuccess = JObject.Parse(loginRet)["LoginResultType"].Value<int>();
+ if (isSuccess == 0)
+ {
+ objjson.code = "0";
+ objjson.count = 0;
+ objjson.Message = loginRet;
+ objjson.data = null;
+ return objjson;
+ }
+ //LogService.Write("jsonRoot:" + jsonRoot.ToString());
+ var result = InvokeHelper.Save("PUR_ReceiveBill", jsonRoot.ToString());
+
+ //LogService.Write(result);
+ if (JObject.Parse(result)["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() == "TRUE")
+ {
+ //鏇存柊閫佽揣鍗� 涓昏〃 ERP鍗曟嵁鍙� 浠ュ強 ERP涓诲唴鐜�
+ string FBillNo = JObject.Parse(result)["Result"]["Number"].ToString();
+ string FID = JObject.Parse(result)["Result"]["Id"].ToString();
+ string updateSql = string.Format(@"
+ update a set
+ a.HERPInterID = {0} ,
+ a.HERPBillNO ='{1}'
+ from Cg_POInStockBillMain a
+ join Cg_POInStockBillSub b on a.hinterid = b.hinterid
+ where b.HInterID = ({2})
+ and b. HSOURCEINTERID = {3}
+ and a.HERPInterID = 0
+ ", FID, FBillNo, dr["HINTERID"].ToString(), dr["FID"].ToString());
+ oCn.RunProc(updateSql);
+ }
+ else
+ {
+ objjson.code = "0";
+ objjson.count = 0;
+ objjson.Message = result;
+ objjson.data = null;
+ return objjson;
+ }
+
+ }
+ }
+ else
+ {
+ LogService.Write("鏀舵枡閫氱煡鍗曞鏍告棤鏁版嵁锛�" + sql);
+ }
+ }
+ else
+ {
+ sql = string.Format(@"
+SELECT T3.FNAME AS FTYPENAME,M.HBILLNO,B.HINTERID,B.HENTRYID,C.FID,C.FENTRYID, D.FBILLNO,B.HQTY,CD.FRECEIVEORGID,CDOO.FNUMBER AS FRECEIVENUMBER
+,D.FSUPPLIERID,DS.FNUMBER AS FSUPPLIERNUMBER,D.FPURCHASEORGID,DOO.FNUMBER AS FPURCHASEORGNUMBER,CROO.FNUMBER AS FSETTLEORGNUMBER,
+E.FPRICETIMEPOINT,E.FSETTLECURRID,EC.FNUMBER AS FSETTLECURRNUMBER,C.FMATERIALID,CM.FNUMBER AS FMATERIALNUMBER ,C.FUNITID
+,CU.FNUMBER AS FUNITNUMBER,CR.FPRICE,CR.FTAXPRICE,CR.FTAXRATE,D.FPURCHASERID,isnull(T4.FNUMBER,'') AS FPURCHASERNUMBER
+,B.HExpressNumberSub,B.HExpressSupplierSub,B.HRemark,B.HPlanArrivalDate,B.HBoxNumber,B.HBatChNo,D.FBILLTYPEID
+,CU2.FNUMBER AS FPRICEUNITNUMBER
+FROM CG_POINSTOCKBILLSUB B
+JOIN CG_POINSTOCKBILLMAIN M ON B.HINTERID = M.HINTERID
+JOIN {0}..T_PUR_POORDERENTRY C ON B.HSOURCEINTERID = C.FID AND B.HSOURCEENTRYID = C.FENTRYID
+LEFT JOIN {0}..T_BD_MATERIAL CM ON C.FMATERIALID =CM.FMATERIALID
+LEFT JOIN {0}..T_BD_UNIT CU ON C.FUNITID =CU.FUNITID
+JOIN {0}..T_PUR_POORDERENTRY_D CD ON C.FENTRYID = CD.FENTRYID
+LEFT JOIN {0}..T_ORG_ORGANIZATIONS CDOO ON CD.FRECEIVEORGID = CDOO.FORGID
+JOIN {0}..T_PUR_POORDERENTRY_F CR ON C.FENTRYID = CR.FENTRYID
+LEFT JOIN {0}..T_ORG_ORGANIZATIONS CROO ON CR.FSETTLEORGID = CROO.FORGID
+LEFT JOIN {0}..T_PUR_POORDER D ON C.FID =D.FID
+LEFT JOIN {0}..T_BAS_BILLTYPE T2 ON D.FBILLTYPEID = T2.FBILLTYPEID
+LEFT JOIN {0}..T_BAS_BILLTYPE_L T3 ON T2.FBILLTYPEID = T3.FBILLTYPEID and FLOCALEID = 2052
+LEFT JOIN {0}..V_BD_BUYER T4 ON D.FPURCHASERID =T4.FID
+LEFT JOIN {0}..T_BD_SUPPLIER DS ON D.FSUPPLIERID = DS.FSUPPLIERID
+LEFT JOIN {0}..T_ORG_ORGANIZATIONS DOO ON D.FPURCHASEORGID = DOO.FORGID
+JOIN {0}..T_PUR_POORDERFIN E ON C.FID =E.FID
+LEFT JOIN {0}..T_BD_CURRENCY EC ON E. FSETTLECURRID =EC.FCURRENCYID
+LEFT JOIN {0}..T_PUR_POORDERENTRY_F CF ON C.FID = CF.FID AND C.FENTRYID = CF.FENTRYID
+LEFT JOIN {0}..T_BD_UNIT CU2 ON CF.FPRICEUNITID =CU2.FUNITID
+ WHERE b.hinterid in ({1}) and M.HERPInterID = 0
+", kdTbaleName, HInterID, CustomFields);
+ dt = oCn.RunProcReturn(sql, "sltz").Tables[0];
+ if (dt.Rows.Count > 0)
+ {
+ foreach (DataRow dr in dt.Rows)
+ {
+ //閲囪喘璁㈠崟涓嬫帹鐢熸垚閫佽揣鍗� 鏃跺�� 鍒ゆ柇鏄惁鏈夌敓鎴愰噰璐鍗曞彉鏇村崟 濡傛灉鏈変笖鍙樻洿鍗曠姸鎬佷笉涓哄凡瀹℃牳 闄愬埗涓嬫帹
+ objJsonResult = TestPOOrder(dr["FEntryID"].ToString());
+ if (objJsonResult.code == "0")
+ return objJsonResult;
+ }
+ foreach (DataRow dr in dt.Rows)
+ {
+ if (fidList.Contains(dr["HINTERID"].ToString()))
+ continue;
+ else
+ fidList.Add(dr["HINTERID"].ToString());
+ DataRow[] drs = dt.Select("HINTERID = " + dr["HINTERID"].ToString());
+ JObject model = new JObject();
+ string fTypeName = "SLD01_SYS";//鏍囧噯閲囪喘璁㈠崟绫诲瀷
+ string ywTypeName = "CG";//鏍囧噯涓氬姟绫诲瀷
+ if (dr["FTYPENAME"].ToString().Contains("濮斿"))
+ {
+ fTypeName = "SLD03_SYS";
+ ywTypeName = "WW";
+ }
+ if (dr["FTYPENAME"].ToString().Contains("璧勪骇"))
+ {
+ fTypeName = "SLD04_SYS";
+ ywTypeName = "ZCCG";
+ }
+ model.Add("FBILLTYPEID", new JObject() { ["Fnumber"] = fTypeName }); //鍗曟嵁绫诲瀷
+ model.Add("FBusinessType", ywTypeName); //涓氬姟绫诲瀷
+ model.Add("FBILLNO", dr["HBillNo"].ToString()); //鍗曟嵁缂栧彿
+ model.Add("FDate", DateTime.Now.ToString("yyyy-MM-dd")); //閫氱煡鏃ユ湡
+ model.Add("FStockOrgId", new JObject() { ["Fnumber"] = dr["FRECEIVENUMBER"].ToString() }); // 鏀舵枡缁勭粐
+ model.Add("FPurOrgId", new JObject() { ["Fnumber"] = dr["FPURCHASEORGNUMBER"].ToString() }); //閲囪喘缁勭粐
+ model.Add("FSupplierId", new JObject() { ["Fnumber"] = dr["FSUPPLIERNUMBER"].ToString() }); //渚涘簲鍟�
+ model.Add("FPURCHASERID", new JObject() { ["Fnumber"] = dr["FPURCHASERNUMBER"].ToString() }); //閲囪喘鍛�
+ model.Add("FOwnerTypeIdHead", "BD_Supplier");// 璐т富绫诲瀷
+ model.Add("FOwnerIdHead", new JObject() { ["Fnumber"] = dr["FSUPPLIERNUMBER"].ToString() });//璐т富 渚涘簲鍟�
+ JArray Fentity = new JArray();
+ foreach (var item in drs)
+ {
+ JObject FentityModel = new JObject();
+ FentityModel.Add("FMaterialId", new JObject() { ["Fnumber"] = item["FMATERIALNUMBER"].ToString() }); // 鐗╂枡缂栫爜
+ FentityModel.Add("FUnitID", new JObject() { ["Fnumber"] = item["FUNITNUMBER"].ToString() }); // 鍗曚綅
+ FentityModel.Add("FPreDeliveryDate", DateTime.Now.ToString("yyyy-MM-dd")); //棰勮鍒拌揣鏃ユ湡
+ FentityModel.Add("FPriceUnitId", new JObject() { ["Fnumber"] = item["FPRICEUNITNUMBER"].ToString() }); // 璁′环鍗曚綅
FentityModel.Add("FStockUnitID", new JObject() { ["Fnumber"] = item["FUNITNUMBER"].ToString() }); // 搴撳瓨鍗曚綅
FentityModel.Add("FStockID", new JObject() { ["Fnumber"] = "BJCK-SH.01.005" }); // 搴撳瓨鍗曚綅
FentityModel.Add("FActReceiveQty", Convert.ToDecimal(item["HQTY"])); // 渚涘簲鍟嗛�佽揣鏁伴噺锛堟彁鏂欒鍒掓暟閲� - 宸茬敓鎴愰�佽揣鍗曟暟閲忥級
@@ -962,12 +1196,13 @@
objjson.data = null;
return objjson;
}
- //LogService.Write("jsonRoot:" + jsonRoot.ToString());
+ LogService.Write("jsonRoot:" + jsonRoot.ToString());
var result = InvokeHelper.Save("PUR_ReceiveBill", jsonRoot.ToString());
//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();
@@ -985,6 +1220,8 @@
}
else
{
+ LogService.Write("SRM-鏀舵枡閫氱煡鍗曞鏍稿け璐SON锛�" + jsonRoot.ToString() );
+
objjson.code = "0";
objjson.count = 0;
objjson.Message = result;
@@ -999,7 +1236,30 @@
LogService.Write("鏀舵枡閫氱煡鍗曞鏍告棤鏁版嵁锛�" + sql);
}
}
-
+ //==================================== Begin 閫佽揣鍗曞鏍稿悗鎺у埗 Begin ====================================
+ for (int i = 0; i < sArray.Length; i++)
+ {
+ ds = oCn.RunProcReturn("exec h_p_SRM_Cg_POInStockBill_AfterCheckCtrl " + sArray[i] + ",'" + HBillNo + "','" + CurUserName + "'", "h_p_SRM_Cg_POInStockBill_AfterCheckCtrl");
+ if (ds == null)
+ {
+ oCn.RollBack(); //鍥炴粴浜嬬墿
+ objjson.code = "0";
+ objjson.count = 0;
+ objjson.Message = "瀹℃牳鍚庡垽鏂け璐ワ紒鏃犳暟鎹繑鍥�";
+ objjson.data = null;
+ return objjson;
+ }
+ if (DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBack"]) != "0")
+ {
+ oCn.RollBack(); //鍥炴粴浜嬬墿
+ objjson.code = "0";
+ objjson.count = 0;
+ objjson.Message = "瀹℃牳澶辫触锛�" + DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HRemarkBack"]);
+ objjson.data = null;
+ return objjson;
+ }
+ }
+ //====================================== End 閫佽揣鍗曞鏍稿悗鎺у埗 End ======================================
}
////鏇存柊鐗╂祦瀛楁 锛堢憺涓庣惇锛�
@@ -1012,6 +1272,9 @@
HCheckDate = getdate()
where HInterID in ({1})", CurUserName, HInterID);
oCn.RunProc(sql);
+
+ oCn.Commit(); //鎻愪氦浜嬬墿
+
objjson.code = "1";
objjson.count = 1;
objjson.Message = "鎿嶄綔鎴愬姛";
@@ -1020,7 +1283,7 @@
}
catch (Exception ex)
{
-
+ oCn.RollBack(); //鍥炴粴浜嬬墿
objjson.code = "0";
objjson.count = 0;
objjson.Message = "鎿嶄綔澶辫触" + ex.Message.ToString();
@@ -1050,7 +1313,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")
@@ -1068,8 +1331,43 @@
try
{
DAL.ClsCg_POInStockBill oBill = new DAL.ClsCg_POInStockBill();
- //鍏堝垹闄� 閲戣澏鏁版嵁
- objjson = DeleteKingDee(HInterID);
+ SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
+ //鑾峰彇瀹㈡埛鍚嶇О
+ string FCusName = oSystemParameter.GetSingleSystemParameter("WMS_CampanyName", ref DBUtility.ClsPub.sExeReturnInfo);
+ //澶忓疂闇�瑕佸厛鍦ㄩ噾铦跺垹闄ゆ敹鏂欓�氱煡鍗曞悗鎵嶈兘鍦ㄤ緵搴斿晢鍗忓悓骞冲彴鍒犻櫎閫佽揣鍗�
+ if (FCusName == "澶忓疂鐢靛櫒")
+ {
+ string sqlBeforeDel = $"exec h_p_SRM_POInStockBeforeDelCtrl " + HInterID;
+
+ DataSet ds = oCn.RunProcReturn(sqlBeforeDel, "h_p_SRM_POInStockBeforeDelCtrl");
+
+ if (ds == null || ds.Tables[0].Rows.Count <= 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍒犻櫎閫佽揣鍗曞彂鐢熷紓甯革紝娌℃湁浠讳綍杩斿洖璁板綍锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ if (ds.Tables[0].Rows[0]["HBackCount"].ToString() == "1")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = ds.Tables[0].Rows[0]["HRemarkBack"].ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ }
+ else
+ {
+ //鍏堝垹闄� 閲戣澏鏁版嵁
+ objjson = DeleteKingDee(HInterID);
+ }
+
+
//LogService.Write(objjson.ToString());
if (objjson.code == "0")
return objjson;
@@ -1236,9 +1534,9 @@
/// <returns></returns>
public object TestSaverPOInStock(string ids, string entryids)
{
- List<string> mylist = new List<string>(ids.Split(',').Distinct());
- List<string> entryList = new List<string>(entryids.Split(',').Distinct());
- SQLHelper.ClsCNSRM oCn = new SQLHelper.ClsCNSRM();
+ List<string> mylist = new List<string>(ids.Split(','));//.Distinct()
+ List<string> entryList = new List<string>(entryids.Split(','));//.Distinct()
+ SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
string FCusName = oSystemParameter.GetSingleSystemParameter("WMS_CampanyName", ref DBUtility.ClsPub.sExeReturnInfo);
if (FCusName == "澶忓疂鐢靛櫒" && mylist.Count > 1)
{
@@ -1250,21 +1548,52 @@
}
try
{
+ DataSet ds2;
+ oCn.BeginTran(); //寮�濮嬩簨鐗�
+
//閲囪喘璁㈠崟涓嬫帹鐢熸垚閫佽揣鍗� 鏃跺�� 鍒ゆ柇鏄惁鏈夌敓鎴愰噰璐鍗曞彉鏇村崟 濡傛灉鏈変笖鍙樻洿鍗曠姸鎬佷笉涓哄凡瀹℃牳 闄愬埗涓嬫帹
objJsonResult = TestPOOrder(entryids);
if (objJsonResult.code == "0")
return objJsonResult;
+
+ if (mylist.Count != entryList.Count)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "涓诲唴鐮佷笌瀛愬唴鐮佹暟閲忎笉涓�鑷达紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ for (int i = 0;i < mylist.Count;i++)
+ {
+ //閲囪喘璁㈠崟涓嬫帹鐢熸垚閫佽揣鍗曞墠鎺у埗
+ string sql = "exec h_p_SRM_POOrderBill_BeforePushDownCtrl " + mylist[i] + "," + entryList[i];
+ ds2 = oCn.RunProcReturn(sql, "h_p_SRM_POOrderBill_BeforePushDownCtrl");
+ if (DBUtility.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HBack"]) != "0")
+ {
+ LogService.Write("閫佽揣鏁伴噺鍚屾杩涘叆鍥炴粴");
+ oCn.RollBack(); //鍥炴粴浜嬬墿
+ objjson.code = "0";
+ objjson.count = 0;
+ objjson.Message = "瀹℃牳鍓嶅垽鏂け璐ワ紒" + DBUtility.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HRemarkBack"]);
+ objjson.data = null;
+ return objjson;
+ }
+ }
+
for (int i = 0; i < mylist.Count; i++)
{
//鏇存柊鍏宠仈鏁伴噺
var HinterID = mylist[i].ToString();
- oCn.RunProc($"exec h_p_SRM_UpDatePPBomRelationQty {HinterID}");
+ 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,鍗曟嵁鍙�,鐗╂枡缂栫爜 from H_v_SRM_POOrderBillList t1 left join AIS20220308151944..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)
{
@@ -1273,11 +1602,14 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = $"璇锋鏌ユ暟鎹紝鍗曟嵁鍙凤細{dr[0]["鍗曟嵁鍙�"]},鐗╂枡缂栫爜锛歿dr[0]["鐗╂枡缂栫爜"]},鍙互鍙戣揣鏁伴噺涓�0锛屽凡鍏ㄩ儴鐢熸垚閫佽揣鍗曪紒";
+ objJsonResult.Message = $"璇锋鏌ユ暟鎹紝鍗曟嵁鍙凤細{dr[0]["鍗曟嵁鍙�"]},鐗╂枡缂栫爜锛歿dr[0]["鐗╂枡缂栫爜"]},鍙互鍙戣揣鏁伴噺涓�0锛屽凡鍏ㄩ儴鐢熸垚閫佽揣鍗曪紒,璁㈠崟鏁伴噺锛歿Convert.ToDouble(dr[0]["璁㈠崟鏁伴噺"]).ToString("f2")},宸插彂璐ф暟閲忥細{Convert.ToDouble(dr[0]["宸插彂璐ф暟閲�"]).ToString("f2")},鍓╀綑鏀舵枡鏁伴噺锛歿Convert.ToDouble(dr[0]["鍓╀綑鏀舵枡鏁伴噺"]).ToString("f2")}";
objJsonResult.data = null;
return objJsonResult;
}
}
+
+ oCn.Commit(); //鎻愪氦浜嬬墿
+
objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = "鎿嶄綔鎴愬姛!";
@@ -1301,7 +1633,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");
@@ -1397,7 +1729,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");
@@ -1430,7 +1762,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");
--
Gitblit v1.9.1