From 9ae6e7e17ded6b90ff3da611ff81ccba9bfe5cc6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Cusername=E2=80=9D?= <“email”>
Date: Thu, 8 May 2025 07:53:22 +0800
Subject: [PATCH] 111
---
A00通用窗体/U_ClothInfoSel.dfm | 26 +-
A00通用窗体/U_ClothInfoSel.pas | 3 +
A00通用窗体/U_LabelMapSet.dfm | 7 +
A00通用窗体/U_LabelMapSet.pas | 2 +-
A00通用窗体/U_LabelPrint.pas | 2 +-
A02基础产品管理/ClothInfo.dproj | 2 +-
A02基础产品管理/ClothInfo.dproj.local | 48 ++--
A02基础产品管理/ClothInfo.identcache | Bin 1785 -> 1785 bytes
A02基础产品管理/ProjectGroup1.groupproj | 20 +-
A02基础产品管理/ProjectGroup1.groupproj.local | 7 +-
A02基础产品管理/U_ClothInfo.dfm | 24 ++
A02基础产品管理/U_ClothInfo.pas | 3 +
A02基础产品管理/U_ClothInfoInput.dfm | 41 +++-
A02基础产品管理/U_ClothInfoInput.pas | 2 +
D01针织生产计划/U_KnitPlanInPut.dfm | 224 +++++++++++-------
D01针织生产计划/U_KnitPlanInPut.pas | 6 +-
D01针织生产计划/U_KnitPlanList.dfm | 56 +++--
D01针织生产计划/U_KnitPlanList.pas | 53 +++++
T03贸易布匹检验/U_TradeMachInsp.pas | 5 +-
19 files changed, 361 insertions(+), 170 deletions(-)
diff --git a/A00通用窗体/U_ClothInfoSel.dfm b/A00通用窗体/U_ClothInfoSel.dfm
index 7ff57bf..cb32e2c 100644
--- a/A00通用窗体/U_ClothInfoSel.dfm
+++ b/A00通用窗体/U_ClothInfoSel.dfm
@@ -10,7 +10,7 @@ inherited frmClothInfoSel: TfrmClothInfoSel
Font.Name = #23435#20307
Position = poScreenCenter
OnClose = FormClose
- ExplicitLeft = -32
+ ExplicitTop = -3
ExplicitWidth = 1501
ExplicitHeight = 673
PixelsPerInch = 96
@@ -263,6 +263,14 @@ inherited frmClothInfoSel: TfrmClothInfoSel
Options.Editing = False
Width = 80
end
+ object cxgrdbclmnTv1Column11: TcxGridDBColumn
+ Caption = #29289#26009#21517#31216
+ DataBinding.FieldName = 'C_Material'
+ DataBinding.IsNullValueType = True
+ HeaderAlignmentHorz = taCenter
+ Options.Editing = False
+ Width = 90
+ end
end
object cxGrid1Level1: TcxGridLevel
GridView = Tv1
@@ -445,6 +453,13 @@ inherited frmClothInfoSel: TfrmClothInfoSel
Height = 12
Caption = #29289#26009#32534#30721
end
+ object lbl3: TLabel
+ Left = 1307
+ Top = 10
+ Width = 48
+ Height = 12
+ Caption = #29289#26009#21517#31216
+ end
object C_Code: TEdit
Tag = 2
Left = 91
@@ -517,6 +532,15 @@ inherited frmClothInfoSel: TfrmClothInfoSel
TabOrder = 7
OnChange = C_NameChange
end
+ object C_Material: TEdit
+ Tag = 2
+ Left = 1360
+ Top = 6
+ Width = 89
+ Height = 20
+ TabOrder = 8
+ OnChange = C_NameChange
+ end
end
inherited ADOQueryBaseCmd: TADOQuery
Connection = ADOConnection1
diff --git a/A00通用窗体/U_ClothInfoSel.pas b/A00通用窗体/U_ClothInfoSel.pas
index 5b61897..a088c93 100644
--- a/A00通用窗体/U_ClothInfoSel.pas
+++ b/A00通用窗体/U_ClothInfoSel.pas
@@ -93,6 +93,9 @@ type
cxgrdbclmnTv1Column10: TcxGridDBColumn;
lbl2: TLabel;
C_KHCode: TEdit;
+ cxgrdbclmnTv1Column11: TcxGridDBColumn;
+ lbl3: TLabel;
+ C_Material: TEdit;
procedure FormCreate(Sender: TObject);
procedure FormClose(Sender: TObject; var Action: TCloseAction);
procedure FormShow(Sender: TObject);
diff --git a/A00通用窗体/U_LabelMapSet.dfm b/A00通用窗体/U_LabelMapSet.dfm
index 463cba3..55fbc95 100644
--- a/A00通用窗体/U_LabelMapSet.dfm
+++ b/A00通用窗体/U_LabelMapSet.dfm
@@ -95,6 +95,7 @@ object frmLabelMapSet: TfrmLabelMapSet
Navigator.Buttons.CustomButtons = <>
Navigator.Buttons.Delete.Enabled = False
Navigator.Buttons.Delete.Visible = False
+ ScrollbarAnnotations.CustomAnnotations = <>
DataController.DataSource = DS_1
DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost]
DataController.Summary.DefaultGroupSummaryItems = <>
@@ -125,6 +126,7 @@ object frmLabelMapSet: TfrmLabelMapSet
object v2Column1: TcxGridDBColumn
Caption = #31867#22411
DataBinding.FieldName = 'LMType'
+ DataBinding.IsNullValueType = True
PropertiesClassName = 'TcxTextEditProperties'
Properties.OnEditValueChanged = v2Column8PropertiesEditValueChanged
HeaderAlignmentHorz = taCenter
@@ -134,6 +136,7 @@ object frmLabelMapSet: TfrmLabelMapSet
object v2Column12: TcxGridDBColumn
Caption = #25253#34920#21517#31216
DataBinding.FieldName = 'LMName'
+ DataBinding.IsNullValueType = True
PropertiesClassName = 'TcxTextEditProperties'
Properties.OnEditValueChanged = v2Column8PropertiesEditValueChanged
HeaderAlignmentHorz = taCenter
@@ -142,6 +145,7 @@ object frmLabelMapSet: TfrmLabelMapSet
object v2Column8: TcxGridDBColumn
Caption = #35843#29992#23384#20648'1'
DataBinding.FieldName = 'LMSql1'
+ DataBinding.IsNullValueType = True
PropertiesClassName = 'TcxTextEditProperties'
Properties.OnEditValueChanged = v2Column8PropertiesEditValueChanged
HeaderAlignmentHorz = taCenter
@@ -150,6 +154,7 @@ object frmLabelMapSet: TfrmLabelMapSet
object Tv1Column1: TcxGridDBColumn
Caption = #35843#29992#23384#20648'2'
DataBinding.FieldName = 'LMSql2'
+ DataBinding.IsNullValueType = True
PropertiesClassName = 'TcxTextEditProperties'
Properties.OnEditValueChanged = v2Column8PropertiesEditValueChanged
HeaderAlignmentHorz = taCenter
@@ -158,6 +163,7 @@ object frmLabelMapSet: TfrmLabelMapSet
object Tv1Column2: TcxGridDBColumn
Caption = #35843#29992#23384#20648'3'
DataBinding.FieldName = 'LMSql3'
+ DataBinding.IsNullValueType = True
PropertiesClassName = 'TcxTextEditProperties'
Properties.OnEditValueChanged = v2Column8PropertiesEditValueChanged
HeaderAlignmentHorz = taCenter
@@ -222,6 +228,7 @@ object frmLabelMapSet: TfrmLabelMapSet
Navigator.Buttons.CustomButtons = <>
Navigator.Buttons.Delete.Enabled = False
Navigator.Buttons.Delete.Visible = False
+ ScrollbarAnnotations.CustomAnnotations = <>
DataController.DataSource = DS_2
DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost]
DataController.Summary.DefaultGroupSummaryItems = <>
diff --git a/A00通用窗体/U_LabelMapSet.pas b/A00通用窗体/U_LabelMapSet.pas
index b762b35..2e12a52 100644
--- a/A00通用窗体/U_LabelMapSet.pas
+++ b/A00通用窗体/U_LabelMapSet.pas
@@ -15,7 +15,7 @@ uses
cxTextEdit, cxPC, cxCheckComboBox, cxDropDownEdit, Menus, RM_e_Xls,
cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, dxSkinsCore,
dxSkinsDefaultPainters, dxDateRanges, dxBarBuiltInMenu, System.ImageList,
- Vcl.ImgList, U_BaseHelp;
+ Vcl.ImgList, U_BaseHelp, dxScrollbarAnnotations;
type
TfrmLabelMapSet = class(Tform)
diff --git a/A00通用窗体/U_LabelPrint.pas b/A00通用窗体/U_LabelPrint.pas
index 54fe9d6..43fdc38 100644
--- a/A00通用窗体/U_LabelPrint.pas
+++ b/A00通用窗体/U_LabelPrint.pas
@@ -95,7 +95,7 @@ begin
Close;
sql.Clear;
sql.add('exec ' + trim(CDS_Label.fieldbyname('LMSql1').AsString) + ' @Filtration=' + quotedstr(Trim(FFiltration1)));
-// ShowMessage(sql.text);
+ //ShowMessage(sql.text);
Open;
end;
end;
diff --git a/A02基础产品管理/ClothInfo.dproj b/A02基础产品管理/ClothInfo.dproj
index d72fb59..d8692a3 100644
--- a/A02基础产品管理/ClothInfo.dproj
+++ b/A02基础产品管理/ClothInfo.dproj
@@ -124,7 +124,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:\Dp10Repo\项目代码\D10gmXinHuaHuaQian\A02基础产品管理\testDll.exe
+ D:\Dp10Repo\项目代码\D10gmBitao\A02基础产品管理\testDll.exe
diff --git a/A02基础产品管理/ClothInfo.dproj.local b/A02基础产品管理/ClothInfo.dproj.local
index 76aac95..1c1f60c 100644
--- a/A02基础产品管理/ClothInfo.dproj.local
+++ b/A02基础产品管理/ClothInfo.dproj.local
@@ -1,44 +1,44 @@
- 1899-12-30 00:00:00.000.710,=D:\Dp10Repo\项目代码\阔和\A00通用窗体\U_LabelPrint.pas
- 1899-12-30 00:00:00.000.692,=D:\Dp10Repo\项目代码\阔和\A00通用窗体\U_LabelPrint.pas
- 1899-12-30 00:00:00.000.048,=D:\Dp10Repo\public10\design\U_BaseList.pas
- 1899-12-30 00:00:00.000.135,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelp.pas=
+ 1899-12-30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.dfm
1899-12-30 00:00:00.000.832,=D:\Dp10Repo\public10\design\U_BaseHelp.pas
+ 1899-12-30 00:00:00.000.431,D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_ClothInfo.dfm=D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_ClothInfo_Tat.dfm
+ 1899-12-30 00:00:00.000.710,=D:\Dp10Repo\项目代码\阔和\A00通用窗体\U_LabelPrint.pas
+ 1899-12-30 00:00:00.000.844,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_AttachmentUpload.pas
+ 1899-12-30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas
+ 1899-12-30 00:00:00.000.716,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ProcessSel.pas
1899-12-30 00:00:00.000.975,=D:\Dp10Repo\public10\ThreeFun\Fun\U_CompressionFun.pas
1899-12-30 00:00:00.000.873,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.pas
- 1899-12-30 00:00:00.000.844,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_AttachmentUpload.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.431,D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_ClothInfo_Tat.pas=D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_ClothInfo.pas
+ 1899-12-30 00:00:00.000.692,=D:\Dp10Repo\项目代码\阔和\A00通用窗体\U_LabelPrint.pas
+ 1899-12-30 00:00:00.000.493,=D:\Dp10Repo\项目代码\RTBasics\A00通用模板\Unit1.pas
1899-12-30 00:00:00.000.187,D:\Dp10Repo\项目代码\RTBasics\A00通用模板\Unit1.pas=
1899-12-30 00:00:00.000.149,=D:\Dp10Repo\public10\ThreeFun\Form\U_ZDYHelp.pas
1899-12-30 00:00:00.000.339,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.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.493,=D:\Dp10Repo\项目代码\RTBasics\A00通用模板\Unit1.pas
- 1899-12-30 00:00:00.000.939,=D:\Dp10Repo\public10\design\U_BaseInput.pas
- 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.656,=D:\Dp10Repo\项目代码\阔和\A00通用窗体\U_LabelMapSet.pas
+ 1899-12-30 00:00:00.000.048,=D:\Dp10Repo\public10\design\U_BaseList.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
1899-12-30 00:00:00.000.372,=D:\Dp10Repo\项目代码\阔和\A00通用窗体\U_LabelMapSet.pas
- 1899-12-30 00:00:00.000.086,=D:\Dp10Repo\public10\design\U_cxGridCustomCss.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.340,=D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_CloInfoFileUp.pas
+ 1899-12-30 00:00:00.000.431,D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_ClothInfo.pas=D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_ClothInfo_Tat.pas
1899-12-30 00:00:00.000.228,=D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_ClothInfo.pas
+ 1899-12-30 00:00:00.000.123,=D:\Dp10Repo\public10\design\U_globalVar.pas
+ 1899-12-30 00:00:00.000.736,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ModuleNote.pas=
+ 1899-12-30 00:00:00.000.086,=D:\Dp10Repo\public10\design\U_cxGridCustomCss.pas
+ 1899-12-30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm
1899-12-30 00:00:00.000.015,=D:\Dp10Repo\public10\ThreeFun\Fun\U_RTFun.pas
1899-12-30 00:00:00.000.504,=D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_ClothType.pas
1899-12-30 00:00:00.000.886,=D:\Dp10Repo\项目代码\阔和\A02基础产品管理\U_testdll.pas
- 1899-12-30 00:00:00.000.123,=D:\Dp10Repo\public10\design\U_globalVar.pas
- 1899-12-30 00:00:00.000.806,D:\Dp10Repo\项目代码\RTBasics\A00通用模板\InformationBase.dproj=D:\Dp10Repo\项目代码\RTBasics\A00通用模板\ClothInfo.dproj
- 1899-12-30 00:00:00.000.092,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_EmployeeSel.pas
- 1899-12-30 00:00:00.000.431,D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_ClothInfo_Tat.dfm=D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_ClothInfo.dfm
- 1899-12-30 00:00:00.000.487,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelpSel.pas=
- 1899-12-30 00:00:00.000.716,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ProcessSel.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.178,=D:\Dp10Repo\public10\design\U_WindowFormdesign.pas
1899-12-30 00:00:00.000.630,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas
+ 1899-12-30 00:00:00.000.092,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_EmployeeSel.pas
+ 1899-12-30 00:00:00.000.487,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelpSel.pas=
+ 1899-12-30 00:00:00.000.246,=D:\Dp10Repo\public10\ThreeFun\Fun\uSZHN_JSON.pas
1899-12-30 00:00:00.000.422,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas
+ 1899-12-30 00:00:00.000.340,=D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_CloInfoFileUp.pas
+ 1899-12-30 00:00:00.000.806,D:\Dp10Repo\项目代码\RTBasics\A00通用模板\ClothInfo.dproj=D:\Dp10Repo\项目代码\RTBasics\A00通用模板\InformationBase.dproj
+ 1899-12-30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas
1899-12-30 00:00:00.000.734,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas
- 2025-03-17 16:20:28.246,=D:\Dp10Repo\public10\ThreeFun\Fun\uSZHN_JSON.pas
@@ -69,7 +69,7 @@
-
+
diff --git a/A02基础产品管理/ClothInfo.identcache b/A02基础产品管理/ClothInfo.identcache
index 1349595e3e700eaa13bd9a6a494eafba47105554..4ae4509a83e4dfe615e7342ff4e03db2c9a11bb8 100644
GIT binary patch
delta 142
zcmey#`;(Vdf`Ng-cd{b0+QfRX$;`~MlOtK3CkwGzP5fs!`52SKWL6fbiEGU#+p|hd
zR$vaAe3{jLvJIpBB;gewiBmH0I5k6S*$0oWs;o85;D1jMPafWlPpk!I>_R8EK&eJm@Iw(
delta 126
zcmey#`;(VZVlp3F_+)KX+sVSL5|ewG0w>
- {D75EC075-444C-40C2-8ACB-0AAD801B39FF}
+ {DB10C7B5-98E1-4614-982F-CD218213F95A}
-
-
-
@@ -17,15 +14,6 @@
-
-
-
-
-
-
-
-
-
@@ -36,13 +24,13 @@
-
+
-
+
-
+
diff --git a/A02基础产品管理/ProjectGroup1.groupproj.local b/A02基础产品管理/ProjectGroup1.groupproj.local
index 4c7eef9..3e41030 100644
--- a/A02基础产品管理/ProjectGroup1.groupproj.local
+++ b/A02基础产品管理/ProjectGroup1.groupproj.local
@@ -1,7 +1,6 @@
-
-
-
-
+
+
+
diff --git a/A02基础产品管理/U_ClothInfo.dfm b/A02基础产品管理/U_ClothInfo.dfm
index e237d03..c24e2fa 100644
--- a/A02基础产品管理/U_ClothInfo.dfm
+++ b/A02基础产品管理/U_ClothInfo.dfm
@@ -239,6 +239,13 @@ inherited frmClothInfo: TfrmClothInfo
Height = 12
Caption = #29289#26009#32534#30721
end
+ object lbl3: TLabel
+ Left = 407
+ Top = 48
+ Width = 48
+ Height = 12
+ Caption = #29289#26009#21517#31216
+ end
object C_Code: TEdit
Tag = 2
Left = 115
@@ -320,6 +327,15 @@ inherited frmClothInfo: TfrmClothInfo
TabOrder = 8
OnKeyPress = C_CodeKeyPress
end
+ object C_Material: TEdit
+ Tag = 2
+ Left = 465
+ Top = 43
+ Width = 89
+ Height = 20
+ TabOrder = 9
+ OnKeyPress = C_CodeKeyPress
+ end
end
object Panel2: TPanel [3]
Left = 512
@@ -595,6 +611,14 @@ inherited frmClothInfo: TfrmClothInfo
Options.Editing = False
Width = 80
end
+ object cxgrdbclmnTv1Column15: TcxGridDBColumn
+ Caption = #29289#26009#21517#31216
+ DataBinding.FieldName = 'C_Material'
+ DataBinding.IsNullValueType = True
+ HeaderAlignmentHorz = taCenter
+ Options.Editing = False
+ Width = 90
+ end
end
object cxGrid1Level1: TcxGridLevel
GridView = Tv1
diff --git a/A02基础产品管理/U_ClothInfo.pas b/A02基础产品管理/U_ClothInfo.pas
index 3d9615b..a6343a9 100644
--- a/A02基础产品管理/U_ClothInfo.pas
+++ b/A02基础产品管理/U_ClothInfo.pas
@@ -148,6 +148,9 @@ type
C_KHName: TEdit;
lbl2: TLabel;
C_KHCode: TEdit;
+ cxgrdbclmnTv1Column15: TcxGridDBColumn;
+ lbl3: TLabel;
+ C_Material: TEdit;
procedure FormClose(Sender: TObject; var Action: TCloseAction);
procedure TBCloseClick(Sender: TObject);
procedure TBDelClick(Sender: TObject);
diff --git a/A02基础产品管理/U_ClothInfoInput.dfm b/A02基础产品管理/U_ClothInfoInput.dfm
index bdfd66a..1a29f4c 100644
--- a/A02基础产品管理/U_ClothInfoInput.dfm
+++ b/A02基础产品管理/U_ClothInfoInput.dfm
@@ -4,7 +4,7 @@ object frmClothInfoInput: TfrmClothInfoInput
Anchors = []
Caption = #20135#21697#20449#24687#24405#20837
ClientHeight = 547
- ClientWidth = 931
+ ClientWidth = 1198
Color = clWhite
Font.Charset = GB2312_CHARSET
Font.Color = clWindowText
@@ -20,7 +20,7 @@ object frmClothInfoInput: TfrmClothInfoInput
object ToolBar1: TToolBar
Left = 0
Top = 0
- Width = 931
+ Width = 1198
Height = 38
AutoSize = True
ButtonHeight = 38
@@ -33,6 +33,7 @@ object frmClothInfoInput: TfrmClothInfoInput
ParentColor = False
ShowCaptions = True
TabOrder = 0
+ ExplicitWidth = 931
object ToolButton1: TToolButton
Tag = 1
Left = 0
@@ -62,7 +63,7 @@ object frmClothInfoInput: TfrmClothInfoInput
object ScrollBox1: TScrollBox
Left = 0
Top = 38
- Width = 931
+ Width = 1198
Height = 509
Align = alClient
AutoSize = True
@@ -73,7 +74,7 @@ object frmClothInfoInput: TfrmClothInfoInput
ParentColor = False
ParentCtl3D = False
TabOrder = 1
- ExplicitHeight = 436
+ ExplicitWidth = 931
object Label1: TLabel
Left = 23
Top = 439
@@ -297,6 +298,19 @@ object frmClothInfoInput: TfrmClothInfoInput
Font.Style = [fsBold]
ParentFont = False
end
+ object lbl3: TLabel
+ Left = 799
+ Top = 27
+ Width = 110
+ Height = 21
+ Caption = #29289#26009#21517#31216#65306
+ Font.Charset = GB2312_CHARSET
+ Font.Color = clWindowText
+ Font.Height = -21
+ Font.Name = #23435#20307
+ Font.Style = [fsBold]
+ ParentFont = False
+ end
object C_Code: TEdit
Tag = 2
Left = 155
@@ -550,7 +564,7 @@ object frmClothInfoInput: TfrmClothInfoInput
Left = 142
Top = 231
Width = 240
- Height = 31
+ Height = 30
Hint = 'C_DYARN/'#24213#32433
Font.Charset = GB2312_CHARSET
Font.Color = clBlack
@@ -567,7 +581,7 @@ object frmClothInfoInput: TfrmClothInfoInput
Left = 533
Top = 230
Width = 240
- Height = 31
+ Height = 30
Hint = 'C_jiaceng/'#22841#23618
Font.Charset = GB2312_CHARSET
Font.Color = clBlack
@@ -579,6 +593,21 @@ object frmClothInfoInput: TfrmClothInfoInput
OnBtnUpClick = C_WidthBtnUpClick
OnBtnDnClick = C_WidthBtnDnClick
end
+ object C_Material: TEdit
+ Tag = 2
+ Left = 906
+ Top = 26
+ Width = 240
+ Height = 27
+ Font.Charset = GB2312_CHARSET
+ Font.Color = clWindowText
+ Font.Height = -21
+ Font.Name = #23435#20307
+ Font.Style = [fsBold]
+ ParentFont = False
+ TabOrder = 17
+ OnKeyPress = CYColorKeyPress
+ end
end
object ADOQueryMain: TADOQuery
Connection = DataLink_ClothInfo.ADOLink
diff --git a/A02基础产品管理/U_ClothInfoInput.pas b/A02基础产品管理/U_ClothInfoInput.pas
index 4dc2631..80fb1d4 100644
--- a/A02基础产品管理/U_ClothInfoInput.pas
+++ b/A02基础产品管理/U_ClothInfoInput.pas
@@ -56,6 +56,8 @@ type
Label23: TLabel;
C_DYARN: TBtnEditC;
C_jiaceng: TBtnEditC;
+ lbl3: TLabel;
+ C_Material: TEdit;
procedure FormShow(Sender: TObject);
procedure TBCloseClick(Sender: TObject);
procedure ToolButton1Click(Sender: TObject);
diff --git a/D01针织生产计划/U_KnitPlanInPut.dfm b/D01针织生产计划/U_KnitPlanInPut.dfm
index 642ba11..419dc90 100644
--- a/D01针织生产计划/U_KnitPlanInPut.dfm
+++ b/D01针织生产计划/U_KnitPlanInPut.dfm
@@ -2,7 +2,7 @@ inherited frmKnitPlanInPut: TfrmKnitPlanInPut
Left = 212
Top = 14
Caption = #36710#38388#29983#20135#35745#21010#21333#24405#20837
- ClientHeight = 658
+ ClientHeight = 581
ClientWidth = 1363
Color = clWhite
Font.Charset = GB2312_CHARSET
@@ -10,7 +10,7 @@ inherited frmKnitPlanInPut: TfrmKnitPlanInPut
Font.Name = #23435#20307
Position = poScreenCenter
ExplicitWidth = 1379
- ExplicitHeight = 697
+ ExplicitHeight = 620
PixelsPerInch = 96
TextHeight = 12
object ToolBar1: TToolBar [0]
@@ -71,7 +71,7 @@ inherited frmKnitPlanInPut: TfrmKnitPlanInPut
Left = 0
Top = 38
Width = 1363
- Height = 538
+ Height = 610
Align = alTop
BevelInner = bvNone
BevelOuter = bvNone
@@ -98,8 +98,8 @@ inherited frmKnitPlanInPut: TfrmKnitPlanInPut
ParentFont = False
end
object Label2: TLabel
- Left = 847
- Top = 8
+ Left = 555
+ Top = 9
Width = 110
Height = 21
Caption = #19979#21333#26085#26399#65306
@@ -150,9 +150,9 @@ inherited frmKnitPlanInPut: TfrmKnitPlanInPut
ParentFont = False
end
object Label22: TLabel
- Left = 845
+ Left = 851
Top = 152
- Width = 110
+ Width = 102
Height = 21
Caption = #25104#21697#20811#37325#65306
Font.Charset = GB2312_CHARSET
@@ -163,8 +163,8 @@ inherited frmKnitPlanInPut: TfrmKnitPlanInPut
ParentFont = False
end
object Label5: TLabel
- Left = 557
- Top = 8
+ Left = 848
+ Top = 9
Width = 110
Height = 21
Caption = #20132#36135#26085#26399#65306
@@ -189,8 +189,8 @@ inherited frmKnitPlanInPut: TfrmKnitPlanInPut
ParentFont = False
end
object Label12: TLabel
- Left = 939
- Top = 534
+ Left = 934
+ Top = 628
Width = 114
Height = 21
Caption = #21305' '#38271#65306
@@ -217,7 +217,7 @@ inherited frmKnitPlanInPut: TfrmKnitPlanInPut
end
object Label16: TLabel
Left = 9
- Top = 414
+ Top = 409
Width = 114
Height = 21
Caption = #22791' '#27880#65306
@@ -242,8 +242,8 @@ inherited frmKnitPlanInPut: TfrmKnitPlanInPut
ParentFont = False
end
object Label27: TLabel
- Left = 1029
- Top = 424
+ Left = 1033
+ Top = 448
Width = 24
Height = 21
Caption = 'KG'
@@ -256,7 +256,7 @@ inherited frmKnitPlanInPut: TfrmKnitPlanInPut
end
object Label28: TLabel
Left = 874
- Top = 424
+ Top = 448
Width = 66
Height = 21
Caption = #30382#37325#65306
@@ -268,8 +268,8 @@ inherited frmKnitPlanInPut: TfrmKnitPlanInPut
ParentFont = False
end
object Label31: TLabel
- Left = 96
- Top = 561
+ Left = 91
+ Top = 655
Width = 114
Height = 21
Caption = #32433' '#32447#65306
@@ -360,9 +360,9 @@ inherited frmKnitPlanInPut: TfrmKnitPlanInPut
ParentFont = False
end
object Label6: TLabel
- Left = 850
- Top = 195
- Width = 110
+ Left = 851
+ Top = 240
+ Width = 114
Height = 21
Caption = #33853#24067#36716#25968#65306
Font.Charset = GB2312_CHARSET
@@ -386,8 +386,8 @@ inherited frmKnitPlanInPut: TfrmKnitPlanInPut
ParentFont = False
end
object Label10: TLabel
- Left = 850
- Top = 241
+ Left = 874
+ Top = 408
Width = 110
Height = 21
Caption = #32986#24067#35201#27714#65306
@@ -556,7 +556,7 @@ inherited frmKnitPlanInPut: TfrmKnitPlanInPut
end
object lbl6: TLabel
Left = 871
- Top = 471
+ Top = 486
Width = 88
Height = 21
Caption = #21253#26631#31614#65306
@@ -567,15 +567,28 @@ inherited frmKnitPlanInPut: TfrmKnitPlanInPut
Font.Style = [fsBold]
ParentFont = False
end
+ object lbl7: TLabel
+ Left = 851
+ Top = 195
+ Width = 110
+ Height = 21
+ Caption = #29289#26009#21517#31216#65306
+ Font.Charset = GB2312_CHARSET
+ Font.Color = clBlack
+ Font.Height = -21
+ Font.Name = #23435#20307
+ Font.Style = [fsBold]
+ ParentFont = False
+ end
object OrdDate: TDateTimePicker
- Left = 957
- Top = 4
- Width = 180
+ Left = 665
+ Top = 5
+ Width = 172
Height = 29
BevelInner = bvNone
Date = 40916.000000000000000000
Format = 'yyyy-MM-dd'
- Time = 0.670856296288548000
+ Time = 0.670856296288548100
ShowCheckbox = True
Font.Charset = GB2312_CHARSET
Font.Color = clBlack
@@ -586,14 +599,14 @@ inherited frmKnitPlanInPut: TfrmKnitPlanInPut
TabOrder = 0
end
object DlyDate: TDateTimePicker
- Left = 659
- Top = 4
- Width = 180
+ Left = 957
+ Top = 5
+ Width = 182
Height = 29
BevelInner = bvNone
Date = 40916.000000000000000000
Format = 'yyyy-MM-dd'
- Time = 0.670856296288548000
+ Time = 0.670856296288548100
ShowCheckbox = True
Font.Charset = GB2312_CHARSET
Font.Color = clBlack
@@ -601,12 +614,12 @@ inherited frmKnitPlanInPut: TfrmKnitPlanInPut
Font.Name = #23435#20307
Font.Style = [fsBold]
ParentFont = False
- TabOrder = 8
+ TabOrder = 7
end
object OrdPieceWeight: TEdit
Tag = 2
- Left = 950
- Top = 550
+ Left = 945
+ Top = 644
Width = 180
Height = 27
Font.Charset = GB2312_CHARSET
@@ -652,20 +665,6 @@ inherited frmKnitPlanInPut: TfrmKnitPlanInPut
OnChange = OrdPieceWeightChange
OnKeyPress = ConNoKeyPress
end
- object RuleBeforeTare: TEdit
- Left = 959
- Top = 423
- Width = 60
- Height = 27
- Font.Charset = GB2312_CHARSET
- Font.Color = clBlack
- Font.Height = -21
- Font.Name = #23435#20307
- Font.Style = [fsBold]
- ParentFont = False
- TabOrder = 7
- OnKeyPress = ConNoKeyPress
- end
object C_GramWeight: TEdit
Tag = 2
Left = 957
@@ -723,7 +722,7 @@ inherited frmKnitPlanInPut: TfrmKnitPlanInPut
Font.Style = [fsBold]
ParentFont = False
ReadOnly = True
- TabOrder = 9
+ TabOrder = 8
OnBtnUpClick = CustNameBtnUpClick
OnBtnDnClick = CustNameBtnDnClick
end
@@ -740,7 +739,7 @@ inherited frmKnitPlanInPut: TfrmKnitPlanInPut
Font.Style = [fsBold]
ParentFont = False
ReadOnly = True
- TabOrder = 10
+ TabOrder = 9
OnBtnUpClick = C_CodeBtnUpClick
OnBtnDnClick = CustNameBtnDnClick
end
@@ -757,7 +756,7 @@ inherited frmKnitPlanInPut: TfrmKnitPlanInPut
Font.Style = [fsBold]
ParentFont = False
ReadOnly = True
- TabOrder = 11
+ TabOrder = 10
OnBtnUpClick = ConNoBtnUpClick
OnBtnDnClick = CustNameBtnDnClick
end
@@ -772,7 +771,7 @@ inherited frmKnitPlanInPut: TfrmKnitPlanInPut
Font.Name = #23435#20307
Font.Style = [fsBold]
ParentFont = False
- TabOrder = 12
+ TabOrder = 11
OnKeyPress = ConNoKeyPress
end
object OurCoName: TBtnEditC
@@ -787,7 +786,7 @@ inherited frmKnitPlanInPut: TfrmKnitPlanInPut
Font.Style = [fsBold]
ParentFont = False
ReadOnly = True
- TabOrder = 13
+ TabOrder = 12
OnBtnUpClick = OurCoNameBtnUpClick
OnBtnDnClick = CustNameBtnDnClick
end
@@ -804,7 +803,7 @@ inherited frmKnitPlanInPut: TfrmKnitPlanInPut
Font.Name = #23435#20307
Font.Style = [fsBold]
ParentFont = False
- TabOrder = 14
+ TabOrder = 13
OnBtnUpClick = MCTypeBtnUpClick
OnBtnDnClick = CustNameBtnDnClick
end
@@ -820,7 +819,7 @@ inherited frmKnitPlanInPut: TfrmKnitPlanInPut
Font.Name = #23435#20307
Font.Style = [fsBold]
ParentFont = False
- TabOrder = 15
+ TabOrder = 14
OnKeyPress = ConNoKeyPress
end
object OrdType: TComboBox
@@ -837,7 +836,7 @@ inherited frmKnitPlanInPut: TfrmKnitPlanInPut
ItemHeight = 20
ItemIndex = 0
ParentFont = False
- TabOrder = 16
+ TabOrder = 15
Text = #22823#36135#21333
Items.Strings = (
#22823#36135#21333
@@ -856,14 +855,14 @@ inherited frmKnitPlanInPut: TfrmKnitPlanInPut
Font.Style = [fsBold]
ParentFont = False
ReadOnly = True
- TabOrder = 17
+ TabOrder = 16
OnBtnUpClick = FtyCoNameBtnUpClick
OnBtnDnClick = CustNameBtnDnClick
end
object C_revolution: TEdit
Tag = 2
- Left = 958
- Top = 192
+ Left = 957
+ Top = 237
Width = 180
Height = 27
Font.Charset = GB2312_CHARSET
@@ -872,7 +871,7 @@ inherited frmKnitPlanInPut: TfrmKnitPlanInPut
Font.Name = #23435#20307
Font.Style = [fsBold]
ParentFont = False
- TabOrder = 18
+ TabOrder = 17
OnChange = OrdPieceWeightChange
OnKeyPress = ConNoKeyPress
end
@@ -889,14 +888,14 @@ inherited frmKnitPlanInPut: TfrmKnitPlanInPut
Font.Name = #23435#20307
Font.Style = [fsBold]
ParentFont = False
- TabOrder = 19
+ TabOrder = 18
OnBtnUpClick = MCTypeBtnUpClick
OnBtnDnClick = CustNameBtnDnClick
end
object C_KnitNote: TBtnEditC
Tag = 2
- Left = 958
- Top = 237
+ Left = 982
+ Top = 404
Width = 180
Height = 30
Hint = 'C_KnitNote/'#32986#24067#35201#27714
@@ -906,7 +905,7 @@ inherited frmKnitPlanInPut: TfrmKnitPlanInPut
Font.Name = #23435#20307
Font.Style = [fsBold]
ParentFont = False
- TabOrder = 20
+ TabOrder = 19
OnBtnUpClick = MCTypeBtnUpClick
OnBtnDnClick = CustNameBtnDnClick
end
@@ -923,7 +922,7 @@ inherited frmKnitPlanInPut: TfrmKnitPlanInPut
Font.Name = #23435#20307
Font.Style = [fsBold]
ParentFont = False
- TabOrder = 21
+ TabOrder = 20
OnBtnUpClick = MCTypeBtnUpClick
OnBtnDnClick = CustNameBtnDnClick
end
@@ -939,7 +938,7 @@ inherited frmKnitPlanInPut: TfrmKnitPlanInPut
Font.Name = #23435#20307
Font.Style = [fsBold]
ParentFont = False
- TabOrder = 22
+ TabOrder = 21
OnKeyPress = ConNoKeyPress
end
object C_Figure: TBtnEditC
@@ -955,7 +954,7 @@ inherited frmKnitPlanInPut: TfrmKnitPlanInPut
Font.Name = #23435#20307
Font.Style = [fsBold]
ParentFont = False
- TabOrder = 23
+ TabOrder = 22
OnBtnUpClick = MCTypeBtnUpClick
OnBtnDnClick = CustNameBtnDnClick
end
@@ -972,7 +971,7 @@ inherited frmKnitPlanInPut: TfrmKnitPlanInPut
Font.Name = #23435#20307
Font.Style = [fsBold]
ParentFont = False
- TabOrder = 24
+ TabOrder = 23
OnBtnUpClick = MCTypeBtnUpClick
OnBtnDnClick = CustNameBtnDnClick
end
@@ -988,7 +987,7 @@ inherited frmKnitPlanInPut: TfrmKnitPlanInPut
Font.Name = #23435#20307
Font.Style = [fsBold]
ParentFont = False
- TabOrder = 25
+ TabOrder = 24
OnChange = OrdPieceWeightChange
OnKeyPress = ConNoKeyPress
end
@@ -1004,13 +1003,13 @@ inherited frmKnitPlanInPut: TfrmKnitPlanInPut
Font.Name = #23435#20307
Font.Style = [fsBold]
ParentFont = False
- TabOrder = 26
+ TabOrder = 25
OnKeyPress = ConNoKeyPress
end
object C_Spec: TEdit
Tag = 2
- Left = 201
- Top = 554
+ Left = 196
+ Top = 648
Width = 1023
Height = 46
Font.Charset = GB2312_CHARSET
@@ -1019,23 +1018,23 @@ inherited frmKnitPlanInPut: TfrmKnitPlanInPut
Font.Name = #23435#20307
Font.Style = [fsBold]
ParentFont = False
- TabOrder = 27
+ TabOrder = 26
Visible = False
OnKeyPress = ConNoKeyPress
end
object OrdSNote: TRichEdit
Tag = 2
Left = 114
- Top = 405
+ Top = 406
Width = 731
- Height = 110
+ Height = 101
Font.Charset = GB2312_CHARSET
Font.Color = clBlack
Font.Height = -21
Font.Name = #23435#20307
Font.Style = [fsBold]
ParentFont = False
- TabOrder = 28
+ TabOrder = 27
Zoom = 100
OnKeyPress = ConNoKeyPress
end
@@ -1052,7 +1051,7 @@ inherited frmKnitPlanInPut: TfrmKnitPlanInPut
Font.Name = #23435#20307
Font.Style = [fsBold]
ParentFont = False
- TabOrder = 29
+ TabOrder = 28
OnBtnUpClick = MCTypeBtnUpClick
OnBtnDnClick = CustNameBtnDnClick
end
@@ -1069,7 +1068,7 @@ inherited frmKnitPlanInPut: TfrmKnitPlanInPut
Font.Style = []
ItemIndex = 0
ParentFont = False
- TabOrder = 30
+ TabOrder = 29
Text = #20844#26020
Items.Strings = (
#20844#26020
@@ -1090,7 +1089,7 @@ inherited frmKnitPlanInPut: TfrmKnitPlanInPut
Font.Name = #23435#20307
Font.Style = [fsBold]
ParentFont = False
- TabOrder = 31
+ TabOrder = 30
OnBtnUpClick = MCTypeBtnUpClick
OnBtnDnClick = CustNameBtnDnClick
end
@@ -1107,7 +1106,7 @@ inherited frmKnitPlanInPut: TfrmKnitPlanInPut
Font.Name = #23435#20307
Font.Style = [fsBold]
ParentFont = False
- TabOrder = 32
+ TabOrder = 31
OnBtnUpClick = MCTypeBtnUpClick
OnBtnDnClick = CustNameBtnDnClick
end
@@ -1122,7 +1121,7 @@ inherited frmKnitPlanInPut: TfrmKnitPlanInPut
Font.Name = #23435#20307
Font.Style = [fsBold]
ParentFont = False
- TabOrder = 33
+ TabOrder = 32
OnKeyPress = ConNoKeyPress
end
object C_Material_Name: TBtnEditC
@@ -1138,7 +1137,7 @@ inherited frmKnitPlanInPut: TfrmKnitPlanInPut
Font.Name = #23435#20307
Font.Style = [fsBold]
ParentFont = False
- TabOrder = 34
+ TabOrder = 33
OnBtnUpClick = MCTypeBtnUpClick
OnBtnDnClick = CustNameBtnDnClick
end
@@ -1155,13 +1154,13 @@ inherited frmKnitPlanInPut: TfrmKnitPlanInPut
Font.Name = #23435#20307
Font.Style = [fsBold]
ParentFont = False
- TabOrder = 35
+ TabOrder = 34
OnBtnUpClick = MCTypeBtnUpClick
OnBtnDnClick = CustNameBtnDnClick
end
object LabPackage: TBtnEditC
Left = 959
- Top = 467
+ Top = 482
Width = 180
Height = 30
Font.Charset = GB2312_CHARSET
@@ -1170,24 +1169,61 @@ inherited frmKnitPlanInPut: TfrmKnitPlanInPut
Font.Name = #23435#20307
Font.Style = [fsBold]
ParentFont = False
- TabOrder = 36
+ TabOrder = 35
OnBtnUpClick = LabPackageBtnUpClick
OnBtnDnClick = CustNameBtnDnClick
end
+ object RuleBeforeTare: TComboBox
+ Left = 958
+ Top = 447
+ Width = 65
+ Height = 26
+ Style = csOwnerDrawFixed
+ Font.Charset = GB2312_CHARSET
+ Font.Color = clBlack
+ Font.Height = -21
+ Font.Name = #23435#20307
+ Font.Style = [fsBold]
+ ItemHeight = 20
+ ParentFont = False
+ TabOrder = 36
+ Items.Strings = (
+ '0.5'
+ '1')
+ end
+ object C_Material: TBtnEditC
+ Tag = 2
+ Left = 957
+ Top = 192
+ Width = 180
+ Height = 30
+ Hint = 'C_Material/'#29289#26009#21517#31216
+ Font.Charset = GB2312_CHARSET
+ Font.Color = clBlack
+ Font.Height = -21
+ Font.Name = #23435#20307
+ Font.Style = [fsBold]
+ ParentFont = False
+ TabOrder = 37
+ OnBtnUpClick = MCTypeBtnUpClick
+ OnBtnDnClick = CustNameBtnDnClick
+ end
end
object Panel2: TPanel [2]
Left = 0
- Top = 576
+ Top = 648
Width = 1363
- Height = 82
+ Height = 3
Align = alClient
TabOrder = 2
Visible = False
+ ExplicitTop = 576
+ ExplicitHeight = 82
object cxPageControl1: TcxPageControl
Left = 1
Top = 1
Width = 1361
- Height = 80
+ Height = 1
Align = alClient
Color = clWhite
Font.Charset = GB2312_CHARSET
@@ -1202,19 +1238,22 @@ inherited frmKnitPlanInPut: TfrmKnitPlanInPut
Properties.ActivePage = cxTabSheet1
Properties.CustomButtons.Buttons = <>
Properties.Style = 6
- ClientRectBottom = 80
+ ExplicitHeight = 80
+ ClientRectBottom = 3
ClientRectRight = 1361
- ClientRectTop = 32
+ ClientRectTop = 3
object cxTabSheet1: TcxTabSheet
Caption = ' '#37197' '#27604' '
Color = clWhite
ImageIndex = 0
ParentColor = False
+ ExplicitTop = 32
+ ExplicitHeight = 48
object cxGrid2: TcxGrid
Left = 0
Top = 38
Width = 1361
- Height = 10
+ Height = 0
Align = alClient
Font.Charset = GB2312_CHARSET
Font.Color = clWindowText
@@ -1223,6 +1262,7 @@ inherited frmKnitPlanInPut: TfrmKnitPlanInPut
Font.Style = []
ParentFont = False
TabOrder = 0
+ ExplicitHeight = 10
object Tv2: TcxGridDBTableView
Navigator.Buttons.CustomButtons = <>
ScrollbarAnnotations.CustomAnnotations = <>
@@ -1463,6 +1503,8 @@ inherited frmKnitPlanInPut: TfrmKnitPlanInPut
object cxTabSheet2: TcxTabSheet
Caption = #25490#38024#19977#35282
ImageIndex = 1
+ ExplicitTop = 32
+ ExplicitHeight = 48
object Panel1: TPanel
Left = 0
Top = 183
diff --git a/D01针织生产计划/U_KnitPlanInPut.pas b/D01针织生产计划/U_KnitPlanInPut.pas
index 80e6433..0d87403 100644
--- a/D01针织生产计划/U_KnitPlanInPut.pas
+++ b/D01针织生产计划/U_KnitPlanInPut.pas
@@ -78,7 +78,6 @@ type
Label26: TLabel;
Label27: TLabel;
Label28: TLabel;
- RuleBeforeTare: TEdit;
v2Column1: TcxGridDBColumn;
v2Column3: TcxGridDBColumn;
v2Column5: TcxGridDBColumn;
@@ -391,6 +390,9 @@ type
C_MainYarn: TBtnEditC;
lbl6: TLabel;
LabPackage: TBtnEditC;
+ RuleBeforeTare: TComboBox;
+ lbl7: TLabel;
+ C_Material: TBtnEditC;
procedure TBCloseClick(Sender: TObject);
procedure FormShow(Sender: TObject);
procedure TBSaveClick(Sender: TObject);
@@ -1685,9 +1687,9 @@ begin
Self.C_jiaceng.Text := frmClothInfoSel.CDS_1.fieldbyname('C_jiaceng').AsString;
Self.C_DYARN.Text := frmClothInfoSel.CDS_1.fieldbyname('C_DYARN').AsString;
Self.C_Material_Name.Text := frmClothInfoSel.CDS_1.fieldbyname('C_KHCode').AsString;
+ Self.C_Material.Text := frmClothInfoSel.CDS_1.fieldbyname('C_Material').AsString;
Self.OrdSNote.Text := frmClothInfoSel.CDS_1.fieldbyname('Note').AsString;
Self.C_Deal.Text := frmClothInfoSel.CDS_1.fieldbyname('C_Deal').AsString;
-
end;
end;
finally
diff --git a/D01针织生产计划/U_KnitPlanList.dfm b/D01针织生产计划/U_KnitPlanList.dfm
index fe80efa..31e26f9 100644
--- a/D01针织生产计划/U_KnitPlanList.dfm
+++ b/D01针织生产计划/U_KnitPlanList.dfm
@@ -89,16 +89,24 @@ inherited frmKnitPlanList: TfrmKnitPlanList
Visible = False
OnClick = TBPrintClick
end
- object TBView: TToolButton
+ object DYPrint: TToolButton
Left = 569
Top = 0
AutoSize = True
+ Caption = #25171#21360#25171#26679#21333
+ ImageIndex = 21
+ OnClick = DYPrintClick
+ end
+ object TBView: TToolButton
+ Left = 676
+ Top = 0
+ AutoSize = True
Caption = #26597#30475
ImageIndex = 4
OnClick = TBViewClick
end
object TBDel: TToolButton
- Left = 640
+ Left = 747
Top = 0
AutoSize = True
Caption = #21024#38500
@@ -106,7 +114,7 @@ inherited frmKnitPlanList: TfrmKnitPlanList
OnClick = TBDelClick
end
object TBSCAP: TToolButton
- Left = 711
+ Left = 818
Top = 0
AutoSize = True
Caption = #29983#20135#23433#25490
@@ -114,7 +122,7 @@ inherited frmKnitPlanList: TfrmKnitPlanList
OnClick = TBSCAPClick
end
object ToolButton2: TToolButton
- Left = 806
+ Left = 913
Top = 0
AutoSize = True
Caption = #25171#21367#35774#32622
@@ -122,24 +130,24 @@ inherited frmKnitPlanList: TfrmKnitPlanList
OnClick = ToolButton2Click
end
object btn1: TToolButton
- Left = 901
+ Left = 1008
Top = 0
AutoSize = True
Caption = #25171#21360#27969#31243#21345
ImageIndex = 21
+ Wrap = True
OnClick = btn1Click
end
object ToolButton5: TToolButton
- Left = 1008
- Top = 0
+ Left = 0
+ Top = 38
AutoSize = True
Caption = ' '#26032#22686#27969#31243#21345
ImageIndex = 2
- Wrap = True
OnClick = ToolButton5Click
end
object ToolButton9: TToolButton
- Left = 0
+ Left = 113
Top = 38
AutoSize = True
Caption = #26032#22686#25286#20998#21345
@@ -147,7 +155,7 @@ inherited frmKnitPlanList: TfrmKnitPlanList
OnClick = ToolButton9Click
end
object ToolButton10: TToolButton
- Left = 107
+ Left = 220
Top = 38
AutoSize = True
Caption = #26032#22686#22238#20462#21345
@@ -155,7 +163,7 @@ inherited frmKnitPlanList: TfrmKnitPlanList
OnClick = ToolButton10Click
end
object ToolButton6: TToolButton
- Left = 214
+ Left = 327
Top = 38
AutoSize = True
Caption = #20462#25913#27969#31243#21345
@@ -163,7 +171,7 @@ inherited frmKnitPlanList: TfrmKnitPlanList
OnClick = ToolButton6Click
end
object ToolButton7: TToolButton
- Left = 321
+ Left = 434
Top = 38
AutoSize = True
Caption = #21024#38500#27969#31243#21345
@@ -171,7 +179,7 @@ inherited frmKnitPlanList: TfrmKnitPlanList
OnClick = ToolButton7Click
end
object TBEnd: TToolButton
- Left = 428
+ Left = 541
Top = 38
AutoSize = True
Caption = #32467#26463
@@ -179,7 +187,7 @@ inherited frmKnitPlanList: TfrmKnitPlanList
OnClick = TBEndClick
end
object TBNoEnd: TToolButton
- Left = 499
+ Left = 612
Top = 38
AutoSize = True
Caption = #25764#38144#32467#26463
@@ -187,7 +195,7 @@ inherited frmKnitPlanList: TfrmKnitPlanList
OnClick = TBNoEndClick
end
object ToolButton3: TToolButton
- Left = 594
+ Left = 707
Top = 38
AutoSize = True
Caption = #26631#32418
@@ -195,7 +203,7 @@ inherited frmKnitPlanList: TfrmKnitPlanList
OnClick = ToolButton3Click
end
object ToolButton4: TToolButton
- Left = 665
+ Left = 778
Top = 38
AutoSize = True
Caption = #25764#38144#26631#32418
@@ -203,7 +211,7 @@ inherited frmKnitPlanList: TfrmKnitPlanList
OnClick = ToolButton4Click
end
object TBExport: TToolButton
- Left = 760
+ Left = 873
Top = 38
AutoSize = True
Caption = #23548#20986
@@ -211,7 +219,7 @@ inherited frmKnitPlanList: TfrmKnitPlanList
OnClick = TBExportClick
end
object ToolButton1: TToolButton
- Left = 831
+ Left = 944
Top = 38
AutoSize = True
Caption = #20445#23384#26684#24335
@@ -219,7 +227,7 @@ inherited frmKnitPlanList: TfrmKnitPlanList
OnClick = ToolButton1Click
end
object TBClose: TToolButton
- Left = 926
+ Left = 1039
Top = 38
AutoSize = True
Caption = #20851#38381
@@ -498,11 +506,17 @@ inherited frmKnitPlanList: TfrmKnitPlanList
end>
DataController.Summary.SummaryGroups = <>
OptionsCustomize.ColumnFiltering = False
- OptionsData.Editing = False
- OptionsSelection.CellSelect = False
OptionsView.Footer = True
OptionsView.GroupByBox = False
Styles.Header = DataLink_KnitPlan.Default
+ object cxgrdbclmnTv1Column21: TcxGridDBColumn
+ Caption = #36873#25321
+ DataBinding.FieldName = 'Ssel'
+ DataBinding.IsNullValueType = True
+ PropertiesClassName = 'TcxCheckBoxProperties'
+ HeaderAlignmentHorz = taCenter
+ Width = 50
+ end
object v1OrderNo: TcxGridDBColumn
Caption = #21512#21516#21495
DataBinding.FieldName = 'ConNo'
diff --git a/D01针织生产计划/U_KnitPlanList.pas b/D01针织生产计划/U_KnitPlanList.pas
index d6d2864..d8f356c 100644
--- a/D01针织生产计划/U_KnitPlanList.pas
+++ b/D01针织生产计划/U_KnitPlanList.pas
@@ -156,6 +156,8 @@ type
ToolButton10: TToolButton;
cxgrdbclmnTv1Column19: TcxGridDBColumn;
cxgrdbclmnTv1Column20: TcxGridDBColumn;
+ cxgrdbclmnTv1Column21: TcxGridDBColumn;
+ DYPrint: TToolButton;
procedure FormClose(Sender: TObject; var Action: TCloseAction);
procedure TBCloseClick(Sender: TObject);
procedure TBFindClick(Sender: TObject);
@@ -199,6 +201,7 @@ type
procedure ToolButton9Click(Sender: TObject);
procedure ToolButton10Click(Sender: TObject);
procedure Tv1CellDblClick(Sender: TcxCustomGridTableView; ACellViewInfo: TcxGridTableDataCellViewInfo; AButton: TMouseButton; AShift: TShiftState; var AHandled: Boolean);
+ procedure DYPrintClick(Sender: TObject);
private
FInt, PFInt: Integer;
procedure InitGrid();
@@ -551,6 +554,56 @@ begin
end;
end;
+procedure TfrmKnitPlanList.DYPrintClick(Sender: TObject);
+var
+ WSql: string;
+begin
+ if CDS_1.IsEmpty then
+ Exit;
+ if not CDS_1.Locate('SSel', True, []) then
+ begin
+ Application.MessageBox('ûѡ!', 'ʾ', 0);
+ Exit;
+ end;
+ WSql := '';
+ CDS_1.DisableControls;
+ with CDS_1 do
+ begin
+ First;
+ while not Eof do
+ begin
+ if CDS_1.fieldbyname('SSel').AsBoolean then
+ begin
+ if WSql <> '' then
+ begin
+ WSql := WSql + ',' + QuotedStr(Trim(CDS_1.fieldbyname('MainId').AsString));
+ end
+ else
+ begin
+ WSql := QuotedStr(Trim(CDS_1.fieldbyname('MainId').AsString));
+ end;
+ end;
+ Next;
+ end;
+ end;
+ CDS_1.Locate('SSel', True, []);
+ CDS_1.EnableControls;
+ try
+ frmLabelPrint := TfrmLabelPrint.Create(Application);
+ with frmLabelPrint do
+ begin
+ FLMType := 'ZZDYD';
+ FFiltration1 := WSql;
+ if ShowModal = 1 then
+ begin
+
+ end;
+ end;
+ finally
+ frmLabelPrint.Free;
+ end;
+end;
+
procedure TfrmKnitPlanList.TBExportClick(Sender: TObject);
begin
if ADOQueryMain.IsEmpty then
diff --git a/T03贸易布匹检验/U_TradeMachInsp.pas b/T03贸易布匹检验/U_TradeMachInsp.pas
index 317f254..ad2a1f4 100644
--- a/T03贸易布匹检验/U_TradeMachInsp.pas
+++ b/T03贸易布匹检验/U_TradeMachInsp.pas
@@ -970,7 +970,7 @@ begin
sql.Add(' left JOIN Trade_Cloth_Inspect_Rule E on C.MainId =E.RuleID ');
// sql.Add(' INNER JOIN BS_Contract_Sub F on D.ConSID =F.ConSID ');
sql.Add(' where A.PCID = ''' + Trim(MBCIOID) + '''');
- //ShowMessage(sql.Text);
+ // ShowMessage(sql.Text);
Open;
end;
@@ -999,6 +999,7 @@ begin
FConSId := Trim(ADOTmp.fieldbyname('ConSId').AsString);
FConNo := Trim(ADOTmp.fieldbyname('ConNo').AsString);
FOrderNo := Trim(ADOTmp.fieldbyname('OrderNo').AsString);
+ FCUSTNAME := Trim(ADOTmp.fieldbyname('CUSTNAME').AsString);
FMainId := Trim(ADOTmp.fieldbyname('MainId').AsString);
FSubId := Trim(ADOTmp.fieldbyname('SubId').AsString);
FPCId := Trim(ADOTmp.fieldbyname('PCID').AsString);
@@ -1015,7 +1016,7 @@ begin
FC_Width := Trim(ADOTmp.fieldbyname('C_Width').AsString);
FC_GramWeight := Trim(ADOTmp.fieldbyname('C_GramWeight').AsString);
FRulePieceNo := Trim(ADOTmp.fieldbyname('RulePieceNo').AsString); //ɹ
- FYWY := Trim(ADOTmp.fieldbyname('YWY').AsString); //ҵԱ
+ FYWY := Trim(ADOTmp.fieldbyname('Saleser').AsString); //ҵԱ
if FRulePieceNo = 'ֶ' then