diff --git a/Pilot_KD_Parino/QPHY_AutoWrire/Bill5.cs b/Pilot_KD_Parino/QPHY_AutoWrire/Bill5.cs index 8088cce..bda6cce 100644 --- a/Pilot_KD_Parino/QPHY_AutoWrire/Bill5.cs +++ b/Pilot_KD_Parino/QPHY_AutoWrire/Bill5.cs @@ -1,6 +1,7 @@ using DevExpress.Data.Linq; using DevExpress.Data.PLinq.Helpers; using DocumentFormat.OpenXml.Drawing.Spreadsheet; +using FarPoint.Excel; using Kingdee.BOS.App.Core.Utils; using Kingdee.BOS.BusinessEntity.BusinessFlow; using Kingdee.BOS.Core.CommonFilter; @@ -23,6 +24,7 @@ using Pilot_KD_Parino.Common; using System; using System.Collections.Generic; using System.ComponentModel; +using System.Data; using System.Globalization; using System.Linq; using System.Text; @@ -846,12 +848,12 @@ namespace Pilot_KD_Parino.QPHY_AutoWrire }); List errorList = new List(); - var eee = ReceiveBILLLIST2.Where(t => t.FDAMOUNT < t.BenCi).ToList(); - if (eee.Count > 0) - { - string kk =string.Join(",", eee.Select(t => t.FBIllNO).ToList()); - errorList.Add("这些订单的本次核销金额大于待核销金额"+ kk); - } + //var eee = ReceiveBILLLIST2.Where(t => (t.FALLAMOUNT- t.FYAMOUNT) < t.BenCi).ToList(); + //if (eee.Count > 0) + //{ + // string kk =string.Join(",", eee.Select(t => t.FBIllNO).ToList()); + // errorList.Add("这些订单的本次核销金额大于待核销金额"+ kk); + //} var shouKuanList = ReceiveBILLLIST2.Where(t => t.F_RowNew == 1).ToList(); @@ -933,6 +935,9 @@ namespace Pilot_KD_Parino.QPHY_AutoWrire successFbillNo.Add(item.FBIllNO); ISXSNUM++; } + + //string tempsql=$@"update T_AR_RECEIVEBILL set F_contractnumber='{item.FCONTRACTNUMBER}' where FBILLNO='{item.FBIllNO}' ;": + //DBServiceHelper.ExecuteDynamicObject(ctx, sql.ToString(), null, null, CommandType.Text, null); } catch (Exception ex) { diff --git a/Pilot_KD_Parino/Sal_Order/PushSaleOutBillPlugIn.cs b/Pilot_KD_Parino/Sal_Order/PushSaleOutBillPlugIn.cs index a57088e..8256dba 100644 --- a/Pilot_KD_Parino/Sal_Order/PushSaleOutBillPlugIn.cs +++ b/Pilot_KD_Parino/Sal_Order/PushSaleOutBillPlugIn.cs @@ -4,6 +4,7 @@ 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; @@ -21,8 +22,8 @@ using System.Data; using System.Linq; namespace Pilot_KD_Parino.Sal_Order { - [Description("批量下推生成销售出库单插件")] - public class PushSaleOutBillPlugIn : AbstractListPlugIn + [Description("下推生成销售出库单及联动生成其他单的插件")] + public class PushSaleOutBillPlugIn : AbstractDynamicFormPlugIn // AbstractListPlugIn { long sScrId = 0; string sScrBillNo = ""; @@ -36,35 +37,40 @@ namespace Pilot_KD_Parino.Sal_Order long sEntryId = 0; long slevel = 2; long sId = 0; - if (e.BarItemKey == "tbPushSalOut")//批量下推调拨 - { - ListSelectedRowCollection rows = this.ListView.SelectedRowsInfo; - List pkIds = new List(); - List pkEntryIds = new List(); - if (rows.Count <= 0) - { - this.View.ShowMessage("请选择对应的发货通知单！！！"); - return; - } - foreach (var row in rows) - { - sBillNo = row.BillNo.ToString();//发货通知单号 - sId = Convert.ToInt64(row.PrimaryKeyValue);//发货通知单ID - sEntryId = Convert.ToInt64(row.EntryPrimaryKeyValue);//发货通知单ID - string sSql = "select FID from T_SAL_DELIVERYNOTICEENTRY where FID= " + sId + " and FENTRYID= " + sEntryId + " and abs(FBaseUnitQty) > abs(FBASEJOINOUTQTY) "; - sSql = String.Format(@"/*dialect*/" + sSql); - var dt = DBServiceHelper.ExecuteDynamicObject(this.Context, sSql); - if (dt.Count > 0) - { - string getSourceSql = "select FID from T_SAL_DELIVERYNOTICE where FBILLNO='" + sBillNo + "'"; - IOperationResult result = Invoke("SAL_DELIVERYNOTICE", "SAL_OUTSTOCK", getSourceSql, "ad0779a4685a43a08f08d2e42d7bf3e9"); - } - }//进入下一个循环生成下一个系列的分布式调出单 - if (flag) - { - this.View.ShowMessage("生成对应系列的分布式调出单完成！！！"); - } - } + this.View.ShowMessage(e.BarItemKey); + return; + + //if (e.BarItemKey.Equals("tbPushSalOut111", StringComparison.OrdinalIgnoreCase)) + //{ + // this.View.ShowMessage("就是这个按钮"); + // return; + // ListSelectedRowCollection rows = this.ListView.SelectedRowsInfo; + // List pkIds = new List(); + // List pkEntryIds = new List(); + // if (rows.Count <= 0) + // { + // this.View.ShowMessage("请选择对应的发货通知单！！！"); + // return; + // } + // foreach (var row in rows) + // { + // sBillNo = row.BillNo.ToString();//发货通知单号 + // sId = Convert.ToInt64(row.PrimaryKeyValue);//发货通知单ID + // sEntryId = Convert.ToInt64(row.EntryPrimaryKeyValue);//发货通知单ID + // string sSql = "select FID from T_SAL_DELIVERYNOTICEENTRY where FID= " + sId + " and FENTRYID= " + sEntryId + " and abs(FBaseUnitQty) > abs(FBASEJOINOUTQTY) "; + // sSql = String.Format(@"/*dialect*/" + sSql); + // var dt = DBServiceHelper.ExecuteDynamicObject(this.Context, sSql); + // if (dt.Count > 0) + // { + // string getSourceSql = "select FID from T_SAL_DELIVERYNOTICE where FBILLNO='" + sBillNo + "'"; + // IOperationResult result = Invoke("SAL_DELIVERYNOTICE", "SAL_OUTSTOCK", getSourceSql, "ad0779a4685a43a08f08d2e42d7bf3e9"); + // } + // }//进入下一个循环生成下一个系列的分布式调出单 + // if (flag) + // { + // this.View.ShowMessage("生成对应系列的分布式调出单完成！！！"); + // } + //} } private IOperationResult Invoke(string source, string target, string getSourceSql, string sargetBillTypeId) { diff --git a/反审核销记录单.sql b/反审核销记录单.sql new file mode 100644 index 0000000..df11191 Binary files /dev/null and b/反审核销记录单.sql differ diff --git a/更新核销金额.sql b/更新核销金额.sql index 88a51bf..e7ee99a 100644 --- a/更新核销金额.sql +++ b/更新核销金额.sql @@ -37,7 +37,7 @@ begin ) d on d.FBILLNO2 =b.FBILLNO2 WHERE a.FID =@FID ; --޸տۼƺ - UPDATE C SET F_Amount =isnull( d.,0) + UPDATE C SET F_Amount =isnull( d.,0) ,C.F_CONTRACTNUMBER=b.FCONTRACTNUMBER2 FROM T_AutoWrireRecord A INNER JOIN T_AutoWrireRecordEntry2 B ON A.FID = B.FID INNER JOIN T_AR_RECEIVEBILL C ON C.FBILLNO = B.FBILLNO3 @@ -61,5 +61,5 @@ end go - Select * From T_SAL_ORDER Where FBILLNO = 'PL-XSDD20250200007' - Update T_SAL_ORDER Set FDOCUMENTSTATUS = 'D' Where FBILLNO = 'PL-XSDD20250200007' \ No newline at end of file + --Select * From T_SAL_ORDER Where FBILLNO = 'PL-XSDD20250200007' + --Update T_SAL_ORDER Set FDOCUMENTSTATUS = 'D' Where FBILLNO = 'PL-XSDD20250200007' \ No newline at end of file