From 7a72361cf3b374329ac8cf7b3c75d6308b124111 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期二, 02 一月 2024 13:49:41 +0800
Subject: [PATCH] 生成条码时新增写入字段，列表改为动态列；退货单列表；同步送货单时新增字段，夏宝得先在金蝶删除收料通知单才能在供应商平台删除送货单
---
WebAPI/Controllers/POInStockController.cs | 1105 +++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 862 insertions(+), 243 deletions(-)
diff --git a/WebAPI/Controllers/POInStockController.cs b/WebAPI/Controllers/POInStockController.cs
index c2bbf1a..cc585db 100644
--- a/WebAPI/Controllers/POInStockController.cs
+++ b/WebAPI/Controllers/POInStockController.cs
@@ -5,14 +5,18 @@
using System;
using System.Collections.Generic;
using System.Data;
+using System.Diagnostics;
using System.IO;
using System.Linq;
using System.Net;
using System.Net.Http;
+using System.Text.RegularExpressions;
using System.Web;
using System.Web.Http;
using WebAPI.Code;
using WebAPI.Models;
+using WebAPI.Utility;
+
namespace WebAPI.Controllers
{
public class POInStockController : ApiController
@@ -21,7 +25,6 @@
private json objjson = new json();
//鑾峰彇绯荤粺鍙傛暟
Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();
-
/// <summary>
/// 鏇存柊鎵撳嵃娆℃暟
/// </summary>
@@ -53,7 +56,6 @@
return objJsonResult;
}
}
-
/// <summary>
/// 鐢熸垚閫佽揣鍗曞崟鎹彿銆佹棩鏈�
/// </summary>
@@ -156,8 +158,7 @@
objjson.data = null;
return objjson;
}
- DAL.ClsCg_POInStockBill oClsCg_POInStockBill = new DAL.ClsCg_POInStockBill();
- ds = oClsCg_POInStockBill.ShowNewBillMainTo(DBUtility.ClsPub.isLong(sMsg), DBUtility.ClsPub.isStrNull(sMsg3), ShowItem, ref DBUtility.ClsPub.sExeReturnInfo);
+ ds = ShowNewBillMainTo(DBUtility.ClsPub.isLong(sMsg), DBUtility.ClsPub.isStrNull(sMsg3), ShowItem, ref DBUtility.ClsPub.sExeReturnInfo);
if (ds == null || ds.Tables[0].Rows.Count == 0)
{
objjson.code = "0";
@@ -215,8 +216,7 @@
objjson.data = null;
return objjson;
}
- DAL.ClsCg_POInStockBill oClsCg_POInStockBill = new DAL.ClsCg_POInStockBill();
- ds = oClsCg_POInStockBill.ShowNewBillSubTo(DBUtility.ClsPub.isLong(sMsg), DBUtility.ClsPub.isStrNull(sMsg2), DBUtility.ClsPub.isStrNull(sMsg3), ShowItem, ref DBUtility.ClsPub.sExeReturnInfo);
+ ds = ShowNewBillSubTo(DBUtility.ClsPub.isLong(sMsg), DBUtility.ClsPub.isStrNull(sMsg2), DBUtility.ClsPub.isStrNull(sMsg3), ShowItem, ref DBUtility.ClsPub.sExeReturnInfo);
if (ds == null || ds.Tables[0].Rows.Count == 0)
{
objjson.code = "0";
@@ -273,7 +273,6 @@
return objJsonResult;
}
}
-
/// <summary>
/// 淇濆瓨閫佽揣鍗�
/// </summary>
@@ -284,15 +283,12 @@
[HttpPost]
public object SaverPOInStock([FromBody] JObject msg)
{
+ SQLHelper.ClsCNSRM oCn = new SQLHelper.ClsCNSRM();
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("msg1:" + msg1);
- //LogService.Write("msg2:" + msg2);
- //LogService.Write("msg3:" + msg3);
-
string UserName = "";
ListModels oListModels = new ListModels();
try
@@ -304,6 +300,19 @@
msg2 = msg2.Replace("\\", "");
msg2 = msg2.Replace("\n", ""); //\n
lsmain = oListModels.getObjectByJson_POInStockMain(msg2);
+ string billno = lsmain[0].HBillNo;
+ string yzsql = $"select count(*) as rows from Cg_POInStockBillMain where HBillNo = '{billno}'";
+ DataTable yzdt = oCn.RunProcReturn(yzsql, "yzds").Tables[0];
+ if (Convert.ToInt32(yzdt.Rows[0][0]) > 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ //鏍规嵁鏀舵枡閫氱煡鍗曞彿鏍￠獙鏄惁宸茬敓鎴�
+ //string jysql = $"select * from ":
foreach (Model.ClsCg_POInStockBillMain oItem in lsmain)
{
//oItem.HMaker = "";
@@ -316,7 +325,7 @@
oItem.HMainSourceInterID = oItem.HInterID;
oItem.HInterID = 0;
//oItem.HInterID = DBUtility.ClsPub.CreateBillID_SRMProd("1103", ref DBUtility.ClsPub.sExeReturnInfo);
- if (FCusName == "瀹夌憺鍖荤枟") //绯荤粺鍙傛暟 瀹㈡埛瀹氬埗鍖栧悕绉� 绌虹櫧涓洪�氱敤
+ if (FCusName.Contains("瀹夌憺")) //绯荤粺鍙傛暟 瀹㈡埛瀹氬埗鍖栧悕绉� 绌虹櫧涓洪�氱敤
{
if (DBUtility.ClsPub.isStrNull(oItem.HDHDate) == "")
{
@@ -350,6 +359,45 @@
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 (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")
+ return objJsonResult;
//澧炲姞鍒ゆ柇 閫佽揣鏁伴噺瓒呭嚭閲囪喘璁㈠崟鏁伴噺
i++;
if (oItemSub.HQty <= 0)
@@ -360,7 +408,7 @@
objJsonResult.data = 1;
return objJsonResult;
}
- if (oItemSub.HQty > oItemSub.HRQty)
+ if (Convert.ToDecimal(oItemSub.HQty) > Convert.ToDecimal(oItemSub.HRQty))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -368,25 +416,12 @@
objJsonResult.data = 1;
return objJsonResult;
}
- if (FCusName == "瀹夌憺鍖荤枟") //绯荤粺鍙傛暟 瀹㈡埛瀹氬埗鍖栧悕绉� 绌虹櫧涓洪�氱敤
- {
- if (DBUtility.ClsPub.isStrNull(oItemSub.HBatChNo) == "")
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "淇濆瓨澶辫触锛佺" + i.ToString() + "琛屾湭濉啓鎵瑰彿锛�";
- objJsonResult.data = 1;
- return objJsonResult;
- }
- }
-
oItemSub.HEntryID = i;
oItemSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now);
- oItemSub.HRemark = "";
+ //oItemSub.HRemark = "";
oItemSub.HCloseMan = "";
oItemSub.HCloseType = false;
oBill.DetailColl.Add(oItemSub);
-
}
//淇濆瓨鍓嶅垽鏂�(鍗曟嵁鍙烽噸澶嶏紝绗斿綍椤圭洰)
//淇濆瓨
@@ -394,7 +429,6 @@
bool bResult;
if (oBill.omodel.HInterID == 0)
{
- // bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
}
else
@@ -428,6 +462,7 @@
return objJsonResult;
}
}
+
/// <summary>
/// 閫佽揣鍗曞垪琛�
/// </summary>
@@ -436,34 +471,27 @@
/// <param name="OnePage"></param>
/// <returns></returns>
[Route("GetPOInStockBill")]
- [HttpGet]
+ [HttpPost]
//閫佽揣鍗曞垪琛�
- public object GetPOInStockBill(string HSupNo, string sqlWhere)
+ public object GetPOInStockBill([FromBody] JObject msg)
{
- string msg = "";
+ string HSupNo = msg["HSupNo"].ToString(); string sqlWhere = msg["sqlWhere"].ToString();
try
{
+ Stopwatch sw = new Stopwatch();
+ sw.Start();//寮�濮嬭鏃�
string VsWhere = "";
string PcWhere = "";
SQLHelper.ClsCNSRM oCn = new SQLHelper.ClsCNSRM();
DataSet ds;
//鍏朵粬杩囨护
- if (msg.Trim() == "")
- {
- msg = " Where hsupid in (select HSupID from h_v_Gy_UserSupplierList where 鐢ㄦ埛 =^^" + HSupNo.Trim() + "^^) " + sqlWhere;
- // msg = " Where hsupid in (select hsupid from Gy_UserSupplierRelation where HUserID=^^" + System.Web.HttpContext.Current.Session["HUserName"].ToString() + "^^)";
- }
- else
- {
- msg = msg + " and hsupid in (select HSupID from h_v_Gy_UserSupplierList where 鐢ㄦ埛 =^^" + HSupNo.Trim() + "^^) " + sqlWhere;
- // msg = msg + " Where hsupid in (select hsupid from Gy_UserSupplierRelation where HUserID=^^" + System.Web.HttpContext.Current.Session["HUserName"].ToString() + "^^)";
- }
+ string sql = " Where hsupid in (select HSupID from h_v_Gy_UserSupplierList where 鐢ㄦ埛 =^^" + HSupNo.Trim() + "^^) " + sqlWhere;
//杞崲鐗规畩瀛楃
- if (Common.SQLtoChange(msg, ref VsWhere, ref PcWhere) == false)
+ if (Common.SQLtoChange(sql, ref VsWhere, ref PcWhere) == false)
{
objjson.code = "0";
objjson.count = 0;
- objjson.Message = "鑾峰彇澶辫触";
+ objjson.Message = "杞崲鐗规畩瀛楃澶辫触";
objjson.data = null;
return objjson;
}
@@ -471,23 +499,24 @@
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");
- //LogService.Write("exec H_p_SRM_POInStockBillList '" + PcWhere + "'");
- if (ds == null || ds.Tables[0].Rows.Count == 0)
+
+ List<object> columnNameList = new List<object>();
+ foreach (DataColumn col in ds.Tables[0].Columns)
{
- objjson.code = "0";
- objjson.count = 0;
- objjson.Message = "鑾峰彇澶辫触";
- objjson.data = null;
- return objjson;
+ Type dataType = col.DataType;
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+ columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
}
- else
- {
- objjson.code = "0";
- objjson.count = 10000;
- objjson.Message = "鑾峰彇鎴愬姛";
- objjson.data = ds.Tables[0];
- return objjson;
- }
+
+ LogService.Write("閫佽揣鍗曞垪琛ㄥ姞杞絪ql:exec H_p_SRM_POInStockBillList '" + PcWhere + "'");
+ LogService.Write("鏁版嵁鏌ヨ杩斿洖" + sw.Elapsed);
+ sw.Stop();//缁撴潫璁℃椂
+ objjson.code = "0";
+ objjson.count = 10000;
+ objjson.Message = "鑾峰彇鎴愬姛";
+ objjson.data = ds.Tables[0];
+ objjson.list = columnNameList;
+ return objjson;
}
catch (Exception e)
{
@@ -605,7 +634,6 @@
return objjson;
}
}
-
[Route("AuditPOInStockBill")]
[HttpGet]
public object AuditPOInStockBill(string HInterID, string CurUserName, string HBillNo)
@@ -625,11 +653,20 @@
objjson.data = null;
return objjson;
}
-
- //string kdTbaleName = "AIS20211209082932";
- string kdTbaleName = "AIS20211130140219";//澶忓疂姝ｅ紡
-
- string sql = string.Format(@"
+ var kdTbaleName = Util.GetConfigKey(AppDomain.CurrentDomain.BaseDirectory + "/Config/kdapi.config", "DataBaseName");
+ string FCusName = oSystemParameter.GetSingleSystemParameter("WMS_CampanyName", ref DBUtility.ClsPub.sExeReturnInfo);
+ string sql = string.Empty;
+ DataTable dt = new DataTable();
+ List<string> fidList = new List<string>();
+ 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 = "";//鑷畾涔夊瓧娈�
+ if (HValue == "Y")
+ {
+ 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,
E.FPRICETIMEPOINT,E.FSETTLECURRID,EC.FNUMBER AS FSETTLECURRNUMBER,C.FMATERIALID,CM.FNUMBER AS FMATERIALNUMBER ,C.FUNITID
@@ -645,7 +682,7 @@
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
+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_HR_EMPINFO T5 ON D.F_XBKF_BASE1 = T5.FID
LEFT JOIN {0}..T_BD_SUPPLIER DS ON D.FSUPPLIERID = DS.FSUPPLIERID
@@ -654,109 +691,112 @@
LEFT JOIN {0}..T_BD_CURRENCY EC ON E. FSETTLECURRID =EC.FCURRENCYID
WHERE b.hinterid in ({1}) and M.HERPInterID = 0
", kdTbaleName, HInterID);
- DataTable dt = oCn.RunProcReturn(sql, "sltz").Tables[0];
- List<string> fidList = new List<string>();
- if (dt.Rows.Count > 0)
- {
- foreach (DataRow dr in dt.Rows)
- {
- if (fidList.Contains(dr["FID"].ToString() + dr["HINTERID"].ToString()))
- continue;
- else
- fidList.Add(dr["FID"].ToString() + dr["HINTERID"].ToString());
-
- DataRow[] drs = dt.Select("FID = " + dr["FID"].ToString() + " and HINTERID = " + dr["HINTERID"].ToString());
-
- JObject model = new JObject();
- string fTypeName = "SLD01_SYS";//閲囪喘璁㈠崟绫诲瀷
- if (dr["FTYPENAME"].ToString().Contains("濮斿"))
- fTypeName = "SLD03_SYS";
- if (dr["FTYPENAME"].ToString().Contains("璧勪骇"))
- fTypeName = "SLD04_SYS";
-
- model.Add("FBILLTYPEID", new JObject() { ["Fnumber"] = fTypeName }); //鍗曟嵁绫诲瀷
- if (dr["FTYPENAME"].ToString().Contains("濮斿"))
- model.Add("FBusinessType", "WW"); //涓氬姟绫诲瀷
- 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("F_xbkf_Base", new JObject() { ["Fnumber"] = dr["FRECEIVEMENNUMBER"].ToString() }); //鏀舵枡鍛�
- model.Add("FOwnerTypeIdHead", "BD_Supplier");// 璐т富绫诲瀷
- model.Add("FOwnerIdHead", new JObject() { ["Fnumber"] = dr["FPURCHASEORGNUMBER"].ToString() });//璐т富
- model.Add("F_XBKF_COMBO", dr["F_xbkf_Combo1"].ToString());//鏄惁鏈夌エ
- JArray Fentity = new JArray();
- foreach (var item in drs)
+ dt = oCn.RunProcReturn(sql, "sltz").Tables[0];
+ if (dt.Rows.Count > 0)
{
- 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["FUNITNUMBER"].ToString() }); // 璁′环鍗曚綅
- FentityModel.Add("FStockUnitID", new JObject() { ["Fnumber"] = item["FUNITNUMBER"].ToString() }); // 搴撳瓨鍗曚綅
- 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("FPrice", item["FPRICE"].ToString());//鍗曚环
- FentityModel.Add("FTaxPrice", item["FTAXPRICE"].ToString());//鍚◣鍗曚环
- FentityModel.Add("FEntryTaxRate", item["FTAXRATE"].ToString());//绋庣巼
+ foreach (DataRow dr in dt.Rows)
+ {
+ if (fidList.Contains(dr["FID"].ToString() + dr["HINTERID"].ToString()))
+ continue;
+ else
+ fidList.Add(dr["FID"].ToString() + dr["HINTERID"].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); //鏄庣粏淇℃伅
+ DataRow[] drs = dt.Select("FID = " + dr["FID"].ToString() + " and 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("F_xbkf_Base", new JObject() { ["Fnumber"] = dr["FRECEIVEMENNUMBER"].ToString() }); //鏀舵枡鍛�
+ model.Add("FOwnerTypeIdHead", "BD_Supplier");// 璐т富绫诲瀷
+ model.Add("FOwnerIdHead", new JObject() { ["Fnumber"] = dr["FSUPPLIERNUMBER"].ToString() });//璐т富 渚涘簲鍟�
+ model.Add("F_XBKF_COMBO", dr["F_xbkf_Combo1"].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["FUNITNUMBER"].ToString() }); // 璁′环鍗曚綅
+ FentityModel.Add("FStockUnitID", new JObject() { ["Fnumber"] = item["FUNITNUMBER"].ToString() }); // 搴撳瓨鍗曚綅
+ 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("FPrice", item["FPRICE"].ToString());//鍗曚环
+ FentityModel.Add("FTaxPrice", item["FTAXPRICE"].ToString());//鍚◣鍗曚环
+ FentityModel.Add("FEntryTaxRate", item["FTAXRATE"].ToString());//绋庣巼
- 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();
+ 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); //鏄庣粏淇℃伅
- string updateSql = string.Format(@"
+ 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}'
@@ -766,27 +806,401 @@
and b. HSOURCEINTERID = {3}
and a.HERPInterID = 0
", FID, FBillNo, dr["HINTERID"].ToString(), dr["FID"].ToString());
- oCn.RunProc(updateSql);
+ oCn.RunProc(updateSql);
+ }
+ else
+ {
+ objjson.code = "0";
+ objjson.count = 0;
+ objjson.Message = result;
+ objjson.data = null;
+ return objjson;
+ }
+ }
+ }
+ }
+ 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
+,isnull(VW.FNUMBER,'') AS FReceiverNUMBER,isnull(B.HKFDate,'') As FProduceDate,B.HTAXPRICE_T AS F_AAAA_PRICE1
+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}..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, 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";
+ }
+ if (FCusName == "鍑礉濂堢壒")
+ {
+ //1鍘�
+ if (dr["FBILLTYPEID"].ToString() == "60cfe60fa16dd8")
+ {
+ fTypeName = "SLD08_SYS";
+ }
+ //2鍘�
+ if (dr["FBILLTYPEID"].ToString() == "60cfe634a1708f")
+ {
+ fTypeName = "SLD09_SYS";
+ }
+ //3鍘�
+ if (dr["FBILLTYPEID"].ToString() == "83d822ca3e374b4ab01e5dd46a0062bd")
+ {
+ fTypeName = "SLD01_SYS";
+ }
+ model.Add("FReceiverId", new JObject() { ["Fnumber"] = dr["FReceiverNUMBER"].ToString() }); //鏀舵枡鍛�
+ }
+ 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["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("FPrice", item["FPRICE"].ToString());//鍗曚环
+ FentityModel.Add("FTaxPrice", item["FTAXPRICE"].ToString());//鍚◣鍗曚环
+ FentityModel.Add("FEntryTaxRate", item["FTAXRATE"].ToString());//绋庣巼
+ 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());//绠卞彿 (鐟炵惇)
+
+ 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
{
- objjson.code = "0";
- objjson.count = 0;
- objjson.Message = result;
- objjson.data = null;
- return objjson;
+ 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
+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
+ 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["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("FPrice", item["FPRICE"].ToString());//鍗曚环
+ FentityModel.Add("FTaxPrice", item["FTAXPRICE"].ToString());//鍚◣鍗曚环
+ FentityModel.Add("FEntryTaxRate", item["FTAXRATE"].ToString());//绋庣巼
+ FentityModel.Add("FLot", new JObject() { ["Fnumber"] = item["HBatChNo"].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());//绠卞彿 (鐟炵惇)
+
+ 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);
}
}
}
+
+ ////鏇存柊鐗╂祦瀛楁 锛堢憺涓庣惇锛�
+ //oCn.RunProc("exec h_p_Cg_LocalToKingDee_POInStock " + HBillNo + "," + HInterID);
+
+ //鏇存柊涓昏〃鐘舵�� 瀹℃牳
sql = string.Format(@"update Cg_POInStockBillMain set
HBillStatus = 2 ,
HChecker ='{0}',
HCheckDate = getdate()
where HInterID in ({1})", CurUserName, HInterID);
-
oCn.RunProc(sql);
-
objjson.code = "1";
objjson.count = 1;
objjson.Message = "鎿嶄綔鎴愬姛";
@@ -823,40 +1237,77 @@
objjson.data = HinterID;
return objjson;
}
-
public int GetHinterIDByBillNo(string HBillNo, string type)
{
SQLHelper.ClsCNSRM oCn = new SQLHelper.ClsCNSRM();
int HInterID = 0;
string sql = "select HInterID from CG_POINSTOCKBILLMAIN where HBILLNO = '" + HBillNo + "'";
- if (type == "Print")
- sql += " and HBillStatus = '2' ";//鎵撳嵃鍒ゆ柇鏄惁瀹℃牳
+ //if (type == "Print")
+ // sql += " and HBillStatus = '2' ";//鎵撳嵃鍒ゆ柇鏄惁瀹℃牳
DataTable dt = oCn.RunProcReturn(sql, "HInterID").Tables[0];
if (dt.Rows.Count > 0)
HInterID = Convert.ToInt32(dt.Rows[0]["HInterID"]);
return HInterID;
}
-
-
[Route("DeltetPOInStockBill")]
[HttpGet]
- public object DeltetPOInStockBill(string HInterID, string HUserName, string HBillNo)
+ public object DeltetPOInStockBill(string HInterID, string HUserName)
{
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
try
{
DAL.ClsCg_POInStockBill oBill = new DAL.ClsCg_POInStockBill();
- //鍏堝垹闄� 閲戣澏鏁版嵁
- objjson = DeleteKingDee(HInterID);
+ SQLHelper.ClsCNSRM oCn = new SQLHelper.ClsCNSRM();
+ //鑾峰彇瀹㈡埛鍚嶇О
+ 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;
- WebAPIController.Add_Log("閫佽揣鍗曞垹闄�", HUserName, "閫佽揣鍗曞垹闄わ紝鍗曞彿锛�" + HBillNo);
oCN.BeginTran();
- oBill.DeleteRelation(ref DBUtility.ClsPub.sExeReturnInfo, Convert.ToInt32(HInterID));
- oCN.RunProc("Delete From Cg_POInStockBillMain where HInterID = " + HInterID);
- oCN.RunProc("Delete From Cg_POInStockBillSub where HInterID = " + HInterID);
+ string sql = $"select HInterID,HBillNo from Cg_POInStockBillMain where HInterID in ({HInterID})";
+ DataTable dt = oCN.RunProcReturn(sql, "deleteTable").Tables[0];
+ foreach (DataRow dr in dt.Rows)
+ {
+ WebAPIController.Add_Log("閫佽揣鍗曞垹闄�", HUserName, "閫佽揣鍗曞垹闄わ紝鍗曞彿锛�" + dr["HBillNo"]);
+ oBill.DeleteRelation(ref DBUtility.ClsPub.sExeReturnInfo, Convert.ToInt32(dr["HInterID"]));
+ oCN.RunProc($"Delete From Cg_POInStockBillMain where HInterID in ({dr["HInterID"]})");
+ oCN.RunProc($"Delete From Cg_POInStockBillSub where HInterID in ({dr["HInterID"]})");
+ }
oCN.Commit();
objJsonResult.code = "1";
objJsonResult.count = 1;
@@ -874,56 +1325,60 @@
return objJsonResult;
}
}
-
//瀹℃牳 鍒犻櫎 鍒犻櫎閲戣澏鏁版嵁搴撳搴� 鏀舵枡閫氱煡鍒版暟鎹�
public json DeleteKingDee(string hinterid)
{
+ var kdTbaleName = Util.GetConfigKey(AppDomain.CurrentDomain.BaseDirectory + "/Config/kdapi.config", "DataBaseName");
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
- string sql = string.Format("select HinterID,HERPBillNO,HERPInterID from Cg_POInStockBillMain where HERPInterID>0 and hinterid in (" + hinterid + ")");
- string FCusName = oSystemParameter.GetSingleSystemParameter("WMS_CampanyName", ref DBUtility.ClsPub.sExeReturnInfo);
- if (FCusName == "澶忓疂鐢靛櫒")
- sql = "select HinterID,HERPBillNO,HERPInterID from Cg_POInStockBillMain t1 join AIS20211130140219..T_PUR_RECEIVE t2 on t1.HERPInterID = t2.FID where HERPInterID>0 and hinterid in (" + hinterid + ")";
+ //string sql = string.Format("select HinterID,HERPBillNO,HERPInterID from Cg_POInStockBillMain where HERPInterID>0 and hinterid in (" + hinterid + ")");
+ //string FCusName = oSystemParameter.GetSingleSystemParameter("WMS_CampanyName", ref DBUtility.ClsPub.sExeReturnInfo);
+ var sql = $"select HinterID,HERPBillNO,HERPInterID from Cg_POInStockBillMain t1 join {kdTbaleName}..T_PUR_RECEIVE t2 on t1.HERPInterID = t2.FID where HERPInterID>0 and hinterid in (" + hinterid + ")";
DataTable dt = oCN.RunProcReturn(sql, "deleteDt").Tables[0];
- if (dt.Rows.Count > 0)
+ if (dt.Rows.Count == 0)
{
- foreach (DataRow dr in dt.Rows)
- {
- var sJson = new
- {
- Numbers = dr["HERPBillNO"].ToString(),
- Ids = ""
- };
- 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("");
- var result = InvokeHelper.Delete("PUR_ReceiveBill", JsonConvert.SerializeObject(sJson));
- //LogService.Write("api缁撴灉鍒犻櫎锛�" + result);
- if (JObject.Parse(result)["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() != "TRUE")
- {
- objjson.code = "0";
- objjson.count = 0;
- objjson.Message = "瀵瑰簲閲戣澏鏀舵枡閫氱煡鍗曞垹闄ゅけ璐� 锛�" + result;
- objjson.data = null;
- return objjson;
- }
-
- }
+ objjson.code = "1";
+ objjson.count = 1;
+ objjson.Message = "Sucess锛�";
+ objjson.data = null;
+ return objjson;
+ }
+ List<string> HERPInterIdList = new List<string>();
+ foreach (DataRow dr in dt.Rows)
+ {
+ HERPInterIdList.Add(dr["HERPInterID"].ToString());
+ }
+ var sJson = new
+ {
+ Ids = string.Join(",", HERPInterIdList)
+ };
+ 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("");
+ var result = InvokeHelper.Delete("PUR_ReceiveBill", JsonConvert.SerializeObject(sJson));
+ //LogService.Write("api缁撴灉鍒犻櫎锛�" + result);
+ if (JObject.Parse(result)["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() != "TRUE")
+ {
+ objjson.code = "0";
+ objjson.count = 0;
+ objjson.Message = "瀵瑰簲閲戣澏鏀舵枡閫氱煡鍗曞垹闄ゅけ璐� 锛乗r\n" + result;
+ objjson.data = null;
+ return objjson;
}
objjson.code = "1";
objjson.count = 1;
objjson.Message = "Sucess锛�";
objjson.data = null;
return objjson;
- }
+ }
//[Route("POInStockAccept")]
//[HttpGet]
///// <summary>
@@ -996,19 +1451,20 @@
// return objJsonResult;
// }
// }
-
-
[Route("TestSaverPOInStock")]
- [HttpPost]
+ [HttpGet]
/// <summary>
/// 鐢熸垚閫佽揣鍗曞墠楠岃瘉閲戣澏閲囪喘璁㈠崟鏄惁鍒犻櫎鍜屽叧闂紝鐒跺悗鏇存柊鍏宠仈鏁伴噺
/// </summary>
/// <param name="HInterID"></param>
/// <returns></returns>
- public object TestSaverPOInStock([FromBody] string[] ids)
+ public object TestSaverPOInStock(string ids, string entryids)
{
- List<string> mylist = new List<string>(ids.Distinct());
- if (mylist.Count > 1)
+ List<string> mylist = new List<string>(ids.Split(',').Distinct());
+ List<string> entryList = new List<string>(entryids.Split(',').Distinct());
+ SQLHelper.ClsCNSRM oCn = new SQLHelper.ClsCNSRM();
+ string FCusName = oSystemParameter.GetSingleSystemParameter("WMS_CampanyName", ref DBUtility.ClsPub.sExeReturnInfo);
+ if (FCusName == "澶忓疂鐢靛櫒" && mylist.Count > 1)
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -1018,28 +1474,35 @@
}
try
{
- string HinterID = "";
+ //閲囪喘璁㈠崟涓嬫帹鐢熸垚閫佽揣鍗� 鏃跺�� 鍒ゆ柇鏄惁鏈夌敓鎴愰噰璐鍗曞彉鏇村崟 濡傛灉鏈変笖鍙樻洿鍗曠姸鎬佷笉涓哄凡瀹℃牳 闄愬埗涓嬫帹
+ objJsonResult = TestPOOrder(entryids);
+ if (objJsonResult.code == "0")
+ return objJsonResult;
+
for (int i = 0; i < mylist.Count; i++)
{
- SQLHelper.ClsCNSRM oCn = new SQLHelper.ClsCNSRM();
//鏇存柊鍏宠仈鏁伴噺
- HinterID = mylist[i].ToString();
- oCn.RunProc("exec h_p_SRM_UpDatePPBomRelationQty '" + HinterID + "'");
- //鍒ゆ柇鏈叧鑱旀暟閲忔槸鍚︿负0
- DataSet ds = oCn.RunProcReturn("select * from H_v_SRM_POOrderBillList where hmainid='"+HinterID+"'", "H_v_SRM_POOrderBillList");
- if (ds!= null || ds.Tables[0].Rows.Count>0)
+ var HinterID = mylist[i].ToString();
+ var HEntryID = entryList[i].ToString();
+ 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");
+ DataTable dt = ds.Tables[0];
+ if (dt.Rows.Count > 0)
+ {
+ DataRow[] dr = dt.Select("hqty <=" + 0);
+ if (dr.Count() > 0)
{
- if (ds.Tables[0].Rows[0]["鏈叧鑱旀暟閲�"].ToString() == "0")
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "鍗曟嵁鍙凤細" + ds.Tables[0].Rows[0]["鍗曟嵁鍙�"].ToString()+"宸插叏閮ㄧ敓鎴愰�佽揣鍗曪紒";
- objJsonResult.data = null;
- return objJsonResult;
- }
+ objJsonResult.code = "0";
+ objJsonResult.count = 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;
}
}
-
objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = "鎿嶄綔鎴愬姛!";
@@ -1056,5 +1519,161 @@
}
}
+ /// <summary>
+ /// 楠岃瘉 閲囪喘璁㈠崟
+ /// </summary>
+ /// <param name="entryids">閲囪喘璁㈠崟FENTRYID</param>
+ /// <returns></returns>
+ public JsonResult TestPOOrder(string entryids)
+ {
+ SQLHelper.ClsCNSRM oCn = new SQLHelper.ClsCNSRM();
+ try
+ {
+ var kdTbaleName = Util.GetConfigKey(AppDomain.CurrentDomain.BaseDirectory + "/Config/kdapi.config", "DataBaseName");
+ //楠岃瘉閲戣澏閲囪喘璁㈠崟鏄惁瀛樺湪
+ string sql = string.Format(@"
+select M.HBillNo,B.HMaterID,E.HNumber,E.HName
+FROM Cg_POOrderBillSub B
+JOIN Cg_POOrderBillMAIN M ON B.HINTERID = M.HINTERID
+JOIN Gy_Material E ON B.HMaterID = E.HItemID
+LEFT JOIN {1}..T_PUR_POORDERENTRY C ON B.HInterID = C.FID AND B.HEntryID = C.FENTRYID
+WHERE ISNULL(C.FENTRYID,0) = 0
+AND B.HEntryID in ({0})"
+ , entryids, kdTbaleName);
+ DataSet ds = oCn.RunProcReturn(sql, "temp");
+ if (ds.Tables[0].Rows.Count > 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鍙凤細" + ds.Tables[0].Rows[0]["HBillNo"].ToString() + ",鐗╂枡缂栫爜锛�" + ds.Tables[0].Rows[0]["HNumber"].ToString() + "锛屽搴旂殑閲戣澏閲囪喘璁㈠崟宸插垹闄わ紝涓嶈兘涓嬫帹閫佽揣鍗曪紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ //閲囪喘璁㈠崟涓嬫帹鐢熸垚閫佽揣鍗� 鏃跺�� 鍒ゆ柇鏄惁鏈夌敓鎴愰噰璐鍗曞彉鏇村崟 濡傛灉鏈変笖鍙樻洿鍗曠姸鎬佷笉涓哄凡瀹℃牳 闄愬埗涓嬫帹
+ sql = string.Format(@"
+select M.HBillNo,B.HMaterID,E.HNumber,E.HName,F.FBILLNO
+FROM Cg_POOrderBillSub B
+JOIN Cg_POOrderBillMAIN M ON B.HINTERID = M.HINTERID
+JOIN Gy_Material E ON B.HMaterID = E.HItemID
+JOIN {1}..T_PUR_POORDERENTRY C ON B.HInterID = C.FID AND B.HEntryID = C.FENTRYID
+LEFT join {1}..T_PUR_POCHANGEENTRY D ON C.FENTRYID = D.FOFENTRYID
+LEFT join {1}..T_PUR_POCHANGE F ON D.FID = F.FID
+where b.HEntryID in ({0})
+and F.FDOCUMENTSTATUS <> 'C'"
+ , entryids, kdTbaleName);
+ ds = oCn.RunProcReturn(sql, "temp");
+ if (ds.Tables[0].Rows.Count > 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鍙凤細" + ds.Tables[0].Rows[0]["HBillNo"].ToString() + ",鐗╂枡缂栫爜锛�" + ds.Tables[0].Rows[0]["HNumber"].ToString() + "锛屽瓨鍦ㄥ搴旈噰璐鍗曞彉鏇村崟:" + ds.Tables[0].Rows[0]["FBILLNO"].ToString() + "鏈鏍革紝涓嶈兘涓嬫帹閫佽揣鍗曪紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ //閲囪喘璁㈠崟涓嬫帹鐢熸垚閫佽揣鍗� 鏃跺�� 鍒ゆ柇鏄惁鏈夌敓鎴愰噰璐鍗曟柊鍙樻洿鍗� 濡傛灉鏈変笖鍙樻洿鍗曠姸鎬佷笉涓哄凡瀹℃牳 闄愬埗涓嬫帹
+ sql = string.Format(@"
+select M.HBillNo,B.HMaterID,E.HNumber,E.HName,F.FBILLNO
+FROM Cg_POOrderBillSub B
+JOIN Cg_POOrderBillMAIN M ON B.HINTERID = M.HINTERID
+JOIN Gy_Material E ON B.HMaterID = E.HItemID
+JOIN {1}..T_PUR_POORDERENTRY C ON B.HInterID = C.FID AND B.HEntryID = C.FENTRYID
+LEFT join {1}..t_PUR_XPOOrderENTRY D ON C.FENTRYID = D.FPKIDX
+LEFT join {1}..t_PUR_XPOOrder F ON D.FID = F.FID
+where F.FDOCUMENTSTATUS <> 'C' and b.HEntryID in ({0}) "
+ , entryids, kdTbaleName);
+ ds = oCn.RunProcReturn(sql, "temp");
+ if (ds.Tables[0].Rows.Count > 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鍙凤細" + ds.Tables[0].Rows[0]["HBillNo"].ToString() + ",鐗╂枡缂栫爜锛�" + ds.Tables[0].Rows[0]["HNumber"].ToString() + "锛屽瓨鍦ㄥ搴旈噰璐鍗曟柊鍙樻洿鍗�:" + ds.Tables[0].Rows[0]["FBILLNO"].ToString() + "鏈鏍革紝涓嶈兘涓嬫帹閫佽揣鍗曪紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鎿嶄綔鎴愬姛!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "澶辫触锛�" + e.Message.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+
+ /// <summary>
+ /// 閲囪喘璁㈠崟鐢熸垚閫佽揣鍗曟寜閽� 鏄剧ず鍗曟嵁澶�
+ /// </summary>
+ /// <param name="lngBillKey"></param>
+ /// <param name="HBillType"></param>
+ /// <param name="sShowItem"></param>
+ /// <param name="sReturn"></param>
+ /// <returns></returns>
+ public DataSet ShowNewBillMainTo(Int64 lngBillKey, string HBillType, string sShowItem, ref string sReturn)
+ {
+ try
+ {
+ SQLHelper.ClsCNSRM oCn = new SQLHelper.ClsCNSRM();
+ //鏌ヨ涓昏〃
+ DataSet Ds;
+ Ds = oCn.RunProcReturn(" exec h_p_SRM_POInStockBillMain_ForWeb " + lngBillKey.ToString() + ",'" + HBillType + "'", "h_p_SRM_POInStockBillMain_ForWeb");
+ if (Ds == null || Ds.Tables[0].Rows.Count == 0)
+ {
+ sReturn = "鍗曟嵁澶存湭鎵惧埌锛�";
+ return null;
+ }
+ sReturn = "鏄剧ず鍗曟嵁澶存垚鍔燂紒";
+ return Ds;
+ }
+ catch (Exception e)
+ {
+ sReturn = e.Message;
+ return null;
+ }
+ }
+
+ /// <summary>
+ /// 閲囪喘璁㈠崟鐢熸垚閫佽揣鍗曟寜閽� 鏄剧ず鍗曟嵁浣�
+ /// </summary>
+ /// <param name="lngBillKey"></param>
+ /// <param name="lngBillKey2"></param>
+ /// <param name="HBillType"></param>
+ /// <param name="sShowItem"></param>
+ /// <param name="sReturn"></param>
+ /// <returns></returns>
+ public DataSet ShowNewBillSubTo(Int64 lngBillKey, string lngBillKey2, string HBillType, string sShowItem, ref string sReturn)
+ {
+ string s = "";
+ try
+ {
+ SQLHelper.ClsCNSRM oCn = new SQLHelper.ClsCNSRM();
+ //鏌ヨ涓昏〃
+ DataSet Ds;
+ Ds = oCn.RunProcReturn(" exec h_p_SRM_POInStockBillSub_ForWeb '" + lngBillKey2 + "','" + HBillType + "'", "h_p_SRM_POInStockBillSub_ForWeb");
+ if (Ds == null || Ds.Tables[0].Rows.Count == 0)
+ {
+ sReturn = "鍗曟嵁浣撴湭鎵惧埌锛�";
+ return null;
+ }
+ sReturn = "鏄剧ず鍗曟嵁浣撴垚鍔燂紒";
+ return Ds;
+ }
+ catch (Exception e)
+ {
+ sReturn = e.Message; //+ s
+ return null;
+ }
+ }
+
+
}
}
\ No newline at end of file
--
Gitblit v1.9.1