diff --git a/项目代码/wenshangkm/G01贸易生产计划/ProjectGroup1.groupproj.local b/项目代码/wenshangkm/G01贸易生产计划/ProjectGroup1.groupproj.local
index 4847c94..bf22d99 100644
--- a/项目代码/wenshangkm/G01贸易生产计划/ProjectGroup1.groupproj.local
+++ b/项目代码/wenshangkm/G01贸易生产计划/ProjectGroup1.groupproj.local
@@ -1,6 +1,6 @@
-
+
diff --git a/项目代码/wenshangkm/G01贸易生产计划/U_GetDllForm.pas b/项目代码/wenshangkm/G01贸易生产计划/U_GetDllForm.pas
index 54faad9..98552c5 100644
--- a/项目代码/wenshangkm/G01贸易生产计划/U_GetDllForm.pas
+++ b/项目代码/wenshangkm/G01贸易生产计划/U_GetDllForm.pas
@@ -73,15 +73,11 @@ begin
if trim(DataBaseStr) = '' then
begin
- server := '101.132.143.144,7781';
- //server:='192.168.110.193,7781';
- dtbase := 'RTBasicsData';
-// dtbase := 'ruifengsyjyData';
- // dtbase:='jingpinjydata' ;
- // dtbase := 'sanhaojydata';
- user := 'rtsa';
- pswd :='rightsoft@5740'; //'rightsoft@123';
-
+ server := '139.129.50.31,7781';
+// server:='.';
+ dtbase := 'kaimengjydata';
+ user := 'kaimengsa';
+ pswd := 'rightsoft@5078';
DConString := 'Provider=SQLOLEDB.1;Password=' + pswd + ';Persist Security Info=True;User ID=' + user + ';Initial Catalog=' + dtbase + ';Data Source=' + server;
Parameters1 := '';
// Parameters1 := 'Ȩ';
diff --git a/项目代码/wenshangkm/G01贸易生产计划/U_PlanDR.dfm b/项目代码/wenshangkm/G01贸易生产计划/U_PlanDR.dfm
index 991941a..557ee47 100644
--- a/项目代码/wenshangkm/G01贸易生产计划/U_PlanDR.dfm
+++ b/项目代码/wenshangkm/G01贸易生产计划/U_PlanDR.dfm
@@ -1,7 +1,7 @@
object frmPlanDR: TfrmPlanDR
Left = 484
Top = 189
- Caption = #24212#25910#27454#23548#20837
+ Caption = #26126#32454#20449#24687#23548#20837
ClientHeight = 504
ClientWidth = 1530
Color = clWhite
@@ -114,16 +114,10 @@ object frmPlanDR: TfrmPlanDR
OptionsData.DeletingConfirmation = False
OptionsView.Footer = True
OptionsView.GroupByBox = False
- object v2CRTime: TcxGridDBColumn
+ object Tv1Column1: TcxGridDBColumn
Caption = 'DATATIME'
- DataBinding.FieldName = 'Filltime'
+ DataBinding.FieldName = 'filltime'
DataBinding.IsNullValueType = True
- PropertiesClassName = 'TcxDateEditProperties'
- Properties.SaveTime = False
- Properties.ShowTime = False
- HeaderAlignmentHorz = taCenter
- Options.Editing = False
- Width = 66
end
object v2Column2: TcxGridDBColumn
Caption = 'ART'
@@ -135,7 +129,7 @@ object frmPlanDR: TfrmPlanDR
end
object v2FactoryName: TcxGridDBColumn
Caption = 'LOT'
- DataBinding.FieldName = 'Batchno'
+ DataBinding.FieldName = 'BatchNo'
DataBinding.IsNullValueType = True
HeaderAlignmentHorz = taCenter
Options.Editing = False
@@ -150,7 +144,7 @@ object frmPlanDR: TfrmPlanDR
Width = 66
end
object Tv1Column3: TcxGridDBColumn
- Caption = 'IO'
+ Caption = 'ID'
DataBinding.FieldName = 'PieceNo'
DataBinding.IsNullValueType = True
HeaderAlignmentHorz = taCenter
@@ -165,14 +159,6 @@ object frmPlanDR: TfrmPlanDR
Options.Editing = False
Width = 66
end
- object Tv1Column2: TcxGridDBColumn
- Caption = #22791#27880
- DataBinding.FieldName = 'Note'
- DataBinding.IsNullValueType = True
- HeaderAlignmentHorz = taCenter
- Options.Editing = False
- Width = 66
- end
end
object cxGridLevel1: TcxGridLevel
GridView = Tv1
@@ -186,8 +172,8 @@ object frmPlanDR: TfrmPlanDR
object CDS_Import: TClientDataSet
Aggregates = <>
Params = <>
- Left = 384
- Top = 252
+ Left = 632
+ Top = 124
end
object GPM_1: TcxGridPopupMenu
PopupMenus = <>
@@ -222,4 +208,28 @@ object frmPlanDR: TfrmPlanDR
Left = 184
Top = 229
end
+ object CDS_1: TClientDataSet
+ Aggregates = <>
+ Params = <>
+ Left = 624
+ Top = 176
+ end
+ object CDS_4: TClientDataSet
+ Aggregates = <>
+ Params = <>
+ Left = 640
+ Top = 344
+ end
+ object CDS_2: TClientDataSet
+ Aggregates = <>
+ Params = <>
+ Left = 616
+ Top = 240
+ end
+ object CDS_3: TClientDataSet
+ Aggregates = <>
+ Params = <>
+ Left = 632
+ Top = 288
+ end
end
diff --git a/项目代码/wenshangkm/G01贸易生产计划/U_PlanDR.pas b/项目代码/wenshangkm/G01贸易生产计划/U_PlanDR.pas
index 07669ea..99fb6a1 100644
--- a/项目代码/wenshangkm/G01贸易生产计划/U_PlanDR.pas
+++ b/项目代码/wenshangkm/G01贸易生产计划/U_PlanDR.pas
@@ -45,15 +45,18 @@ type
CDS_LM: TClientDataSet;
cxGrid1: TcxGrid;
Tv1: TcxGridDBTableView;
- v2CRTime: TcxGridDBColumn;
v2Column2: TcxGridDBColumn;
v2FactoryName: TcxGridDBColumn;
v2OrderNo: TcxGridDBColumn;
Tv1Column3: TcxGridDBColumn;
Tv1Column19: TcxGridDBColumn;
- Tv1Column2: TcxGridDBColumn;
cxGridLevel1: TcxGridLevel;
ADOCmd: TADOQuery;
+ CDS_1: TClientDataSet;
+ Tv1Column1: TcxGridDBColumn;
+ CDS_4: TClientDataSet;
+ CDS_2: TClientDataSet;
+ CDS_3: TClientDataSet;
procedure TBCloseClick(Sender: TObject);
procedure FormShow(Sender: TObject);
procedure TSaveClick(Sender: TObject);
@@ -61,12 +64,9 @@ type
procedure v1P_SpecPropertiesButtonClick(Sender: TObject; AButtonIndex: Integer);
procedure v1QtyUnitPropertiesButtonClick(Sender: TObject; AButtonIndex: Integer);
procedure FormDestroy(Sender: TObject);
- procedure Tv1Column2PropertiesButtonClick(Sender: TObject; AButtonIndex: Integer);
procedure Tv1Column3PropertiesButtonClick(Sender: TObject; AButtonIndex: Integer);
- procedure Tv1Column6PropertiesButtonClick(Sender: TObject; AButtonIndex: Integer);
procedure ToolButton2Click(Sender: TObject);
procedure ToolButton3Click(Sender: TObject);
- procedure Tv1Column4PropertiesButtonClick(Sender: TObject; AButtonIndex: Integer);
procedure ToolButton4Click(Sender: TObject);
private
procedure initGrid();
@@ -141,6 +141,9 @@ begin
fieldbyname('OrdQty').Value := '0';
end;
// LRTSetsavedata(ADOCmd, 'Trade_Plan_Main', dxLayoutControl_bzplan, 2);
+ fieldbyname('C_Code').Value := Trim(CDS_Import.fieldbyname('C_Code').AsString);
+ fieldbyname('C_Name').Value := Trim(CDS_Import.fieldbyname('C_Name').AsString);
+ fieldbyname('batchNo').Value := Trim(CDS_Import.fieldbyname('BatchNo').AsString);
fieldbyname('MainId').Value := trim(JMmaxno);
fieldbyname('SubId').Value := trim(JSmaxno);
Post;
@@ -150,6 +153,20 @@ begin
first;
while not eof do
begin
+ with ADOQueryCmd do
+ begin
+ Close;
+ sql.Clear;
+ sql.Add('select * from Trade_Cloth_Inspect where BCIOID=''' + Trim(CDS_Import.fieldbyname('BCIOID').AsString) + ''' ');
+ open;
+ end;
+ if not ADOQueryCmd.IsEmpty then
+ begin
+ ADOQueryCmd.Connection.RollbackTrans;
+ Application.MessageBox(PChar(Trim(CDS_Import.fieldbyname('BCIOID').AsString) + '已经存在'), '提示', 0);
+ exit;
+ end;
+
if fieldbyname('CIID').AsString = '' then
begin
if GetLSNo(ADOQueryTmp, MaxNo, '', 'Trade_Cloth_Inspect', 4, 1) = False then
@@ -181,10 +198,11 @@ begin
end;
RTSetSaveDataCDS(ADOQueryCmd, Tv1, CDS_Import, 'Trade_Cloth_Inspect', 0);
ADOQueryCmd.fieldbyname('CIID').Value := MaxNo;
+ ADOQueryCmd.fieldbyname('PCID').Value := MaxNo;
ADOQueryCmd.FieldByName('Orderno').Value := JMmaxno;
ADOQueryCmd.FieldByName('mainid').Value := JMmaxno;
ADOQueryCmd.FieldByName('subid').Value := JSmaxno;
- ADOQueryCmd.fieldbyName('CIIOFlag').value := '未入库';
+ ADOQueryCmd.fieldbyName('CIIOFlag').value := '未检验';
ADOQueryCmd.fieldbyName('Coefficient').value := '0';
ADOQueryCmd.fieldbyName('Yardage').value := '0';
ADOQueryCmd.fieldbyName('Meter').value := '0';
@@ -219,7 +237,7 @@ begin
begin
close;
sql.Clear;
- sql.Add('select * from Trade_Cloth_Inspect where CIID=''' + trim(FFFID) + '''');
+ sql.Add('select *,'''' as mjxh1 from Trade_Cloth_Inspect where CIID=''' + trim(FFFID) + '''');
// sql.add(' and isnull(status,''0'')=''0''');
open;
end;
@@ -246,16 +264,52 @@ begin
close;
CreateDataSet;
end;
+ with CDS_1 do
+ begin
+ FieldDefs.Clear;
+ FieldDefs.Add('LXH', ftInteger, 0);
+ FieldDefs.Add('lCode', ftString, 40);
+ FieldDefs.Add('LName', ftString, 40);
+ close;
+ CreateDataSet;
+ end;
+ with CDS_2 do
+ begin
+ FieldDefs.Clear;
+ FieldDefs.Add('LXH', ftInteger, 0);
+ FieldDefs.Add('lCode', ftString, 40);
+ FieldDefs.Add('LName', ftString, 40);
+ close;
+ CreateDataSet;
+ end;
+ with CDS_3 do
+ begin
+ FieldDefs.Clear;
+ FieldDefs.Add('LXH', ftInteger, 0);
+ FieldDefs.Add('lCode', ftString, 40);
+ FieldDefs.Add('LName', ftString, 40);
+ close;
+ CreateDataSet;
+ end;
+ with CDS_4 do
+ begin
+ FieldDefs.Clear;
+ FieldDefs.Add('LXH', ftInteger, 0);
+ FieldDefs.Add('lCode', ftString, 40);
+ FieldDefs.Add('LName', ftString, 40);
+ close;
+ CreateDataSet;
+ end;
initGrid();
end;
procedure TfrmPlanDR.TSaveClick(Sender: TObject);
begin
-// if CDS_Import.Locate('IO', null, []) then
-// begin
-// application.MessageBox('IO不能为空', '提示');
-// exit;
-// end;
+ if CDS_Import.Locate('BCIOID', null, []) then
+ begin
+ application.MessageBox('卷号不能为空', '提示');
+ exit;
+ end;
// if CDS_Import.Locate('ROLLLNO', null, []) then
// begin
// application.MessageBox('ROLLLNO不能为空', '提示');
@@ -334,27 +388,6 @@ begin
frmPlanDR := nil;
end;
-procedure TfrmPlanDR.Tv1Column2PropertiesButtonClick(Sender: TObject; AButtonIndex: Integer);
-begin
- try
- frmCompanySel := TfrmCompanySel.Create(Application);
- with frmCompanySel do
- begin
- FCoType := '我司';
- if ShowModal = 1 then
- begin
-
- Self.CDS_Import.Edit;
- Self.CDS_Import.FieldByName('OurCoNo').Value := Trim(CDS_1.fieldbyname('CoCode').AsString);
- Self.CDS_Import.FieldByName('OurCoName').Value := Trim(CDS_1.fieldbyname('CoAbbrName').AsString);
-
- end;
- end;
- finally
- frmCompanySel.Free;
- end;
-end;
-
procedure TfrmPlanDR.Tv1Column3PropertiesButtonClick(Sender: TObject; AButtonIndex: Integer);
begin
try
@@ -375,46 +408,6 @@ begin
end;
end;
-procedure TfrmPlanDR.Tv1Column4PropertiesButtonClick(Sender: TObject; AButtonIndex: Integer);
-begin
- try
- frmCompanySel := TfrmCompanySel.Create(Application);
- with frmCompanySel do
- begin
- FCoType := '客户';
- if ShowModal = 1 then
- begin
- Self.CDS_Import.Edit;
- Self.CDS_Import.FieldByName('OppCoNo').Value := Trim(CDS_1.fieldbyname('CoCode').AsString);
- Self.CDS_Import.FieldByName('OppCoName').Value := Trim(CDS_1.fieldbyname('CoAbbrName').AsString);
- Self.CDS_Import.FieldByName('OppParentCoNo').Value := Trim(CDS_1.fieldbyname('CoCode').AsString);
- Self.CDS_Import.FieldByName('OppParentCoName').Value := Trim(CDS_1.fieldbyname('CoAbbrName').AsString);
- end;
- end;
- finally
- frmCompanySel.Free;
- end;
-end;
-
-procedure TfrmPlanDR.Tv1Column6PropertiesButtonClick(Sender: TObject; AButtonIndex: Integer);
-begin
- try
- frmCompanySel := TfrmCompanySel.Create(Application);
- with frmCompanySel do
- begin
- FCoType := '客户';
- if ShowModal = 1 then
- begin
- Self.CDS_Import.Edit;
- Self.CDS_Import.FieldByName('OppParentCoNo').Value := Trim(CDS_1.fieldbyname('CoCode').AsString);
- Self.CDS_Import.FieldByName('OppParentCoName').Value := Trim(CDS_1.fieldbyname('CoAbbrName').AsString);
- end;
- end;
- finally
- frmCompanySel.Free;
- end;
-end;
-
procedure TfrmPlanDR.ToolButton2Click(Sender: TObject);
begin
if CDS_Import.IsEmpty then
@@ -432,6 +425,9 @@ var
excelApp, WorkBook: Variant;
i, j, k, LX, ExcelRowCount: integer;
maxId, FCPID, FCPName, t1, t2, t3, FFID: string;
+ Parts, KeyValuePairs: TStringList;
+ ColonPos: Integer;
+ Key, Value, AData: string;
begin
try
@@ -451,6 +447,30 @@ begin
end;
CDS_LM.EmptyDataSet;
+ CDS_1.EmptyDataSet;
+ CDS_2.EmptyDataSet;
+ CDS_3.EmptyDataSet;
+ CDS_4.EmptyDataSet;
+
+ Parts := TStringList.Create;
+ KeyValuePairs := TStringList.Create;
+
+ AData := WorkBook.WorkSheets[1].Cells[3, 2].Value;
+ // 按竖线分割
+ ExtractStrings(['|'], [' '], PChar(AData), Parts);
+
+ // 处理每个部分
+ for i := 0 to Parts.Count - 1 do
+ begin
+ // 找到冒号位置
+ ColonPos := Pos(':', Trim(Parts[i]));
+ if ColonPos > 0 then
+ begin
+ Key := Trim(Copy(Parts[i], 1, ColonPos - 1));
+ Value := Trim(Copy(Parts[i], ColonPos + 1, Length(Parts[i])));
+ KeyValuePairs.Values[Key] := Value;
+ end;
+ end;
for j := 0 to Tv1.ColumnCount - 1 do
begin
@@ -461,14 +481,43 @@ begin
FieldByName('LName').Value := trim(Tv1.Columns[j].Caption);
Post;
end;
+ with CDS_1 do
+ begin
+ Append;
+ FieldByName('LCode').Value := trim(Tv1.Columns[j].DataBinding.FieldName);
+ FieldByName('LName').Value := trim(Tv1.Columns[j].Caption);
+ Post;
+ end;
+ with CDS_2 do
+ begin
+ Append;
+ FieldByName('LCode').Value := trim(Tv1.Columns[j].DataBinding.FieldName);
+ FieldByName('LName').Value := trim(Tv1.Columns[j].Caption);
+ Post;
+ end;
+ with CDS_3 do
+ begin
+ Append;
+ FieldByName('LCode').Value := trim(Tv1.Columns[j].DataBinding.FieldName);
+ FieldByName('LName').Value := trim(Tv1.Columns[j].Caption);
+ Post;
+ end;
+ with CDS_4 do
+ begin
+ Append;
+ FieldByName('LCode').Value := trim(Tv1.Columns[j].DataBinding.FieldName);
+ FieldByName('LName').Value := trim(Tv1.Columns[j].Caption);
+ Post;
+ end;
end;
try
- for i := 1 to 50 do
+ for i := 2 to 3 do
begin
- if trim(WorkBook.WorkSheets[1].Cells[1, i].value) = '' then
+ if trim(WorkBook.WorkSheets[1].Cells[6, i].Value) = '' then
continue;
- if CDS_LM.Locate('LName', trim(WorkBook.WorkSheets[1].Cells[1, i].value), []) then
+ t2 := trim(WorkBook.WorkSheets[1].Cells[1, i].Value);
+ if CDS_LM.Locate('LName', trim(WorkBook.WorkSheets[1].Cells[6, i].Value), []) then
begin
with CDS_LM do
begin
@@ -478,13 +527,72 @@ begin
end;
end;
end;
+ for i := 4 to 5 do
+ begin
+ if trim(WorkBook.WorkSheets[1].Cells[6, i].Value) = '' then
+ continue;
+ t2 := trim(WorkBook.WorkSheets[1].Cells[6, i].Value);
+ if CDS_1.Locate('LName', trim(WorkBook.WorkSheets[1].Cells[6, i].Value), []) then
+ begin
+ t2 := trim(WorkBook.WorkSheets[1].Cells[6, i].Value);
+ with CDS_1 do
+ begin
+ Edit;
+ FieldByName('LXH').Value := i;
+ Post;
+ end;
+ end;
+ end;
+ for i := 6 to 7 do
+ begin
+ if trim(WorkBook.WorkSheets[1].Cells[6, i].Value) = '' then
+ continue;
+ if CDS_2.Locate('LName', trim(WorkBook.WorkSheets[1].Cells[6, i].Value), []) then
+ begin
+ with CDS_2 do
+ begin
+ Edit;
+ FieldByName('LXH').Value := i;
+ Post;
+ end;
+ end;
+ end;
+ for i := 8 to 9 do
+ begin
+ if trim(WorkBook.WorkSheets[1].Cells[6, i].Value) = '' then
+ continue;
+ if CDS_3.Locate('LName', trim(WorkBook.WorkSheets[1].Cells[6, i].Value), []) then
+ begin
+ with CDS_3 do
+ begin
+ Edit;
+ FieldByName('LXH').Value := i;
+ Post;
+ end;
+ end;
+ end;
+ for i := 11 to 12 do
+ begin
+ if trim(WorkBook.WorkSheets[1].Cells[6, i].Value) = '' then
+ continue;
+ t2 := trim(WorkBook.WorkSheets[1].Cells[1, i].Value);
+ if CDS_4.Locate('LName', trim(WorkBook.WorkSheets[1].Cells[6, i].Value), []) then
+ begin
+ with CDS_4 do
+ begin
+ Edit;
+ FieldByName('LXH').Value := i;
+ Post;
+ end;
+ end;
+ end;
except
application.MessageBox('加载数组错误！', '错误信息', MB_ICONERROR);
exit;
end;
try
- for i := 2 to ExcelRowCount do
+ for i := 7 to ExcelRowCount do
begin
with CDS_Import do
begin
@@ -493,12 +601,119 @@ begin
while not CDS_LM.Eof do
begin
if CDS_LM.FieldByName('LXH').AsInteger > 0 then
+ begin
CDS_Import.fieldbyname(CDS_LM.FieldByName('LCode').AsString).Value := WorkBook.WorkSheets[1].Cells[i, CDS_LM.FieldByName('LXH').AsInteger].Value;
+ CDS_Import.FieldByName('C_Name').AsString := KeyValuePairs.Values['ART'];
+ CDS_Import.FieldByName('BatchNo').AsString := KeyValuePairs.Values['LOT'];
+ CDS_Import.FieldByName('C_Code').AsString := KeyValuePairs.Values['GUID'];
+ CDS_Import.FieldByName('Filltime').AsDateTime := StrToDateTimeDef(KeyValuePairs.Values['DATETIME'], Now);
+ end;
CDS_LM.Next;
end;
Post;
end;
end;
+ for i := 7 to ExcelRowCount do
+ begin
+ with CDS_Import do
+ begin
+ Append;
+ CDS_1.First;
+ while not CDS_1.Eof do
+ begin
+ if CDS_1.FieldByName('LXH').AsInteger > 0 then
+ begin
+ CDS_Import.fieldbyname(CDS_1.FieldByName('LCode').AsString).Value := WorkBook.WorkSheets[1].Cells[i, CDS_1.FieldByName('LXH').AsInteger].Value;
+ CDS_Import.FieldByName('C_Name').AsString := KeyValuePairs.Values['ART'];
+ CDS_Import.FieldByName('BatchNo').AsString := KeyValuePairs.Values['LOT'];
+ CDS_Import.FieldByName('C_Code').AsString := KeyValuePairs.Values['GUID'];
+ CDS_Import.FieldByName('Filltime').AsDateTime := StrToDateTimeDef(KeyValuePairs.Values['DATETIME'], Now);
+ end;
+ CDS_1.Next;
+ end;
+ Post;
+ end;
+ end;
+ for i := 7 to ExcelRowCount do
+ begin
+ with CDS_Import do
+ begin
+ Append;
+ CDS_2.First;
+ while not CDS_2.Eof do
+ begin
+ if CDS_2.FieldByName('LXH').AsInteger > 0 then
+ begin
+ CDS_Import.fieldbyname(CDS_2.FieldByName('LCode').AsString).Value := WorkBook.WorkSheets[1].Cells[i, CDS_2.FieldByName('LXH').AsInteger].Value;
+ CDS_Import.FieldByName('C_Name').AsString := KeyValuePairs.Values['ART'];
+ CDS_Import.FieldByName('BatchNo').AsString := KeyValuePairs.Values['LOT'];
+ CDS_Import.FieldByName('C_Code').AsString := KeyValuePairs.Values['GUID'];
+ CDS_Import.FieldByName('Filltime').AsDateTime := StrToDateTimeDef(KeyValuePairs.Values['DATETIME'], Now);
+ end;
+ CDS_2.Next;
+ end;
+ Post;
+ end;
+ end;
+ for i := 7 to ExcelRowCount do
+ begin
+ with CDS_Import do
+ begin
+ Append;
+ CDS_3.First;
+ while not CDS_3.Eof do
+ begin
+ if CDS_3.FieldByName('LXH').AsInteger > 0 then
+ begin
+ CDS_Import.fieldbyname(CDS_3.FieldByName('LCode').AsString).Value := WorkBook.WorkSheets[1].Cells[i, CDS_3.FieldByName('LXH').AsInteger].Value;
+ CDS_Import.FieldByName('C_Name').AsString := KeyValuePairs.Values['ART'];
+ CDS_Import.FieldByName('BatchNo').AsString := KeyValuePairs.Values['LOT'];
+ CDS_Import.FieldByName('C_Code').AsString := KeyValuePairs.Values['GUID'];
+ CDS_Import.FieldByName('Filltime').AsDateTime := StrToDateTimeDef(KeyValuePairs.Values['DATETIME'], Now);
+ end;
+ CDS_3.Next;
+ end;
+ Post;
+ end;
+ end;
+ for i := 7 to ExcelRowCount do
+ begin
+ with CDS_Import do
+ begin
+ Append;
+ CDS_4.First;
+ while not CDS_4.Eof do
+ begin
+ if CDS_4.FieldByName('LXH').AsInteger > 0 then
+ begin
+ CDS_Import.fieldbyname(CDS_4.FieldByName('LCode').AsString).Value := WorkBook.WorkSheets[1].Cells[i, CDS_4.FieldByName('LXH').AsInteger].Value;
+ CDS_Import.FieldByName('C_Name').AsString := KeyValuePairs.Values['ART'];
+ CDS_Import.FieldByName('BatchNo').AsString := KeyValuePairs.Values['LOT'];
+ CDS_Import.FieldByName('C_Code').AsString := KeyValuePairs.Values['GUID'];
+ CDS_Import.FieldByName('Filltime').AsDateTime := StrToDateTimeDef(KeyValuePairs.Values['DATETIME'], Now);
+ end;
+ CDS_4.Next;
+ end;
+ Post;
+ end;
+ end;
+
+ with CDS_Import do
+ begin
+ First; // 移动到第一条记录
+ while not Eof do
+ begin
+ if Trim(FieldByName('bcioid').AsString) = '' then
+ begin
+ Edit;
+ Delete;
+ end
+ else
+ begin
+ Next; // 移动到下一条记录
+ end;
+ end;
+ end;
WorkBook.Close;
excelApp.Quit;
excelApp := Unassigned;
@@ -511,6 +726,9 @@ begin
exit;
end;
+ Parts.Free;
+ KeyValuePairs.Free;
+
end;
end.
diff --git a/项目代码/wenshangkm/G01贸易生产计划/U_TradePlanInPut.dfm b/项目代码/wenshangkm/G01贸易生产计划/U_TradePlanInPut.dfm
index 3724845..bf9f484 100644
--- a/项目代码/wenshangkm/G01贸易生产计划/U_TradePlanInPut.dfm
+++ b/项目代码/wenshangkm/G01贸易生产计划/U_TradePlanInPut.dfm
@@ -234,7 +234,7 @@ inherited frmTradePlanInPut: TfrmTradePlanInPut
object DLYDate: TcxDateEdit
Tag = 2
Left = 67
- Top = 49
+ Top = 44
Properties.SaveTime = False
Properties.ShowTime = False
Style.HotTrack = False
@@ -245,7 +245,7 @@ inherited frmTradePlanInPut: TfrmTradePlanInPut
object saleser: TcxButtonEdit
Tag = 2
Left = 247
- Top = 49
+ Top = 44
Hint = 'saleser/'#19994#21153#21592
Properties.Buttons = <
item
@@ -262,7 +262,7 @@ inherited frmTradePlanInPut: TfrmTradePlanInPut
object factoryName: TcxButtonEdit
Tag = 2
Left = 446
- Top = 49
+ Top = 44
Hint = 'FtyName/'#21152#24037#21378
Properties.Buttons = <
item
@@ -279,7 +279,7 @@ inherited frmTradePlanInPut: TfrmTradePlanInPut
object Gilding: TcxButtonEdit
Tag = 2
Left = 67
- Top = 85
+ Top = 74
Hint = 'Gilding/'#28907#37329
Properties.Buttons = <
item
@@ -296,7 +296,7 @@ inherited frmTradePlanInPut: TfrmTradePlanInPut
object PackSeal: TcxButtonEdit
Tag = 2
Left = 657
- Top = 85
+ Top = 74
Hint = 'PackSeal/'#23553#26465
Properties.Buttons = <
item
@@ -317,7 +317,7 @@ inherited frmTradePlanInPut: TfrmTradePlanInPut
object ShippingSample: TcxButtonEdit
Tag = 2
Left = 247
- Top = 85
+ Top = 74
Hint = 'ShippingSample/'#33337#26679
AutoSize = False
Properties.Buttons = <
@@ -330,13 +330,13 @@ inherited frmTradePlanInPut: TfrmTradePlanInPut
Style.HotTrack = False
Style.TransparentBorder = False
TabOrder = 8
- Height = 29
+ Height = 25
Width = 150
end
object SizeNote: TcxButtonEdit
Tag = 2
Left = 446
- Top = 85
+ Top = 74
Hint = 'SizeNote/'#24320#21098
Properties.Buttons = <
item
@@ -353,7 +353,7 @@ inherited frmTradePlanInPut: TfrmTradePlanInPut
object OrdNote: TcxMemo
Tag = 2
Left = 67
- Top = 241
+ Top = 220
Properties.ScrollBars = ssVertical
Style.HotTrack = False
Style.TransparentBorder = False
@@ -364,7 +364,7 @@ inherited frmTradePlanInPut: TfrmTradePlanInPut
object PackNote: TcxMemo
Tag = 2
Left = 67
- Top = 157
+ Top = 136
Properties.ScrollBars = ssVertical
Style.HotTrack = False
Style.TransparentBorder = False
@@ -437,7 +437,7 @@ inherited frmTradePlanInPut: TfrmTradePlanInPut
StyleDisabled.LookAndFeel.SkinName = 'WXI'
StyleFocused.LookAndFeel.SkinName = 'WXI'
StyleHot.LookAndFeel.SkinName = 'WXI'
- TabOrder = 26
+ TabOrder = 23
Visible = False
Width = 131
end
@@ -466,7 +466,7 @@ inherited frmTradePlanInPut: TfrmTradePlanInPut
end
object LabVolume: TcxButtonEdit
Left = 67
- Top = 121
+ Top = 106
Properties.Buttons = <
item
Default = True
@@ -482,7 +482,7 @@ inherited frmTradePlanInPut: TfrmTradePlanInPut
end
object LabPackage: TcxButtonEdit
Left = 299
- Top = 121
+ Top = 106
Properties.Buttons = <
item
Default = True
@@ -594,7 +594,7 @@ inherited frmTradePlanInPut: TfrmTradePlanInPut
AllowRemove = False
CaptionOptions.Text = '[COLOR=#FF0000]*[/COLOR]'#35746#21333#21495
Control = OrderNo
- ControlOptions.OriginalHeight = 29
+ ControlOptions.OriginalHeight = 23
ControlOptions.OriginalWidth = 131
ControlOptions.ShowBorder = False
Index = 0
@@ -606,7 +606,7 @@ inherited frmTradePlanInPut: TfrmTradePlanInPut
AllowRemove = False
CaptionOptions.Text = #23458' '#25143
Control = CustName
- ControlOptions.OriginalHeight = 29
+ ControlOptions.OriginalHeight = 23
ControlOptions.OriginalWidth = 150
ControlOptions.ShowBorder = False
Index = 1
@@ -617,7 +617,7 @@ inherited frmTradePlanInPut: TfrmTradePlanInPut
SizeOptions.SizableHorz = True
CaptionOptions.Text = #21512#21516#21495
Control = ConNo
- ControlOptions.OriginalHeight = 29
+ ControlOptions.OriginalHeight = 23
ControlOptions.OriginalWidth = 150
ControlOptions.ShowBorder = False
Index = 2
@@ -629,7 +629,7 @@ inherited frmTradePlanInPut: TfrmTradePlanInPut
AllowRemove = False
CaptionOptions.Text = #25490#21333#26085#26399
Control = OrdDate
- ControlOptions.OriginalHeight = 29
+ ControlOptions.OriginalHeight = 23
ControlOptions.OriginalWidth = 131
ControlOptions.ShowBorder = False
Index = 3
@@ -648,7 +648,7 @@ inherited frmTradePlanInPut: TfrmTradePlanInPut
SizeOptions.SizableHorz = True
CaptionOptions.Text = #21152#24037#21378
Control = factoryName
- ControlOptions.OriginalHeight = 29
+ ControlOptions.OriginalHeight = 23
ControlOptions.OriginalWidth = 150
ControlOptions.ShowBorder = False
Index = 2
@@ -660,7 +660,7 @@ inherited frmTradePlanInPut: TfrmTradePlanInPut
AllowRemove = False
CaptionOptions.Text = #20132#36135#26085#26399
Control = DLYDate
- ControlOptions.OriginalHeight = 29
+ ControlOptions.OriginalHeight = 23
ControlOptions.OriginalWidth = 131
ControlOptions.ShowBorder = False
Index = 0
@@ -672,7 +672,7 @@ inherited frmTradePlanInPut: TfrmTradePlanInPut
AllowRemove = False
CaptionOptions.Text = #19994#21153#21592
Control = saleser
- ControlOptions.OriginalHeight = 29
+ ControlOptions.OriginalHeight = 23
ControlOptions.OriginalWidth = 150
ControlOptions.ShowBorder = False
Index = 1
@@ -705,7 +705,7 @@ inherited frmTradePlanInPut: TfrmTradePlanInPut
SizeOptions.SizableHorz = True
CaptionOptions.Text = #28907' '#37329
Control = Gilding
- ControlOptions.OriginalHeight = 29
+ ControlOptions.OriginalHeight = 23
ControlOptions.OriginalWidth = 131
ControlOptions.ShowBorder = False
Index = 0
@@ -716,7 +716,7 @@ inherited frmTradePlanInPut: TfrmTradePlanInPut
SizeOptions.SizableHorz = True
CaptionOptions.Text = #24320' '#21098
Control = SizeNote
- ControlOptions.OriginalHeight = 29
+ ControlOptions.OriginalHeight = 23
ControlOptions.OriginalWidth = 150
ControlOptions.ShowBorder = False
Index = 2
@@ -727,7 +727,7 @@ inherited frmTradePlanInPut: TfrmTradePlanInPut
SizeOptions.SizableHorz = True
CaptionOptions.Text = #23553' '#26465
Control = PackSeal
- ControlOptions.OriginalHeight = 29
+ ControlOptions.OriginalHeight = 23
ControlOptions.OriginalWidth = 131
ControlOptions.ShowBorder = False
Index = 3
@@ -770,7 +770,7 @@ inherited frmTradePlanInPut: TfrmTradePlanInPut
SizeOptions.SizableVert = False
CaptionOptions.Text = #33136#23553#22791#27880
Control = PackSealNote
- ControlOptions.OriginalHeight = 25
+ ControlOptions.OriginalHeight = 19
ControlOptions.OriginalWidth = 131
ControlOptions.ShowBorder = False
Index = -1
@@ -781,7 +781,7 @@ inherited frmTradePlanInPut: TfrmTradePlanInPut
SizeOptions.SizableVert = False
CaptionOptions.Text = #21253#35013#26041#24335
Control = PackType
- ControlOptions.OriginalHeight = 25
+ ControlOptions.OriginalHeight = 19
ControlOptions.OriginalWidth = 131
ControlOptions.ShowBorder = False
Index = -1
@@ -792,7 +792,7 @@ inherited frmTradePlanInPut: TfrmTradePlanInPut
SizeOptions.SizableVert = False
CaptionOptions.Text = #25968#37327#35201#27714#65292#28322#30701#35013
Control = QtyNote
- ControlOptions.OriginalHeight = 25
+ ControlOptions.OriginalHeight = 19
ControlOptions.OriginalWidth = 131
ControlOptions.ShowBorder = False
Index = -1
@@ -803,7 +803,7 @@ inherited frmTradePlanInPut: TfrmTradePlanInPut
SizeOptions.SizableVert = False
CaptionOptions.Text = #20854#20182#35201#27714
Control = OtherProcess1
- ControlOptions.OriginalHeight = 25
+ ControlOptions.OriginalHeight = 19
ControlOptions.OriginalWidth = 131
ControlOptions.ShowBorder = False
Index = -1
@@ -824,7 +824,7 @@ inherited frmTradePlanInPut: TfrmTradePlanInPut
SizeOptions.Width = 237
CaptionOptions.Text = #21367#26631#31614
Control = LabVolume
- ControlOptions.OriginalHeight = 29
+ ControlOptions.OriginalHeight = 23
ControlOptions.OriginalWidth = 183
ControlOptions.ShowBorder = False
Index = 0
@@ -836,7 +836,7 @@ inherited frmTradePlanInPut: TfrmTradePlanInPut
SizeOptions.Width = 204
CaptionOptions.Text = #21253#26631#31614
Control = LabPackage
- ControlOptions.OriginalHeight = 29
+ ControlOptions.OriginalHeight = 23
ControlOptions.OriginalWidth = 162
ControlOptions.ShowBorder = False
Index = 1
@@ -847,7 +847,7 @@ inherited frmTradePlanInPut: TfrmTradePlanInPut
SizeOptions.SizableVert = True
CaptionOptions.Text = #20027#34920#23383#31526#33258#23450#20041#23383#27573'1'
Control = CustDefStr1
- ControlOptions.OriginalHeight = 29
+ ControlOptions.OriginalHeight = 23
ControlOptions.OriginalWidth = 150
ControlOptions.ShowBorder = False
Index = -1
@@ -858,7 +858,7 @@ inherited frmTradePlanInPut: TfrmTradePlanInPut
SizeOptions.SizableVert = True
CaptionOptions.Text = #20027#34920#23383#31526#33258#23450#20041#23383#27573'2'
Control = CustDefStr2
- ControlOptions.OriginalHeight = 29
+ ControlOptions.OriginalHeight = 23
ControlOptions.OriginalWidth = 150
ControlOptions.ShowBorder = False
Index = -1
@@ -869,7 +869,7 @@ inherited frmTradePlanInPut: TfrmTradePlanInPut
SizeOptions.SizableVert = True
CaptionOptions.Text = #20027#34920#23383#31526#33258#23450#20041#23383#27573'3'
Control = CustDefStr3
- ControlOptions.OriginalHeight = 29
+ ControlOptions.OriginalHeight = 23
ControlOptions.OriginalWidth = 150
ControlOptions.ShowBorder = False
Index = -1
@@ -880,7 +880,7 @@ inherited frmTradePlanInPut: TfrmTradePlanInPut
SizeOptions.SizableVert = True
CaptionOptions.Text = #20027#34920#25968#23383#33258#23450#20041#23383#27573'1'
Control = CustDefFloat1
- ControlOptions.OriginalHeight = 29
+ ControlOptions.OriginalHeight = 23
ControlOptions.OriginalWidth = 94
ControlOptions.ShowBorder = False
Index = -1
@@ -891,7 +891,7 @@ inherited frmTradePlanInPut: TfrmTradePlanInPut
SizeOptions.SizableVert = True
CaptionOptions.Text = #20027#34920#25968#23383#33258#23450#20041#23383#27573'2'
Control = CustDefFloat2
- ControlOptions.OriginalHeight = 29
+ ControlOptions.OriginalHeight = 23
ControlOptions.OriginalWidth = 82
ControlOptions.ShowBorder = False
Index = -1
@@ -987,18 +987,17 @@ inherited frmTradePlanInPut: TfrmTradePlanInPut
TabOrder = 1
Properties.ActivePage = cxTabSheet1
Properties.CustomButtons.Buttons = <>
- ClientRectBottom = 335
- ClientRectLeft = 2
- ClientRectRight = 198
- ClientRectTop = 32
+ ClientRectBottom = 337
+ ClientRectRight = 200
+ ClientRectTop = 28
object cxTabSheet1: TcxTabSheet
Caption = #21367#26631#31614
ImageIndex = 0
object RMPreview1: TRMPreview
Left = 0
Top = 0
- Width = 196
- Height = 303
+ Width = 200
+ Height = 309
Align = alClient
BevelOuter = bvNone
Caption = 'Insert After'
@@ -1021,11 +1020,15 @@ inherited frmTradePlanInPut: TfrmTradePlanInPut
object cxTabSheet2: TcxTabSheet
Caption = #21253#26631#31614
ImageIndex = 1
+ ExplicitLeft = 2
+ ExplicitTop = 32
+ ExplicitWidth = 196
+ ExplicitHeight = 303
object RMPreview2: TRMPreview
Left = 0
Top = 0
- Width = 196
- Height = 303
+ Width = 200
+ Height = 309
Align = alClient
BevelOuter = bvNone
Caption = #26631#31614#39044#35272
@@ -1037,6 +1040,8 @@ inherited frmTradePlanInPut: TfrmTradePlanInPut
Options.DrawBorder = False
Options.BorderPen.Color = clGray
Options.BorderPen.Style = psDash
+ ExplicitWidth = 196
+ ExplicitHeight = 303
end
end
end
diff --git a/项目代码/wenshangkm/G01贸易生产计划/U_TradePlanMgeList.dfm b/项目代码/wenshangkm/G01贸易生产计划/U_TradePlanMgeList.dfm
index ae61be4..8bf31b8 100644
--- a/项目代码/wenshangkm/G01贸易生产计划/U_TradePlanMgeList.dfm
+++ b/项目代码/wenshangkm/G01贸易生产计划/U_TradePlanMgeList.dfm
@@ -16,10 +16,10 @@ inherited frmTradePlanMgeList: TfrmTradePlanMgeList
Left = 0
Top = 0
Width = 1290
- Height = 60
+ Height = 76
AutoSize = True
- ButtonHeight = 30
- ButtonWidth = 83
+ ButtonHeight = 38
+ ButtonWidth = 169
Caption = 'ToolBar1'
Color = clBtnFace
Images = DataLink_TradePlan.cxImageList_bar
@@ -36,7 +36,7 @@ inherited frmTradePlanMgeList: TfrmTradePlanMgeList
OnClick = TBRafreshClick
end
object Tfilter: TToolButton
- Left = 63
+ Left = 71
Top = 0
AutoSize = True
Caption = #36807#28388
@@ -44,7 +44,7 @@ inherited frmTradePlanMgeList: TfrmTradePlanMgeList
OnClick = TfilterClick
end
object TBAdd: TToolButton
- Left = 126
+ Left = 142
Top = 0
AutoSize = True
Caption = #26032#22686
@@ -52,7 +52,7 @@ inherited frmTradePlanMgeList: TfrmTradePlanMgeList
OnClick = TBAddClick
end
object btnCopy: TToolButton
- Left = 189
+ Left = 213
Top = 0
AutoSize = True
Caption = #22797#21046
@@ -60,7 +60,7 @@ inherited frmTradePlanMgeList: TfrmTradePlanMgeList
OnClick = btnCopyClick
end
object TBEdit: TToolButton
- Left = 252
+ Left = 284
Top = 0
AutoSize = True
Caption = #20462#25913
@@ -68,7 +68,7 @@ inherited frmTradePlanMgeList: TfrmTradePlanMgeList
OnClick = TBEditClick
end
object TBDel: TToolButton
- Left = 315
+ Left = 355
Top = 0
AutoSize = True
Caption = #21024#38500
@@ -76,7 +76,7 @@ inherited frmTradePlanMgeList: TfrmTradePlanMgeList
OnClick = TBDelClick
end
object Tdjsz: TToolButton
- Left = 378
+ Left = 426
Top = 0
AutoSize = True
Caption = #25171#21367#35774#32622
@@ -84,7 +84,7 @@ inherited frmTradePlanMgeList: TfrmTradePlanMgeList
OnClick = TdjszClick
end
object Tbqyl: TToolButton
- Left = 465
+ Left = 529
Top = 0
AutoSize = True
Caption = #26631#31614#39044#35272
@@ -93,97 +93,105 @@ inherited frmTradePlanMgeList: TfrmTradePlanMgeList
Style = tbsDropDown
end
object TBPrint: TToolButton
- Left = 569
+ Left = 655
Top = 0
AutoSize = True
Caption = #25171#21360
ImageIndex = 21
- Wrap = True
OnClick = TBPrintClick
end
- object TBCK: TToolButton
+ object ToolButton2: TToolButton
+ Left = 726
+ Top = 0
+ Caption = #20462#25913#24179#22343#20462#24067#26102#38388
+ ImageIndex = 3
+ Wrap = True
+ OnClick = ToolButton2Click
+ end
+ object ToolButton1: TToolButton
Left = 0
- Top = 30
+ Top = 38
+ AutoSize = True
+ Caption = #23548#20837#35746#21333
+ ImageIndex = 28
+ OnClick = ToolButton1Click
+ end
+ object TBCK: TToolButton
+ Left = 103
+ Top = 38
AutoSize = True
Caption = #26597#30475
ImageIndex = 8
OnClick = TBCKClick
end
object ToolButton4: TToolButton
- Left = 63
- Top = 30
+ Left = 174
+ Top = 38
AutoSize = True
Caption = #38468#20214
ImageIndex = 22
OnClick = ToolButton4Click
end
object TWC: TToolButton
- Left = 126
- Top = 30
+ Left = 245
+ Top = 38
AutoSize = True
Caption = #23436#25104
ImageIndex = 12
OnClick = TWCClick
end
object Ttoexcel: TToolButton
- Left = 189
- Top = 30
+ Left = 316
+ Top = 38
AutoSize = True
Caption = #23548#20986
ImageIndex = 28
OnClick = TtoexcelClick
end
object TNowc: TToolButton
- Left = 252
- Top = 30
+ Left = 387
+ Top = 38
AutoSize = True
Caption = #25764#38144#23436#25104
ImageIndex = 11
OnClick = TNowcClick
end
object Tcdgl: TToolButton
- Left = 339
- Top = 30
+ Left = 490
+ Top = 38
AutoSize = True
Caption = #30133#28857#31649#29702
ImageIndex = 30
OnClick = TcdglClick
end
object Tupdateto: TToolButton
- Left = 426
- Top = 30
+ Left = 593
+ Top = 38
AutoSize = True
Caption = #25968#25454#21516#27493
ImageIndex = 50
OnClick = TupdatetoClick
end
object Tbcgs: TToolButton
- Left = 513
- Top = 30
+ Left = 696
+ Top = 38
AutoSize = True
Caption = #20445#23384#26684#24335
ImageIndex = 37
OnClick = TbcgsClick
end
object TBClose: TToolButton
- Left = 600
- Top = 30
+ Left = 799
+ Top = 38
AutoSize = True
Caption = #20851#38381
ImageIndex = 7
OnClick = TBCloseClick
end
- object ToolButton1: TToolButton
- Left = 663
- Top = 30
- Caption = #23548#20837#35746#21333
- ImageIndex = 8
- OnClick = ToolButton1Click
- end
end
object dxLayoutControl_query: TdxLayoutControl [1]
Left = 0
- Top = 60
+ Top = 76
Width = 1290
Height = 45
Align = alTop
@@ -191,7 +199,6 @@ inherited frmTradePlanMgeList: TfrmTradePlanMgeList
LayoutLookAndFeel = DataLink_TradePlan.dxLayoutSkinLookAndFeel1
OptionsItem.SizableHorz = True
OptionsItem.SizableVert = True
- ExplicitTop = 76
object custName: TcxTextEdit
Tag = 2
Left = 629
@@ -215,14 +222,14 @@ inherited frmTradePlanMgeList: TfrmTradePlanMgeList
object BuyConNo: TcxTextEdit
Tag = 2
Left = 10000
- Top = 10000
+ Top = 9990
ParentFont = False
Properties.OnChange = TfilterClick
Style.BorderColor = clWindowFrame
Style.BorderStyle = ebs3D
Style.HotTrack = False
Style.TransparentBorder = False
- TabOrder = 6
+ TabOrder = 7
Visible = False
Width = 121
end
@@ -239,21 +246,7 @@ inherited frmTradePlanMgeList: TfrmTradePlanMgeList
object ywy: TcxTextEdit
Tag = 99
Left = 10000
- Top = 10000
- ParentFont = False
- Properties.OnChange = TfilterClick
- Style.BorderColor = clWindowFrame
- Style.BorderStyle = ebs3D
- Style.HotTrack = False
- Style.TransparentBorder = False
- TabOrder = 7
- Visible = False
- Width = 121
- end
- object C_Name: TcxTextEdit
- Tag = 2
- Left = 10000
- Top = 10000
+ Top = 9990
ParentFont = False
Properties.OnChange = TfilterClick
Style.BorderColor = clWindowFrame
@@ -264,6 +257,23 @@ inherited frmTradePlanMgeList: TfrmTradePlanMgeList
Visible = False
Width = 121
end
+ object C_Name: TcxTextEdit
+ Tag = 2
+ Left = 989
+ Top = 11
+ ParentFont = False
+ Properties.OnChange = TfilterClick
+ Style.Font.Charset = ANSI_CHARSET
+ Style.Font.Color = clWindowText
+ Style.Font.Height = -16
+ Style.Font.Name = #24494#36719#38597#40657
+ Style.Font.Style = []
+ Style.HotTrack = False
+ Style.TransparentBorder = False
+ Style.IsFontAssigned = True
+ TabOrder = 5
+ Width = 121
+ end
object endDate: TcxDateEdit
Left = 242
Top = 11
@@ -284,18 +294,18 @@ inherited frmTradePlanMgeList: TfrmTradePlanMgeList
end
object batchNo: TcxTextEdit
Tag = 2
- Left = 989
+ Left = 1191
Top = 11
Properties.OnChange = TfilterClick
Style.HotTrack = False
Style.TransparentBorder = False
- TabOrder = 5
+ TabOrder = 6
Width = 105
end
object FtyPCId: TcxTextEdit
Tag = 2
Left = 10000
- Top = 10000
+ Top = 9990
Properties.OnChange = TfilterClick
Style.HotTrack = False
Style.TransparentBorder = False
@@ -311,6 +321,7 @@ inherited frmTradePlanMgeList: TfrmTradePlanMgeList
SizeOptions.SizableHorz = True
SizeOptions.SizableVert = True
Hidden = True
+ ItemIndex = 5
LayoutDirection = ldHorizontal
Padding.Bottom = -5
Padding.Top = -5
@@ -348,14 +359,13 @@ inherited frmTradePlanMgeList: TfrmTradePlanMgeList
Index = -1
end
object dxLayoutItem_pm: TdxLayoutItem
- Tag = 99
- Visible = False
+ Parent = dxLayoutControl_queryGroup_Root
CaptionOptions.Text = #20135#21697#21517#31216
Control = C_Name
- ControlOptions.OriginalHeight = 21
+ ControlOptions.OriginalHeight = 27
ControlOptions.OriginalWidth = 121
ControlOptions.ShowBorder = False
- Index = -1
+ Index = 5
end
object dxLayoutItem_beg: TdxLayoutItem
Parent = dxLayoutControl_queryGroup_Root
@@ -403,7 +413,7 @@ inherited frmTradePlanMgeList: TfrmTradePlanMgeList
ControlOptions.OriginalHeight = 27
ControlOptions.OriginalWidth = 105
ControlOptions.ShowBorder = False
- Index = 5
+ Index = 6
end
object dxLayoutItem_FtyPCId: TdxLayoutItem
CaptionOptions.Text = #26579#21378#32568#21495
@@ -554,7 +564,7 @@ inherited frmTradePlanMgeList: TfrmTradePlanMgeList
Width = 75
end
object v1ConNo: TcxGridDBColumn
- Caption = #21512#21516#21495
+ Caption = 'PO'#21495
DataBinding.FieldName = 'ConNo'
DataBinding.IsNullValueType = True
FixedKind = fkLeftDynamic
@@ -1721,7 +1731,7 @@ inherited frmTradePlanMgeList: TfrmTradePlanMgeList
end
object cxTabControl1: TcxTabControl [3]
Left = 0
- Top = 105
+ Top = 121
Width = 1290
Height = 26
Align = alTop
@@ -1739,7 +1749,6 @@ inherited frmTradePlanMgeList: TfrmTradePlanMgeList
LookAndFeel.Kind = lfOffice11
LookAndFeel.NativeStyle = False
OnChange = cxTabControl1Change
- ExplicitTop = 121
ClientRectRight = 0
ClientRectTop = 0
end
@@ -1864,7 +1873,7 @@ inherited frmTradePlanMgeList: TfrmTradePlanMgeList
Top = 288
end
object PopupMenu1: TPopupMenu
- Left = 800
+ Left = 944
Top = 16
object N1: TMenuItem
Caption = #21367#26631#31614
@@ -1898,14 +1907,14 @@ inherited frmTradePlanMgeList: TfrmTradePlanMgeList
CompressThread = False
LaterBuildEvents = True
OnlyOwnerDataSet = False
- Left = 776
- Top = 16
+ Left = 992
+ Top = 32
ReportData = {}
end
object RMDB_1: TRMDBDataSet
Visible = False
DataSet = ADOQueryPrint
- Left = 876
- Top = 24
+ Left = 1012
+ Top = 16
end
end
diff --git a/项目代码/wenshangkm/G01贸易生产计划/U_TradePlanMgeList.pas b/项目代码/wenshangkm/G01贸易生产计划/U_TradePlanMgeList.pas
index eebe89c..ee623a6 100644
--- a/项目代码/wenshangkm/G01贸易生产计划/U_TradePlanMgeList.pas
+++ b/项目代码/wenshangkm/G01贸易生产计划/U_TradePlanMgeList.pas
@@ -206,6 +206,7 @@ type
TV2Column9: TcxGridDBColumn;
TV2Column10: TcxGridDBColumn;
ToolButton1: TToolButton;
+ ToolButton2: TToolButton;
procedure TBCloseClick(Sender: TObject);
procedure FormCreate(Sender: TObject);
procedure FormClose(Sender: TObject; var Action: TCloseAction);
@@ -236,6 +237,7 @@ type
procedure TupdatetoClick(Sender: TObject);
procedure ButtonEdit(Sender: TObject; AButtonIndex: Integer);
procedure ToolButton1Click(Sender: TObject);
+ procedure ToolButton2Click(Sender: TObject);
private
canshu1, canshu2: string;
fIsLoad: Boolean;
@@ -319,6 +321,7 @@ begin
dxLayoutItem_pm.Visible := false;
dxLayoutItem_batchno.Visible := false;
dxLayoutItem_FtyPCId.Visible := false;
+ dxLayoutItem_pm.Visible := false;
end
else
begin
@@ -326,6 +329,7 @@ begin
dxLayoutItem_pm.Visible := true;
dxLayoutItem_batchno.Visible := true;
dxLayoutItem_FtyPCId.Visible := true;
+ dxLayoutItem_pm.Visible := true;
end;
TBRafresh.Click
end;
@@ -875,6 +879,60 @@ begin
end;
end;
+procedure TfrmTradePlanMgeList.ToolButton2Click(Sender: TObject);
+var
+ MStrIn: string;
+ mvalue: double;
+begin
+ if ORDER_SUB.IsEmpty then
+ Exit;
+
+ if ORDER_SUB.Locate('SSel', True, []) = False then
+ begin
+ Application.MessageBox('ѡϸݼ¼', 'ʾ', 0);
+ Exit;
+ end;
+
+ if not InputQuery('ƽʱ', '', MStrIn) then
+ begin
+ Exit;
+ end;
+ mvalue := strTofloatdef(trim(MStrIn), 0);
+ try
+ ORDER_SUB.DisableControls;
+ ADOQuerySub.Connection.BeginTrans;
+ with ORDER_SUB do
+ begin
+ First;
+ while not Eof do
+ begin
+ if ORDER_SUB.FieldByName('SSel').AsBoolean = True then
+ begin
+ with ADOQuerySub do
+ begin
+ Close;
+ sql.Clear;
+ sql.Add('Update Trade_Plan_Sub Set Averagetime=' + floatTostr(mvalue));
+ sql.Add('where subid=''' + Trim(ORDER_SUB.fieldbyname('subid').AsString) + '''');
+ sql.Add('Update Trade_Cloth_Inspect Set Averagetime=' + floatTostr(mvalue));
+ sql.Add('where subid=''' + Trim(ORDER_SUB.fieldbyname('subid').AsString) + '''');
+ ExecSQL;
+ end;
+ end;
+ Next;
+ end;
+ end;
+ ADOQuerySub.Connection.CommitTrans;
+ ORDER_SUB.EnableControls;
+ application.MessageBox('ݲɹ', 'ʾϢ');
+ TBRafresh.Click;
+ except
+ ADOQuerySub.Connection.RollbackTrans;
+ ORDER_SUB.EnableControls;
+ application.MessageBox('ݲʧܣ', 'ʾϢ', 0);
+ end;
+end;
+
procedure TfrmTradePlanMgeList.ToolButton4Click(Sender: TObject);
var
mMainId: string;
diff --git a/项目代码/wenshangkm/G01贸易生产计划/djdPackPlan.dproj b/项目代码/wenshangkm/G01贸易生产计划/djdPackPlan.dproj
index 70dc0cd..89a2540 100644
--- a/项目代码/wenshangkm/G01贸易生产计划/djdPackPlan.dproj
+++ b/项目代码/wenshangkm/G01贸易生产计划/djdPackPlan.dproj
@@ -156,7 +156,7 @@
CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName)
- D:\Dp10RepoV1\项目代码\D10djdPack\项目代码\wenshangkm\G01贸易生产计划\testDll.exe
+ D:\Dp10RepoV1\项目代码\D10djdPackwenshang\项目代码\wenshangkm\G01贸易生产计划\testDll.exe
diff --git a/项目代码/wenshangkm/G01贸易生产计划/djdPackPlan.dproj.local b/项目代码/wenshangkm/G01贸易生产计划/djdPackPlan.dproj.local
index cdad893..989c04e 100644
--- a/项目代码/wenshangkm/G01贸易生产计划/djdPackPlan.dproj.local
+++ b/项目代码/wenshangkm/G01贸易生产计划/djdPackPlan.dproj.local
@@ -53,7 +53,7 @@
-
+
@@ -98,12 +98,12 @@
1899-12-30 00:00:00.000.939,D:\Dp10RepoV1\项目代码\djdPack\G01贸易生产计划\U_SysLogOrderzsd.pas=
- 1899-12-30 00:00:00.000.245,D:\Dp10RepoV1\项目代码\djdPack\G01贸易生产计划\U_UptPlanDataToRoll.dfm=D:\Dp10RepoV1\项目代码\djdPack\G01贸易生产计划\Unit2.dfm
- 1899-12-30 00:00:00.000.054,D:\Dp10RepoV1\项目代码\djdPack\G01贸易生产计划\U_ProductOrderNewList.pas=
1899-12-30 00:00:00.000.368,D:\Dp10RepoV1\项目代码\djdPack\G01贸易生产计划\U_OrderInPut.pas=
+ 1899-12-30 00:00:00.000.054,D:\Dp10RepoV1\项目代码\djdPack\G01贸易生产计划\U_ProductOrderNewList.pas=
1899-12-30 00:00:00.000.578,D:\Dp10RepoV1\项目代码\djdPack\G01贸易生产计划\U_MJSJFX.pas=
+ 1899-12-30 00:00:00.000.245,D:\Dp10RepoV1\项目代码\djdPack\G01贸易生产计划\Unit2.dfm=D:\Dp10RepoV1\项目代码\djdPack\G01贸易生产计划\U_UptPlanDataToRoll.dfm
1899-12-30 00:00:00.000.296,D:\Dp10RepoV1\项目代码\djdPack\G01贸易生产计划\U_TradePlanList.pas=
- 1899-12-30 00:00:00.000.245,D:\Dp10RepoV1\项目代码\djdPack\G01贸易生产计划\U_UptPlanDataToRoll.pas=D:\Dp10RepoV1\项目代码\djdPack\G01贸易生产计划\Unit2.pas
+ 1899-12-30 00:00:00.000.245,D:\Dp10RepoV1\项目代码\djdPack\G01贸易生产计划\Unit2.pas=D:\Dp10RepoV1\项目代码\djdPack\G01贸易生产计划\U_UptPlanDataToRoll.pas
1899-12-30 00:00:00.000.651,=D:\Dp10RepoV1\项目代码\djdPack\G01贸易生产计划\Unit2.pas
diff --git a/项目代码/wenshangkm/G01贸易生产计划/djdPackPlan.identcache b/项目代码/wenshangkm/G01贸易生产计划/djdPackPlan.identcache
index 0d92095..77828ec 100644
Binary files a/项目代码/wenshangkm/G01贸易生产计划/djdPackPlan.identcache and b/项目代码/wenshangkm/G01贸易生产计划/djdPackPlan.identcache differ
diff --git a/项目代码/wenshangkm/G01贸易生产计划/testDll.identcache b/项目代码/wenshangkm/G01贸易生产计划/testDll.identcache
index 075b4e9..5adb423 100644
Binary files a/项目代码/wenshangkm/G01贸易生产计划/testDll.identcache and b/项目代码/wenshangkm/G01贸易生产计划/testDll.identcache differ
diff --git a/项目代码/wenshangkm/G03贸易布匹检验/DjdMachineInsp.dpr b/项目代码/wenshangkm/G03贸易布匹检验/DjdMachineInsp.dpr
index f600464..01af984 100644
--- a/项目代码/wenshangkm/G03贸易布匹检验/DjdMachineInsp.dpr
+++ b/项目代码/wenshangkm/G03贸易布匹检验/DjdMachineInsp.dpr
@@ -38,7 +38,7 @@ uses
U_TradePack in 'U_TradePack.pas' {frmTradePack},
U_TradeClothWaitPack in 'U_TradeClothWaitPack.pas' {frmTradeClothWaitPack},
U_TradeClothInspList in 'U_TradeClothInspList.pas' {frmTradeClothInspList},
- U_DjdDjClList in 'U_DjdDjClList.pas' {frmDjdDjClList},
+ U_DjdDjClListJT in 'U_DjdDjClListJT.pas' {frmDjdDjClListJT},
U_MdPrint in '..\A00ͨô\U_MdPrint.pas' {frmMdPrint},
U_LabelPrint in '..\A00ͨô\U_LabelPrint.pas' {frmLabelPrint},
U_DeviceJkTest in 'U_DeviceJkTest.pas' {frmDeviceJkTest},
diff --git a/项目代码/wenshangkm/G03贸易布匹检验/DjdMachineInsp.dproj b/项目代码/wenshangkm/G03贸易布匹检验/DjdMachineInsp.dproj
index 8815bad..f7b6dae 100644
--- a/项目代码/wenshangkm/G03贸易布匹检验/DjdMachineInsp.dproj
+++ b/项目代码/wenshangkm/G03贸易布匹检验/DjdMachineInsp.dproj
@@ -161,7 +161,7 @@
CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName)
- D:\Dp10RepoV1\项目代码\D10djdPack\项目代码\djdPack\G03贸易布匹检验\testDll.exe
+ D:\Dp10RepoV1\项目代码\D10djdPackwenshang\项目代码\wenshangkm\G03贸易布匹检验\testDll.exe
@@ -268,8 +268,8 @@
dfm
-
-
+
+
dfm
diff --git a/项目代码/wenshangkm/G03贸易布匹检验/DjdMachineInsp.dproj.local b/项目代码/wenshangkm/G03贸易布匹检验/DjdMachineInsp.dproj.local
index 33251c0..9508817 100644
--- a/项目代码/wenshangkm/G03贸易布匹检验/DjdMachineInsp.dproj.local
+++ b/项目代码/wenshangkm/G03贸易布匹检验/DjdMachineInsp.dproj.local
@@ -1,42 +1,43 @@
+ 1899-12-30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.pas
1899-12-30 00:00:00.000.157,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_TradePack.pas
1899-12-30 00:00:00.000.322,=D:\Dp10RepoV1\public10\design\U_FormInitThread.pas
- 1899-12-30 00:00:00.000.417,=D:\Dp10RepoV1\public10\design\U_cxGridCustomSet.pas
+ 1899-12-30 00:00:00.000.630,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas
1899-12-30 00:00:00.000.422,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas
1899-12-30 00:00:00.000.734,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas
- 1899-12-30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.pas
+ 1899-12-30 00:00:00.000.339,D:\Dp10RepoV1\项目代码\djdPack\G03贸易布匹检验\Unit1.dfm=D:\Dp10RepoV1\项目代码\djdPack\G03贸易布匹检验\U_baseList1.dfm
1899-12-30 00:00:00.000.582,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.pas
1899-12-30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.dfm
- 1899-12-30 00:00:00.000.832,=D:\Dp10Repo\public10\design\U_BaseHelp.pas
+ 1899-12-30 00:00:00.000.417,=D:\Dp10RepoV1\public10\design\U_cxGridCustomSet.pas
1899-12-30 00:00:00.000.092,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_EmployeeSel.pas
1899-12-30 00:00:00.000.716,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ProcessSel.pas
- 1899-12-30 00:00:00.000.339,D:\Dp10RepoV1\项目代码\djdPack\G03贸易布匹检验\Unit1.dfm=D:\Dp10RepoV1\项目代码\djdPack\G03贸易布匹检验\U_baseList1.dfm
+ 1899-12-30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas
1899-12-30 00:00:00.000.339,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas
1899-12-30 00:00:00.000.769,=D:\Dp10RepoV1\项目代码\djdPack\G03贸易布匹检验\Unit2.pas
- 1899-12-30 00:00:00.000.965,D:\Dp10Repo\项目代码\RTBasics\F05染色检验\DyeInsp.dproj=D:\Dp10Repo\项目代码\RTBasics\F05染色检验\InformationBase.dproj
+ 1899-12-30 00:00:00.000.193,D:\Dp10RepoV1\项目代码\D10djdPackwenshang\项目代码\wenshangkm\G03贸易布匹检验\U_DjdDjClList.pas=D:\Dp10RepoV1\项目代码\D10djdPackwenshang\项目代码\wenshangkm\G03贸易布匹检验\U_DjdDjClListJT.pas
1899-12-30 00:00:00.000.382,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\TradeInsp.dproj=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\TradeMachineInsp.dproj
1899-12-30 00:00:00.000.792,=D:\rtgit\D10djdPack\public10\ThreeFun\Fun\uSZHN_JSON.pas
- 1899-12-30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas
+ 1899-12-30 00:00:00.000.540,=D:\Dp10RepoV1\项目代码\djdPack\G03贸易布匹检验\Unit1.pas
1899-12-30 00:00:00.000.339,D:\Dp10RepoV1\项目代码\djdPack\G03贸易布匹检验\Unit1.pas=D:\Dp10RepoV1\项目代码\djdPack\G03贸易布匹检验\U_baseList1.pas
1899-12-30 00:00:00.000.888,D:\Dp10RepoV1\项目代码\djdPack\G03贸易布匹检验\U_TradeMachInsp.pas=
- 1899-12-30 00:00:00.000.630,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas
+ 1899-12-30 00:00:00.000.965,D:\Dp10Repo\项目代码\RTBasics\F05染色检验\DyeInsp.dproj=D:\Dp10Repo\项目代码\RTBasics\F05染色检验\InformationBase.dproj
1899-12-30 00:00:00.000.123,=D:\Dp10Repo\public10\design\U_globalVar.pas
1899-12-30 00:00:00.000.532,=D:\Dp10Repo\项目代码\RTBasics\F05染色检验\U_DyeMachInsp.pas
- 1899-12-30 00:00:00.000.540,=D:\Dp10RepoV1\项目代码\djdPack\G03贸易布匹检验\Unit1.pas
- 1899-12-30 00:00:00.000.612,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit1.pas
+ 1899-12-30 00:00:00.000.832,=D:\Dp10Repo\public10\design\U_BaseHelp.pas
+ 1899-12-30 00:00:00.000.507,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit1.pas
1899-12-30 00:00:00.000.567,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit1.pas=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_frameBads.pas
1899-12-30 00:00:00.000.514,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit1.pas=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_KeyBoard.pas
+ 1899-12-30 00:00:00.000.950,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit1.pas
+ 1899-12-30 00:00:00.000.612,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit1.pas
1899-12-30 00:00:00.000.308,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit1.pas
- 1899-12-30 00:00:00.000.294,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit1.pas
- 1899-12-30 00:00:00.000.230,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit1.pas
1899-12-30 00:00:00.000.663,=D:\Dp10RepoV1\public10\design\U_FormLayOutDesign.pas
1899-12-30 00:00:00.000.822,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_frameParam.pas=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit1.pas
1899-12-30 00:00:00.000.686,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_MachRollMain.pas=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas
1899-12-30 00:00:00.000.193,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit1.pas=D:\Dp10RepoV1\public10\ThreeFun\Fun\U_AdoFunc.pas
- 1899-12-30 00:00:00.000.983,D:\Dp10Repo\项目代码\RTBasics\F05染色检验\Unit1.pas=
1899-12-30 00:00:00.000.996,=D:\Dp10RepoV1\public10\design\U_BaseDataLink.pas
+ 1899-12-30 00:00:00.000.983,D:\Dp10Repo\项目代码\RTBasics\F05染色检验\Unit1.pas=
1899-12-30 00:00:00.000.736,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_ProductListHelp.pas=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas
1899-12-30 00:00:00.000.135,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelp.pas=
1899-12-30 00:00:00.000.939,=D:\Dp10Repo\public10\design\U_BaseInput.pas
@@ -44,23 +45,23 @@
1899-12-30 00:00:00.000.051,=D:\Dp10RepoV1\项目代码\djdPack\G03贸易布匹检验\U_BillPrintList.pas
1899-12-30 00:00:00.000.048,=D:\Dp10Repo\public10\design\U_BaseList.pas
1899-12-30 00:00:00.000.018,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_TradeClothWaitPack.pas
- 1899-12-30 00:00:00.000.507,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit1.pas
- 1899-12-30 00:00:00.000.950,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit1.pas
+ 1899-12-30 00:00:00.000.294,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit1.pas
+ 1899-12-30 00:00:00.000.230,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit1.pas
1899-12-30 00:00:00.000.114,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_DeviceJkTest.pas=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas
1899-12-30 00:00:00.000.114,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_DeviceJkTest.dfm=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.dfm
1899-12-30 00:00:00.000.581,D:\Dp10Repo\项目代码\RTBasics\G03贸易布匹检验\TradeInsp.dproj=D:\Dp10Repo\项目代码\RTBasics\G03贸易布匹检验\DyeInsp.dproj
1899-12-30 00:00:00.000.822,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_frameParam.dfm=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit1.dfm
1899-12-30 00:00:00.000.991,=D:\Dp10RepoV1\项目代码\djdPack\A00通用组件\FrameDateSel.pas
1899-12-30 00:00:00.000.487,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelpSel.pas=
- 1899-12-30 00:00:00.000.178,=D:\Dp10Repo\public10\design\U_WindowFormdesign.pas
+ 1899-12-30 00:00:00.000.736,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ModuleNote.pas=
1899-12-30 00:00:00.000.995,D:\Dp10RepoV1\项目代码\TradePack\A00通用窗体\U_LabelPrint.dfm=D:\Dp10RepoV1\项目代码\TradePack\A00通用窗体\U_MdPrint.dfm
1899-12-30 00:00:00.000.421,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_ParamSet.pas=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas
+ 1899-12-30 00:00:00.000.717,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas
1899-12-30 00:00:00.000.757,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_ProductJYHZList.pas
1899-12-30 00:00:00.000.990,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas
1899-12-30 00:00:00.000.706,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas
- 1899-12-30 00:00:00.000.739,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas
+ 1899-12-30 00:00:00.000.053,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas
1899-12-30 00:00:00.000.950,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas
- 1899-12-30 00:00:00.000.701,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas
1899-12-30 00:00:00.000.514,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit1.dfm=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_KeyBoard.dfm
1899-12-30 00:00:00.000.567,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit1.dfm=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_frameBads.dfm
1899-12-30 00:00:00.000.909,=D:\Dp10Repo\项目代码\RTBasics\F05染色检验\U_DyeClothInspList.pas
@@ -68,17 +69,18 @@
1899-12-30 00:00:00.000.582,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\TradeMachineInsp.dproj=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\DjdMachineInsp.dproj
1899-12-30 00:00:00.000.015,=D:\Dp10Repo\public10\ThreeFun\Fun\U_RTFun.pas
1899-12-30 00:00:00.000.448,=D:\Dp10RepoV1\项目代码\TradePack\A00通用窗体\U_LabelPrint.pas
- 1899-12-30 00:00:00.000.736,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ModuleNote.pas=
+ 1899-12-30 00:00:00.000.178,=D:\Dp10Repo\public10\design\U_WindowFormdesign.pas
1899-12-30 00:00:00.000.975,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_DeviceJkDll.pas=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit1.pas
1899-12-30 00:00:00.000.086,=D:\Dp10Repo\public10\design\U_cxGridCustomCss.pas
1899-12-30 00:00:00.000.995,D:\Dp10RepoV1\项目代码\TradePack\A00通用窗体\U_LabelPrint.pas=D:\Dp10RepoV1\项目代码\TradePack\A00通用窗体\U_MdPrint.pas
1899-12-30 00:00:00.000.661,=D:\Dp10RepoV1\项目代码\TradePack\A00通用窗体\U_LabelPrint.pas
- 1899-12-30 00:00:00.000.226,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_SysLogList.pas=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas
+ 1899-12-30 00:00:00.000.701,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas
1899-12-30 00:00:00.000.736,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_ProductListHelp.dfm=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.dfm
+ 1899-12-30 00:00:00.000.193,D:\Dp10RepoV1\项目代码\D10djdPackwenshang\项目代码\wenshangkm\G03贸易布匹检验\U_DjdDjClList.dfm=D:\Dp10RepoV1\项目代码\D10djdPackwenshang\项目代码\wenshangkm\G03贸易布匹检验\U_DjdDjClListJT.dfm
1899-12-30 00:00:00.000.421,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_ParamSet.dfm=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.dfm
1899-12-30 00:00:00.000.226,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_SysLogList.dfm=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.dfm
- 1899-12-30 00:00:00.000.686,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_MachRollMain.dfm=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.dfm
1899-12-30 00:00:00.000.322,=D:\Dp10Repo\项目代码\RTBasics\G03贸易布匹检验\U_TradeMachInsp.pas
+ 1899-12-30 00:00:00.000.226,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_SysLogList.pas=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas
1899-12-30 00:00:00.000.313,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_BatchMdyData.dfm=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.dfm
1899-12-30 00:00:00.000.493,=D:\Dp10Repo\项目代码\RTBasics\A00通用模板\Unit1.pas
1899-12-30 00:00:00.000.149,=D:\Dp10Repo\public10\ThreeFun\Form\U_ZDYHelp.pas
@@ -86,17 +88,17 @@
1899-12-30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm
1899-12-30 00:00:00.000.673,D:\Dp10RepoV1\public10\ThreeFun\Fun\U_ControlData.pas=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit1.pas
1899-12-30 00:00:00.000.964,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_DjdDjClList.pas
- 1899-12-30 00:00:00.000.679,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas
1899-12-30 00:00:00.000.975,=D:\Dp10Repo\public10\ThreeFun\Fun\U_CompressionFun.pas
- 1899-12-30 00:00:00.000.717,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas
- 1899-12-30 00:00:00.000.053,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas
+ 1899-12-30 00:00:00.000.054,=D:\Dp10RepoV1\项目代码\TradePack\G00贸易通用窗体\U_TradePlanSel.pas
+ 1899-12-30 00:00:00.000.679,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas
+ 1899-12-30 00:00:00.000.739,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas
1899-12-30 00:00:00.000.233,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas
- 1899-12-30 00:00:00.000.964,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.dfm=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_DjdDjClList.dfm
1899-12-30 00:00:00.000.757,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.dfm=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_ProductJYHZList.dfm
1899-12-30 00:00:00.000.313,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_BatchMdyData.pas=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas
- 1899-12-30 00:00:00.000.054,=D:\Dp10RepoV1\项目代码\TradePack\G00贸易通用窗体\U_TradePlanSel.pas
+ 1899-12-30 00:00:00.000.686,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_MachRollMain.dfm=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.dfm
1899-12-30 00:00:00.000.747,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_TradeClothInspList.pas
1899-12-30 00:00:00.000.844,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_AttachmentUpload.pas
+ 1899-12-30 00:00:00.000.964,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.dfm=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_DjdDjClList.dfm
@@ -168,11 +170,11 @@
+
-
@@ -199,8 +201,6 @@
-
-
@@ -210,5 +210,7 @@
+
+
diff --git a/项目代码/wenshangkm/G03贸易布匹检验/DjdMachineInsp.identcache b/项目代码/wenshangkm/G03贸易布匹检验/DjdMachineInsp.identcache
index ee2dbf1..34a09eb 100644
Binary files a/项目代码/wenshangkm/G03贸易布匹检验/DjdMachineInsp.identcache and b/项目代码/wenshangkm/G03贸易布匹检验/DjdMachineInsp.identcache differ
diff --git a/项目代码/wenshangkm/G03贸易布匹检验/ProjectGroup1.groupproj.local b/项目代码/wenshangkm/G03贸易布匹检验/ProjectGroup1.groupproj.local
index bc562eb..e624df4 100644
--- a/项目代码/wenshangkm/G03贸易布匹检验/ProjectGroup1.groupproj.local
+++ b/项目代码/wenshangkm/G03贸易布匹检验/ProjectGroup1.groupproj.local
@@ -1,6 +1,6 @@
-
+
diff --git a/项目代码/wenshangkm/G03贸易布匹检验/TradeInspFile.INI b/项目代码/wenshangkm/G03贸易布匹检验/TradeInspFile.INI
index 3b8311a..122e80f 100644
--- a/项目代码/wenshangkm/G03贸易布匹检验/TradeInspFile.INI
+++ b/项目代码/wenshangkm/G03贸易布匹检验/TradeInspFile.INI
@@ -18,6 +18,13 @@
Զĸ1=A
Զĸ2=B
ӡ뵥Զ=1
-=1
+=0
Ĭϱǩļ=DZǩ1
Ĭϰǩļ=
+سԶύ=1
+Զѡ=1
+Զύ=1
+ύͳ=
+õķ=
+Զѡ=1
+
diff --git a/项目代码/wenshangkm/G03贸易布匹检验/U_DjdDjClListJT.dfm b/项目代码/wenshangkm/G03贸易布匹检验/U_DjdDjClListJT.dfm
new file mode 100644
index 0000000..18a8ae8
--- /dev/null
+++ b/项目代码/wenshangkm/G03贸易布匹检验/U_DjdDjClListJT.dfm
@@ -0,0 +1,749 @@
+inherited frmDjdDjClListJT: TfrmDjdDjClListJT
+ Caption = #26426#21488#25171#21367#20135#37327#32479#35745#27719#24635
+ ClientHeight = 422
+ ClientWidth = 1061
+ Color = clBtnFace
+ Font.Height = -16
+ FormStyle = fsMDIChild
+ Visible = True
+ ExplicitWidth = 1077
+ ExplicitHeight = 461
+ PixelsPerInch = 96
+ TextHeight = 21
+ object toolbar1: TToolBar [0]
+ Tag = 1
+ Left = 0
+ Top = 0
+ Width = 1061
+ Height = 33
+ ButtonHeight = 30
+ ButtonWidth = 99
+ Caption = 'toolbar1'
+ Color = clBtnFace
+ Images = DataLink_TradeInsp.cxImageList_bar
+ List = True
+ ParentColor = False
+ ShowCaptions = True
+ TabOrder = 3
+ Transparent = True
+ object TBRafresh: TToolButton
+ Left = 0
+ Top = 0
+ AutoSize = True
+ Caption = #21047#26032
+ ImageIndex = 1
+ OnClick = TBRafreshClick
+ end
+ object TBFind: TToolButton
+ Left = 71
+ Top = 0
+ AutoSize = True
+ Caption = #36807#28388
+ ImageIndex = 0
+ Visible = False
+ OnClick = TBFindClick
+ end
+ object TBExport: TToolButton
+ Left = 142
+ Top = 0
+ AutoSize = True
+ Caption = #23548#20986
+ ImageIndex = 28
+ OnClick = TBExportClick
+ end
+ object Tbcgs: TToolButton
+ Left = 213
+ Top = 0
+ AutoSize = True
+ Caption = #20445#23384#26684#24335
+ ImageIndex = 16
+ OnClick = TbcgsClick
+ end
+ object TBClose: TToolButton
+ Left = 316
+ Top = 0
+ AutoSize = True
+ Caption = #20851#38381
+ ImageIndex = 7
+ OnClick = TBCloseClick
+ end
+ end
+ object cxGrid1: TcxGrid [1]
+ Left = 20
+ Top = 184
+ Width = 1005
+ Height = 230
+ BorderStyle = cxcbsNone
+ TabOrder = 4
+ object TV1: TcxGridDBTableView
+ Navigator.Buttons.CustomButtons = <>
+ ScrollbarAnnotations.CustomAnnotations = <>
+ DataController.DataSource = DataSource1
+ DataController.Filter.AutoDataSetFilter = True
+ DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost]
+ DataController.Summary.DefaultGroupSummaryItems = <>
+ DataController.Summary.FooterSummaryItems = <
+ item
+ Kind = skSum
+ Column = cxGridDBColumn9
+ end
+ item
+ Kind = skSum
+ end
+ item
+ Kind = skCount
+ end
+ item
+ Kind = skSum
+ Column = cxGridDBColumn11
+ end
+ item
+ Kind = skSum
+ end
+ item
+ Kind = skSum
+ end
+ item
+ Kind = skSum
+ end
+ item
+ Kind = skSum
+ Column = cxGridDBColumn10
+ end
+ item
+ Kind = skSum
+ end
+ item
+ Format = #26816#39564#31995#25968'=#.##'
+ Kind = skAverage
+ end
+ item
+ Format = #25442#31639#31995#25968'=#.##'
+ Kind = skAverage
+ end
+ item
+ Kind = skSum
+ end
+ item
+ Kind = skSum
+ end
+ item
+ Kind = skSum
+ end
+ item
+ Kind = skCount
+ end
+ item
+ Kind = skSum
+ Column = cxGridDBColumn12
+ end
+ item
+ Kind = skSum
+ Column = cxGridDBColumn8
+ end>
+ DataController.Summary.SummaryGroups = <>
+ OptionsCustomize.ColumnFiltering = False
+ OptionsView.Footer = True
+ OptionsView.GroupByBox = False
+ OptionsView.IndicatorWidth = 30
+ object cxGridDBColumn3: TcxGridDBColumn
+ Tag = 11
+ Caption = #35746#21333#21495
+ DataBinding.FieldName = 'OrderNo'
+ DataBinding.IsNullValueType = True
+ HeaderAlignmentHorz = taCenter
+ Options.Editing = False
+ Width = 112
+ end
+ object TV1ConNo: TcxGridDBColumn
+ Caption = #21512#21516#21495
+ DataBinding.FieldName = 'ConNo'
+ DataBinding.IsNullValueType = True
+ end
+ object TV1CustName: TcxGridDBColumn
+ Caption = #23458#25143
+ DataBinding.FieldName = 'CustName'
+ DataBinding.IsNullValueType = True
+ Visible = False
+ HeaderAlignmentHorz = taCenter
+ Options.Editing = False
+ end
+ object cxGridDBColumn4: TcxGridDBColumn
+ Caption = #20135#21697#21517#31216
+ DataBinding.FieldName = 'C_Name'
+ DataBinding.IsNullValueType = True
+ HeaderAlignmentHorz = taCenter
+ Options.Editing = False
+ Width = 101
+ end
+ object TV1Column1: TcxGridDBColumn
+ AlternateCaption = #26426#21488#21495
+ Caption = #25171#30721#20154
+ DataBinding.FieldName = 'CIMachNo'
+ DataBinding.IsNullValueType = True
+ HeaderAlignmentHorz = taCenter
+ Width = 70
+ end
+ object cxGridDBColumn7: TcxGridDBColumn
+ Caption = #25171#21367#26085#26399
+ DataBinding.FieldName = 'Filltime'
+ DataBinding.IsNullValueType = True
+ HeaderAlignmentHorz = taCenter
+ Options.Editing = False
+ Width = 84
+ end
+ object cxGridDBColumn8: TcxGridDBColumn
+ Caption = #21367#25968
+ DataBinding.FieldName = 'SumPieceNo'
+ DataBinding.IsNullValueType = True
+ HeaderAlignmentHorz = taCenter
+ Options.Editing = False
+ Width = 94
+ end
+ object cxGridDBColumn9: TcxGridDBColumn
+ Caption = #27611#37325
+ DataBinding.FieldName = 'GrossWeight'
+ DataBinding.IsNullValueType = True
+ HeaderAlignmentHorz = taCenter
+ Options.Editing = False
+ Width = 88
+ end
+ object cxGridDBColumn10: TcxGridDBColumn
+ Caption = #20928#37325
+ DataBinding.FieldName = 'NetWeight'
+ DataBinding.IsNullValueType = True
+ HeaderAlignmentHorz = taCenter
+ Options.Editing = False
+ Width = 93
+ end
+ object cxGridDBColumn11: TcxGridDBColumn
+ Caption = #31859#25968
+ DataBinding.FieldName = 'Meter'
+ DataBinding.IsNullValueType = True
+ HeaderAlignmentHorz = taCenter
+ Options.Editing = False
+ Width = 91
+ end
+ object cxGridDBColumn12: TcxGridDBColumn
+ Caption = #30721#25968
+ DataBinding.FieldName = 'Yardage'
+ DataBinding.IsNullValueType = True
+ HeaderAlignmentHorz = taCenter
+ Options.Editing = False
+ Width = 99
+ end
+ object TV1operators: TcxGridDBColumn
+ Caption = #26426#21488#20154#21592
+ DataBinding.FieldName = 'operators'
+ DataBinding.IsNullValueType = True
+ HeaderAlignmentHorz = taCenter
+ Options.Editing = False
+ Width = 87
+ end
+ object TV1Column2: TcxGridDBColumn
+ Caption = #33394#21495
+ DataBinding.FieldName = 'C_ColorNo'
+ DataBinding.IsNullValueType = True
+ HeaderAlignmentHorz = taCenter
+ Width = 60
+ end
+ object TV1Column3: TcxGridDBColumn
+ Caption = #39068#33394
+ DataBinding.FieldName = 'C_Color'
+ DataBinding.IsNullValueType = True
+ HeaderAlignmentHorz = taCenter
+ Width = 60
+ end
+ end
+ object cxGridLevel1: TcxGridLevel
+ GridView = TV1
+ end
+ end
+ object dxLayoutControl_query: TdxLayoutControl [2]
+ Left = 0
+ Top = 33
+ Width = 1061
+ Height = 83
+ Align = alTop
+ BorderWidth = 2
+ TabOrder = 2
+ LayoutLookAndFeel = DataLink_TradeInsp.dxLayoutSkinLookAndFeel1
+ OptionsItem.SizableHorz = True
+ OptionsItem.SizableVert = True
+ object Filler: TcxTextEdit
+ Tag = 2
+ Left = 306
+ Top = 35
+ Hint = 'Filler'
+ Properties.OnChange = TBFindClick
+ Style.HotTrack = False
+ Style.TransparentBorder = False
+ TabOrder = 4
+ Width = 136
+ end
+ object begdate: TcxDateEdit
+ Left = 88
+ Top = 8
+ Properties.ImmediatePost = True
+ Properties.SaveTime = False
+ Properties.ShowTime = False
+ Style.HotTrack = False
+ Style.TransparentBorder = False
+ TabOrder = 0
+ Width = 155
+ end
+ object enddate: TcxDateEdit
+ Left = 88
+ Top = 35
+ AutoSize = False
+ Properties.ImmediatePost = True
+ Properties.SaveTime = False
+ Properties.ShowTime = False
+ Style.HotTrack = False
+ Style.TransparentBorder = False
+ TabOrder = 3
+ Height = 29
+ Width = 153
+ end
+ object C_name: TcxTextEdit
+ Tag = 2
+ Left = 523
+ Top = 35
+ Properties.OnChange = TBFindClick
+ Style.HotTrack = False
+ Style.TransparentBorder = False
+ TabOrder = 5
+ Width = 160
+ end
+ object orderNo: TcxTextEdit
+ Tag = 2
+ Left = 308
+ Top = 8
+ Properties.OnChange = TBFindClick
+ Style.HotTrack = False
+ Style.TransparentBorder = False
+ TabOrder = 1
+ Width = 134
+ end
+ object C_color: TcxTextEdit
+ Tag = 2
+ Left = 10000
+ Top = 10000
+ ParentFont = False
+ Properties.OnChange = TBFindClick
+ Style.HotTrack = False
+ Style.TransparentBorder = False
+ TabOrder = 6
+ Visible = False
+ Width = 105
+ end
+ object conNo: TcxTextEdit
+ Tag = 2
+ Left = 523
+ Top = 8
+ Properties.OnChange = TBFindClick
+ Style.HotTrack = False
+ Style.TransparentBorder = False
+ TabOrder = 2
+ Width = 161
+ end
+ object dxLayoutControl_queryGroup_Root: TdxLayoutGroup
+ AlignHorz = ahParentManaged
+ AlignVert = avParentManaged
+ CaptionOptions.AlignVert = tavCenter
+ CaptionOptions.Text = #26597#35810#32452
+ CaptionOptions.Visible = False
+ SizeOptions.AssignedValues = [sovSizableHorz, sovSizableVert]
+ SizeOptions.SizableHorz = True
+ SizeOptions.SizableVert = True
+ Hidden = True
+ ItemIndex = 1
+ Padding.Top = -8
+ Padding.AssignedValues = [lpavBottom, lpavTop]
+ ShowBorder = False
+ UseIndent = False
+ Index = -1
+ end
+ object dxLayoutItem2: TdxLayoutItem
+ Parent = dxLayoutGroup1
+ SizeOptions.Width = 190
+ AllowRemove = False
+ CaptionOptions.Text = #35746#21333#21495
+ Control = orderNo
+ ControlOptions.OriginalHeight = 27
+ ControlOptions.OriginalWidth = 134
+ ControlOptions.ShowBorder = False
+ Index = 1
+ end
+ object dxLayoutItem_color: TdxLayoutItem
+ SizeOptions.Width = 136
+ CaptionOptions.Text = #39068#33394
+ Control = C_color
+ ControlOptions.OriginalHeight = 19
+ ControlOptions.OriginalWidth = 105
+ ControlOptions.ShowBorder = False
+ Index = -1
+ end
+ object dxLayoutItem_pm: TdxLayoutItem
+ Parent = dxLayoutGroup2
+ SizeOptions.Width = 232
+ CaptionOptions.Text = #20013#25991#21517#31216
+ Control = C_name
+ ControlOptions.OriginalHeight = 27
+ ControlOptions.OriginalWidth = 160
+ ControlOptions.ShowBorder = False
+ Index = 2
+ end
+ object dxLayoutItem_hth: TdxLayoutItem
+ Parent = dxLayoutGroup1
+ SizeOptions.Width = 233
+ CaptionOptions.Text = #21512#21516#21495
+ Control = conNo
+ ControlOptions.OriginalHeight = 27
+ ControlOptions.OriginalWidth = 161
+ ControlOptions.ShowBorder = False
+ Index = 2
+ end
+ object dxLayoutGroup1: TdxLayoutGroup
+ Parent = dxLayoutControl_queryGroup_Root
+ CaptionOptions.Text = #32452'1'
+ Hidden = True
+ LayoutDirection = ldHorizontal
+ ShowBorder = False
+ Index = 0
+ end
+ object dxLayoutGroup2: TdxLayoutGroup
+ Parent = dxLayoutControl_queryGroup_Root
+ CaptionOptions.Text = #32452'2'
+ Hidden = True
+ ItemIndex = 2
+ LayoutDirection = ldHorizontal
+ ShowBorder = False
+ Index = 1
+ end
+ object dxLayoutItem_beg: TdxLayoutItem
+ Parent = dxLayoutGroup1
+ SizeOptions.Width = 227
+ CaptionOptions.Text = #26816#39564#26102#38388
+ Control = begdate
+ ControlOptions.OriginalHeight = 27
+ ControlOptions.OriginalWidth = 155
+ ControlOptions.ShowBorder = False
+ Index = 0
+ end
+ object dxLayoutItem_end: TdxLayoutItem
+ Parent = dxLayoutGroup2
+ AlignVert = avClient
+ SizeOptions.Width = 225
+ CaptionOptions.Text = #33267
+ Control = enddate
+ ControlOptions.OriginalHeight = 29
+ ControlOptions.OriginalWidth = 153
+ ControlOptions.ShowBorder = False
+ Index = 0
+ end
+ object dxLayoutItem1: TdxLayoutItem
+ Parent = dxLayoutGroup2
+ SizeOptions.Width = 192
+ CaptionOptions.Text = #25171#30721#20154
+ Control = Filler
+ ControlOptions.OriginalHeight = 27
+ ControlOptions.OriginalWidth = 136
+ ControlOptions.ShowBorder = False
+ Index = 1
+ end
+ end
+ inherited cxProgressBar2: TcxProgressBar
+ Left = 291
+ Top = 136
+ ExplicitLeft = 291
+ ExplicitTop = 136
+ ExplicitHeight = 29
+ end
+ inherited ADOQueryBaseCmd: TADOQuery
+ Connection = DataLink_TradeInsp.ADOLink
+ Top = 232
+ end
+ inherited ADOQueryBaseTemp: TADOQuery
+ Connection = DataLink_TradeInsp.ADOLink
+ Left = 185
+ Top = 241
+ end
+ object ADOQueryMain: TADOQuery
+ Connection = DataLink_TradeInsp.ADOLink
+ LockType = ltReadOnly
+ CommandTimeout = 60
+ Parameters = <>
+ Left = 584
+ Top = 224
+ end
+ object DataSource1: TDataSource
+ DataSet = ADOQueryMain
+ Left = 632
+ Top = 152
+ end
+ object cxGridPopupMenu1: TcxGridPopupMenu
+ Grid = cxGrid1
+ PopupMenus = <>
+ Left = 552
+ Top = 160
+ end
+ object frxReport1: TfrxReport
+ Tag = 21650
+ Version = '6.9.12'
+ DataSet = frxDB_1
+ DataSetName = 'frxDBDataset1'
+ DotMatrixReport = False
+ IniFile = '\Software\Fast Reports'
+ PreviewOptions.Buttons = [pbPrint, pbLoad, pbSave, pbExport, pbZoom, pbFind, pbOutline, pbPageSetup, pbTools, pbEdit, pbNavigator, pbExportQuick, pbCopy, pbSelection]
+ PreviewOptions.Zoom = 1.000000000000000000
+ PrintOptions.Printer = 'Default'
+ PrintOptions.PrintOnSheet = 0
+ ReportOptions.CreateDate = 45471.415863680600000000
+ ReportOptions.LastChange = 45471.637332314800000000
+ ScriptLanguage = 'PascalScript'
+ ScriptText.Strings = (
+ ''
+ 'begin'
+ ''
+ 'end.')
+ OnReportPrint = 'frxReportAbstractOnReportPrint'
+ Left = 704
+ Top = 128
+ Datasets = <
+ item
+ DataSet = frxDB_1
+ DataSetName = 'frxDBDataset1'
+ end>
+ Variables = <>
+ Style = <>
+ object Data: TfrxDataPage
+ Height = 1000.000000000000000000
+ Width = 1000.000000000000000000
+ end
+ object Page1: TfrxReportPage
+ PaperWidth = 70.000000000000000000
+ PaperHeight = 50.000000000000000000
+ PaperSize = 256
+ Frame.Typ = []
+ MirrorMode = [mcmBTTContent]
+ object TableObject1: TfrxTableObject
+ AllowVectorExport = True
+ Left = 10.255639090000000000
+ Top = 2.526315790000000000
+ object TableColumn1: TfrxTableColumn
+ Width = 81.229697744360900000
+ MaxWidth = 75.590600000000000000
+ end
+ object TableColumn2: TfrxTableColumn
+ Width = 154.229697744361000000
+ MaxWidth = 75.590600000000000000
+ end
+ object TableRow1: TfrxTableRow
+ Height = 34.085619924812000000
+ object TableCell1: TfrxTableCell
+ AllowVectorExport = True
+ Restrictions = [rfDontDelete]
+ Frame.Typ = [ftLeft, ftRight, ftTop, ftBottom]
+ object Memo1: TfrxMemoView
+ AllowVectorExport = True
+ Left = 8.761904770000000000
+ Top = 4.461152880000000000
+ Width = 57.000000000000000000
+ Height = 27.000000000000000000
+ Font.Charset = DEFAULT_CHARSET
+ Font.Color = clBlack
+ Font.Height = -13
+ Font.Name = 'Arial'
+ Font.Style = [fsBold]
+ Frame.Typ = []
+ Memo.UTF8W = (
+ 'wwww')
+ ParentFont = False
+ end
+ end
+ object TableCell2: TfrxTableCell
+ AllowVectorExport = True
+ Restrictions = [rfDontDelete]
+ Frame.Typ = [ftLeft, ftRight, ftTop, ftBottom]
+ object Memo3: TfrxMemoView
+ AllowVectorExport = True
+ Left = 11.018422570000000000
+ Top = 3.754385970000000000
+ Width = 49.604010030000000000
+ Height = 18.162907270000000000
+ Frame.Typ = []
+ Memo.UTF8W = (
+ 'wweee')
+ end
+ end
+ end
+ object TableRow2: TfrxTableRow
+ Height = 28.055544736842100000
+ object TableCell6: TfrxTableCell
+ AllowVectorExport = True
+ Restrictions = [rfDontDelete]
+ Font.Charset = DEFAULT_CHARSET
+ Font.Color = clBlack
+ Font.Height = -13
+ Font.Name = 'Arial'
+ Font.Style = []
+ Frame.Typ = [ftLeft, ftRight, ftTop, ftBottom]
+ ParentFont = False
+ ColSpan = 2
+ object Memo2: TfrxMemoView
+ AllowVectorExport = True
+ Left = 2.714207400000000000
+ Top = 5.039066800000000000
+ Width = 152.498433580000000000
+ Height = 15.364583330000000000
+ Font.Charset = DEFAULT_CHARSET
+ Font.Color = clBlack
+ Font.Height = -12
+ Font.Name = 'Arial'
+ Font.Style = []
+ Frame.Typ = []
+ Memo.UTF8W = (
+ '[frxDBDataset1."C_Name"]')
+ ParentFont = False
+ end
+ end
+ object TableCell7: TfrxTableCell
+ AllowVectorExport = True
+ Restrictions = [rfDontDelete]
+ Font.Charset = DEFAULT_CHARSET
+ Font.Color = clBlack
+ Font.Height = -13
+ Font.Name = 'Arial'
+ Font.Style = []
+ Frame.Typ = [ftLeft, ftRight, ftTop, ftBottom]
+ ParentFont = False
+ end
+ end
+ object TableRow3: TfrxTableRow
+ Height = 34.085619924812000000
+ object TableCell11: TfrxTableCell
+ AllowVectorExport = True
+ Restrictions = [rfDontDelete]
+ Font.Charset = DEFAULT_CHARSET
+ Font.Color = clBlack
+ Font.Height = -13
+ Font.Name = 'Arial'
+ Font.Style = []
+ Frame.Typ = [ftLeft, ftRight, ftTop, ftBottom]
+ ParentFont = False
+ end
+ object TableCell12: TfrxTableCell
+ AllowVectorExport = True
+ Restrictions = [rfDontDelete]
+ Font.Charset = DEFAULT_CHARSET
+ Font.Color = clBlack
+ Font.Height = -13
+ Font.Name = 'Arial'
+ Font.Style = []
+ Frame.Typ = [ftLeft, ftRight, ftTop, ftBottom]
+ ParentFont = False
+ end
+ end
+ object TableRow4: TfrxTableRow
+ Height = 34.085619924812000000
+ object TableCell16: TfrxTableCell
+ AllowVectorExport = True
+ Restrictions = [rfDontDelete]
+ Frame.Typ = [ftLeft, ftRight, ftTop, ftBottom]
+ RowSpan = 2
+ object Barcode2D1: TfrxBarcode2DView
+ AllowVectorExport = True
+ Left = 23.275689220000000000
+ Top = 11.317075065563900000
+ Width = 84.000000000000000000
+ Height = 84.000000000000000000
+ StretchMode = smActualHeight
+ Expression = '123'
+ BarType = bcCodeQR
+ BarProperties.Encoding = qrAuto
+ BarProperties.QuietZone = 0
+ BarProperties.ErrorLevels = ecL
+ BarProperties.PixelSize = 4
+ BarProperties.CodePage = 0
+ Frame.Typ = []
+ Rotation = 0
+ ShowText = False
+ HexData = '31003200330034003500360037003800'
+ Zoom = 0.500000000000000000
+ FontScaled = True
+ QuietZone = 0
+ ColorBar = clBlack
+ end
+ end
+ object TableCell17: TfrxTableCell
+ AllowVectorExport = True
+ Restrictions = [rfDontDelete]
+ Frame.Typ = [ftLeft, ftRight, ftTop, ftBottom]
+ end
+ end
+ object TableRow5: TfrxTableRow
+ Height = 34.085619924812000000
+ object TableCell21: TfrxTableCell
+ AllowVectorExport = True
+ Restrictions = [rfDontDelete]
+ Frame.Typ = [ftLeft, ftRight, ftTop, ftBottom]
+ end
+ object TableCell22: TfrxTableCell
+ AllowVectorExport = True
+ Restrictions = [rfDontDelete]
+ Frame.Typ = [ftLeft, ftRight, ftTop, ftBottom]
+ end
+ end
+ end
+ end
+ end
+ object frxDB_1: TfrxDBDataset
+ UserName = 'frxDBDataset1'
+ CloseDataSource = False
+ DataSet = ADOQueryMain
+ BCDToCurrency = False
+ Left = 744
+ Top = 168
+ end
+ object frxBarCodeObject1: TfrxBarCodeObject
+ Left = 768
+ Top = 224
+ end
+ object frxRichObject1: TfrxRichObject
+ Left = 768
+ Top = 304
+ end
+ object frxReportTableObject1: TfrxReportTableObject
+ Left = 584
+ Top = 328
+ end
+ object frxPDFExport1: TfrxPDFExport
+ UseFileCache = True
+ ShowProgress = True
+ OverwritePrompt = False
+ DataOnly = False
+ InteractiveFormsFontSubset = 'A-Z,a-z,0-9,#43-#47 '
+ OpenAfterExport = False
+ PrintOptimized = False
+ Outline = False
+ Background = False
+ HTMLTags = True
+ Quality = 95
+ Transparency = False
+ Author = 'FastReport'
+ Subject = 'FastReport PDF export'
+ ProtectionFlags = [ePrint, eModify, eCopy, eAnnot]
+ HideToolbar = False
+ HideMenubar = False
+ HideWindowUI = False
+ FitWindow = False
+ CenterWindow = False
+ PrintScaling = False
+ PdfA = False
+ PDFStandard = psNone
+ PDFVersion = pv17
+ Left = 544
+ Top = 81
+ end
+end
diff --git a/项目代码/wenshangkm/G03贸易布匹检验/U_DjdDjClListJT.pas b/项目代码/wenshangkm/G03贸易布匹检验/U_DjdDjClListJT.pas
new file mode 100644
index 0000000..fb82237
--- /dev/null
+++ b/项目代码/wenshangkm/G03贸易布匹检验/U_DjdDjClListJT.pas
@@ -0,0 +1,174 @@
+unit U_DjdDjClListJT;
+
+interface
+
+uses
+ Winapi.Windows, Winapi.Messages, System.SysUtils, System.Variants, System.Classes, Vcl.Graphics,
+ Vcl.Controls, Vcl.Forms, Vcl.Dialogs, cxGraphics, cxControls, cxLookAndFeels,
+ cxLookAndFeelPainters, cxStyles, cxCustomData,
+ cxFilter, cxData, cxDataStorage, cxEdit, cxNavigator, dxDateRanges,
+ dxScrollbarAnnotations, Data.DB, cxDBData, cxGridLevel, cxGridCustomTableView,
+ cxGridTableView, cxGridDBTableView, cxClasses, cxGridCustomView, cxGrid,
+ Vcl.StdCtrls, Vcl.ComCtrls, Vcl.ExtCtrls, Vcl.ToolWin,U_BaseList,
+ Data.Win.ADODB, Data.FMTBcd, dxBarBuiltInMenu, cxGridCustomPopupMenu,
+ cxGridPopupMenu, Data.SqlExpr, cxContainer, dxCore, cxDateUtils, cxTextEdit,
+ cxMaskEdit, cxDropDownEdit, cxCalendar, dxLayoutcxEditAdapters,
+ dxLayoutContainer, dxLayoutControl, frxRich, frxBarcode, frxClass, frxDBSet, frxTableObject, frxExportBaseDialog, frxExportPDF,
+ cxProgressBar;
+
+type
+ TfrmDjdDjClListJT = class(TfrmBaseList)
+ toolbar1: TToolBar;
+ TBRafresh: TToolButton;
+ TBFind: TToolButton;
+ TBExport: TToolButton;
+ Tbcgs: TToolButton;
+ TBClose: TToolButton;
+ Filler: TcxTextEdit;
+ cxGrid1: TcxGrid;
+ TV1: TcxGridDBTableView;
+ cxGridDBColumn3: TcxGridDBColumn;
+ cxGridDBColumn4: TcxGridDBColumn;
+ TV1Column1: TcxGridDBColumn;
+ cxGridDBColumn7: TcxGridDBColumn;
+ cxGridDBColumn8: TcxGridDBColumn;
+ cxGridDBColumn9: TcxGridDBColumn;
+ cxGridDBColumn10: TcxGridDBColumn;
+ cxGridDBColumn11: TcxGridDBColumn;
+ cxGridDBColumn12: TcxGridDBColumn;
+ cxGridLevel1: TcxGridLevel;
+ ADOQueryMain: TADOQuery;
+ DataSource1: TDataSource;
+ cxGridPopupMenu1: TcxGridPopupMenu;
+ begdate: TcxDateEdit;
+ enddate: TcxDateEdit;
+ TV1ConNo: TcxGridDBColumn;
+ dxLayoutControl_query: TdxLayoutControl;
+ C_name: TcxTextEdit;
+ orderNo: TcxTextEdit;
+ C_color: TcxTextEdit;
+ conNo: TcxTextEdit;
+ dxLayoutControl_queryGroup_Root: TdxLayoutGroup;
+ dxLayoutItem2: TdxLayoutItem;
+ dxLayoutItem_color: TdxLayoutItem;
+ dxLayoutItem_pm: TdxLayoutItem;
+ dxLayoutItem_hth: TdxLayoutItem;
+ dxLayoutGroup1: TdxLayoutGroup;
+ dxLayoutGroup2: TdxLayoutGroup;
+ dxLayoutItem_beg: TdxLayoutItem;
+ dxLayoutItem_end: TdxLayoutItem;
+ dxLayoutItem1: TdxLayoutItem;
+ frxReport1: TfrxReport;
+ frxDB_1: TfrxDBDataset;
+ frxBarCodeObject1: TfrxBarCodeObject;
+ frxRichObject1: TfrxRichObject;
+ frxReportTableObject1: TfrxReportTableObject;
+ frxPDFExport1: TfrxPDFExport;
+ TV1CustName: TcxGridDBColumn;
+ TV1operators: TcxGridDBColumn;
+ TV1Column2: TcxGridDBColumn;
+ TV1Column3: TcxGridDBColumn;
+ procedure FormCreate(Sender: TObject);
+ procedure TBRafreshClick(Sender: TObject);
+ procedure FormShow(Sender: TObject);
+ procedure TBExportClick(Sender: TObject);
+ procedure TBCloseClick(Sender: TObject);
+ procedure FormClose(Sender: TObject; var Action: TCloseAction);
+ procedure TBFindClick(Sender: TObject);
+ procedure TbcgsClick(Sender: TObject);
+ private
+ procedure InitGrid();
+ public
+ { Public declarations }
+ end;
+
+var
+ frmDjdDjClListJT: TfrmDjdDjClListJT;
+
+implementation
+uses
+ U_RTFun,U_DataLink,U_globalVar,U_FormLayOutDesign;
+{$R *.dfm}
+
+procedure TfrmDjdDjClListJT.FormClose(Sender: TObject; var Action: TCloseAction);
+begin
+ inherited;
+ Action := caFree;
+end;
+
+procedure TfrmDjdDjClListJT.FormCreate(Sender: TObject);
+begin
+ inherited ;
+ cxGrid1.Align:=alClient;
+ BegDate.Date:=SGetServerDateTime(ADOQueryBaseTemp);
+ EndDate.Date:=SGetServerDateTime(ADOQueryBaseTemp)
+end;
+
+procedure TfrmDjdDjClListJT.FormShow(Sender: TObject);
+begin
+ inherited;
+ TBRafresh.Click;
+ ReadCxGrid(Trim(self.Caption) + 'Tv1', Tv1, gDllFileCaption);
+end;
+
+procedure TfrmDjdDjClListJT.InitGrid();
+begin
+try
+ ADOQueryMain.DisableControls;
+ with ADOQueryMain do
+ begin
+ Close;
+ sql.Clear;
+ Filtered:=False;
+ sql.Add('exec p_select_djcl_list');
+ sql.Add('@begdate='+ quotedstr(FormatDateTime('yyyy-MM-dd', BegDate.Date)));
+ sql.Add(',@enddate='+ quotedstr(FormatDateTime('yyyy-MM-dd', endDate.Date+1)));
+ sql.Add(',@djMan='+ quotedstr(gUserName));
+ sql.Add(',@cltype='+ quotedstr(''));
+ Open;
+ end;
+
+ finally
+ ADOQueryMain.EnableControls;
+ end
+end;
+
+procedure TfrmDjdDjClListJT.TbcgsClick(Sender: TObject);
+begin
+ inherited;
+ WriteCxGrid(Trim(self.Caption) + 'Tv1', Tv1, gDllFileCaption);
+ if gIsCanDesign then
+ begin
+ saveLayOut(application, dxLayoutControl_query, ADOQueryBaseCmd, PWideChar( fDllFileName + '|' + Self.Name + '|' + dxLayoutControl_query.Name + '.ini'));
+ end;
+end;
+
+procedure TfrmDjdDjClListJT.TBCloseClick(Sender: TObject);
+begin
+ inherited;
+ close;
+end;
+
+procedure TfrmDjdDjClListJT.TBExportClick(Sender: TObject);
+begin
+ inherited;
+ if ADOQueryMain.IsEmpty then exit;
+ TcxGridToExcel(self.Caption,cxGrid1);
+end;
+
+procedure TfrmDjdDjClListJT.TBFindClick(Sender: TObject);
+begin
+ inherited;
+ if ADOQueryMain.Active then
+ begin
+ SDofilter(ADOQueryMain,SLGetFilters(dxLayoutControl_query,1,2));
+ end;
+end;
+
+procedure TfrmDjdDjClListJT.TBRafreshClick(Sender: TObject);
+begin
+ inherited;
+ InitGrid();
+end;
+
+end.
diff --git a/项目代码/wenshangkm/G03贸易布匹检验/U_GetDllForm.pas b/项目代码/wenshangkm/G03贸易布匹检验/U_GetDllForm.pas
index 1d36474..ac1e743 100644
--- a/项目代码/wenshangkm/G03贸易布匹检验/U_GetDllForm.pas
+++ b/项目代码/wenshangkm/G03贸易布匹检验/U_GetDllForm.pas
@@ -17,7 +17,7 @@ implementation
uses
U_DataLink, U_globalVar, U_iniParam, U_TradeMachInsp, U_ProductJYHZList,
U_DeviceJkTest, U_TradeClothInspList, U_MachRollMain, U_TradePack,
- U_DjdDjClList, U_FormLayOutDesign;
+ U_DjdDjClList, U_FormLayOutDesign, U_DjdDjClListJT;
/////////////////////////////////////////////////////////////////
// ˵:ȡDllеô //
@@ -76,11 +76,11 @@ begin
if trim(DataBaseStr) = '' then
begin
- server := '101.132.143.144,7781';
+ server := '139.129.50.31,7781';
// server:='.';
- dtbase := 'RTBasicsData';
- user := 'rtsa';
- pswd := 'rightsoft@5740';
+ dtbase := 'kaimengjydata';
+ user := 'kaimengsa';
+ pswd := 'rightsoft@5078';
DConString := 'Provider=SQLOLEDB.1;Password=' + pswd + ';Persist Security Info=True;User ID=' + user + ';Initial Catalog=' + dtbase + ';Data Source=' + server;
// DParameters1:='Ȩ';
end
@@ -163,17 +163,6 @@ begin
mnewHandle := Handle;
end;
end;
-// 111: //̨
-// begin
-// form2:=tform2.create(Application.MainForm) ;
-// with form2 do
-// begin
-// WindowState := mstate;
-// BorderStyle := mborderstyle;
-// mnewHandle := Handle;
-// // show;
-// end;
-// end;
1: //̨
begin
with TfrmMachRollMain.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10)) do //
@@ -228,6 +217,17 @@ begin
mnewHandle := Handle;
end;
end;
+ 214: //ʹ ̨
+ begin
+ with TfrmDjdDjClListJT.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10), FormID) do //
+ begin
+ fFormID := FormID;
+ // FormStyle := mstyle;
+ WindowState := mstate;
+ BorderStyle := mborderstyle;
+ mnewHandle := Handle;
+ end;
+ end;
10000:
begin
for i := 0 to application.MainForm.MDIChildCount - 1 do
diff --git a/项目代码/wenshangkm/G03贸易布匹检验/U_KeyBoard.dfm b/项目代码/wenshangkm/G03贸易布匹检验/U_KeyBoard.dfm
index 9d301c9..d6e52fc 100644
--- a/项目代码/wenshangkm/G03贸易布匹检验/U_KeyBoard.dfm
+++ b/项目代码/wenshangkm/G03贸易布匹检验/U_KeyBoard.dfm
@@ -18,7 +18,6 @@ object FrameKeyBoard: TFrameKeyBoard
Align = alClient
Frame.Visible = False
TabOrder = 0
- ExplicitHeight = 192
object SpeedButton1: TSpeedButton
Left = 1
Top = 2
@@ -231,5 +230,18 @@ object FrameKeyBoard: TFrameKeyBoard
Font.Style = [fsBold]
ParentFont = False
end
+ object SpeedButton11: TSpeedButton
+ Left = 63
+ Top = 186
+ Width = 60
+ Height = 44
+ Caption = 'S'
+ Font.Charset = GB2312_CHARSET
+ Font.Color = clWindowText
+ Font.Height = -20
+ Font.Name = #24494#36719#38597#40657
+ Font.Style = [fsBold]
+ ParentFont = False
+ end
end
end
diff --git a/项目代码/wenshangkm/G03贸易布匹检验/U_KeyBoard.pas b/项目代码/wenshangkm/G03贸易布匹检验/U_KeyBoard.pas
index d679b07..ac3b3f4 100644
--- a/项目代码/wenshangkm/G03贸易布匹检验/U_KeyBoard.pas
+++ b/项目代码/wenshangkm/G03贸易布匹检验/U_KeyBoard.pas
@@ -28,6 +28,7 @@ type
SpeedButton_zdykey2: TSpeedButton;
SpeedButton_zdykey1: TSpeedButton;
SpeedButton10: TSpeedButton;
+ SpeedButton11: TSpeedButton;
private
{ Private declarations }
public
diff --git a/项目代码/wenshangkm/G03贸易布匹检验/U_MachRollMain.dfm b/项目代码/wenshangkm/G03贸易布匹检验/U_MachRollMain.dfm
index 209a07e..09673db 100644
--- a/项目代码/wenshangkm/G03贸易布匹检验/U_MachRollMain.dfm
+++ b/项目代码/wenshangkm/G03贸易布匹检验/U_MachRollMain.dfm
@@ -1,14 +1,15 @@
inherited frmMachRollMain: TfrmMachRollMain
Caption = #26426#21488#26816#39564
ClientHeight = 736
- ClientWidth = 1112
+ ClientWidth = 1169
Color = clBtnFace
DoubleBuffered = True
Font.Charset = ANSI_CHARSET
Font.Height = -16
FormStyle = fsMDIChild
Visible = True
- ExplicitWidth = 1128
+ ExplicitTop = -100
+ ExplicitWidth = 1185
ExplicitHeight = 775
PixelsPerInch = 96
TextHeight = 21
@@ -142,13 +143,13 @@ inherited frmMachRollMain: TfrmMachRollMain
TabOrder = 19
OnClick = edtScanEnter
OnKeyPress = InputLenKeyPress
- Height = 38
+ Height = 105
Width = 133
end
object BTPrint: TButton
Left = 259
- Top = 283
- Width = 140
+ Top = 350
+ Width = 451
Height = 59
Caption = #25552' '#20132
Font.Charset = GB2312_CHARSET
@@ -157,7 +158,7 @@ inherited frmMachRollMain: TfrmMachRollMain
Font.Name = #24494#36719#38597#40657
Font.Style = [fsBold]
ParentFont = False
- TabOrder = 23
+ TabOrder = 25
OnClick = BTPrintClick
end
object Button_bad: TButton
@@ -233,7 +234,7 @@ inherited frmMachRollMain: TfrmMachRollMain
object Tare: TcxTextEdit
Tag = 999
Left = 158
- Top = 283
+ Top = 350
AutoSize = False
ParentFont = False
Properties.OnChange = InputLenPropertiesChange
@@ -245,7 +246,7 @@ inherited frmMachRollMain: TfrmMachRollMain
Style.HotTrack = False
Style.TransparentBorder = False
Style.IsFontAssigned = True
- TabOrder = 22
+ TabOrder = 24
OnClick = edtScanEnter
OnKeyPress = InputLenKeyPress
Height = 59
@@ -254,7 +255,7 @@ inherited frmMachRollMain: TfrmMachRollMain
object Coefficient: TcxTextEdit
Tag = 999
Left = 78
- Top = 351
+ Top = 418
AutoSize = False
ParentFont = False
Properties.ReadOnly = False
@@ -266,7 +267,7 @@ inherited frmMachRollMain: TfrmMachRollMain
Style.HotTrack = False
Style.TransparentBorder = False
Style.IsFontAssigned = True
- TabOrder = 24
+ TabOrder = 26
OnClick = edtScanEnter
OnKeyPress = InputLenKeyPress
Height = 37
@@ -275,7 +276,7 @@ inherited frmMachRollMain: TfrmMachRollMain
object InputWeight: TcxTextEdit
Tag = 999
Left = 78
- Top = 283
+ Top = 350
AutoSize = False
ParentFont = False
Properties.OnChange = InputLenPropertiesChange
@@ -287,7 +288,7 @@ inherited frmMachRollMain: TfrmMachRollMain
Style.HotTrack = False
Style.TransparentBorder = False
Style.IsFontAssigned = True
- TabOrder = 21
+ TabOrder = 23
OnClick = edtScanEnter
OnKeyPress = InputLenKeyPress
Height = 59
@@ -322,8 +323,8 @@ inherited frmMachRollMain: TfrmMachRollMain
end
object OutPutWeight: TcxTextEdit
Tag = 999
- Left = 10000
- Top = 10000
+ Left = 6454
+ Top = 9915
AutoSize = False
ParentFont = False
Style.Font.Charset = ANSI_CHARSET
@@ -334,7 +335,7 @@ inherited frmMachRollMain: TfrmMachRollMain
Style.HotTrack = False
Style.TransparentBorder = False
Style.IsFontAssigned = True
- TabOrder = 29
+ TabOrder = 37
Visible = False
OnClick = edtScanEnter
OnKeyPress = InputLenKeyPress
@@ -362,7 +363,7 @@ inherited frmMachRollMain: TfrmMachRollMain
end
object AOrdDefNote1: TcxRichEdit
Left = 0
- Top = 405
+ Top = 472
ParentFont = False
Properties.ReadOnly = True
Properties.ScrollBars = ssBoth
@@ -374,13 +375,13 @@ inherited frmMachRollMain: TfrmMachRollMain
Style.HotTrack = False
Style.TransparentBorder = False
Style.IsFontAssigned = True
- TabOrder = 27
+ TabOrder = 35
Height = 238
Width = 181
end
object cxDBImage1: TcxDBImage
- Left = 10000
- Top = 10000
+ Left = 6454
+ Top = 9915
Hint = 'FileName'
DataBinding.DataField = 'FilesOther'
DataBinding.DataSource = DS_IMAGE
@@ -390,20 +391,24 @@ inherited frmMachRollMain: TfrmMachRollMain
Properties.ShowFocusRect = False
Style.HotTrack = False
Style.TransparentBorder = False
- TabOrder = 30
+ TabOrder = 38
Visible = False
Height = 122
Width = 280
end
object grade: TcxComboBox
- Left = 304
+ Left = 647
Top = 236
AutoSize = False
ParentFont = False
Properties.DropDownListStyle = lsEditFixedList
Properties.Items.Strings = (
- #27491#21697
- #27425#21697)
+ 'A'
+ 'B'
+ 'C'
+ 'D'
+ 'D/C')
+ Properties.OnEditValueChanged = gradePropertiesEditValueChanged
Style.Font.Charset = ANSI_CHARSET
Style.Font.Color = clWindowText
Style.Font.Height = -16
@@ -412,11 +417,10 @@ inherited frmMachRollMain: TfrmMachRollMain
Style.HotTrack = False
Style.TransparentBorder = False
Style.IsFontAssigned = True
- TabOrder = 20
- Text = #27491#21697
- OnKeyPress = InputLenKeyPress
- Height = 38
- Width = 95
+ TabOrder = 21
+ Text = 'A'
+ Height = 65
+ Width = 63
end
object btnUnRk: TButton
Left = 414
@@ -451,7 +455,7 @@ inherited frmMachRollMain: TfrmMachRollMain
object lblRuleConversion: TcxComboBox
Tag = 2
Left = 140
- Top = 351
+ Top = 418
AutoSize = False
ParentFont = False
Properties.DropDownListStyle = lsEditFixedList
@@ -473,7 +477,7 @@ inherited frmMachRollMain: TfrmMachRollMain
StyleDisabled.LookAndFeel.SkinName = 'WXI'
StyleFocused.LookAndFeel.SkinName = 'WXI'
StyleHot.LookAndFeel.SkinName = 'WXI'
- TabOrder = 25
+ TabOrder = 27
Text = #26080#38656#36716#25442
Height = 37
Width = 102
@@ -481,7 +485,7 @@ inherited frmMachRollMain: TfrmMachRollMain
object packnote: TcxMemo
Tag = 999
Left = 190
- Top = 405
+ Top = 472
ParentFont = False
Properties.ReadOnly = True
Properties.ScrollBars = ssVertical
@@ -493,7 +497,7 @@ inherited frmMachRollMain: TfrmMachRollMain
Style.HotTrack = False
Style.TransparentBorder = False
Style.IsFontAssigned = True
- TabOrder = 28
+ TabOrder = 36
Height = 241
Width = 199
end
@@ -526,18 +530,18 @@ inherited frmMachRollMain: TfrmMachRollMain
Width = 149
end
object C_Pattern: TcxTextEdit
- Left = 10000
- Top = 10000
+ Left = 6454
+ Top = 9915
Properties.ReadOnly = True
Style.HotTrack = False
Style.TransparentBorder = False
- TabOrder = 34
+ TabOrder = 42
Visible = False
Width = 124
end
object RuleYardstick: TcxTextEdit
- Left = 10000
- Top = 10000
+ Left = 6454
+ Top = 9915
AutoSize = False
ParentFont = False
Properties.ReadOnly = True
@@ -549,7 +553,7 @@ inherited frmMachRollMain: TfrmMachRollMain
Style.HotTrack = False
Style.TransparentBorder = False
Style.IsFontAssigned = True
- TabOrder = 35
+ TabOrder = 43
Text = '100'
Visible = False
OnClick = edtScanEnter
@@ -558,20 +562,20 @@ inherited frmMachRollMain: TfrmMachRollMain
Width = 69
end
object C_StyleNo: TcxTextEdit
- Left = 10000
- Top = 10000
+ Left = 6454
+ Top = 9915
ParentFont = False
Properties.ReadOnly = True
Style.HotTrack = False
Style.TransparentBorder = False
- TabOrder = 36
+ TabOrder = 44
Visible = False
Width = 168
end
object packPostBtn: TButton
- Left = 251
- Top = 351
- Width = 148
+ Left = 460
+ Top = 418
+ Width = 250
Height = 37
Caption = #25171#21253#25552#20132
Font.Charset = GB2312_CHARSET
@@ -580,72 +584,72 @@ inherited frmMachRollMain: TfrmMachRollMain
Font.Name = #24494#36719#38597#40657
Font.Style = [fsBold]
ParentFont = False
- TabOrder = 26
+ TabOrder = 30
OnClick = packPostBtnClick
end
object customStrField1: TcxTextEdit
- Left = 10000
- Top = 10000
+ Left = 6454
+ Top = 9915
Style.HotTrack = False
Style.TransparentBorder = False
- TabOrder = 37
+ TabOrder = 45
Visible = False
OnClick = edtScanEnter
Width = 121
end
object customStrField2: TcxTextEdit
- Left = 10000
- Top = 10000
+ Left = 6454
+ Top = 9915
Style.HotTrack = False
Style.TransparentBorder = False
- TabOrder = 38
+ TabOrder = 46
Visible = False
OnClick = edtScanEnter
Width = 121
end
object C_Width: TcxTextEdit
- Left = 10000
- Top = 10000
+ Left = 9452
+ Top = 9976
Style.HotTrack = False
Style.TransparentBorder = False
- TabOrder = 39
+ TabOrder = 47
Visible = False
OnClick = edtScanEnter
Width = 121
end
object C_GramWeight: TcxTextEdit
- Left = 10000
- Top = 10000
+ Left = 9452
+ Top = 9976
Style.HotTrack = False
Style.TransparentBorder = False
- TabOrder = 40
+ TabOrder = 48
Visible = False
OnClick = edtScanEnter
Width = 121
end
object addLen: TcxTextEdit
- Left = 10000
- Top = 10000
+ Left = 8854
+ Top = 9976
Style.HotTrack = False
Style.TransparentBorder = False
- TabOrder = 41
+ TabOrder = 49
Visible = False
OnClick = edtScanEnter
Width = 121
end
object addWet: TcxTextEdit
- Left = 10000
- Top = 10000
+ Left = 6454
+ Top = 9915
Style.HotTrack = False
Style.TransparentBorder = False
- TabOrder = 42
+ TabOrder = 50
Visible = False
OnClick = edtScanEnter
Width = 121
end
object bt_printmd: TButton
- Left = 10000
- Top = 10000
+ Left = 6454
+ Top = 9915
Width = 48
Height = 33
Caption = #30721#21333
@@ -655,74 +659,74 @@ inherited frmMachRollMain: TfrmMachRollMain
Font.Name = #24494#36719#38597#40657
Font.Style = [fsBold]
ParentFont = False
- TabOrder = 43
+ TabOrder = 51
Visible = False
OnClick = bt_printmdClick
end
object presentLen: TcxTextEdit
- Left = 10000
- Top = 10000
+ Left = 6454
+ Top = 9915
Style.HotTrack = False
Style.TransparentBorder = False
- TabOrder = 44
+ TabOrder = 52
Visible = False
OnClick = edtScanEnter
Width = 121
end
object presentWeight: TcxTextEdit
- Left = 10000
- Top = 10000
+ Left = 6454
+ Top = 9915
Style.HotTrack = False
Style.TransparentBorder = False
- TabOrder = 45
+ TabOrder = 53
Visible = False
OnClick = edtScanEnter
Width = 121
end
object unitPieces: TcxTextEdit
- Left = 10000
- Top = 10000
+ Left = 6454
+ Top = 9915
Style.HotTrack = False
Style.TransparentBorder = False
- TabOrder = 46
+ TabOrder = 54
Visible = False
OnClick = edtScanEnter
Width = 121
end
object custName: TcxTextEdit
- Left = 10000
- Top = 10000
+ Left = 6454
+ Top = 9915
Properties.ReadOnly = True
Style.HotTrack = False
Style.TransparentBorder = False
- TabOrder = 47
+ TabOrder = 55
Visible = False
Width = 164
end
object customStrField3: TcxComboBox
- Left = 10000
- Top = 10000
+ Left = 6454
+ Top = 9915
Style.HotTrack = False
Style.TransparentBorder = False
- TabOrder = 48
+ TabOrder = 56
Visible = False
OnClick = edtScanEnter
Width = 145
end
object c_ecolor: TcxTextEdit
- Left = 10000
- Top = 10000
+ Left = 6454
+ Top = 9915
Properties.ReadOnly = True
Style.HotTrack = False
Style.TransparentBorder = False
- TabOrder = 49
+ TabOrder = 57
Visible = False
Width = 164
end
object edit_roll_auto: TcxTextEdit
Tag = 999
- Left = 10000
- Top = 10000
+ Left = 6454
+ Top = 9915
AutoSize = False
ParentFont = False
Properties.ReadOnly = True
@@ -734,15 +738,15 @@ inherited frmMachRollMain: TfrmMachRollMain
Style.HotTrack = False
Style.TransparentBorder = False
Style.IsFontAssigned = True
- TabOrder = 50
+ TabOrder = 58
Visible = False
OnClick = edit_roll_autoClick
Height = 31
Width = 20
end
object customStrField4: TcxButtonEdit
- Left = 10000
- Top = 10000
+ Left = 6454
+ Top = 9915
Hint = 'customStrField4/'#33258#23450#20041'4'
Properties.Buttons = <
item
@@ -751,15 +755,15 @@ inherited frmMachRollMain: TfrmMachRollMain
end>
Style.HotTrack = False
Style.TransparentBorder = False
- TabOrder = 55
+ TabOrder = 63
Visible = False
OnClick = edtScanEnter
OnDblClick = customStrField5DblClick
Width = 121
end
object customStrField8: TcxButtonEdit
- Left = 10000
- Top = 10000
+ Left = 6454
+ Top = 9915
Hint = 'customStrField8/'#33258#23450#20041'8'
Properties.Buttons = <
item
@@ -768,15 +772,15 @@ inherited frmMachRollMain: TfrmMachRollMain
end>
Style.HotTrack = False
Style.TransparentBorder = False
- TabOrder = 54
+ TabOrder = 62
Visible = False
OnClick = edtScanEnter
OnDblClick = customStrField5DblClick
Width = 121
end
object customStrField7: TcxButtonEdit
- Left = 10000
- Top = 10000
+ Left = 6454
+ Top = 9915
Hint = 'customStrField7/'#33258#23450#20041'7'
Properties.Buttons = <
item
@@ -785,15 +789,15 @@ inherited frmMachRollMain: TfrmMachRollMain
end>
Style.HotTrack = False
Style.TransparentBorder = False
- TabOrder = 53
+ TabOrder = 61
Visible = False
OnClick = edtScanEnter
OnDblClick = customStrField5DblClick
Width = 121
end
object customStrField6: TcxButtonEdit
- Left = 10000
- Top = 10000
+ Left = 6454
+ Top = 9915
Hint = 'customStrField6/'#33258#23450#20041'6'
Properties.Buttons = <
item
@@ -802,15 +806,15 @@ inherited frmMachRollMain: TfrmMachRollMain
end>
Style.HotTrack = False
Style.TransparentBorder = False
- TabOrder = 51
+ TabOrder = 59
Visible = False
OnClick = edtScanEnter
OnDblClick = customStrField5DblClick
Width = 121
end
object customStrField5: TcxButtonEdit
- Left = 10000
- Top = 10000
+ Left = 6454
+ Top = 9915
Hint = 'customStrField5/'#33258#23450#20041'5'
Properties.Buttons = <
item
@@ -820,12 +824,183 @@ inherited frmMachRollMain: TfrmMachRollMain
Properties.OnButtonClick = customStrField5PropertiesButtonClick
Style.HotTrack = False
Style.TransparentBorder = False
- TabOrder = 52
+ TabOrder = 60
Visible = False
OnClick = edtScanEnter
OnDblClick = customStrField5DblClick
Width = 121
end
+ object InspectionType: TcxComboBox
+ Left = 647
+ Top = 310
+ Properties.DropDownRows = 10
+ Properties.Items.Strings = (
+ #26816#39564
+ #20462#24067#21518#26816#39564
+ #20462#33394#21518#26816#39564
+ #25171#21367#21518#26816#39564
+ #36820#20462#21518#22797#39564
+ #20462#24067#21518#22797#39564
+ #20462#33394#21518#22797#39564
+ #20108#27425#22797#39564
+ #25171#21367)
+ Style.HotTrack = False
+ Style.TransparentBorder = False
+ TabOrder = 22
+ Text = #26816#39564
+ Width = 63
+ end
+ object topLen: TcxTextEdit
+ Left = 9385
+ Top = 9976
+ Style.HotTrack = False
+ Style.TransparentBorder = False
+ TabOrder = 67
+ Visible = False
+ OnClick = edtScanEnter
+ Width = 121
+ end
+ object midLen: TcxTextEdit
+ Left = 9385
+ Top = 9976
+ Style.HotTrack = False
+ Style.TransparentBorder = False
+ TabOrder = 68
+ Visible = False
+ OnClick = edtScanEnter
+ Width = 121
+ end
+ object lastLen: TcxTextEdit
+ Left = 9385
+ Top = 9976
+ AutoSize = False
+ Style.HotTrack = False
+ Style.TransparentBorder = False
+ TabOrder = 69
+ Visible = False
+ OnClick = edtScanEnter
+ Height = 23
+ Width = 121
+ end
+ object Cause: TcxTextEdit
+ Left = 964
+ Top = 236
+ Style.HotTrack = False
+ Style.TransparentBorder = False
+ TabOrder = 34
+ OnClick = edtScanEnter
+ Width = 121
+ end
+ object Radio_banci: TRadioGroup
+ Left = 220
+ Top = 236
+ Width = 73
+ Height = 105
+ Caption = #29677#27425
+ Color = 16505534
+ Items.Strings = (
+ 'A'
+ 'B'
+ 'C')
+ ParentBackground = False
+ ParentColor = False
+ TabOrder = 20
+ end
+ object BanciqtyA: TcxTextEdit
+ Left = 8854
+ Top = 9976
+ AutoSize = False
+ Style.HotTrack = False
+ Style.TransparentBorder = False
+ TabOrder = 66
+ Visible = False
+ OnClick = edtScanEnter
+ Height = 25
+ Width = 121
+ end
+ object BanciqtyC: TcxTextEdit
+ Left = 8854
+ Top = 9976
+ AutoSize = False
+ Style.HotTrack = False
+ Style.TransparentBorder = False
+ TabOrder = 65
+ Visible = False
+ OnClick = edtScanEnter
+ Height = 25
+ Width = 121
+ end
+ object BanciqtyB: TcxTextEdit
+ Left = 8854
+ Top = 9976
+ AutoSize = False
+ Style.HotTrack = False
+ Style.TransparentBorder = False
+ TabOrder = 64
+ Visible = False
+ OnClick = edtScanEnter
+ Height = 25
+ Width = 121
+ end
+ object AFiller: TcxTextEdit
+ Left = 797
+ Top = 236
+ Style.HotTrack = False
+ Style.TransparentBorder = False
+ TabOrder = 31
+ OnClick = edtScanEnter
+ Width = 121
+ end
+ object BFiller: TcxTextEdit
+ Left = 797
+ Top = 270
+ Style.HotTrack = False
+ Style.TransparentBorder = False
+ TabOrder = 32
+ OnClick = edtScanEnter
+ Width = 121
+ end
+ object CFiller: TcxTextEdit
+ Left = 797
+ Top = 304
+ Style.HotTrack = False
+ Style.TransparentBorder = False
+ TabOrder = 33
+ OnClick = edtScanEnter
+ Width = 121
+ end
+ object edtMaBiao: TcxTextEdit
+ Left = 288
+ Top = 418
+ AutoSize = False
+ Style.HotTrack = False
+ Style.TransparentBorder = False
+ TabOrder = 28
+ Text = #8730
+ OnClick = edtMaBiaoClick
+ Height = 37
+ Width = 57
+ end
+ object EDIT_Machi: TcxTextEdit
+ Left = 394
+ Top = 418
+ AutoSize = False
+ Style.HotTrack = False
+ Style.TransparentBorder = False
+ TabOrder = 29
+ OnClick = EDIT_MachiClick
+ Height = 37
+ Width = 57
+ end
+ object hundredsquare: TLabel
+ Left = 302
+ Top = 236
+ Width = 90
+ Height = 19
+ Caption = #30334#24179#26041#31859#30133#28857
+ Color = 16505534
+ ParentColor = False
+ end
object dxLayoutControl_packGroup_Root: TdxLayoutGroup
AlignHorz = ahClient
AlignVert = avTop
@@ -836,6 +1011,7 @@ inherited frmMachRollMain: TfrmMachRollMain
SizeOptions.SizableVert = True
AllowRemove = False
Hidden = True
+ ItemIndex = 4
Padding.Left = -15
Padding.Top = -5
Padding.AssignedValues = [lpavLeft, lpavTop]
@@ -902,7 +1078,7 @@ inherited frmMachRollMain: TfrmMachRollMain
end
object dxLayoutGroup_plan: TdxLayoutGroup
Parent = dxLayoutControl_packGroup_Root
- AlignHorz = ahRight
+ AlignHorz = ahLeft
CaptionOptions.Text = #35746#21333#20449#24687#32452
CaptionOptions.Visible = False
SizeOptions.Width = 721
@@ -1147,6 +1323,7 @@ inherited frmMachRollMain: TfrmMachRollMain
object lblLenUnit: TdxLayoutLabeledItem
Tag = 999
Parent = dxLayoutAutoCreatedGroup5
+ AlignHorz = ahLeft
AlignVert = avBottom
SizeOptions.AssignedValues = [sovSizableHorz]
SizeOptions.SizableHorz = False
@@ -1154,10 +1331,11 @@ inherited frmMachRollMain: TfrmMachRollMain
CaptionOptions.Hint = 'M'
CaptionOptions.ShowAccelChar = False
CaptionOptions.Text = '[B][SIZE=12]M[/SIZE][/B]'
- Index = 1
+ Index = 4
end
object dxLayoutItem18: TdxLayoutItem
Parent = dxLayoutAutoCreatedGroup3
+ AlignHorz = ahLeft
AlignVert = avClient
SizeOptions.AssignedValues = [sovSizableHorz, sovSizableVert]
SizeOptions.SizableHorz = True
@@ -1231,7 +1409,7 @@ inherited frmMachRollMain: TfrmMachRollMain
SizeOptions.Height = 10
SizeOptions.Width = 2
CaptionOptions.Text = #20998#21106#26465
- Index = 1
+ Index = 3
end
object dxLayoutAutoCreatedGroup1: TdxLayoutAutoCreatedGroup
Parent = dxLayoutAutoCreatedGroup2
@@ -1262,7 +1440,7 @@ inherited frmMachRollMain: TfrmMachRollMain
SizeOptions.Width = 114
Hidden = True
ShowBorder = False
- Index = 2
+ Index = 4
end
object dxLayoutItem_pieceorder: TdxLayoutItem
Parent = dxLayoutGroup_do1
@@ -1365,7 +1543,7 @@ inherited frmMachRollMain: TfrmMachRollMain
Index = 0
end
object dxLayoutItem_grade: TdxLayoutItem
- Parent = dxLayoutAutoCreatedGroup5
+ Parent = dxLayoutAutoCreatedGroup7
AlignVert = avClient
SizeOptions.Width = 134
AllowRemove = False
@@ -1374,7 +1552,7 @@ inherited frmMachRollMain: TfrmMachRollMain
ControlOptions.OriginalHeight = 38
ControlOptions.OriginalWidth = 95
ControlOptions.ShowBorder = False
- Index = 2
+ Index = 0
end
object dxLayoutItem17: TdxLayoutItem
Parent = dxLayoutControl_packGroup_Root
@@ -1474,7 +1652,7 @@ inherited frmMachRollMain: TfrmMachRollMain
ControlOptions.OriginalHeight = 33
ControlOptions.OriginalWidth = 75
ControlOptions.ShowBorder = False
- Index = 2
+ Index = 4
end
object dxLayoutItem_customStrField1: TdxLayoutItem
CaptionOptions.Text = #33258#23450#20041#36755#20837'1'
@@ -1630,21 +1808,181 @@ inherited frmMachRollMain: TfrmMachRollMain
ControlOptions.ShowBorder = False
Index = -1
end
+ object dxLayoutItem12: TdxLayoutItem
+ Parent = dxLayoutAutoCreatedGroup7
+ SizeOptions.Width = 119
+ CaptionOptions.Text = '[COLOR=Red][SIZE=12]'#26816#39564#31867#21035'[/COLOR][/SIZE]'
+ Control = InspectionType
+ ControlOptions.OriginalHeight = 25
+ ControlOptions.OriginalWidth = 121
+ ControlOptions.ShowBorder = False
+ Index = 1
+ end
+ object dxLayoutAutoCreatedGroup7: TdxLayoutAutoCreatedGroup
+ Parent = dxLayoutAutoCreatedGroup5
+ Index = 5
+ end
+ object dxLayoutItem22: TdxLayoutItem
+ AlignHorz = ahLeft
+ CaptionOptions.Text = #22836
+ Control = topLen
+ ControlOptions.OriginalHeight = 25
+ ControlOptions.OriginalWidth = 121
+ ControlOptions.ShowBorder = False
+ Index = -1
+ end
+ object dxLayoutItem23: TdxLayoutItem
+ AlignHorz = ahLeft
+ CaptionOptions.Text = #20013
+ Control = midLen
+ ControlOptions.OriginalHeight = 25
+ ControlOptions.OriginalWidth = 121
+ ControlOptions.ShowBorder = False
+ Index = -1
+ end
+ object dxLayoutItem25: TdxLayoutItem
+ SizeOptions.Height = 23
+ CaptionOptions.Text = #23614
+ Control = lastLen
+ ControlOptions.OriginalHeight = 23
+ ControlOptions.OriginalWidth = 121
+ ControlOptions.ShowBorder = False
+ Index = -1
+ end
+ object hundredsquares: TdxLayoutLabeledItem
+ Parent = dxLayoutAutoCreatedGroup5
+ AlignHorz = ahLeft
+ AlignVert = avTop
+ CaptionOptions.Text = #30334#24179#26041#31859#30133#28857#19981#35201
+ Index = 3
+ end
+ object dxLayoutItem26: TdxLayoutItem
+ Parent = dxLayoutGroup_do2
+ AlignHorz = ahLeft
+ AlignVert = avTop
+ CaptionOptions.Text = #21407#22240
+ Control = Cause
+ ControlOptions.OriginalHeight = 25
+ ControlOptions.OriginalWidth = 121
+ ControlOptions.ShowBorder = False
+ Index = 2
+ end
+ object dxLayoutItem29: TdxLayoutItem
+ Parent = dxLayoutAutoCreatedGroup5
+ CaptionOptions.Text = 'RadioGroup1'
+ CaptionOptions.Visible = False
+ Control = Radio_banci
+ ControlOptions.AutoColor = True
+ ControlOptions.OriginalHeight = 105
+ ControlOptions.OriginalWidth = 73
+ ControlOptions.ShowBorder = False
+ Index = 1
+ end
+ object dxLayoutItem_qtyA: TdxLayoutItem
+ AlignHorz = ahLeft
+ AlignVert = avTop
+ CaptionOptions.Text = 'A'#29677#27425#20135#37327
+ Control = BanciqtyA
+ ControlOptions.OriginalHeight = 25
+ ControlOptions.OriginalWidth = 121
+ ControlOptions.ShowBorder = False
+ Index = -1
+ end
+ object dxLayoutItem_qtyC: TdxLayoutItem
+ AlignVert = avClient
+ CaptionOptions.Text = 'C'#29677#27425#20135#37327
+ Control = BanciqtyC
+ ControlOptions.OriginalHeight = 25
+ ControlOptions.OriginalWidth = 121
+ ControlOptions.ShowBorder = False
+ Index = -1
+ end
+ object dxLayoutItem_qtyB: TdxLayoutItem
+ CaptionOptions.Text = 'B'#29677#27425#20135#37327
+ Control = BanciqtyB
+ ControlOptions.OriginalHeight = 25
+ ControlOptions.OriginalWidth = 121
+ ControlOptions.ShowBorder = False
+ Index = -1
+ end
+ object dxLayoutItem19: TdxLayoutItem
+ Parent = dxLayoutAutoCreatedGroup6
+ CaptionOptions.Text = 'A'#29677#26816#39564#20154
+ Control = AFiller
+ ControlOptions.OriginalHeight = 25
+ ControlOptions.OriginalWidth = 121
+ ControlOptions.ShowBorder = False
+ Index = 0
+ end
+ object dxLayoutItem27: TdxLayoutItem
+ Parent = dxLayoutAutoCreatedGroup6
+ AlignHorz = ahLeft
+ CaptionOptions.Text = 'B'#29677#26816#39564#20154
+ Control = BFiller
+ ControlOptions.OriginalHeight = 25
+ ControlOptions.OriginalWidth = 121
+ ControlOptions.ShowBorder = False
+ Index = 1
+ end
+ object dxLayoutAutoCreatedGroup6: TdxLayoutAutoCreatedGroup
+ Parent = dxLayoutGroup_do2
+ Index = 1
+ end
+ object dxLayoutItem28: TdxLayoutItem
+ Parent = dxLayoutAutoCreatedGroup6
+ CaptionOptions.Text = 'C'#29677#26816#39564#20154
+ Control = CFiller
+ ControlOptions.OriginalHeight = 25
+ ControlOptions.OriginalWidth = 121
+ ControlOptions.ShowBorder = False
+ Index = 2
+ end
+ object dxLayoutItem30: TdxLayoutItem
+ Parent = dxLayoutAutoCreatedGroup4
+ AlignVert = avClient
+ SizeOptions.Width = 94
+ CaptionOptions.Text = #30721#34920
+ Control = edtMaBiao
+ ControlOptions.OriginalHeight = 25
+ ControlOptions.OriginalWidth = 57
+ ControlOptions.ShowBorder = False
+ Index = 2
+ end
+ object dxLayoutItem31: TdxLayoutItem
+ Parent = dxLayoutAutoCreatedGroup4
+ AlignVert = avBottom
+ CaptionOptions.Text = '98'#30721
+ Control = EDIT_Machi
+ ControlOptions.OriginalHeight = 37
+ ControlOptions.OriginalWidth = 57
+ ControlOptions.ShowBorder = False
+ Index = 3
+ end
+ object dxLayoutItem32: TdxLayoutItem
+ Parent = dxLayoutAutoCreatedGroup5
+ CaptionOptions.Text = #30334#24179#26041#31859#30133#28857
+ CaptionOptions.Visible = False
+ Control = hundredsquare
+ ControlOptions.AutoColor = True
+ ControlOptions.OriginalHeight = 19
+ ControlOptions.OriginalWidth = 90
+ ControlOptions.ShowBorder = False
+ Index = 2
+ end
end
object Panel_right: TPanel [1]
- Left = 860
+ Left = 917
Top = 0
Width = 252
Height = 736
Align = alRight
- Caption = 'Panel_right'
TabOrder = 0
object cxGrid3: TcxGrid
Tag = 9999
Left = 1
- Top = 151
+ Top = 181
Width = 250
- Height = 311
+ Height = 5
Align = alClient
TabOrder = 0
object Tv3: TcxGridDBTableView
@@ -1859,14 +2197,14 @@ inherited frmMachRollMain: TfrmMachRollMain
object cxPageControl1: TcxPageControl
Tag = 999
Left = 1
- Top = 462
+ Top = 186
Width = 250
- Height = 273
+ Height = 549
Align = alBottom
TabOrder = 1
Properties.ActivePage = cxTabSheet1
Properties.CustomButtons.Buttons = <>
- ClientRectBottom = 273
+ ClientRectBottom = 549
ClientRectRight = 250
ClientRectTop = 32
object cxTabSheet1: TcxTabSheet
@@ -1877,7 +2215,7 @@ inherited frmMachRollMain: TfrmMachRollMain
Left = 0
Top = 0
Width = 250
- Height = 241
+ Height = 517
Align = alClient
TabOrder = 0
object Tv2: TcxGridDBTableView
@@ -1985,6 +2323,13 @@ inherited frmMachRollMain: TfrmMachRollMain
DataBinding.FieldName = 'SubtractQty'
DataBinding.IsNullValueType = True
end
+ object Tv2Column1: TcxGridDBColumn
+ Caption = #36317#36793
+ DataBinding.FieldName = 'CIJBQty'
+ DataBinding.IsNullValueType = True
+ HeaderAlignmentHorz = taCenter
+ Width = 40
+ end
end
object cxGridLevel1: TcxGridLevel
GridView = Tv2
@@ -1999,7 +2344,7 @@ inherited frmMachRollMain: TfrmMachRollMain
Left = 0
Top = 0
Width = 250
- Height = 241
+ Height = 517
Align = alClient
TabOrder = 0
object TV1: TcxGridDBTableView
@@ -2105,6 +2450,13 @@ inherited frmMachRollMain: TfrmMachRollMain
DataBinding.IsNullValueType = True
Options.Editing = False
end
+ object TV1Column1: TcxGridDBColumn
+ Caption = #36317#36793
+ DataBinding.FieldName = 'CIJBQty'
+ DataBinding.IsNullValueType = True
+ HeaderAlignmentHorz = taCenter
+ Width = 40
+ end
end
object cxGridLevel3: TcxGridLevel
GridView = TV1
@@ -2117,7 +2469,7 @@ inherited frmMachRollMain: TfrmMachRollMain
Left = 1
Top = 1
Width = 250
- Height = 150
+ Height = 180
AutoSize = True
ButtonHeight = 30
ButtonWidth = 115
@@ -2136,6 +2488,7 @@ inherited frmMachRollMain: TfrmMachRollMain
AutoSize = True
Caption = #37325#25171
ImageIndex = 21
+ Visible = False
OnClick = ToolButton3Click
end
object TprintPack: TToolButton
@@ -2145,6 +2498,7 @@ inherited frmMachRollMain: TfrmMachRollMain
Caption = #21253#26631#31614
ImageIndex = 21
Wrap = True
+ Visible = False
OnClick = TprintPackClick
end
object Trolldel: TToolButton
@@ -2153,6 +2507,7 @@ inherited frmMachRollMain: TfrmMachRollMain
AutoSize = True
Caption = #21024#38500
ImageIndex = 5
+ Visible = False
OnClick = TrolldelClick
end
object ToolButton4: TToolButton
@@ -2162,6 +2517,7 @@ inherited frmMachRollMain: TfrmMachRollMain
Caption = #30133#28857#31649#29702
ImageIndex = 2
Wrap = True
+ Visible = False
OnClick = ToolButton4Click
end
object Tedit: TToolButton
@@ -2187,36 +2543,54 @@ inherited frmMachRollMain: TfrmMachRollMain
AutoSize = True
Caption = #26085#24535
ImageIndex = 30
+ Visible = False
OnClick = TlogClick
end
- object TgridLiSet: TToolButton
+ object TCP: TToolButton
Left = 71
Top = 90
AutoSize = True
+ Caption = ' '#25286' '#21305' '
+ ImageIndex = 30
+ Wrap = True
+ OnClick = TCPClick
+ end
+ object TgridLiSet: TToolButton
+ Left = 0
+ Top = 120
+ AutoSize = True
Caption = #34920#26684#21015#35774#32622
ImageIndex = 16
- Wrap = True
end
object ToolButton1: TToolButton
- Left = 0
+ Left = 119
Top = 120
AutoSize = True
Caption = #25171#21360#30721#21333
ImageIndex = 9
+ Wrap = True
+ Visible = False
OnClick = ToolButton1Click
end
object ToolButton8: TToolButton
- Left = 103
- Top = 120
+ Left = 0
+ Top = 150
AutoSize = True
Caption = #20851#38381
ImageIndex = 7
OnClick = ToolButton8Click
end
+ object ToolButton2: TToolButton
+ Left = 71
+ Top = 150
+ Caption = #37325' '#39564
+ ImageIndex = 47
+ OnClick = ToolButton2Click
+ end
end
object Panel_msg: TPanel
- Left = 8
- Top = 186
+ Left = 0
+ Top = 287
Width = 241
Height = 41
Caption = #20877#27425#28857#20462#25913#21487#20197#35299#38500#20462#25913#25552#20132
@@ -2233,7 +2607,7 @@ inherited frmMachRollMain: TfrmMachRollMain
object dxPanel_mid: TdxPanel [2]
Left = 400
Top = 0
- Width = 340
+ Width = 315
Height = 736
Align = alLeft
TabOrder = 5
@@ -2241,7 +2615,7 @@ inherited frmMachRollMain: TfrmMachRollMain
inline frameBads1: TframeBads
Left = 0
Top = 0
- Width = 338
+ Width = 313
Height = 734
Align = alClient
DoubleBuffered = False
@@ -2256,42 +2630,68 @@ inherited frmMachRollMain: TfrmMachRollMain
ParentDoubleBuffered = False
ParentFont = False
TabOrder = 0
- ExplicitWidth = 338
+ ExplicitWidth = 313
ExplicitHeight = 734
inherited dxPanel1: TdxPanel
Top = 448
- Width = 338
+ Width = 313
Height = 286
ExplicitTop = 448
- ExplicitWidth = 338
+ ExplicitWidth = 313
ExplicitHeight = 286
inherited RadioGroup1: TRadioGroup
Top = 103
- Width = 336
+ Width = 311
+ ItemIndex = 0
+ Items.Strings = (
+ '1'
+ '2'
+ '3'
+ '4'
+ #36731#24494)
ExplicitTop = 103
- ExplicitWidth = 336
+ ExplicitWidth = 311
end
inherited dxPanel3: TdxPanel
Top = 235
- Width = 336
+ Width = 311
ExplicitTop = 235
- ExplicitWidth = 336
+ ExplicitWidth = 311
+ inherited cxButton1: TcxButton
+ Top = 6
+ OnClick = cxButton1Click
+ ExplicitTop = 6
+ end
inherited cxButton2: TcxButton
+ Top = 6
OnClick = cxButton2Click
+ ExplicitTop = 6
end
end
inherited dxLayoutControl1: TdxLayoutControl
Top = 4
- Width = 336
+ Width = 311
OnDblClick = dxLayoutControl_packDblClick
ExplicitTop = 4
- ExplicitWidth = 336
+ ExplicitWidth = 311
inherited CIFBeg: TcxTextEdit
OnEnter = edtScanEnter
end
+ inherited CIFEnd: TcxTextEdit
+ Left = 138
+ ExplicitLeft = 138
+ ExplicitWidth = 51
+ Width = 51
+ end
+ inherited CIFQty: TcxTextEdit
+ Left = 213
+ ExplicitLeft = 213
+ ExplicitWidth = 39
+ Width = 39
+ end
inherited IsSubtract: TcxCheckBox
- ExplicitWidth = 60
- Width = 60
+ ExplicitWidth = 96
+ Width = 96
end
inherited SubtractQty: TcxTextEdit
Properties.OnEditValueChanged = nil
@@ -2299,15 +2699,43 @@ inherited frmMachRollMain: TfrmMachRollMain
inherited cxCheck_len: TcxCheckBox
Properties.OnChange = frameBads1cxCheck_lenPropertiesChange
end
+ inherited CIJBQty: TcxTextEdit
+ Left = 285
+ OnClick = edtScanEnter
+ ExplicitLeft = 285
+ end
inherited dxLayoutControl1Group_Root: TdxLayoutGroup
ItemIndex = 1
end
+ inherited dxLayoutGroup2: TdxLayoutGroup
+ ItemIndex = 4
+ end
+ inherited dxLayoutItem4: TdxLayoutItem
+ ControlOptions.OriginalWidth = 51
+ Index = 3
+ end
+ inherited dxLayoutItem5: TdxLayoutItem
+ ControlOptions.OriginalWidth = 39
+ Index = 4
+ end
+ inherited lblLenUnit1: TdxLayoutLabeledItem
+ Index = 2
+ end
+ object dxLayoutItem20: TdxLayoutItem
+ AlignHorz = ahLeft
+ AlignVert = avClient
+ CaptionOptions.Text = #36317#36793
+ ControlOptions.OriginalHeight = 25
+ ControlOptions.OriginalWidth = 57
+ ControlOptions.ShowBorder = False
+ Index = -1
+ end
end
end
inherited cxScrollBox1: TcxScrollBox
- Width = 338
+ Width = 313
Height = 448
- ExplicitWidth = 338
+ ExplicitWidth = 313
ExplicitHeight = 448
end
inherited ADOTmp: TADOQuery
@@ -2426,21 +2854,94 @@ inherited frmMachRollMain: TfrmMachRollMain
inherited cxProgressBar2: TcxProgressBar
ExplicitHeight = 29
end
+ object cxGroupBox1: TcxGroupBox [6]
+ Tag = 999
+ Left = 8
+ Top = 478
+ Caption = #21407#22240
+ TabOrder = 6
+ Visible = False
+ Height = 207
+ Width = 256
+ object Label1: TLabel
+ Left = 215
+ Top = 8
+ Width = 38
+ Height = 25
+ Caption = #20851#38381
+ Font.Charset = ANSI_CHARSET
+ Font.Color = clWindowText
+ Font.Height = -19
+ Font.Name = #24494#36719#38597#40657
+ Font.Style = []
+ ParentFont = False
+ OnClick = Label1Click
+ end
+ object Label2: TLabel
+ Left = 94
+ Top = 146
+ Width = 56
+ Height = 25
+ Caption = #30830' '#23450' '
+ Font.Charset = ANSI_CHARSET
+ Font.Color = clWindowText
+ Font.Height = -19
+ Font.Name = #24494#36719#38597#40657
+ Font.Style = []
+ ParentFont = False
+ OnClick = Label2Click
+ end
+ object edit_Cause: TComboBox
+ Left = 208
+ Top = 145
+ Width = 165
+ Height = 33
+ Font.Charset = ANSI_CHARSET
+ Font.Color = clWindowText
+ Font.Height = -19
+ Font.Name = #24494#36719#38597#40657
+ Font.Style = []
+ ParentFont = False
+ TabOrder = 0
+ Visible = False
+ Items.Strings = (
+ #25972#29702
+ #22383#24067)
+ end
+ object Radio_Cause: TRadioGroup
+ Left = 27
+ Top = 33
+ Width = 185
+ Height = 103
+ Caption = #21407#22240
+ Font.Charset = ANSI_CHARSET
+ Font.Color = clWindowText
+ Font.Height = -20
+ Font.Name = #24494#36719#38597#40657
+ Font.Style = []
+ ItemIndex = 0
+ Items.Strings = (
+ #25972#29702
+ #22383#24067)
+ ParentFont = False
+ TabOrder = 1
+ end
+ end
inherited ADOQueryBaseCmd: TADOQuery
Connection = DataLink_TradeInsp.ADOLink
- Left = 617
- Top = 72
+ Left = 470
+ Top = 279
end
inherited ADOQueryBaseTemp: TADOQuery
Connection = DataLink_TradeInsp.ADOLink
- Left = 465
- Top = 81
+ Left = 520
+ Top = 279
end
object cds_params: TClientDataSet
Aggregates = <>
Params = <>
- Left = 712
- Top = 168
+ Left = 620
+ Top = 329
object cds_paramsdabao: TStringField
FieldName = 'dabao'
Size = 10
@@ -2538,49 +3039,49 @@ inherited frmMachRollMain: TfrmMachRollMain
object CDS_2: TClientDataSet
Aggregates = <>
Params = <>
- Left = 872
- Top = 165
+ Left = 520
+ Top = 329
end
object DS_2: TDataSource
DataSet = CDS_2
- Left = 755
- Top = 149
+ Left = 520
+ Top = 379
end
object cds_1: TClientDataSet
Aggregates = <>
Params = <>
- Left = 960
- Top = 261
+ Left = 470
+ Top = 329
end
object cds_3: TClientDataSet
Aggregates = <>
Params = <>
- Left = 896
- Top = 189
+ Left = 570
+ Top = 329
end
object ds_3: TDataSource
DataSet = cds_3
- Left = 987
- Top = 213
+ Left = 570
+ Top = 379
end
object ds_1: TDataSource
DataSet = cds_1
- Left = 947
- Top = 197
+ Left = 470
+ Top = 379
end
object ADOQueryMain: TADOQuery
Connection = DataLink_TradeInsp.ADOLink
LockType = ltReadOnly
Parameters = <>
- Left = 848
- Top = 127
+ Left = 620
+ Top = 279
end
object ADOQueryPrint: TADOQuery
Connection = DataLink_TradeInsp.ADOLink
LockType = ltReadOnly
Parameters = <>
- Left = 756
- Top = 581
+ Left = 670
+ Top = 279
end
object RM1: TRMGridReport
ThreadPrepareReport = True
@@ -2599,37 +3100,37 @@ inherited frmMachRollMain: TfrmMachRollMain
CompressThread = False
LaterBuildEvents = True
OnlyOwnerDataSet = False
- Left = 876
- Top = 325
+ Left = 470
+ Top = 429
ReportData = {}
end
object RMDB_1: TRMDBDataSet
Visible = True
DataSet = ADOQueryPrint
- Left = 832
- Top = 591
+ Left = 670
+ Top = 379
end
object cxGridPopupMenu1: TcxGridPopupMenu
Grid = cxGrid3
PopupMenus = <>
- Left = 720
- Top = 104
+ Left = 670
+ Top = 329
end
object ADOQueryImage: TADOQuery
Connection = DataLink_TradeInsp.ADOLink
LockType = ltReadOnly
CommandTimeout = 300
Parameters = <>
- Left = 680
- Top = 64
+ Left = 570
+ Top = 279
end
object DS_IMAGE: TDataSource
DataSet = ADOQueryImage
- Left = 555
- Top = 21
+ Left = 620
+ Top = 379
end
object RMRichObject1: TRMRichObject
- Left = 600
- Top = 176
+ Left = 520
+ Top = 429
end
end
diff --git a/项目代码/wenshangkm/G03贸易布匹检验/U_MachRollMain.pas b/项目代码/wenshangkm/G03贸易布匹检验/U_MachRollMain.pas
index 4362cc2..75b04e2 100644
--- a/项目代码/wenshangkm/G03贸易布匹检验/U_MachRollMain.pas
+++ b/项目代码/wenshangkm/G03贸易布匹检验/U_MachRollMain.pas
@@ -17,7 +17,9 @@ uses
cxCheckBox, cxMaskEdit, cxDropDownEdit, Vcl.Menus, cxButtonEdit, RM_Dataset,
cxGeometry, dxFramedControl, dxPanel, U_KeyBoard, cxGroupBox,
cxGridCustomPopupMenu, cxGridPopupMenu, MovePanel, RM_RichEdit, cxProgressBar,
- {FlatUtils, FlatBtns, }cxCurrencyEdit;
+ {FlatUtils, FlatBtns, }cxCurrencyEdit, dxX509Certificate, dxPDFCore, dxPDFBase,
+ dxPDFText, dxPDFRecognizedObject, dxPDFForm, dxPDFFormData, dxPDFDocument,
+ dxPrintUtils, dxCustomPreview, dxPDFDocumentViewer, dxPDFViewer, cxRadioGroup;
type
TfrmMachRollMain = class(TfrmBaseList)
@@ -257,6 +259,49 @@ type
customStrField5: TcxButtonEdit;
dxLayoutItem_customStrField5: TdxLayoutItem;
ToolButton1: TToolButton;
+ InspectionType: TcxComboBox;
+ dxLayoutItem12: TdxLayoutItem;
+ dxLayoutAutoCreatedGroup7: TdxLayoutAutoCreatedGroup;
+ dxLayoutItem20: TdxLayoutItem;
+ topLen: TcxTextEdit;
+ dxLayoutItem22: TdxLayoutItem;
+ midLen: TcxTextEdit;
+ dxLayoutItem23: TdxLayoutItem;
+ lastLen: TcxTextEdit;
+ dxLayoutItem25: TdxLayoutItem;
+ hundredsquares: TdxLayoutLabeledItem;
+ Cause: TcxTextEdit;
+ dxLayoutItem26: TdxLayoutItem;
+ cxGroupBox1: TcxGroupBox;
+ edit_Cause: TComboBox;
+ Radio_banci: TRadioGroup;
+ dxLayoutItem29: TdxLayoutItem;
+ BanciqtyA: TcxTextEdit;
+ dxLayoutItem_qtyA: TdxLayoutItem;
+ Label1: TLabel;
+ BanciqtyC: TcxTextEdit;
+ dxLayoutItem_qtyC: TdxLayoutItem;
+ dxLayoutItem_qtyB: TdxLayoutItem;
+ BanciqtyB: TcxTextEdit;
+ Label2: TLabel;
+ Tv2Column1: TcxGridDBColumn;
+ TV1Column1: TcxGridDBColumn;
+ Radio_Cause: TRadioGroup;
+ AFiller: TcxTextEdit;
+ dxLayoutItem19: TdxLayoutItem;
+ BFiller: TcxTextEdit;
+ dxLayoutItem27: TdxLayoutItem;
+ dxLayoutAutoCreatedGroup6: TdxLayoutAutoCreatedGroup;
+ CFiller: TcxTextEdit;
+ dxLayoutItem28: TdxLayoutItem;
+ TCP: TToolButton;
+ edtMaBiao: TcxTextEdit;
+ dxLayoutItem30: TdxLayoutItem;
+ EDIT_Machi: TcxTextEdit;
+ dxLayoutItem31: TdxLayoutItem;
+ ToolButton2: TToolButton;
+ hundredsquare: TLabel;
+ dxLayoutItem32: TdxLayoutItem;
procedure FormCreate(Sender: TObject);
procedure FormShow(Sender: TObject);
procedure Button_badClick(Sender: TObject);
@@ -304,6 +349,14 @@ type
procedure customStrField5DblClick(Sender: TObject);
procedure customStrField5PropertiesButtonClick(Sender: TObject; AButtonIndex: Integer);
procedure ToolButton1Click(Sender: TObject);
+ procedure cxButton1Click(Sender: TObject);
+ procedure gradePropertiesEditValueChanged(Sender: TObject);
+ procedure Label1Click(Sender: TObject);
+ procedure Label2Click(Sender: TObject);
+ procedure TCPClick(Sender: TObject);
+ procedure edtMaBiaoClick(Sender: TObject);
+ procedure EDIT_MachiClick(Sender: TObject);
+ procedure ToolButton2Click(Sender: TObject);
private
FCIID, FOperationStatus, FCIFName, FWorkshop: string;
FBCIOID, FOrderNo, FMainId, FSubId, FPCId, FConNo, FConMId, fBuyConNo, FConSId: string;
@@ -358,12 +411,13 @@ type
function deletePack(packId: string): boolean;
function checkPicecNo(): boolean;
function getCurPieceNO(mCcid: string): string;
+ function gethundredsquares(): string;
procedure threadLoadform();
function getCurMaxPieceNo(): integer;
type
public
- fmanage: string;
+ fmanage, FCINote: string;
fFlileFlag: string;
end;
@@ -379,6 +433,51 @@ uses
U_MdPrint;
{$R *.dfm}
+function TfrmMachRollMain.gethundredsquares(): string; //ƽ״õ
+var
+ mxIds, FCDfs: Double;
+ Fhundredsquares: string;
+begin
+ result := '';
+ hundredsquare.Font.color := clBlack;
+ if CDS_2.IsEmpty then
+ Exit;
+
+ CDS_2.First;
+ while not CDS_2.eof do
+ begin
+
+ mxIds := RoundFloat(CDS_2.FieldByName('CIFPoints').asfloat, 2) + mxIds;
+ CDS_2.Next;
+ end;
+ if (strtofloatdef(C_Width.text, 0) > 0) and (strtofloatdef(inputlen.text, 0) > 0) then
+ begin
+ FCDfs := RoundFloat((mxIds * 10000) / (strtofloatdef((inputlen.text), 0) * strtofloatdef(C_Width.text, 0)), 2);
+ end
+ else
+ begin
+ FCDfs := 1;
+ end;
+
+ hundredsquare.Caption := 'ƽ״õ' + floattostr(FCDfs);
+ if FCDfs <= 20 then
+ begin
+ GRade.text := 'A';
+ end
+ else if (FCDfs <= 30) then
+ begin
+ GRade.text := 'B';
+ end
+ else if FCDfs <= 40 then
+ begin
+ GRade.text := 'C';
+ end;
+ if FCDfs > 40 then
+ begin
+ hundredsquare.Font.color := clred;
+ end;
+end;
+
procedure TfrmMachRollMain.Btn_rlBillClick(Sender: TObject);
begin
if cds_3.IsEmpty then
@@ -409,19 +508,16 @@ var
mvalue: double;
i: Integer;
begin
-
try
if cds_3.IsEmpty then
exit;
- Panel_msg.Visible := not Panel_msg.Visible;
+// Panel_msg.Visible := not Panel_msg.Visible;
cxgrid3.Enabled := not cxgrid3.Enabled;
InitJTM(cds_3.fieldbyName('CIID').AsString);
initEditPiece();
//ύ
-
-
fCanAutoPost := false;
BTPrint.Enabled := false;
@@ -433,6 +529,16 @@ begin
Application.MessageBox('ȼΪ!', 'ʾ', 0);
exit;
end;
+ if trim(C_Width.Text) = '' then
+ begin
+ Application.MessageBox('ŷΪ!', 'ʾ', 0);
+ exit;
+ end;
+ if (trim(AFiller.text) = '') and (trim(BFiller.text) = '') and (trim(CFiller.text) = '') then
+ begin
+ Application.MessageBox('˲ܶΪ!', 'ʾ', 0);
+ exit;
+ end;
if CheckData('ύ') = false then
exit;
@@ -449,6 +555,14 @@ begin
funitPiecesStr := '';
unitPieces.Text := '';
presentWeight.Text := '';
+ Cause.text := '';
+ FCINote := '';
+ BanciqtyC.text := '';
+ BanciqtyA.text := '';
+ BanciqtyB.text := '';
+// AFiller.text := '';
+// BFiller.text := '';
+// CFiller.text := '';
// if (cds_params.fieldbyName('rollnoMake').AsString = 'ֶ') and (trim(Edit_pieceOrder.Text) <> '') then
// begin
// pieceNo.Text:=intTostr(getCurMaxPieceNo());
@@ -463,7 +577,7 @@ begin
cds_params.fieldbyName('mabiao').value := fOldMaBiao;
cds_params.Post;
edtPacketNo.Enabled := true;
- Panel_msg.Visible := true;
+// Panel_msg.Visible := true;
if fileexists(ExtractFilePath(Application.ExeName) + 'ijɹ.wav') then
playSound(pwidechar('ijɹ.wav'), 0, SND_FILENAME or SND_ASYNC);
end
@@ -571,6 +685,7 @@ begin
finally
BTPrint.Enabled := true;
end;
+ edtScan.SetFocus;
end;
procedure TfrmMachRollMain.bt_printmdClick(Sender: TObject);
@@ -827,6 +942,8 @@ begin
try
// loadProcess.Visible:=true;
// loadProcess.Refresh;
+
+ hundredsquare.Caption := 'ƽ״õ';
Coefficient.Properties.ReadOnly := gZhxsReadonly;
tare.Properties.ReadOnly := gTareReadonly;
@@ -876,22 +993,23 @@ begin
begin
if trim(DZCDYDllName) <> '' then
OpenCom(DZCDYDllName);
+
if trim(MBDYDllName) <> '' then
OpenCom(MBDYDllName);
// edtScan.SetFocus;
-
end;
if trim(fCanInputFs) = '1' then
begin
- cxGroupBox_keys.ClientHeight := round(cxGrid3.ClientHeight * 0.6);
+ cxGroupBox_keys.ClientHeight := 260; //round(cxGrid3.ClientHeight * 0.6);
frameKeyBoard1.SpeedButton10.Visible := true;
end
else
begin
- cxGroupBox_keys.ClientHeight := round(cxGrid3.ClientHeight * 0.55);
+ cxGroupBox_keys.ClientHeight := 260; //round(cxGrid3.ClientHeight * 0.55);
frameKeyBoard1.SpeedButton10.Visible := false;
end;
+// Radio_banci.ItemIndex := 0;
finally
// loadProcess.Visible:=false;
end;
@@ -899,6 +1017,9 @@ begin
//////
if dxLayoutItem_customStrField3.ActuallyVisible then
InitDevCombobox(ADOQueryBaseTemp, customStrField3, 'DOROLLZDY3');
+ cxPageControl1.ActivePageIndex := 0;
+ dxPanel_mid.Visible := not dxPanel_mid.Visible;
+ cxGroupBox_keys.Left := Panel_right.Left + 15;
end;
procedure TfrmMachRollMain.frameBads1CIFBegDblClick(Sender: TObject);
@@ -1233,7 +1354,7 @@ begin
fBuyConNo := trim(fieldbyName('BuyConNo').AsString);
FMainId := trim(fieldbyName('MainId').AsString);
FSubId := trim(fieldbyName('SubId').AsString);
- // FPCId := Trim(ADOTmp.fieldbyname('ToPCId').AsString);
+ FCIID := Trim(fieldbyname('CIID').AsString);
// FC_CustPattern := Trim(ADOTmp.fieldbyname('C_CustPattern').AsString);
// FC_ColorDepth := Trim(ADOTmp.fieldbyname('C_ColorDepth').AsString);
// FWorkshop := Trim(ADOTmp.fieldbyname('Workshop').AsString);
@@ -1242,7 +1363,7 @@ begin
FC_Code := trim(fieldbyName('C_Code').AsString);
FC_Name := trim(fieldbyName('C_Name').AsString);
FC_EName := trim(fieldbyName('C_EName').AsString);
- // FBatchNO := Trim(ADOTmp.fieldbyname('BatchNO').AsString);
+// FBatchNO := Trim(fieldbyname('BatchNO').AsString);
FC_Spec := trim(fieldbyName('C_Spec').AsString);
FC_Color := trim(fieldbyName('C_Color').AsString);
FC_ColorNo := trim(fieldbyName('C_ColorNo').AsString);
@@ -1301,19 +1422,19 @@ begin
cds_params.fieldbyName('dabao').value := '';
end;
//ǩֽ
- if (fields.FindField('labelOutPage') <> nil) then
- begin
- if (fieldbyName('labelOutPage').AsBoolean or fieldbyName('labelOutPage').IsNull) then
- begin
- cds_params.fieldbyName('OutPage').value := '';
- end
- else
- begin
- cds_params.fieldbyName('OutPage').value := '';
- end;
- end
- else
- cds_params.fieldbyName('outPage').value := '';
+// if (fields.FindField('labelOutPage') <> nil) then
+// begin
+// if (fieldbyName('labelOutPage').AsBoolean or fieldbyName('labelOutPage').IsNull) then
+// begin
+// cds_params.fieldbyName('OutPage').value := '';
+// end
+// else
+// begin
+// cds_params.fieldbyName('OutPage').value := '';
+// end;
+// end
+// else
+// cds_params.fieldbyName('outPage').value := '';
if fieldbyName('DecimalY').Value <> null then
cds_params.fieldbyName('Yplace').value := fieldbyName('DecimalY').AsInteger;
if fieldbyName('DecimalM').Value <> null then
@@ -1417,12 +1538,8 @@ end;
procedure TfrmMachRollMain.InputLenPropertiesChange(Sender: TObject);
begin
-
- // if StrToIntDef(trim(InputWeight.Text), 0) = 0 then
- // begin
- // exit;
- // end;
QuantityConversion();
+ gethundredsquares();
if gAutoPost and (trim(cds_params.fieldbyName('mabiao').AsString) = '1') then
begin
if StrToFloatdef(trim(InputLen.Text), 0) > 5 then
@@ -1430,6 +1547,28 @@ begin
fCanAutoPost := true;
end;
end;
+ if gAutoCheckBadNum and (frameBads1.dxPanel1.Visible = true) then
+ begin
+ frameBads1.cxCheck_len.Checked := true;
+ if (frameBads1.cxCheck_len.Checked) and (trim(InputLen.Text) <> '') and (frameBads1.CIFBeg.Text <> '') then
+ begin
+ frameBads1.CIFEnd.Text := trim(InputLen.Text);
+ end;
+ end;
+
+end;
+
+procedure TfrmMachRollMain.Label1Click(Sender: TObject);
+begin
+
+ cxGroupBox1.Visible := false;
+end;
+
+procedure TfrmMachRollMain.Label2Click(Sender: TObject);
+begin
+ Cause.text := trim(Radio_Cause.Caption);
+// trIM(edit_Cause.text);
+ cxGroupBox1.Visible := false;
end;
procedure TfrmMachRollMain.lblRuleConversionPropertiesChange(Sender: TObject);
@@ -1535,6 +1674,24 @@ begin
end;
end;
+procedure TfrmMachRollMain.ToolButton2Click(Sender: TObject);
+begin
+ if CDS_3.IsEmpty then
+ Exit;
+
+ with ADOQueryBaseCmd do
+ begin
+ Close;
+ SQL.Clear;
+ sql.add('insert into Trade_Cloth_Inspect_Flaw_del select * from Trade_Cloth_Inspect_Flaw where CIID=''' + trim(cds_3.fieldbyName('CIID').AsString) + '''');
+ SQL.Add('delete from Trade_Cloth_Inspect_Flaw ');
+ SQL.Add(' where CIID=''' + trim(cds_3.fieldbyName('CIID').AsString) + ''' ');
+ execsql;
+ end;
+ InitCDGridCX(cds_3.fieldbyName('CIID').AsString);
+ gethundredsquares();
+end;
+
procedure TfrmMachRollMain.ToolButton3Click(Sender: TObject);
begin
if cds_3.IsEmpty then
@@ -1654,6 +1811,16 @@ begin
if Application.MessageBox('ȷҪɾǰü¼', 'Ϣ', 1) = 2 then
exit;
CDS_2.Delete;
+ with ADOQueryBaseCmd do
+ begin
+ Close;
+ SQL.Clear;
+ sql.add('insert into Trade_Cloth_Inspect_Flaw_del select * from Trade_Cloth_Inspect_Flaw where CIFID=''' + trim(CDS_2.fieldbyName('CIFID').AsString) + '''');
+ SQL.Add('delete from Trade_Cloth_Inspect_Flaw ');
+ SQL.Add(' where CIID=''' + trim(cds_3.fieldbyName('CIID').AsString) + ''' and CIFID=''' + trim(CDS_2.fieldbyName('CIFID').AsString) + '''');
+ execsql;
+ end;
+ gethundredsquares();
end;
procedure TfrmMachRollMain.Tv3CustomDrawCell(Sender: TcxCustomGridTableView; ACanvas: TcxCanvas; AViewInfo: TcxGridTableDataCellViewInfo; var ADone: Boolean);
@@ -1669,15 +1836,38 @@ begin
InitCDGridCX(cds_3.fieldbyName('CIID').AsString);
end;
+procedure TfrmMachRollMain.TCPClick(Sender: TObject);
+//var
+// CPciid: string;
+begin
+// CPciid := trim(CDS_3.fieldbyName('CIID').AsString);
+ with ADOQueryBaseCmd do
+ begin
+ close;
+ sql.clear;
+ sql.add(' exec P_Trade_Cloth_CP ');
+ sql.add('@ciid=''' + trim(CDS_3.fieldbyName('CIID').AsString) + ''' ');
+ open;
+ end;
+ Application.MessageBox(pchar(trim(ADOQueryBaseCmd.fieldbyName('ShowMsg').AsString)), 'ʾϢ', 0);
+// raise Exception.create(pchar(trim(ADOQueryBaseCmd.fieldbyName('ShowMsg').AsString)));
+end;
+
procedure TfrmMachRollMain.TeditClick(Sender: TObject);
begin
if cds_3.IsEmpty then
exit;
- Panel_msg.Visible := not Panel_msg.Visible;
+// Panel_msg.Visible := not Panel_msg.Visible;
cxgrid3.Enabled := not cxgrid3.Enabled;
InitJTM(cds_3.fieldbyName('CIID').AsString);
-
initEditPiece();
+ with cds_3 do
+ begin
+ InputLen.Text := fieldbyName('InputLen').AsString;
+ grade.ItemIndex := grade.Properties.Items.IndexOf(trim(fieldbyName('grade').AsString));
+ end;
+ InitCDGrid(cds_3.fieldbyName('CIID').AsString);
+ gethundredsquares();
end;
procedure TfrmMachRollMain.TlogClick(Sender: TObject);
@@ -1780,7 +1970,7 @@ begin
AOrdDefNote1.Text := '';
if fBuyConNo <> '' then
AOrdDefNote1.Text := AOrdDefNote1.Text + 'ͻ:' + fBuyConNo + #13;
- AOrdDefNote1.Text := AOrdDefNote1.Text + ':' + FBCIOID + #13;
+ AOrdDefNote1.Text := AOrdDefNote1.Text + ':' + FBCIOID + #13;
if FC_EName <> '' then
AOrdDefNote1.Text := AOrdDefNote1.Text + 'Ʒ:' + FC_Name + '(' + FC_EName + ')' + #13
else
@@ -1938,6 +2128,7 @@ end;
procedure TfrmMachRollMain.InitCDGrid(MCIID: string);
begin
+
cxPageControl1.ActivePageIndex := 0;
try
tv2.BeginUpdate();
@@ -2201,53 +2392,121 @@ begin
end;
-procedure TfrmMachRollMain.cxButton2Click(Sender: TObject);
+procedure TfrmMachRollMain.cxButton1Click(Sender: TObject);
begin
- inherited;
- if FCIFName = '' then
- begin
- frameBads1.dxPanel1.Visible := false;
- exit;
- end;
-
- with CDS_2 do
- begin
- Append;
- if frameBads1.RadioGroup1.ItemIndex = 5 then
- FieldByName('CIFName').Value := '' + Trim(FCIFName)
- else if frameBads1.RadioGroup1.ItemIndex = 4 then
- FieldByName('CIFName').Value := 'ƥ' + Trim(FCIFName)
- else
- fieldbyName('CIFName').value := trim(FCIFName);
-
- fieldbyName('CIFbeg').value := trim(frameBads1.CIFBeg.Text);
- fieldbyName('CIFEnd').value := trim(frameBads1.CIFEnd.Text);
- fieldbyName('CIFNumber').value := strtointdef(trim(frameBads1.CIFNumber.Text), 0);
-
- fieldbyName('CIFPoints').value := 0;
-
- if frameBads1.RadioGroup1.ItemIndex > -1 then
- begin
- if frameBads1.RadioGroup1.ItemIndex < 3 then
- begin
- fieldbyName('CIFPoints').value := frameBads1.RadioGroup1.ItemIndex + 1;
- end
- else
- begin
- fieldbyName('CIFPoints').value := 4;
- end;
- end;
- fieldbyName('CIFQty').value := strtofloatdef(trim(frameBads1.CIFQty.Text), 0);
- fieldbyName('SubtractQty').value := strtofloatdef(trim(frameBads1.SubtractQty.Text), 0);
- fieldbyName('IsSubtract').value := frameBads1.IsSubtract.Checked;
-
- Post;
- end;
+ frameBads1.RadioGroup1.ItemIndex := 0;
+ frameBads1.CIFNumber.text := '';
+ frameBads1.CIJBQty.text := '';
frameBads1.CIFBeg.Text := '';
frameBads1.CIFEnd.Text := '';
frameBads1.CIFQty.Text := '';
frameBads1.dxPanel1.Visible := false;
+ exit;
+
+end;
+
+procedure TfrmMachRollMain.cxButton2Click(Sender: TObject);
+var
+ maxno: string;
+begin
+ inherited;
+ if FCIFName = '' then
+ begin
+// frameBads1.dxPanel1.Visible := false;
+ exit;
+ end;
+ if frameBads1.RadioGroup1.ItemIndex = 4 then
+ begin
+ FCINote := '' + Trim(FCIFName);
+ end
+ else
+ begin
+
+ with CDS_2 do
+ begin
+ Append;
+// if frameBads1.RadioGroup1.ItemIndex = 5 then
+// FieldByName('CIFName').Value := '' + Trim(FCIFName)
+// else
+// if frameBads1.RadioGroup1.ItemIndex = 4 then
+// FieldByName('CIFName').Value := 'ƥ' + Trim(FCIFName)
+// else
+ fieldbyName('CIFName').value := trim(FCIFName);
+
+ fieldbyName('CIFbeg').value := trim(frameBads1.CIFBeg.Text);
+ fieldbyName('CIFEnd').value := trim(frameBads1.CIFEnd.Text);
+ fieldbyName('CIFNumber').value := strtointdef(trim(frameBads1.CIFNumber.Text), 0);
+
+ fieldbyName('CIFPoints').value := 0;
+
+ if frameBads1.RadioGroup1.ItemIndex > -1 then
+ begin
+ if frameBads1.RadioGroup1.ItemIndex < 3 then
+ begin
+ fieldbyName('CIFPoints').value := frameBads1.RadioGroup1.ItemIndex + 1;
+ end
+ else
+ begin
+ fieldbyName('CIFPoints').value := 4;
+ end;
+ end;
+ fieldbyName('CIFQty').value := strtofloatdef(trim(frameBads1.CIFQty.Text), 0);
+ fieldbyName('CIJBQty').value := strtofloatdef(trim(frameBads1.CIJBQty.Text), 0);
+ fieldbyName('SubtractQty').value := strtofloatdef(trim(frameBads1.SubtractQty.Text), 0);
+ fieldbyName('IsSubtract').value := frameBads1.IsSubtract.Checked;
+ Post;
+ end;
+ end;
+ with CDS_2 do
+ begin
+ First;
+ while not eof do
+ begin
+ if trim(CDS_2.fieldbyName('CIFID').AsString) = '' then
+ begin
+ if not GetLSNo(ADOQueryBaseTemp, maxno, 'JC', 'Trade_Cloth_Inspect_Flaw', 5, 1) then
+ raise Exception.create('ȡõʧܣ');
+ end
+ else
+ begin
+ maxno := trim(CDS_2.fieldbyName('CIFID').AsString);
+ end;
+ with ADOQueryBaseCmd do
+ begin
+ Close;
+ SQL.Clear;
+ SQL.Add('select * from Trade_Cloth_Inspect_Flaw ');
+ SQL.Add(' where CIFID=''' + trim(maxno) + '''');
+ Open;
+ end;
+ with ADOQueryBaseCmd do
+ begin
+ if trim(CDS_2.fieldbyName('CIFID').AsString) = '' then
+ Append
+ else
+ edit;
+ RTSetSaveDataCDS(ADOQueryBaseCmd, Tv2, CDS_2, 'Trade_Cloth_Inspect_Flaw', 0);
+ fieldbyName('CIID').value := trim(FCIID);
+ fieldbyName('CIFID').value := trim(maxno);
+ Post;
+ end;
+ CDS_2.edit;
+ CDS_2.fieldbyName('CIID').value := trim(FCIID);
+ CDS_2.fieldbyName('CIFID').value := trim(maxno);
+ next;
+ end;
+ end;
+ frameBads1.CIFBeg.Text := '';
+ frameBads1.CIFEnd.Text := '';
+ frameBads1.CIFQty.Text := '';
+ frameBads1.RadioGroup1.ItemIndex := 0;
+ frameBads1.CIFNumber.text := '';
+ frameBads1.CIJBQty.text := '';
+
+// frameBads1.dxPanel1.Visible := false;
cxPageControl1.ActivePageIndex := 0;
+ gethundredsquares();
+ cxGroupBox_keys.Visible := false;
end;
procedure TfrmMachRollMain.dxLayoutControl_packDblClick(Sender: TObject);
@@ -2288,6 +2547,18 @@ begin
// end;
end;
+procedure TfrmMachRollMain.EDIT_MachiClick(Sender: TObject);
+begin
+ if trim(EDIT_Machi.Text) = '' then
+ begin
+ EDIT_Machi.Text := '';
+ end
+ else
+ begin
+ EDIT_Machi.Text := '';
+ end;
+end;
+
procedure TfrmMachRollMain.Edit_pieceOrderClick(Sender: TObject);
begin
inherited;
@@ -2324,6 +2595,29 @@ begin
end;
+procedure TfrmMachRollMain.edtMaBiaoClick(Sender: TObject);
+begin
+ inherited;
+ if trim(edtMaBiao.Text) = '' then
+ begin
+ edtMaBiao.Text := '';
+ end
+ else
+ begin
+ edtMaBiao.Text := '';
+ end;
+
+ with cds_params do
+ begin
+ cds_params.Edit;
+ if Trim(edtMaBiao.Text) = '' then
+ cds_params.fieldByName('mabiao').Value := '1'
+ else
+ cds_params.fieldByName('mabiao').Value := '0';
+ cds_params.Post;
+ end;
+end;
+
procedure TfrmMachRollMain.edtScanDblClick(Sender: TObject);
begin
inherited;
@@ -2357,8 +2651,6 @@ begin
end;
end;
-//
-
function TfrmMachRollMain.SaveData(): Boolean;
var
maxno, MCIID, BZID, strsql: string;
@@ -2372,7 +2664,16 @@ begin
Result := false;
Maddwet := strTofloatDef(trim(addwet.text), 0); // Faddwet;
maddLen := strTofloatDef(trim(addlen.text), 0); // faddlen;
- mYardStick := strtofloatdef(trim(RuleYardstick.Text), 100);
+ if trim(EDIT_Machi.Text) = '' then
+ begin
+ mYardStick := 100;
+ end
+ else
+ begin
+ mYardStick := 98;
+ end;
+
+// mYardStick := strtofloatdef(trim(RuleYardstick.Text), 100);
mPresentLen := strTofloatDef(trim(presentlen.text), 0);
mpresentWeight := strTofloatDef(trim(presentWeight.text), 0);
mPresentLen0 := strTofloatDef(trim(presentlen.text), 0);
@@ -2383,16 +2684,16 @@ begin
funitPiecesStr := Trim(unitPieces.Text) + '+' + floatTostr((strtoFloatdef(trim(InputLen.Text), 0)) - strtoFloatdef(Trim(unitPieces.Text), 0));
end;
//0:䣻1ȥ
- if gPresentNumFlag = 1 then
- begin
- mPresentLen := -1 * mPresentLen;
- mpresentWeight := -1 * mpresentWeight;
- end
- else
- begin
- mPresentLen := 0;
- mpresentWeight := 0;
- end;
+// if gPresentNumFlag = 1 then
+// begin
+ mPresentLen := -1 * mPresentLen;
+ mpresentWeight := -1 * mpresentWeight;
+// end
+// else
+// begin
+// mPresentLen := 0;
+// mpresentWeight := 0;
+// end;
if FOperationStatus = '' then
begin
@@ -2492,12 +2793,12 @@ begin
// +mAddLen
if (uppercase(lblLenUnit.CaptionOptions.Hint) = 'M') or (lblLenUnit.CaptionOptions.Hint = '') then
begin
- MMeter := RoundFloat((MInputLen + maddLen + mPresentLen) / (mYardStick / 100), cds_params.fieldbyName('MPlace').AsInteger);
+ MMeter := RoundFloat((MInputLen + maddLen + mPresentLen) * (mYardStick / 100), cds_params.fieldbyName('MPlace').AsInteger);
MYardage := RoundFloat(MMeter / 0.9144, cds_params.fieldbyName('YPlace').AsInteger);
end
else
begin
- MYardage := RoundFloat((MInputLen + maddLen + mPresentLen) / (mYardStick / 100), cds_params.fieldbyName('YPlace').AsInteger);
+ MYardage := RoundFloat((MInputLen + maddLen + mPresentLen) * (mYardStick / 100), cds_params.fieldbyName('YPlace').AsInteger);
MMeter := RoundFloat(MYardage * 0.9144, cds_params.fieldbyName('MPlace').AsInteger);
end;
@@ -2509,14 +2810,39 @@ begin
fieldbyName('YardStick').value := mYardStick;
/// ////////////////////// 泤 /////////////////////////
- // if Trim(Edit_zp.Text) <> '' then
- // begin
+
fieldbyName('Grade').value := trim(grade.Text);
- // end;
- // if Trim(Edit_cp.Text) <> '' then
- // begin
- // FieldByName('Grade').Value := 'Ʒ';
- // end;
+ fieldbyName('InspectionType').value := trim(InspectionType.Text);
+// fieldbyName('banci').value := trim(banci.Text);
+ if Radio_banci.ItemIndex = 0 then
+ begin
+ fieldbyName('banci').value := 'A';
+ fieldbyName('BanciqtyA').value := RoundFloat(strtofloatdef(trim(InputLen.Text), 0) - strtofloatdef(trim(BanciqtyB.Text), 0) - strtofloatdef(trim(BanciqtyC.Text), 0), 2);
+ fieldbyName('BanciqtyB').value := RoundFloat(strtofloatdef(trim(BanciqtyB.Text), 0), 2);
+ fieldbyName('BanciqtyC').value := RoundFloat(strtofloatdef(trim(BanciqtyB.Text), 0), 2);
+
+ end
+ else if Radio_banci.ItemIndex = 1 then
+ begin
+ fieldbyName('banci').value := 'B';
+ fieldbyName('BanciqtyB').value := RoundFloat(strtofloatdef(trim(InputLen.Text), 0) - strtofloatdef(trim(BanciqtyA.Text), 0) - strtofloatdef(trim(BanciqtyC.Text), 0), 2);
+ fieldbyName('BanciqtyA').value := RoundFloat(strtofloatdef(trim(BanciqtyA.Text), 0), 2);
+
+ fieldbyName('BanciqtyC').value := RoundFloat(strtofloatdef(trim(BanciqtyB.Text), 0), 2);
+ end
+ else
+ begin
+ fieldbyName('banci').value := 'C';
+ fieldbyName('BanciqtyC').value := RoundFloat(strtofloatdef(trim(InputLen.Text), 0) - strtofloatdef(trim(BanciqtyA.Text), 0) - strtofloatdef(trim(BanciqtyB.Text), 0), 2);
+ fieldbyName('BanciqtyA').value := RoundFloat(strtofloatdef(trim(BanciqtyA.Text), 0), 2);
+ fieldbyName('BanciqtyB').value := RoundFloat(strtofloatdef(trim(BanciqtyB.Text), 0), 2);
+
+ end;
+
+ fieldbyName('AFiller').value := trim(AFiller.Text);
+ fieldbyName('BFiller').value := trim(BFiller.Text);
+ fieldbyName('CFiller').value := trim(CFiller.Text);
+
if FOperationStatus <> '' then
begin
fieldbyName('PieceNo').value := 0;
@@ -2536,11 +2862,13 @@ begin
fieldbyName('ConMId').value := trim(FConMId);
fieldbyName('ConSId').value := trim(FConSId);
fieldbyName('BCIOID').value := trim(FBCIOID);
+ fieldbyName('PCID').value := trim(maxno);
fieldbyName('Workshop').value := trim(FWorkshop);
- if dxLayoutItem_rk.Visible then
- fieldbyName('CIIOFlag').value := 'δ'
- else
- fieldbyName('CIIOFlag').value := '';
+// if dxLayoutItem_rk.Visible then
+// fieldbyName('CIIOFlag').value := 'δ'
+// else
+ fieldbyName('CIIOFlag').value := 'Ѽ';
+ fieldbyName('CINote').value := trim(FCINote);
fieldbyName('C_Code').value := FC_Code;
fieldbyName('C_Name').value := FC_Name;
fieldbyName('C_EName').value := FC_EName;
@@ -2551,6 +2879,19 @@ begin
fieldbyName('C_EColor').value := FC_EColor;
fieldbyName('C_ColorNo').value := FC_ColorNo;
fieldbyName('C_StyleNo').value := FC_StyleNo;
+ if StrToFloatDef(topLen.Text, 0) > 0 then
+ begin
+ fieldbyName('topLen').value := trim(topLen.Text);
+ end;
+ if StrToFloatDef(midLen.Text, 0) > 0 then
+ begin
+ fieldbyName('midLen').value := trim(midLen.Text);
+ end;
+ if StrToFloatDef(lastLen.Text, 0) > 0 then
+ begin
+ fieldbyName('lastLen').value := trim(lastLen.Text);
+ end;
+ fieldbyName('Cause').value := trim(Cause.Text);
fieldbyName('C_Composition').value := FC_Composition;
if dxLayoutItem_width.ActuallyVisible then
fieldbyName('C_Width').value := trim(C_width.Text)
@@ -2602,7 +2943,7 @@ begin
FCIID := trim(maxno);
/// /////////////// õϢ //////////////////
- with CDS_2 do
+ { with CDS_2 do
begin
First;
while not eof do
@@ -2640,7 +2981,7 @@ begin
CDS_2.fieldbyName('CIFID').value := trim(maxno);
next;
end;
- end;
+ end; }
/// /////////////// õϢ //////////////////
///
/// /////////////// ¾ŴõϢ //////////////////
@@ -2665,12 +3006,11 @@ begin
end;
//жǷظ
- if not checkPicecNo() then
- begin
-
- exit;
- end;
-
+// if not checkPicecNo() then
+// begin
+//
+// exit;
+// end;
/// /////////////// ¾ŴõϢ //////////////////
///
/// /////////////// ¿ //////////////////
@@ -2757,11 +3097,11 @@ begin
if fLabVolume = '' then
fLabVolume := trim(gDefaultLableFile);
- if fLabVolume = '' then
- begin
- Application.MessageBox('δñǩ', 'ʾϢ', MB_ICONERROR);
- exit;
- end;
+// if fLabVolume = '' then
+// begin
+// Application.MessageBox('δñǩ', 'ʾϢ', MB_ICONERROR);
+// exit;
+// end;
ExportFtErpFile(fLabVolume + '.rmf', ADOQueryBaseTemp);
fPrintFile := ExtractFilePath(Application.ExeName) + 'Report\' + fLabVolume + '.rmf';
@@ -2892,7 +3232,7 @@ begin
begin
FOperationStatus := '';
FCIID := MCIID;
- InitCDGrid(MCIID);
+// InitCDGrid(MCIID);
end;
end;
@@ -2938,7 +3278,7 @@ begin
if (trim(cds_params.fieldbyName('mabiao').AsString) = '1') then
begin
- //Զύ
+ //Զύ
if gAutoPost and fCanAutoPost then
begin
if i1 = 0 then
@@ -2968,7 +3308,7 @@ begin
SetUnit('Y');
end;
end;
-
+ gethundredsquares();
end;
end;
@@ -3029,16 +3369,16 @@ begin
with cds_3 do
begin
// InputLen.Text := fieldbyName('InputLen').AsString;
-// fLastPieceNo := trim(PieceNo.Text);
-// PieceNo.Text := fieldbyName('PieceNo').AsString;
+ fLastPieceNo := trim(PieceNo.Text);
+ PieceNo.Text := fieldbyName('PieceNo').AsString;
// InputWeight.Text := fieldbyName('InputWeight').AsString;
-// Tare.Text := fieldbyName('Tare').AsString;
+ Tare.Text := fieldbyName('Tare').AsString;
// grade.ItemIndex := grade.Properties.Items.IndexOf(trim(fieldbyName('grade').AsString));
- // Coefficient.Text:=fieldByName('Coefficient').AsString;
+// Coefficient.Text := fieldByName('Coefficient').AsString;
end;
edtPacketNo.Enabled := False;
- end
+ {end
else
begin
BTPrint.Caption := ' ';
@@ -3051,8 +3391,8 @@ begin
cds_params.fieldbyName('chen').value := fOldCheng;
cds_params.fieldbyName('mabiao').value := fOldmabiao;
cds_params.Post;
+ }
end;
-
end;
procedure TfrmMachRollMain.GetPacketNo();
@@ -3092,6 +3432,25 @@ begin
end;
end;
+procedure TfrmMachRollMain.gradePropertiesEditValueChanged(Sender: TObject);
+var
+ MStrIn: string;
+// mvalue: double;
+begin
+ if (trim(grade.text) = 'D/C') or (trim(grade.text) = 'D') then
+ begin
+ cxGroupBox1.Visible := not cxGroupBox1.Visible;
+ if cxGroupBox1.Visible then
+ begin
+ cxGroupBox1.Left := (self.Width - cxGroupBox1.Width) div 2;
+// edit_Cause.SetFocus;
+ end;
+ Cause.text := trIM(edit_Cause.text);
+
+ end;
+
+end;
+
/////////////////////////////////////
function TfrmMachRollMain.deletePack(packId: string): boolean;
var
diff --git a/项目代码/wenshangkm/G03贸易布匹检验/U_ParamSet.dfm b/项目代码/wenshangkm/G03贸易布匹检验/U_ParamSet.dfm
index 89564a5..0ab6865 100644
--- a/项目代码/wenshangkm/G03贸易布匹检验/U_ParamSet.dfm
+++ b/项目代码/wenshangkm/G03贸易布匹检验/U_ParamSet.dfm
@@ -62,25 +62,26 @@ object frmParamSet: TfrmParamSet
Visible = True
end
inherited edtMaBiao: TcxTextEdit
- ExplicitHeight = 38
+ ExplicitHeight = 34
end
inherited edtMBDW: TcxTextEdit
- ExplicitHeight = 38
+ ExplicitHeight = 34
end
inherited edtChen: TcxTextEdit
- ExplicitHeight = 38
+ ExplicitHeight = 34
end
inherited outPage: TcxTextEdit
- ExplicitHeight = 38
+ Text = ''
+ ExplicitHeight = 34
end
inherited AddwetPresent: TcxTextEdit
- ExplicitHeight = 31
+ ExplicitHeight = 27
end
inherited AddLenPresent: TcxTextEdit
- ExplicitHeight = 31
+ ExplicitHeight = 27
end
inherited presentNumFlag: TcxComboBox
- ExplicitHeight = 31
+ ExplicitHeight = 27
end
end
inherited cxGroupBox2: TcxGroupBox
@@ -95,39 +96,39 @@ object frmParamSet: TfrmParamSet
Touch.TabletOptions = []
ExplicitLeft = 53
ExplicitTop = 27
- ExplicitHeight = 31
+ ExplicitHeight = 27
end
inherited MaxLen: TcxTextEdit
- ExplicitHeight = 31
+ ExplicitHeight = 27
end
inherited MinWeight: TcxTextEdit
- ExplicitHeight = 31
+ ExplicitHeight = 27
end
inherited MaxWeight: TcxTextEdit
- ExplicitHeight = 31
+ ExplicitHeight = 27
end
inherited BeginPieceNo: TcxTextEdit
Top = 64
Properties.OnChange = FrameParam1BeginPieceNoPropertiesChange
ExplicitTop = 64
- ExplicitHeight = 31
+ ExplicitHeight = 27
end
inherited EndPieceNo: TcxTextEdit
Properties.OnChange = FrameParam1EndPieceNoPropertiesChange
- ExplicitHeight = 31
+ ExplicitHeight = 27
end
end
inherited cxGroupBox3: TcxGroupBox
ExplicitWidth = 771
Width = 771
inherited MPlace: TcxTextEdit
- ExplicitHeight = 31
+ ExplicitHeight = 27
end
inherited YPlace: TcxTextEdit
- ExplicitHeight = 31
+ ExplicitHeight = 27
end
inherited KgPlace: TcxTextEdit
- ExplicitHeight = 31
+ ExplicitHeight = 27
end
end
inherited cxGroupBox4: TcxGroupBox
@@ -138,19 +139,19 @@ object frmParamSet: TfrmParamSet
inherited edtdabao: TcxTextEdit
Style.Font.Height = -16
Style.IsFontAssigned = True
- ExplicitHeight = 34
+ ExplicitHeight = 30
end
inherited packRolls: TcxTextEdit
- ExplicitHeight = 31
+ ExplicitHeight = 27
end
inherited rollnoMake: TcxComboBox
Properties.DropDownListStyle = lsEditFixedList
Style.Font.Charset = GB2312_CHARSET
Style.IsFontAssigned = True
- ExplicitHeight = 31
+ ExplicitHeight = 27
end
inherited packNoMake: TcxComboBox
- ExplicitHeight = 31
+ ExplicitHeight = 27
end
inherited packPrintPreview: TCheckBox
Top = 74
@@ -161,15 +162,14 @@ object frmParamSet: TfrmParamSet
inherited packlabNumber: TcxComboBox
Style.Font.Charset = GB2312_CHARSET
Style.IsFontAssigned = True
- ExplicitHeight = 25
end
inherited packPrintAction: TcxComboBox
- ExplicitHeight = 31
+ ExplicitHeight = 27
end
end
end
inherited weightRule: TcxComboBox
- ExplicitHeight = 34
+ ExplicitHeight = 30
end
end
object dxPanel1: TdxPanel
diff --git a/项目代码/wenshangkm/G03贸易布匹检验/U_TradeClothInspList.dfm b/项目代码/wenshangkm/G03贸易布匹检验/U_TradeClothInspList.dfm
index 5c087b5..e19c3d9 100644
--- a/项目代码/wenshangkm/G03贸易布匹检验/U_TradeClothInspList.dfm
+++ b/项目代码/wenshangkm/G03贸易布匹检验/U_TradeClothInspList.dfm
@@ -20,6 +20,7 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList
AutoSize = True
BevelInner = bvLowered
TabOrder = 3
+ ExplicitTop = 130
DesignSize = (
1296
40)
@@ -98,10 +99,10 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList
end
end
object cxGrid1: TcxGrid [1]
- Left = -40
- Top = 194
+ Left = 8
+ Top = 167
Width = 1296
- Height = 390
+ Height = 426
BorderStyle = cxcbsNone
PopupMenu = PM_1
TabOrder = 2
@@ -539,6 +540,13 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList
DataBinding.IsNullValueType = True
Width = 60
end
+ object Tv1Column13: TcxGridDBColumn
+ Caption = #24179#22343#26102#38388
+ DataBinding.FieldName = 'Averagetime'
+ DataBinding.IsNullValueType = True
+ HeaderAlignmentHorz = taCenter
+ Width = 60
+ end
end
object cxGrid1Level1: TcxGridLevel
GridView = Tv1
@@ -552,7 +560,7 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList
Height = 76
AutoSize = True
ButtonHeight = 38
- ButtonWidth = 121
+ ButtonWidth = 169
Caption = 'ToolBar1'
Color = clWhite
DoubleBuffered = False
@@ -597,17 +605,25 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList
ImageIndex = 3
OnClick = btnEditClick
end
- object ToolButton2: TToolButton
+ object ToolButton6: TToolButton
Left = 403
Top = 0
AutoSize = True
+ Caption = #20462#25913#24179#22343#26102#38388
+ ImageIndex = 3
+ OnClick = ToolButton6Click
+ end
+ object ToolButton2: TToolButton
+ Left = 538
+ Top = 0
+ AutoSize = True
Caption = #25209#37327#20462#25913
DropdownMenu = PopupMenu2
ImageIndex = 3
Style = tbsDropDown
end
object TBZF: TToolButton
- Left = 529
+ Left = 664
Top = 0
AutoSize = True
Caption = #21024#38500
@@ -615,26 +631,26 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList
OnClick = TBZFClick
end
object Tout: TToolButton
- Left = 600
+ Left = 735
Top = 0
AutoSize = True
Caption = #20986#24211
DropdownMenu = PopupMenu1
ImageIndex = 49
+ Wrap = True
Style = tbsDropDown
OnClick = ToutClick
end
object Tunout: TToolButton
- Left = 694
- Top = 0
+ Left = 0
+ Top = 38
AutoSize = True
Caption = #25764#38144#20986#24211
ImageIndex = 11
- Wrap = True
OnClick = TunoutClick
end
object ToolButton4: TToolButton
- Left = 0
+ Left = 103
Top = 38
AutoSize = True
Caption = #25171#21253
@@ -642,7 +658,7 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList
OnClick = ToolButton4Click
end
object btnJYBG: TToolButton
- Left = 71
+ Left = 174
Top = 38
AutoSize = True
Caption = #26816#39564#25253#21578
@@ -650,15 +666,23 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList
OnClick = btnJYBGClick
end
object Tprintmd: TToolButton
- Left = 174
+ Left = 277
Top = 38
AutoSize = True
Caption = #25171#21360#30721#21333
ImageIndex = 21
OnClick = TprintmdClick
end
+ object ToolButton7: TToolButton
+ Left = 380
+ Top = 38
+ AutoSize = True
+ Caption = #25171#21360#39564#36135#20998#26512#25253#21578
+ ImageIndex = 21
+ OnClick = ToolButton7Click
+ end
object TBExport: TToolButton
- Left = 277
+ Left = 547
Top = 38
AutoSize = True
Caption = #23548#20986
@@ -666,7 +690,7 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList
OnClick = TBExportClick
end
object ToolButton5: TToolButton
- Left = 348
+ Left = 618
Top = 38
AutoSize = True
Caption = #26085#24535
@@ -674,7 +698,7 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList
OnClick = ToolButton5Click
end
object ToolButton1: TToolButton
- Left = 419
+ Left = 689
Top = 38
AutoSize = True
Caption = #20445#23384#26684#24335
@@ -682,7 +706,7 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList
OnClick = ToolButton1Click
end
object TBClose: TToolButton
- Left = 522
+ Left = 792
Top = 38
AutoSize = True
Caption = #20851#38381
@@ -1502,4 +1526,89 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList
OnClick = MenuItem1Click
end
end
+ object ADO_1: TADOQuery
+ Connection = DataLink_TradeInsp.ADOLink
+ LockType = ltReadOnly
+ Parameters = <>
+ Left = 280
+ Top = 340
+ end
+ object RMDB_A: TRMDBDataSet
+ Visible = True
+ DataSet = ADO_1
+ Left = 348
+ Top = 344
+ end
+ object RMDB_B: TRMDBDataSet
+ Visible = True
+ DataSet = ADO_2
+ Left = 348
+ Top = 396
+ end
+ object ADO_2: TADOQuery
+ Connection = DataLink_TradeInsp.ADOLink
+ LockType = ltReadOnly
+ Parameters = <>
+ Left = 272
+ Top = 388
+ end
+ object ADO_3: TADOQuery
+ Connection = DataLink_TradeInsp.ADOLink
+ LockType = ltReadOnly
+ Parameters = <>
+ Left = 272
+ Top = 436
+ end
+ object RMDB_C: TRMDBDataSet
+ Visible = True
+ DataSet = ADO_3
+ Left = 348
+ Top = 444
+ end
+ object RMDB_D: TRMDBDataSet
+ Visible = True
+ DataSet = ADO_4
+ Left = 340
+ Top = 484
+ end
+ object RMDB_F: TRMDBDataSet
+ Visible = True
+ DataSet = ADO_5
+ Left = 412
+ Top = 484
+ end
+ object ADO_4: TADOQuery
+ Connection = DataLink_TradeInsp.ADOLink
+ LockType = ltReadOnly
+ Parameters = <>
+ Left = 264
+ Top = 484
+ end
+ object ADO_5: TADOQuery
+ Connection = DataLink_TradeInsp.ADOLink
+ LockType = ltReadOnly
+ Parameters = <>
+ Left = 408
+ Top = 436
+ end
+ object RM2: TRMGridReport
+ ThreadPrepareReport = True
+ InitialZoom = pzDefault
+ PreviewButtons = [rmpbZoom, rmpbLoad, rmpbSave, rmpbPrint, rmpbFind, rmpbPageSetup, rmpbExit, rmpbSaveToXLS, rmpbExport, rmpbNavigator]
+ DefaultCollate = False
+ ShowPrintDialog = False
+ SaveReportOptions.RegistryPath = 'Software\ReportMachine\ReportSettings\'
+ PreviewOptions.RulerUnit = rmutScreenPixels
+ PreviewOptions.RulerVisible = False
+ PreviewOptions.DrawBorder = False
+ PreviewOptions.BorderPen.Color = clGray
+ PreviewOptions.BorderPen.Style = psDash
+ CompressLevel = rmzcFastest
+ CompressThread = False
+ LaterBuildEvents = True
+ OnlyOwnerDataSet = False
+ Left = 580
+ Top = 440
+ ReportData = {}
+ end
end
diff --git a/项目代码/wenshangkm/G03贸易布匹检验/U_TradeClothInspList.pas b/项目代码/wenshangkm/G03贸易布匹检验/U_TradeClothInspList.pas
index 5c74e89..b1504b1 100644
--- a/项目代码/wenshangkm/G03贸易布匹检验/U_TradeClothInspList.pas
+++ b/项目代码/wenshangkm/G03贸易布匹检验/U_TradeClothInspList.pas
@@ -167,6 +167,20 @@ type
MenuItem1: TMenuItem;
cxCheckBox1: TcxCheckBox;
Tv1Column9: TcxGridDBColumn;
+ ToolButton6: TToolButton;
+ Tv1Column13: TcxGridDBColumn;
+ ToolButton7: TToolButton;
+ ADO_1: TADOQuery;
+ RMDB_A: TRMDBDataSet;
+ RMDB_B: TRMDBDataSet;
+ ADO_2: TADOQuery;
+ ADO_3: TADOQuery;
+ RMDB_C: TRMDBDataSet;
+ RMDB_D: TRMDBDataSet;
+ RMDB_F: TRMDBDataSet;
+ ADO_4: TADOQuery;
+ ADO_5: TADOQuery;
+ RM2: TRMGridReport;
procedure FormClose(Sender: TObject; var Action: TCloseAction);
procedure FormCreate(Sender: TObject);
procedure TBCloseClick(Sender: TObject);
@@ -216,6 +230,7 @@ type
procedure Tv1CustomDrawCell(Sender: TcxCustomGridTableView; ACanvas: TcxCanvas; AViewInfo: TcxGridTableDataCellViewInfo; var ADone: Boolean);
procedure v1sselPropertiesEditValueChanged(Sender: TObject);
procedure cxCheckBox1Click(Sender: TObject);
+ procedure ToolButton7Click(Sender: TObject);
private
fstopwatch: TStopwatch;
DQdate: TDateTime;
@@ -766,21 +781,154 @@ begin
end;
procedure TfrmTradeClothInspList.ToolButton6Click(Sender: TObject);
+var
+ MStrIn: string;
+ mvalue: double;
begin
-// with ADOQueryTemp do
-// begin
-// close;
-// sql.Clear;
-// sql.Add('SELECT * FROM [dbo].[Bs_Report_Cloud_File]');
-// sql.Add('where BLCLID=''D22E6757-43C2-45B9-AE14-921BD2293E50''');
-// open;
-// end;
-// if ADOQueryTemp.RecordCount>0 then
-// begin
-// rm1.LoadPreparedReportFromBlobField(TBlobField(ADOQueryTemp.fieldByName('GenerateFiles')));
-// rm1.ShowPreparedReport;
-// // rm1.PrintPreparedReport('',1,true,rmppAll) ;
-// end;
+ if Order_Main.IsEmpty then
+ Exit;
+
+ if Order_Main.Locate('SSel', True, []) = False then
+ begin
+ Application.MessageBox('ѡݼ¼', 'ʾ', 0);
+ Exit;
+ end;
+
+ if not InputQuery('ƽʱ', '', MStrIn) then
+ begin
+ Exit;
+ end;
+ mvalue := strTofloatdef(trim(MStrIn), 0);
+ try
+ Order_Main.DisableControls;
+ ADOQueryCmd.Connection.BeginTrans;
+ with Order_Main do
+ begin
+ First;
+ while not Eof do
+ begin
+ if Order_Main.FieldByName('SSel').AsBoolean = True then
+ begin
+ with ADOQueryCmd do
+ begin
+ Close;
+ sql.Clear;
+ sql.Add('Update Trade_Cloth_Inspect Set Averagetime=' + floatTostr(mvalue));
+ sql.Add('where cIId=''' + Trim(Order_Main.fieldbyname('cIId').AsString) + '''');
+ ExecSQL;
+ end;
+ end;
+ Next;
+ end;
+ end;
+ ADOQueryCmd.Connection.CommitTrans;
+ Order_Main.EnableControls;
+ application.MessageBox('ݲɹ', 'ʾϢ');
+ TBRafresh.Click;
+ except
+ ADOQueryCmd.Connection.RollbackTrans;
+ Order_Main.EnableControls;
+ application.MessageBox('ݲʧܣ', 'ʾϢ', 0);
+ end;
+
+end;
+
+procedure TfrmTradeClothInspList.ToolButton7Click(Sender: TObject);
+var
+ WSql, FFiltration1: string;
+ fPrintFile, fPrintFile10, FMainID, LBName: string;
+begin
+ if Order_Main.IsEmpty then
+ Exit;
+ if Order_Main.Locate('SSel', True, []) = False then
+ begin
+ Application.MessageBox('ûѡ', 'ʾ', 0);
+ Exit;
+ end;
+ ExportFtErpFile('.rmf', ADOQueryTemp);
+ WSql := '';
+ Order_Main.DisableControls;
+ with Order_Main do
+ begin
+ First;
+ while not Eof do
+ begin
+ if Order_Main.fieldbyname('SSel').AsBoolean then
+ begin
+ if WSql <> '' then
+ begin
+ WSql := WSql + ',' + Trim(Order_Main.fieldbyname('CIID').AsString);
+ end
+ else
+ begin
+ WSql := Trim(Order_Main.fieldbyname('CIID').AsString);
+ end;
+ end;
+ Next;
+ end;
+ end;
+ Order_Main.Locate('SSel', True, []);
+ FFiltration1 := WSql;
+ Order_Main.EnableControls;
+ with ADO_1 do
+ begin
+ Close;
+ sql.Clear;
+ sql.add('exec P_Trade_Cloth_IN_djd_Prt_JYFX');
+ sql.add(' @Filtration=' + quotedstr(Trim(FFiltration1)));
+ sql.add(',@grade=''A'' ');
+ Open;
+ end;
+ with ADO_2 do
+ begin
+ Close;
+ sql.Clear;
+ sql.add('exec P_Trade_Cloth_IN_djd_Prt_JYFX');
+ sql.add(' @Filtration=' + quotedstr(Trim(FFiltration1)));
+ sql.add(',@grade=''B'' ');
+ Open;
+ end;
+ with ADO_3 do
+ begin
+ Close;
+ sql.Clear;
+ sql.add('exec P_Trade_Cloth_IN_djd_Prt_JYFX');
+ sql.add(' @Filtration=' + quotedstr(Trim(FFiltration1)));
+ sql.add(',@grade=''C'' ');
+ Open;
+ end;
+ with ADO_4 do
+ begin
+ Close;
+ sql.Clear;
+ sql.add('exec P_Trade_Cloth_IN_djd_Prt_JYFX');
+ sql.add(' @Filtration=' + quotedstr(Trim(FFiltration1)));
+ sql.add(',@grade=''D'' ');
+ Open;
+ end;
+ with ADO_5 do
+ begin
+ Close;
+ sql.Clear;
+ sql.add('exec P_Trade_Cloth_IN_djd_Prt_JYFX');
+ sql.add(' @Filtration=' + quotedstr(Trim(FFiltration1)));
+ sql.add(',@grade=''D/C'' ');
+ Open;
+ end;
+ fPrintFile := ExtractFilePath(Application.ExeName) + 'Report\.rmf';
+
+ RMXLSExport1.ShowDialog := true;
+ if FileExists(fPrintFile) then
+ begin
+ RM2.LoadFromFile(fPrintFile);
+ RM2.DefaultCopies := 1;
+ RM2.ShowReport;
+// RM1.PrintReport;
+ end
+ else
+ begin
+ Application.MessageBox(PChar('û' + fPrintFile), 'ʾ', 0);
+ end;
end;
procedure TfrmTradeClothInspList.ToutClick(Sender: TObject);
@@ -790,7 +938,7 @@ begin
Application.MessageBox('ѡ!', 'ʾ', 0);
Exit;
end;
- if Application.MessageBox('ȷҪ', 'ʾ', 32 + 4) <> IDYES then
+ if Application.MessageBox('ȷҪƽʱ', 'ʾ', 32 + 4) <> IDYES then
Exit;
Order_Main.DisableControls;
with Order_Main do
@@ -805,7 +953,7 @@ begin
begin
Close;
sql.Clear;
- sql.Add('update Trade_Cloth_Inspect set CIIOFlag=''ѳ'',IOTime=getdate() where CIID=''' + Trim(Order_Main.fieldbyname('CIID').AsString) + '''');
+ sql.Add('update Trade_Cloth_Inspect set Averagetime=''ѳ'',IOTime=getdate() where CIID=''' + Trim(Order_Main.fieldbyname('CIID').AsString) + '''');
ExecSQL;
end;
diff --git a/项目代码/wenshangkm/G03贸易布匹检验/U_frameBads.dfm b/项目代码/wenshangkm/G03贸易布匹检验/U_frameBads.dfm
index 7228376..d560e50 100644
--- a/项目代码/wenshangkm/G03贸易布匹检验/U_frameBads.dfm
+++ b/项目代码/wenshangkm/G03贸易布匹检验/U_frameBads.dfm
@@ -1,7 +1,7 @@
object frameBads: TframeBads
Left = 0
Top = 0
- Width = 331
+ Width = 300
Height = 435
DoubleBuffered = False
Font.Charset = ANSI_CHARSET
@@ -15,15 +15,16 @@ object frameBads: TframeBads
object dxPanel1: TdxPanel
Left = 0
Top = 144
- Width = 331
+ Width = 300
Height = 291
Align = alBottom
TabOrder = 0
Visible = False
+ ExplicitWidth = 321
object RadioGroup1: TRadioGroup
Left = 0
Top = 108
- Width = 329
+ Width = 298
Height = 132
Align = alBottom
Columns = 2
@@ -43,15 +44,17 @@ object frameBads: TframeBads
ParentCtl3D = False
ParentFont = False
TabOrder = 0
+ ExplicitWidth = 319
end
object dxPanel3: TdxPanel
Left = 0
Top = 240
- Width = 329
+ Width = 298
Height = 49
Align = alBottom
Frame.Borders = [bLeft, bRight, bBottom]
TabOrder = 1
+ ExplicitWidth = 319
object cxButton1: TcxButton
Left = 25
Top = 3
@@ -86,7 +89,7 @@ object frameBads: TframeBads
object dxLayoutControl1: TdxLayoutControl
Left = 0
Top = 9
- Width = 329
+ Width = 298
Height = 99
Align = alBottom
Font.Charset = ANSI_CHARSET
@@ -97,8 +100,9 @@ object frameBads: TframeBads
ParentFont = False
TabOrder = 2
LayoutLookAndFeel = DataLink_TradeInsp.dxLayoutSkinLookAndFeel1
+ ExplicitWidth = 319
object CIFBeg: TcxTextEdit
- Left = 53
+ Left = -21
Top = 54
ParentFont = False
Properties.OnEditValueChanged = CIFBegPropertiesEditValueChanged
@@ -114,7 +118,7 @@ object frameBads: TframeBads
Width = 52
end
object CIFEnd: TcxTextEdit
- Left = 129
+ Left = 55
Top = 54
AutoSize = False
ParentFont = False
@@ -128,11 +132,11 @@ object frameBads: TframeBads
Style.TransparentBorder = False
Style.IsFontAssigned = True
TabOrder = 5
- Height = 37
+ Height = 31
Width = 58
end
object CIFQty: TcxTextEdit
- Left = 211
+ Left = 137
Top = 54
AutoSize = False
ParentFont = False
@@ -145,11 +149,11 @@ object frameBads: TframeBads
Style.TransparentBorder = False
Style.IsFontAssigned = True
TabOrder = 6
- Height = 37
+ Height = 31
Width = 53
end
object CIFNumber: TcxTextEdit
- Left = 49
+ Left = -20
Top = 9
ParentFont = False
Style.Font.Charset = ANSI_CHARSET
@@ -164,7 +168,7 @@ object frameBads: TframeBads
Width = 56
end
object IsSubtract: TcxCheckBox
- Left = 262
+ Left = 193
Top = 9
AutoSize = False
Caption = ' '
@@ -186,10 +190,10 @@ object frameBads: TframeBads
Transparent = True
OnClick = IsSubtractClick
Height = 37
- Width = 36
+ Width = 117
end
object SubtractQty: TcxTextEdit
- Left = 194
+ Left = 125
Top = 9
AutoSize = False
ParentFont = False
@@ -207,7 +211,7 @@ object frameBads: TframeBads
Width = 60
end
object cxCheck_len: TcxCheckBox
- Left = 4
+ Left = -65
Top = 54
Caption = #38271#24230
ParentFont = False
@@ -216,6 +220,14 @@ object frameBads: TframeBads
TabOrder = 3
Transparent = True
end
+ object CIJBQty: TcxTextEdit
+ Left = 237
+ Top = 54
+ Style.HotTrack = False
+ Style.TransparentBorder = False
+ TabOrder = 7
+ Width = 73
+ end
object dxLayoutControl1Group_Root: TdxLayoutGroup
AlignHorz = ahParentManaged
AlignVert = avTop
@@ -251,7 +263,7 @@ object frameBads: TframeBads
object dxLayoutItem2: TdxLayoutItem
Parent = dxLayoutGroup1
Control = CIFNumber
- ControlOptions.OriginalHeight = 37
+ ControlOptions.OriginalHeight = 31
ControlOptions.OriginalWidth = 56
ControlOptions.ShowBorder = False
Index = 2
@@ -285,7 +297,7 @@ object frameBads: TframeBads
object dxLayoutItem1: TdxLayoutItem
Parent = dxLayoutGroup2
Control = CIFBeg
- ControlOptions.OriginalHeight = 37
+ ControlOptions.OriginalHeight = 31
ControlOptions.OriginalWidth = 52
ControlOptions.ShowBorder = False
Index = 1
@@ -352,19 +364,33 @@ object frameBads: TframeBads
CaptionOptions.Visible = False
Control = cxCheck_len
ControlOptions.OriginalHeight = 30
- ControlOptions.OriginalWidth = 49
+ ControlOptions.OriginalWidth = 44
ControlOptions.ShowBorder = False
Index = 0
end
+ object dxLayoutItem7: TdxLayoutItem
+ Parent = dxLayoutGroup2
+ CaptionOptions.Text = #36317#36793
+ Control = CIJBQty
+ ControlOptions.OriginalHeight = 25
+ ControlOptions.OriginalWidth = 73
+ ControlOptions.ShowBorder = False
+ Index = 5
+ end
+ object CM: TdxLayoutLabeledItem
+ CaptionOptions.Text = 'CM'
+ Index = -1
+ end
end
end
object cxScrollBox1: TcxScrollBox
Left = 0
Top = 0
- Width = 331
+ Width = 300
Height = 144
Align = alClient
TabOrder = 1
+ ExplicitWidth = 321
end
object ADOTmp: TADOQuery
Connection = DataLink_TradeInsp.ADOLink
diff --git a/项目代码/wenshangkm/G03贸易布匹检验/U_frameBads.pas b/项目代码/wenshangkm/G03贸易布匹检验/U_frameBads.pas
index c4dd790..b7889fe 100644
--- a/项目代码/wenshangkm/G03贸易布匹检验/U_frameBads.pas
+++ b/项目代码/wenshangkm/G03贸易布匹检验/U_frameBads.pas
@@ -4,13 +4,12 @@ interface
uses
Winapi.Windows, Winapi.Messages, System.SysUtils, System.Variants,
- System.Classes,
- Vcl.Graphics, Vcl.Controls, Vcl.Forms, Vcl.Dialogs, cxGraphics, cxControls,
- cxLookAndFeels, cxLookAndFeelPainters, cxContainer, cxEdit,
- Vcl.StdCtrls, Vcl.ExtCtrls, cxTextEdit, MovePanel, Vcl.Buttons,
- cxGeometry, dxFramedControl, Vcl.Menus, cxButtons, dxPanel, cxScrollBox,
- dxLayoutcxEditAdapters, dxLayoutContainer, cxClasses, dxLayoutControl,
- Data.DB, Data.Win.ADODB, cxCheckBox;
+ System.Classes, Vcl.Graphics, Vcl.Controls, Vcl.Forms, Vcl.Dialogs, cxGraphics,
+ cxControls, cxLookAndFeels, cxLookAndFeelPainters, cxContainer, cxEdit,
+ Vcl.StdCtrls, Vcl.ExtCtrls, cxTextEdit, MovePanel, Vcl.Buttons, cxGeometry,
+ dxFramedControl, Vcl.Menus, cxButtons, dxPanel, cxScrollBox,
+ dxLayoutcxEditAdapters, dxLayoutContainer, cxClasses, dxLayoutControl, Data.DB,
+ Data.Win.ADODB, cxCheckBox;
type
TframeBads = class(TFrame)
@@ -44,12 +43,16 @@ type
dxLayoutAutoCreatedGroup1: TdxLayoutAutoCreatedGroup;
cxCheck_len: TcxCheckBox;
dxLayoutItem_checkLen: TdxLayoutItem;
+ CIJBQty: TcxTextEdit;
+ dxLayoutItem7: TdxLayoutItem;
+ CM: TdxLayoutLabeledItem;
procedure cxButton2Click(Sender: TObject);
procedure cxButton1Click(Sender: TObject);
procedure CIFBegPropertiesEditValueChanged(Sender: TObject);
procedure IsSubtractClick(Sender: TObject);
procedure SubtractQtyPropertiesEditValueChanged(Sender: TObject);
procedure CIFEndPropertiesChange(Sender: TObject);
+
private
procedure SpeedButtonClick(Sender: TObject);
public
@@ -84,7 +87,7 @@ begin
begin
CIFQty.Text := '';
exit;
- end ;
+ end;
CIFQty.Text := FloatToStr(StrToFloat(CIFEnd.Text) - StrToFloat(CIFBeg.Text));
end;
@@ -100,17 +103,23 @@ begin
Application.MessageBox('Ƿ!', 'ʾ', 0);
Exit;
end;
- end ;
+ end;
- if trim(CIFBeg.Text)='' then
- CIFQty.Text :=''
+ if trim(CIFBeg.Text) = '' then
+ CIFQty.Text := ''
else
- CIFQty.Text := FloatToStr(StrToFloatDef(trim(CIFEnd.Text),0) - StrToFloatdef(trim(CIFBeg.Text),0));
+ CIFQty.Text := FloatToStr(StrToFloatDef(trim(CIFEnd.Text), 0) - StrToFloatdef(trim(CIFBeg.Text), 0));
end;
procedure TframeBads.cxButton1Click(Sender: TObject);
begin
RadioGroup1.ItemIndex := -1;
+ CIFNumber.text := '';
+ CIJBQty.text := '';
+ CIFBeg.Text := '';
+ CIFEnd.Text := '';
+ CIFQty.Text := '';
+
end;
procedure TframeBads.cxButton2Click(Sender: TObject);
@@ -138,17 +147,25 @@ begin
end;
end;
- if strTofloatdef(Trim(SubtractQty.Text),0)>0 then
+ if strTofloatdef(Trim(SubtractQty.Text), 0) > 0 then
begin
- IsSubtract.Checked:=true;
+ IsSubtract.Checked := true;
end
else
begin
- IsSubtract.Checked:=false;
+ IsSubtract.Checked := false;
end;
+ CIFNumber.text := '';
+ CIJBQty.text := '';
+ CIFBeg.Text := '';
+ CIFEnd.Text := '';
+ CIFQty.Text := '';
+ RadioGroup1.ItemIndex := -1;
end;
+
+
procedure TframeBads.InitBadPanel();
var
speedBtn: TSpeedButton;
@@ -189,7 +206,6 @@ begin
speedBtn.Width := fBadBtnSize;
speedBtn.Height := fBadBtnSize;
-
speedBtn.Left := 5 + (i mod j) * speedBtn.Width;
speedBtn.Top := 3 + k * speedBtn.Height;
@@ -197,8 +213,7 @@ begin
speedBtn.Hint := zdyName;
if Length(zdyName) > 4 then
begin
- speedBtn.Caption := Copy(zdyName, 1, 4) + #13 +
- Copy(zdyName, 5, Length(zdyName) - 4);
+ speedBtn.Caption := Copy(zdyName, 1, 4) + #13 + Copy(zdyName, 5, Length(zdyName) - 4);
end
else
speedBtn.Caption := zdyName;
@@ -229,10 +244,11 @@ end;
procedure TframeBads.SubtractQtyPropertiesEditValueChanged(Sender: TObject);
begin
- if trim(SubtractQty.Text)<>'' then
- isSubTract.Checked:=true
+ if trim(SubtractQty.Text) <> '' then
+ isSubTract.Checked := true
else
- isSubTract.Checked:=false;
+ isSubTract.Checked := false;
end;
end.
+
diff --git a/项目代码/wenshangkm/机台检验主程序可配置20201/机台检验主程序可配置2020/RollMakingShop.dproj.local b/项目代码/wenshangkm/机台检验主程序可配置20201/机台检验主程序可配置2020/RollMakingShop.dproj.local
index 89d9c52..aea9fda 100644
--- a/项目代码/wenshangkm/机台检验主程序可配置20201/机台检验主程序可配置2020/RollMakingShop.dproj.local
+++ b/项目代码/wenshangkm/机台检验主程序可配置20201/机台检验主程序可配置2020/RollMakingShop.dproj.local
@@ -5,13 +5,13 @@
1899-12-30 00:00:00.000.139,D:\Dp10RepoV1\项目代码\TradePack\机台检验主程序可配置20201\机台检验主程序可配置2020\AES.pas=
1899-12-30 00:00:00.000.206,D:\Dp10RepoV1\项目代码\TradePack\机台检验主程序可配置20201\机台检验主程序可配置2020\delphitwain\DelphiTwainUtils.pas=
1899-12-30 00:00:00.000.237,D:\Dp10RepoV1\public10\ThreeFun\Fun\U_RTFun.pas=
- 1899-12-30 00:00:00.000.075,=D:\Dp10RepoV1\项目代码\TradePack\机台检验主程序可配置20201\机台检验主程序可配置2020\AES\untAES.pas
1899-12-30 00:00:00.000.583,=D:\Dp10RepoV1\项目代码\djdPack\机台检验主程序可配置20201\机台检验主程序可配置2020\U_staffSeList.pas
+ 1899-12-30 00:00:00.000.075,=D:\Dp10RepoV1\项目代码\TradePack\机台检验主程序可配置20201\机台检验主程序可配置2020\AES\untAES.pas
1899-12-30 00:00:00.000.375,=D:\Dp10RepoV1\public10\ThreeFun\Fun\U_RTFun.pas
1899-12-30 00:00:00.000.917,D:\Dp10RepoV1\项目代码\TradePack\机台检验主程序可配置20201\机台检验主程序可配置2020\delphitwain\Twain.pas=
1899-12-30 00:00:00.000.645,=D:\Dp10RepoV1\项目代码\TradePack\机台检验主程序可配置20201\机台检验主程序可配置2020\U_FileAutoUpdate.pas
1899-12-30 00:00:00.000.160,D:\Dp10RepoV1\项目代码\TradePack\机台检验主程序可配置20201\机台检验主程序可配置2020\delphitwain\DelphiTwain.pas=
- 1899-12-30 00:00:00.000.453,D:\Dp10RepoV1\项目代码\TradePack\机台检验主程序可配置20201\机台检验主程序可配置2020\WFBProduction.dproj=D:\Dp10RepoV1\项目代码\TradePack\机台检验主程序可配置20201\机台检验主程序可配置2020\RollMakingShop.dproj
+ 1899-12-30 00:00:00.000.453,D:\Dp10RepoV1\项目代码\TradePack\机台检验主程序可配置20201\机台检验主程序可配置2020\RollMakingShop.dproj=D:\Dp10RepoV1\项目代码\TradePack\机台检验主程序可配置20201\机台检验主程序可配置2020\WFBProduction.dproj
1899-12-30 00:00:00.000.961,=D:\Dp10RepoV1\项目代码\TradePack\机台检验主程序可配置20201\机台检验主程序可配置2020\AES\ElAES.pas
1899-12-30 00:00:00.000.022,=D:\Dp10RepoV1\项目代码\TradePack\机台检验主程序可配置20201\机台检验主程序可配置2020\AES\JDAESExtend.pas
1899-12-30 00:00:00.000.945,D:\Dp10RepoV1\项目代码\TradePack\机台检验主程序可配置20201\机台检验主程序可配置2020\ElAES.pas=
diff --git a/项目代码/wenshangkm/机台检验主程序可配置20201/机台检验主程序可配置2020/RollMakingShop.identcache b/项目代码/wenshangkm/机台检验主程序可配置20201/机台检验主程序可配置2020/RollMakingShop.identcache
index 18be071..898d46e 100644
Binary files a/项目代码/wenshangkm/机台检验主程序可配置20201/机台检验主程序可配置2020/RollMakingShop.identcache and b/项目代码/wenshangkm/机台检验主程序可配置20201/机台检验主程序可配置2020/RollMakingShop.identcache differ