diff --git a/Pilot_KD_Parino/Pilot_KD_Parino.csproj b/Pilot_KD_Parino/Pilot_KD_Parino.csproj
index 5c71130..1637a79 100644
--- a/Pilot_KD_Parino/Pilot_KD_Parino.csproj
+++ b/Pilot_KD_Parino/Pilot_KD_Parino.csproj
@@ -334,6 +334,7 @@
+
diff --git a/Pilot_KD_Parino/QPHY_AutoWrire/Bill5.cs b/Pilot_KD_Parino/QPHY_AutoWrire/Bill5.cs
index c8e0719..dd4f047 100644
--- a/Pilot_KD_Parino/QPHY_AutoWrire/Bill5.cs
+++ b/Pilot_KD_Parino/QPHY_AutoWrire/Bill5.cs
@@ -59,8 +59,6 @@ namespace Pilot_KD_Parino.QPHY_AutoWrire
public override void OnLoad(EventArgs e)
{
base.OnLoad(e);
-
-
var showParameter = new DynamicFormShowParameter();
showParameter.FormId = "NAAD_ZiDongHeXiao";
showParameter.ParentPageId = this.View.PageId;
@@ -427,6 +425,9 @@ namespace Pilot_KD_Parino.QPHY_AutoWrire
FType = Convert.ToString(item["FType"]),
FISHX = item["FISHX"]?.ToString(),
FWeiYi = item["FWeiYi"]?.ToString(),
+ FaHuoAmount30Days = Convert.ToDouble( item["FaHuoAmount30Days"].ToString()),
+ FInvoiceAmount30Days= Convert.ToDouble(item["FInvoiceAmount30Days"].ToString()),
+
}).ToList();
var SaleBILLLISNew = SaleBILLLIS.Where(a => a.FISHX != "已核销配对").ToList();
var ReceiveBILLLIST2 = new List();
@@ -473,7 +474,7 @@ namespace Pilot_KD_Parino.QPHY_AutoWrire
//var dasdsas = oneToOneTemp.Where(h => h.FBIllNO == "PL-XSDD20250400471").FirstOrDefault();
var saleList1 = oneToOneTemp.Select(t => t.FBIllNO).Distinct().ToList();
var ReceiveList1 = oneToOneTemp.Select(t => t.UFbillNo).Distinct().ToList();
- if (saleList1.Count > ReceiveList1.Count)
+ if (saleList1.Count() > ReceiveList1.Count())
{
List deleteFBIllNOList = new List();
ReceiveList1.ForEach(t =>
@@ -557,7 +558,7 @@ namespace Pilot_KD_Parino.QPHY_AutoWrire
//var dasdsas = oneToOneTemp.Where(h => h.FBIllNO == "PL-XSDD20250400471").FirstOrDefault();
var saleList22 = oneToOneTemp2.Select(t => t.FBIllNO).Distinct().ToList();
var ReceiveList22 = oneToOneTemp2.Select(t => t.UFbillNo).Distinct().ToList();
- if (saleList22.Count > ReceiveList22.Count)
+ if (saleList22.Count() > ReceiveList22.Count())
{
List deleteFBIllNOList = new List();
ReceiveList22.ForEach(t =>
@@ -636,13 +637,13 @@ namespace Pilot_KD_Parino.QPHY_AutoWrire
var SaleBILLLIS2Sa333 = SaleBILLLISNew.Where(t => t.FISHX != "已核销配对" && t.FDAMOUNT > 0 ).OrderBy(t => t.FClient).ThenByDescending(t => t.FDate).ToList();
ReceiveBILLLIST = ReceiveBILLLIST2.Where(a => a.F_RowNew == 1 && a.FISHX != "已核销配对" && a.FDAMOUNT > 0).OrderBy(t => t.FClient).ThenByDescending(t => t.FDate).ToList();
- var oneToOneTemp3 = (from q in SaleBILLLIS2Sa222
+ var oneToOneTemp3 = (from q in SaleBILLLIS2Sa333
join u in ReceiveBILLLIST on new { q.FClient, FDAMOUNT = q.FInvoiceAmount30Days } equals new { u.FClient, u.FDAMOUNT }
select new { q.FClient, q.FBIllNO, q.FCONTRACTNUMBER, u.FDAMOUNT, UFbillNo = u.FBIllNO }).ToList();
//var dasdsas = oneToOneTemp.Where(h => h.FBIllNO == "PL-XSDD20250400471").FirstOrDefault();
var saleList33 = oneToOneTemp3.Select(t => t.FBIllNO).Distinct().ToList();
var ReceiveList33 = oneToOneTemp3.Select(t => t.UFbillNo).Distinct().ToList();
- if (SaleBILLLIS2Sa333.Count > ReceiveList33.Count)
+ if (SaleBILLLIS2Sa333.Count() > ReceiveList33.Count())
{
List deleteFBIllNOList = new List();
ReceiveList33.ForEach(t =>
@@ -1612,7 +1613,11 @@ namespace Pilot_KD_Parino.QPHY_AutoWrire
this.View.Model.SetValue("F_Ordercategory2", SaleBILLLIS2[i].F_Ordercategory2, i);
this.View.Model.SetValue("F_Ordercategory", SaleBILLLIS2[i].F_Ordercategory, i);
this.View.Model.SetValue("FInvoiceAmount", SaleBILLLIS2[i].FInvoiceAmount, i);
+ this.View.Model.SetValue("FInvoiceAmount30Days", SaleBILLLIS2[i].FInvoiceAmount30Days, i);
+ this.View.Model.SetValue("FaHuoAmount30Days", SaleBILLLIS2[i].FaHuoAmount30Days, i);
+ //FaHuoAmount30Days = Convert.ToDouble(item["FaHuoAmount30Days"]),
+ //FInvoiceAmount30Days = Convert.ToDouble(item["FInvoiceAmount30Days"]),
}
diff --git a/Pilot_KD_Parino/Sal_Order/PushSaleBillPlugIn.cs b/Pilot_KD_Parino/Sal_Order/PushSaleBillPlugIn.cs
new file mode 100644
index 0000000..ff07bca
--- /dev/null
+++ b/Pilot_KD_Parino/Sal_Order/PushSaleBillPlugIn.cs
@@ -0,0 +1,456 @@
+using DevExpress.Xpo.DB.Helpers;
+using FarPoint.Excel;
+using Kingdee.BOS;
+using Kingdee.BOS.App;
+using Kingdee.BOS.App.Data;
+using Kingdee.BOS.Contracts;
+using Kingdee.BOS.Core.DynamicForm;
+using Kingdee.BOS.Core.DynamicForm.Operation;
+using Kingdee.BOS.Core.DynamicForm.PlugIn;
+using Kingdee.BOS.Core.DynamicForm.PlugIn.Args;
+using Kingdee.BOS.Core.List;
+using Kingdee.BOS.Core.List.PlugIn;
+using Kingdee.BOS.Core.Metadata;
+using Kingdee.BOS.Core.Metadata.ConvertElement;
+using Kingdee.BOS.Core.Metadata.ConvertElement.ServiceArgs;
+using Kingdee.BOS.Core.Metadata.FormElement;
+using Kingdee.BOS.Log;
+using Kingdee.BOS.Orm;
+using Kingdee.BOS.Orm.DataEntity;
+using Kingdee.BOS.ServiceHelper;
+using Kingdee.BOS.Util;
+using Newtonsoft.Json.Linq;
+using Pilot_KD_Parino.Common;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Linq;
+namespace Pilot_KD_Parino.Sal_Order
+{
+ [Description("销售单下推生成跨组织的采购申请单的插件"), HotUpdate]
+ public class PushSaleBillPlugIn : AbstractDynamicFormPlugIn // AbstractListPlugIn
+ {
+ long sScrId = 0;
+ string sScrBillNo = "";
+ public override void AfterBarItemClick(AfterBarItemClickEventArgs e)
+ {
+ base.AfterBarItemClick(e);
+
+ //this.View.ShowMessage("669977");
+
+ if (e.BarItemKey.Equals("tbSaleBill222", StringComparison.OrdinalIgnoreCase))
+ {
+ var FEntity = this.View.Model.DataObject;
+ var json = JsonUtil.Serialize(FEntity);
+ //Logger.Error("FEntity", json, new Exception());
+ var id = FEntity["id"];
+ string formid = FEntity["FFormId"].ToString();
+
+
+ int stockId = 0;
+ IOperationResult result = Invoke("SAL_SaleOrder", "PUR_PurchaseOrder", id.ToString(), "7cd93c259999489c97798063f2f7bd70", ref stockId);
+
+
+ var sheet = result.SuccessDataEnity.FirstOrDefault();
+ string jsonsheet = JsonHelper.ToJson(sheet);
+ //Logger.Error("推送采购入库单",jsonsheet,null);
+ if (sheet != null)
+ {
+
+ result = Invoke("PUR_ReceiveBill", "STK_InStock", sheet["id"].ToString(), "a1ff32276cd9469dad3bf2494366fa4f", ref stockId);
+ //sheet = result.SuccessDataEnity.FirstOrDefault();
+ //result = Invoke("PUR_ReceiveBill", "STK_InStock", sheet["id"].ToString(), "a1ff32276cd9469dad3bf2494366fa4f");
+ }
+
+ //找到最开始的销售订单
+ for (int kk = 0; kk < 6 && tablename.ToUpper() != "T_SAL_ORDERENTRY"; kk++)
+ {
+ ////发货通知单
+ tempFid = int.Parse(dt.Select(t => t["FSBILLID"]).FirstOrDefault().ToString());
+ string tempTable = dt.Select(t => t["FSTABLENAME"]).FirstOrDefault().ToString();
+ getSourceSql = $@"/*dialect*/SELECT FSTABLENAME,FSBILLID FROM dbo.{tempTable}_lk
+ WHERE FENTRYID IN ( SELECT FENTRYID FROM {tempTable} WHERE FID = {tempFid})";
+ dt = DBServiceHelper.ExecuteDynamicObject(this.Context, getSourceSql);
+
+ if (dt == null || dt.Count == 0)
+ {
+
+ this.View.ShowMessage("没有上查关联的跨组织的采购订单");
+ return;
+ }
+ else
+ {
+ tablename = dt.Select(t => t["FSTABLENAME"]).FirstOrDefault().ToString();
+
+ }
+ tempFid = int.Parse(dt.Select(t => t["FSBILLID"]).FirstOrDefault().ToString());
+ }
+ if (tablename.ToUpper() != "T_SAL_ORDERENTRY")
+ {
+
+ throw new KDBusinessException("", "推送销售发货通知单失败,没有上查关联的跨组织的销售订单:" + tablename);
+
+ }
+
+ result = Invoke("SAL_SaleOrder", "SAL_DELIVERYNOTICE", tempFid.ToString(), "193822715afc48aa9fa6d6beca7700ab", ref stockId);
+ sheet = result.SuccessDataEnity.FirstOrDefault();
+ result = Invoke("SAL_DELIVERYNOTICE", "SAL_OUTSTOCK", sheet["id"].ToString(), "ad0779a4685a43a08f08d2e42d7bf3e9", ref stockId);
+
+ this.View.ShowMessage("跨组织下推订单完成");
+
+ //this.View.ShowMessage("就是这个按钮"+ id);
+
+ //ListSelectedRowCollection rows =new ListSelectedRowCollection();
+ //List pkIds = new List();
+ //List