SRM-WEBAPI.git - Gitblit

			@@ -10,6 +10,7 @@
			using System.Linq;
			using System.Net;
			using System.Net.Http;
			using System.Text.RegularExpressions;
			using System.Web;
			using System.Web.Http;
			using WebAPI.Code;
			@@ -358,8 +359,43 @@
			int i = 0;
			foreach (Model.ClsCg_POInStockBillSub oItemSub in ls)
			{
			//判断采购订单状态
			objJsonResult = TestPOOrder(oItemSub.HPOOrderEntryID.ToString());
			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;
			//增加判断送货数量超出采购订单数量
			@@ -372,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;
			@@ -382,7 +418,7 @@
			}
			oItemSub.HEntryID = i;
			oItemSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now);
			oItemSub.HRemark = "";
			//oItemSub.HRemark = "";
			oItemSub.HCloseMan = "";
			oItemSub.HCloseType = false;
			oBill.DetailColl.Add(oItemSub);
			@@ -426,6 +462,7 @@
			return objJsonResult;
			}
			}

			/// <summary>
			/// 送货单列表
			/// </summary>
			@@ -773,11 +810,13 @@
			}
			else
			{
			sql = string.Format(@"
			//瑞琪字段
			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
			@@ -827,6 +866,24 @@
			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("FBILLTYPEID", new JObject() { ["Fnumber"] = fTypeName }); //单据类型
			model.Add("FBusinessType", ywTypeName); //业务类型
			model.Add("FBILLNO", dr["HBillNo"].ToString()); //单据编号
			@@ -860,6 +917,13 @@
			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();
			@@ -899,7 +963,8 @@
			return objjson;
			}
			//LogService.Write("jsonRoot:" + jsonRoot.ToString());
			var result = InvokeHelper.Save("PUR_ReceiveBill", jsonRoot.ToString());
			var result = InvokeHelper.Save("PUR_ReceiveBill", jsonRoot.ToString());

			//LogService.Write(result);
			if (JObject.Parse(result)["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() == "TRUE")
			{
			@@ -936,6 +1001,10 @@
			}

			}

			////更新物流字段（瑞与琪）
			//oCn.RunProc("exec h_p_Cg_LocalToKingDee_POInStock " + HBillNo + "," + HInterID);

			//更新主表状态审核
			sql = string.Format(@"update Cg_POInStockBillMain set
			HBillStatus = 2 ,
			@@ -984,8 +1053,8 @@
			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"]);
			@@ -1192,8 +1261,10 @@
			var HinterID = mylist[i].ToString();
			oCn.RunProc($"exec h_p_SRM_UpDatePPBomRelationQty {HinterID}");
			}

			//判断未关联数量是否为0
			DataSet ds = oCn.RunProcReturn($"select T1.hqty-T1.hrelationqty as hqty,单据号,物料编码 from H_v_SRM_POOrderBillList t1 where hentryid in ({string.Join(", ", entryList)}) ", "H_v_SRM_POOrderBillList");
			//安瑞：AIS20220914133941 瑞与琪：AIS20220308151944 本地：AIS20210811135644 夏宝：AIS20211130140219 凯贝：AIS20210820164804
			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");
			DataTable dt = ds.Tables[0];
			if (dt.Rows.Count > 0)
			{