提交当前本机整理版本
This commit is contained in:
+18
-1
@@ -719,4 +719,21 @@ namespace Lskj.PubBomImport
|
||||
private DevExpress.XtraEditors.DropDownButton dpbImport;
|
||||
private DevExpress.XtraEditors.SimpleButton btnBillAdd;
|
||||
private DevExpress.XtraEditors.SimpleButton btnBillApply;
|
||||
private D
|
||||
private DevExpress.XtraEditors.DropDownButton dpCopyBill;
|
||||
private DevExpress.XtraEditors.DropDownButton btnPrint;
|
||||
private DevExpress.XtraEditors.DropDownButton dpbTools;
|
||||
private DevExpress.XtraEditors.SimpleButton btnDelete;
|
||||
private DevExpress.XtraEditors.SimpleButton btnBillSave;
|
||||
private DevExpress.XtraEditors.PanelControl pl_main_top;
|
||||
private DevExpress.XtraEditors.PanelControl pl_main_top_center;
|
||||
private System.Windows.Forms.Label lbTitle;
|
||||
private DevExpress.XtraEditors.PanelControl pl_main_top_right;
|
||||
private DevExpress.XtraEditors.LabelControl lblOrderNo;
|
||||
private DevExpress.XtraEditors.LabelControl labelControl1;
|
||||
private DevExpress.XtraEditors.PanelControl pl_main_top_left;
|
||||
private DevExpress.XtraEditors.PanelControl pl_red;
|
||||
private System.Windows.Forms.RadioButton rdRed;
|
||||
private DevExpress.XtraEditors.PanelControl pl_blue;
|
||||
private System.Windows.Forms.RadioButton rdBlue;
|
||||
}
|
||||
}
|
||||
@@ -621,4 +621,32 @@ namespace Lskj.PubBomImport
|
||||
if (mainRow != null)
|
||||
{
|
||||
//更新
|
||||
DataTable source = this.gcMain.GridC
|
||||
DataTable source = this.gcMain.GridControl.DataSourceTable();
|
||||
List<DataRow> deleteRows = new List<DataRow>();
|
||||
foreach (DataRow sourceRow in source.Rows)
|
||||
{
|
||||
string bak = sourceRow["bak"] + "";
|
||||
if (!string.IsNullOrEmpty(bak) && bak.Trim().StartsWith("ZZQD"))
|
||||
{
|
||||
deleteRows.Add(sourceRow);
|
||||
}
|
||||
}
|
||||
foreach (DataRow deleteRow in deleteRows)
|
||||
{
|
||||
source.Rows.Remove(deleteRow);
|
||||
}
|
||||
foreach (DataRow newSourceRow in newSource.Rows)
|
||||
{
|
||||
DataRow newRow = source.NewRow();
|
||||
newRow.ItemArray = newSourceRow.ItemArray;
|
||||
source.Rows.Add(newRow);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
//新增
|
||||
this.gcMain.GridControl.DataSource = newSource;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
+23
-3
@@ -248,7 +248,6 @@ namespace Lskj.PubBomImport
|
||||
this.gcMain.Name = "gcMain";
|
||||
this.gcMain.SiftEnumObj = Lskj.Control.GridControlEx.HeaderSiftEnum.Sum;
|
||||
this.gcMain.Size = new System.Drawing.Size(500, 444);
|
||||
this.gcMain.SysModel = null;
|
||||
this.gcMain.TabIndex = 16;
|
||||
//
|
||||
// gc_Right
|
||||
@@ -260,7 +259,6 @@ namespace Lskj.PubBomImport
|
||||
this.gc_Right.Name = "gc_Right";
|
||||
this.gc_Right.SiftEnumObj = Lskj.Control.GridControlEx.HeaderSiftEnum.Sum;
|
||||
this.gc_Right.Size = new System.Drawing.Size(367, 444);
|
||||
this.gc_Right.SysModel = null;
|
||||
this.gc_Right.TabIndex = 18;
|
||||
//
|
||||
// FrmMain
|
||||
@@ -290,4 +288,26 @@ namespace Lskj.PubBomImport
|
||||
((System.ComponentModel.ISupportInitialize)(this.tipsEdit.Properties)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.splitMainContainer)).EndInit();
|
||||
this.splitMainContainer.ResumeLayout(false);
|
||||
this.ResumeLayout(f
|
||||
this.ResumeLayout(false);
|
||||
|
||||
}
|
||||
#endregion
|
||||
private DevExpress.XtraEditors.SimpleButton btnImport;
|
||||
private DevExpress.XtraEditors.SimpleButton btnRead;
|
||||
private DevExpress.XtraEditors.PanelControl pl_bottom;
|
||||
private DevExpress.XtraEditors.SimpleButton btnCancel;
|
||||
private DevExpress.XtraEditors.SimpleButton btnOk;
|
||||
private DevExpress.XtraEditors.PanelControl pl_cond;
|
||||
private DevExpress.XtraEditors.TextEdit condTxtEdit;
|
||||
private System.Windows.Forms.Label lb_cond;
|
||||
private DevExpress.XtraEditors.PanelControl pl_purview;
|
||||
private Control.LabelMultiAutoTextEdit purview_Mulit;
|
||||
private System.Windows.Forms.Label lb_purview;
|
||||
private DevExpress.XtraEditors.PanelControl tips;
|
||||
private DevExpress.XtraEditors.TextEdit tipsEdit;
|
||||
private DevExpress.XtraEditors.SplitContainerControl splitMainContainer;
|
||||
private Control.GridControlEx gcMain;
|
||||
private Control.GridControlEx gc_Right;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+26
-1
@@ -140,4 +140,29 @@
|
||||
this.Controls.Add(this.splitter2);
|
||||
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
|
||||
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
|
||||
|
||||
this.MaximizeBox = false;
|
||||
this.MinimizeBox = false;
|
||||
this.Name = "FrmProgress";
|
||||
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
|
||||
this.Text = "导入Bom";
|
||||
this.panel2.ResumeLayout(false);
|
||||
this.panel2.PerformLayout();
|
||||
this.panel1.ResumeLayout(false);
|
||||
this.panel1.PerformLayout();
|
||||
this.ResumeLayout(false);
|
||||
|
||||
}
|
||||
|
||||
#endregion
|
||||
|
||||
private System.Windows.Forms.Label label3;
|
||||
private System.Windows.Forms.Splitter splitter1;
|
||||
private System.Windows.Forms.ProgressBar progressBarTotal;
|
||||
private System.Windows.Forms.Panel panel2;
|
||||
private System.Windows.Forms.Label labelCurrentItem;
|
||||
private System.Windows.Forms.ProgressBar progressBarCurrent;
|
||||
private System.Windows.Forms.Label lblAll;
|
||||
private System.Windows.Forms.Panel panel1;
|
||||
private System.Windows.Forms.Splitter splitter2;
|
||||
}
|
||||
}
|
||||
@@ -3911,6 +3911,8 @@ namespace Lskj.PubBomImport
|
||||
string suffix = Path.GetExtension(File);
|
||||
string name = fileInfo.Name;
|
||||
DateTime creationTime = fileInfo.CreationTime;
|
||||
byte[] fileBytes = ConvertFileToBytes(File);
|
||||
string fileStream = Convert.ToBase64String(fileBytes);
|
||||
string userId = ERPInfo.Instance.UserId;
|
||||
DateTime uploadTime = DateTime.Now;
|
||||
string code = "";
|
||||
@@ -4110,7 +4112,8 @@ namespace Lskj.PubBomImport
|
||||
catch (Exception ex)
|
||||
{
|
||||
returnMsg = ex.Message;
|
||||
throw new Exception($"文件{Path.GetFileName(filePath)}上传失败\r\n{ex.Message}", ex);
|
||||
throw new Exception($"文件{Path.GetFileName(filePath)}上传失败\r\n{ex.Message}");
|
||||
isUpload = false;
|
||||
}
|
||||
msg = returnMsg;
|
||||
outFileId = fileId;
|
||||
@@ -4301,4 +4304,16 @@ namespace Lskj.PubBomImport
|
||||
SoureMode, SoureObj, autoPick, Billdocument_Id, custom_ProductDescrip, bomFlag, encapsulation, serialnumber,
|
||||
lsidx_id, workorderid, providerid, mx_ProductId, amountLoss, ProductSx, lstr1, lstr2, productidbak,
|
||||
cltype, parentbillno, lskjimport_errorFlag, clProductId, bom_workordername, bom_workordernameTm, isbcp,
|
||||
tamount,
|
||||
tamount, xn_tig, historyVer, bombb, bombc
|
||||
)
|
||||
SELECT
|
||||
ProductId, Famount, Amount, '{zzqdCode}', amountx, ProcedureID, WorkingProcedure, Bak, Ver,
|
||||
SoureMode, SoureObj, autoPick, Billdocument_Id, custom_ProductDescrip, bomFlag, encapsulation, serialnumber,
|
||||
lsidx_id, workorderid, providerid, mx_ProductId, amountLoss, ProductSx, lstr1, lstr2, productidbak,
|
||||
cltype, parentbillno, lskjimport_errorFlag, clProductId, bom_workordername, bom_workordernameTm, isbcp,
|
||||
tamount, xn_tig, historyVer, bombb, bombc
|
||||
FROM bom_BillListTab WHERE Billdocument_Id = (select top 1 billdocument_id from bom_BillTab where productid = '{topProductId}') and bak like 'ZZQD%';";
|
||||
SqlHelper.ExecuteNonQuery(sql);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -41,17 +41,21 @@
|
||||
<SpecificVersion>False</SpecificVersion>
|
||||
<HintPath>..\..\引用DLL\Newtonsoft.Json.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="NPOI">
|
||||
<HintPath>..\..\..\引用DLL\NPOI.dll</HintPath>
|
||||
<Reference Include="NPOI, Version=2.1.3.1, Culture=neutral, PublicKeyToken=0df73ec7942b34e1, processorArchitecture=MSIL">
|
||||
<SpecificVersion>False</SpecificVersion>
|
||||
<HintPath>..\Lskj.LserpAll\packages\NPOI.2.1.3.1\lib\net40\NPOI.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="NPOI.OOXML">
|
||||
<HintPath>..\..\..\引用DLL\NPOI.OOXML.dll</HintPath>
|
||||
<Reference Include="NPOI.OOXML, Version=2.1.3.1, Culture=neutral, PublicKeyToken=0df73ec7942b34e1, processorArchitecture=MSIL">
|
||||
<SpecificVersion>False</SpecificVersion>
|
||||
<HintPath>..\Lskj.LserpAll\packages\NPOI.2.1.3.1\lib\net40\NPOI.OOXML.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="NPOI.OpenXml4Net">
|
||||
<HintPath>D:\工作\lserp_cs_6.0\引用DLL\NPOI.OpenXml4Net.dll</HintPath>
|
||||
<Reference Include="NPOI.OpenXml4Net, Version=2.1.3.1, Culture=neutral, PublicKeyToken=0df73ec7942b34e1, processorArchitecture=MSIL">
|
||||
<SpecificVersion>False</SpecificVersion>
|
||||
<HintPath>..\Lskj.LserpAll\packages\NPOI.2.1.3.1\lib\net40\NPOI.OpenXml4Net.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="NPOI.OpenXmlFormats">
|
||||
<HintPath>D:\工作\lserp_cs_6.0\引用DLL\NPOI.OpenXmlFormats.dll</HintPath>
|
||||
<Reference Include="NPOI.OpenXmlFormats, Version=2.1.3.1, Culture=neutral, PublicKeyToken=0df73ec7942b34e1, processorArchitecture=MSIL">
|
||||
<SpecificVersion>False</SpecificVersion>
|
||||
<HintPath>..\Lskj.LserpAll\packages\NPOI.2.1.3.1\lib\net40\NPOI.OpenXmlFormats.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System" />
|
||||
<Reference Include="System.Core" />
|
||||
|
||||
@@ -6,4 +6,31 @@ using System.Runtime.InteropServices;
|
||||
// 控制。更改这些特性值可修改
|
||||
// 与程序集关联的信息。
|
||||
[assembly: AssemblyTitle("Lskj.PubBomImport")]
|
||||
[assembly: AssemblyDe
|
||||
[assembly: AssemblyDescription("")]
|
||||
[assembly: AssemblyConfiguration("")]
|
||||
[assembly: AssemblyCompany("")]
|
||||
[assembly: AssemblyProduct("Lskj.PubBomImport")]
|
||||
[assembly: AssemblyCopyright("Copyright © 2025")]
|
||||
[assembly: AssemblyTrademark("")]
|
||||
[assembly: AssemblyCulture("")]
|
||||
|
||||
// 将 ComVisible 设置为 false 会使此程序集中的类型
|
||||
//对 COM 组件不可见。如果需要从 COM 访问此程序集中的类型
|
||||
//请将此类型的 ComVisible 特性设置为 true。
|
||||
[assembly: ComVisible(false)]
|
||||
|
||||
// 如果此项目向 COM 公开,则下列 GUID 用于类型库的 ID
|
||||
[assembly: Guid("8c507c31-8c19-46c9-82f8-85ddcae69190")]
|
||||
|
||||
// 程序集的版本信息由下列四个值组成:
|
||||
//
|
||||
// 主版本
|
||||
// 次版本
|
||||
// 生成号
|
||||
// 修订号
|
||||
//
|
||||
//可以指定所有这些值,也可以使用“生成号”和“修订号”的默认值
|
||||
//通过使用 "*",如下所示:
|
||||
// [assembly: AssemblyVersion("1.0.*")]
|
||||
[assembly: AssemblyVersion("1.0.0.0")]
|
||||
[assembly: AssemblyFileVersion("1.0.0.0")]
|
||||
|
||||
+25
-1
@@ -11,4 +11,28 @@
|
||||
namespace Lskj.PubBomImport.Properties {
|
||||
|
||||
|
||||
[global::System.Runtime.CompilerServices.CompilerGeneratedAttrib
|
||||
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
|
||||
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.10.0.0")]
|
||||
internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
|
||||
|
||||
private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
|
||||
|
||||
public static Settings Default {
|
||||
get {
|
||||
return defaultInstance;
|
||||
}
|
||||
}
|
||||
|
||||
[global::System.Configuration.UserScopedSettingAttribute()]
|
||||
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
|
||||
[global::System.Configuration.DefaultSettingValueAttribute("")]
|
||||
public string LastSelectFolder {
|
||||
get {
|
||||
return ((string)(this["LastSelectFolder"]));
|
||||
}
|
||||
set {
|
||||
this["LastSelectFolder"] = value;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1 @@
|
||||
DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v15.2, Version=15.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
|
||||
Reference in New Issue
Block a user