From ba25bf142340a77bc9c7204a45fad4adf1d39a95 Mon Sep 17 00:00:00 2001 From: "DESKTOP-E401PHE\\Administrator" Date: Sat, 1 Nov 2025 13:51:41 +0800 Subject: [PATCH] 1 --- 坯布码单待检(PBMDDJ.dll)/PBMDDJ.dof | 2 +- 坯布码单待检(PBMDDJ.dll)/U_DataLink.dfm | 4 +-- 坯布码单待检(PBMDDJ.dll)/U_PBCKKCList.dfm | 12 +++---- .../U_ProductOrderListSel.dfm | 4 +-- 坯布码单待检(PBMDDJ.dll)/U_SXCKInPut.dfm | 17 +++++++--- 坯布码单待检(PBMDDJ.dll)/U_SXCKInPut.pas | 4 +++ 坯布码单待检(PBMDDJ.dll)/U_SXCKKCSelList.dfm | 19 +++++++---- 坯布码单待检(PBMDDJ.dll)/U_SXCKKCSelList.pas | 1 + 坯布码单待检(PBMDDJ.dll)/U_SXCKNewList.dfm | 18 +++++++---- 坯布码单待检(PBMDDJ.dll)/U_SXCKNewList.pas | 1 + 坯布码单待检(PBMDDJ.dll)/U_SXCKOutList.dfm | 24 ++++++++------ 坯布码单待检(PBMDDJ.dll)/U_SXCKOutList.pas | 1 + 坯布码单待检(PBMDDJ.dll)/U_SXCKOutPut.dfm | 19 +++++++---- 坯布码单待检(PBMDDJ.dll)/U_SXCKOutPut.pas | 3 ++ .../ProjectGroup1.bpg | 4 +-- .../U_ClothSCDCGAnPai.dfm | 4 +-- .../U_ClothSCDCGAnPai.pas | 2 +- 布匹检验(FabricInspection.dll)/U_DataLink.dfm | 4 +-- .../U_GreyInspection.dfm | 6 ++-- .../U_GreyInspection.pas | 8 ++--- .../U_CPCKMdList.dfm | 10 +++--- .../U_CPCKMdList.pas | 2 -- .../U_CPFHSQInPut.dfm | 20 ++++++++---- .../U_CPFHSQInPut.pas | 2 ++ .../U_CPFHSQList.dfm | 31 +++++++++++------- .../U_CPFHSQList.pas | 1 + .../U_DataLink.dfm | 4 +-- .../U_FinishedClothKCList.dfm | 18 +++++------ .../U_SQKCHZSelList2.dfm | 25 +++++++++------ .../U_SQKCHZSelList2.pas | 7 ++-- .../U_SXCKKCSelList.dfm | 14 ++++---- .../U_DataLink.dfm | 4 +-- .../U_PlanCardList.dfm | 4 +-- .../U_ShuttleClothSCInPut.dfm | 32 +++++++++---------- .../U_ShuttleClothSCList.dfm | 4 +-- 经轴仓库(Warehouse.dll)/ProjectGroup1.bpg | 6 ++-- 36 files changed, 203 insertions(+), 138 deletions(-) diff --git a/坯布码单待检(PBMDDJ.dll)/PBMDDJ.dof b/坯布码单待检(PBMDDJ.dll)/PBMDDJ.dof index e3cbcd7..598ebbe 100644 --- a/坯布码单待检(PBMDDJ.dll)/PBMDDJ.dof +++ b/坯布码单待检(PBMDDJ.dll)/PBMDDJ.dof @@ -101,7 +101,7 @@ DebugSourceDirs= UsePackages=0 [Parameters] RunParams= -HostApplication=D:\Dp7Repo\Ŀ\·\뵥(PBMDDJ.dll)\testDll.exe +HostApplication=D:\Ŀ\D7szChenfeng\뵥(PBMDDJ.dll)\testDll.exe Launcher= UseLauncher=0 DebugCWD= diff --git a/坯布码单待检(PBMDDJ.dll)/U_DataLink.dfm b/坯布码单待检(PBMDDJ.dll)/U_DataLink.dfm index ec58005..5a4d121 100644 --- a/坯布码单待检(PBMDDJ.dll)/U_DataLink.dfm +++ b/坯布码单待检(PBMDDJ.dll)/U_DataLink.dfm @@ -1,8 +1,8 @@ object DataLink_PBMDDJ: TDataLink_PBMDDJ OldCreateOrder = False OnDestroy = DataModuleDestroy - Left = 343 - Top = 231 + Left = 459 + Top = 278 Height = 349 Width = 482 object AdoDataLink: TADOQuery diff --git a/坯布码单待检(PBMDDJ.dll)/U_PBCKKCList.dfm b/坯布码单待检(PBMDDJ.dll)/U_PBCKKCList.dfm index 31da051..f0e2fb6 100644 --- a/坯布码单待检(PBMDDJ.dll)/U_PBCKKCList.dfm +++ b/坯布码单待检(PBMDDJ.dll)/U_PBCKKCList.dfm @@ -1,6 +1,6 @@ object frmPBCKKCList: TfrmPBCKKCList - Left = 276 - Top = 165 + Left = 463 + Top = 374 Width = 1181 Height = 511 Caption = #22383#24067#24211#23384#21015#34920 @@ -20,7 +20,7 @@ object frmPBCKKCList: TfrmPBCKKCList object ToolBar1: TToolBar Left = 0 Top = 0 - Width = 1165 + Width = 1173 Height = 33 ButtonHeight = 30 ButtonWidth = 59 @@ -91,7 +91,7 @@ object frmPBCKKCList: TfrmPBCKKCList object Panel1: TPanel Left = 0 Top = 33 - Width = 1165 + Width = 1173 Height = 60 Align = alTop BevelInner = bvRaised @@ -166,8 +166,8 @@ object frmPBCKKCList: TfrmPBCKKCList object cxGrid2: TcxGrid Left = 0 Top = 93 - Width = 1165 - Height = 379 + Width = 1173 + Height = 387 Align = alClient PopupMenu = PopupMenu1 TabOrder = 2 diff --git a/坯布码单待检(PBMDDJ.dll)/U_ProductOrderListSel.dfm b/坯布码单待检(PBMDDJ.dll)/U_ProductOrderListSel.dfm index 6cab10e..9d17925 100644 --- a/坯布码单待检(PBMDDJ.dll)/U_ProductOrderListSel.dfm +++ b/坯布码单待检(PBMDDJ.dll)/U_ProductOrderListSel.dfm @@ -1,6 +1,6 @@ object frmProductOrderListSel: TfrmProductOrderListSel - Left = 242 - Top = 66 + Left = 597 + Top = 578 Width = 1209 Height = 674 Caption = #29983#20135#25351#31034#21333#36873#25321 diff --git a/坯布码单待检(PBMDDJ.dll)/U_SXCKInPut.dfm b/坯布码单待检(PBMDDJ.dll)/U_SXCKInPut.dfm index a9a9d7c..89a0251 100644 --- a/坯布码单待检(PBMDDJ.dll)/U_SXCKInPut.dfm +++ b/坯布码单待检(PBMDDJ.dll)/U_SXCKInPut.dfm @@ -1,6 +1,6 @@ object frmSXCKInPut: TfrmSXCKInPut - Left = 229 - Top = 209 + Left = 641 + Top = 608 Width = 1283 Height = 502 Align = alClient @@ -20,8 +20,8 @@ object frmSXCKInPut: TfrmSXCKInPut object cxGrid2: TcxGrid Left = 0 Top = 33 - Width = 1267 - Height = 430 + Width = 1275 + Height = 438 Align = alClient TabOrder = 1 object Tv1: TcxGridDBTableView @@ -238,6 +238,13 @@ object frmSXCKInPut: TfrmSXCKInPut HeaderAlignmentHorz = taCenter Width = 79 end + object Tv1Column2: TcxGridDBColumn + Tag = 2 + Caption = #25209#21495 + DataBinding.FieldName = 'BatchNo' + HeaderAlignmentHorz = taCenter + Width = 70 + end end object cxGrid2Level1: TcxGridLevel GridView = Tv1 @@ -246,7 +253,7 @@ object frmSXCKInPut: TfrmSXCKInPut object ToolBar1: TToolBar Left = 0 Top = 0 - Width = 1267 + Width = 1275 Height = 33 ButtonHeight = 30 ButtonWidth = 59 diff --git a/坯布码单待检(PBMDDJ.dll)/U_SXCKInPut.pas b/坯布码单待检(PBMDDJ.dll)/U_SXCKInPut.pas index 4da5375..067cd31 100644 --- a/坯布码单待检(PBMDDJ.dll)/U_SXCKInPut.pas +++ b/坯布码单待检(PBMDDJ.dll)/U_SXCKInPut.pas @@ -56,6 +56,7 @@ type v1Column13: TcxGridDBColumn; v1Column17: TcxGridDBColumn; Tv1Column1: TcxGridDBColumn; + Tv1Column2: TcxGridDBColumn; procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure TBAddClick(Sender: TObject); procedure TBCloseClick(Sender: TObject); @@ -722,6 +723,9 @@ begin FieldByName('SPMF').Value := Trim(frmProductOrderListSel.Order_Main.fieldbyname('P_MF').AsString); FieldByName('SPKZ').Value := Trim(frmProductOrderListSel.Order_Main.fieldbyname('P_KZ').AsString); + + FieldByName('BatchNo').Value := Trim(frmProductOrderListSel.Order_Main.fieldbyname('BatchNo').AsString); + end; end; end; diff --git a/坯布码单待检(PBMDDJ.dll)/U_SXCKKCSelList.dfm b/坯布码单待检(PBMDDJ.dll)/U_SXCKKCSelList.dfm index a8d897a..4c97cba 100644 --- a/坯布码单待检(PBMDDJ.dll)/U_SXCKKCSelList.dfm +++ b/坯布码单待检(PBMDDJ.dll)/U_SXCKKCSelList.dfm @@ -1,6 +1,6 @@ object frmSXCKKCSelList: TfrmSXCKKCSelList - Left = 198 - Top = 125 + Left = 649 + Top = 589 Width = 1181 Height = 511 Align = alClient @@ -21,7 +21,7 @@ object frmSXCKKCSelList: TfrmSXCKKCSelList object ToolBar1: TToolBar Left = 0 Top = 0 - Width = 1165 + Width = 1173 Height = 33 ButtonHeight = 30 ButtonWidth = 59 @@ -76,7 +76,7 @@ object frmSXCKKCSelList: TfrmSXCKKCSelList object Panel1: TPanel Left = 0 Top = 33 - Width = 1165 + Width = 1173 Height = 60 Align = alTop BevelInner = bvRaised @@ -239,8 +239,8 @@ object frmSXCKKCSelList: TfrmSXCKKCSelList object cxGrid2: TcxGrid Left = 0 Top = 93 - Width = 1165 - Height = 379 + Width = 1173 + Height = 387 Align = alClient PopupMenu = PopupMenu1 TabOrder = 2 @@ -475,9 +475,16 @@ object frmSXCKKCSelList: TfrmSXCKKCSelList Tag = 2 Caption = #22791#27880 DataBinding.FieldName = 'Note' + HeaderAlignmentHorz = taCenter Options.Editing = False Width = 79 end + object Tv1Column2: TcxGridDBColumn + Caption = #25209#21495 + DataBinding.FieldName = 'BatchNo' + HeaderAlignmentHorz = taCenter + Width = 70 + end end object cxGrid2Level1: TcxGridLevel GridView = Tv1 diff --git a/坯布码单待检(PBMDDJ.dll)/U_SXCKKCSelList.pas b/坯布码单待检(PBMDDJ.dll)/U_SXCKKCSelList.pas index 68dc80a..9157164 100644 --- a/坯布码单待检(PBMDDJ.dll)/U_SXCKKCSelList.pas +++ b/坯布码单待检(PBMDDJ.dll)/U_SXCKKCSelList.pas @@ -92,6 +92,7 @@ type Tv1Column1: TcxGridDBColumn; Label2: TLabel; CustomerNoName: TEdit; + Tv1Column2: TcxGridDBColumn; procedure FormDestroy(Sender: TObject); procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure TBRafreshClick(Sender: TObject); diff --git a/坯布码单待检(PBMDDJ.dll)/U_SXCKNewList.dfm b/坯布码单待检(PBMDDJ.dll)/U_SXCKNewList.dfm index f512c3a..165178d 100644 --- a/坯布码单待检(PBMDDJ.dll)/U_SXCKNewList.dfm +++ b/坯布码单待检(PBMDDJ.dll)/U_SXCKNewList.dfm @@ -1,6 +1,6 @@ object frmSXCKNewList: TfrmSXCKNewList - Left = 247 - Top = 159 + Left = 585 + Top = 665 Width = 1335 Height = 511 Caption = #22383#24067#20837#24211#21015#34920 @@ -21,7 +21,7 @@ object frmSXCKNewList: TfrmSXCKNewList object ToolBar1: TToolBar Left = 0 Top = 0 - Width = 1319 + Width = 1327 Height = 33 ButtonHeight = 30 ButtonWidth = 83 @@ -107,7 +107,7 @@ object frmSXCKNewList: TfrmSXCKNewList object Panel1: TPanel Left = 0 Top = 33 - Width = 1319 + Width = 1327 Height = 72 Align = alTop BevelInner = bvRaised @@ -198,8 +198,8 @@ object frmSXCKNewList: TfrmSXCKNewList object cxGrid2: TcxGrid Left = 0 Top = 105 - Width = 1319 - Height = 367 + Width = 1327 + Height = 375 Align = alClient TabOrder = 2 object Tv1: TcxGridDBTableView @@ -384,6 +384,12 @@ object frmSXCKNewList: TfrmSXCKNewList HeaderAlignmentHorz = taCenter Width = 68 end + object Tv1Column2: TcxGridDBColumn + Caption = #25209#21495 + DataBinding.FieldName = 'BatchNo' + HeaderAlignmentHorz = taCenter + Width = 70 + end end object cxGrid2Level1: TcxGridLevel GridView = Tv1 diff --git a/坯布码单待检(PBMDDJ.dll)/U_SXCKNewList.pas b/坯布码单待检(PBMDDJ.dll)/U_SXCKNewList.pas index c01e372..f2db504 100644 --- a/坯布码单待检(PBMDDJ.dll)/U_SXCKNewList.pas +++ b/坯布码单待检(PBMDDJ.dll)/U_SXCKNewList.pas @@ -83,6 +83,7 @@ type Tv1Column1: TcxGridDBColumn; Label3: TLabel; CustomerNoName: TEdit; + Tv1Column2: TcxGridDBColumn; procedure FormDestroy(Sender: TObject); procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure FormCreate(Sender: TObject); diff --git a/坯布码单待检(PBMDDJ.dll)/U_SXCKOutList.dfm b/坯布码单待检(PBMDDJ.dll)/U_SXCKOutList.dfm index 378c106..fb336e6 100644 --- a/坯布码单待检(PBMDDJ.dll)/U_SXCKOutList.dfm +++ b/坯布码单待检(PBMDDJ.dll)/U_SXCKOutList.dfm @@ -1,6 +1,6 @@ object frmSXCKOutList: TfrmSXCKOutList - Left = 147 - Top = 136 + Left = 612 + Top = 524 Width = 1314 Height = 572 Caption = #22383#24067#20986#24211#21015#34920 @@ -21,7 +21,7 @@ object frmSXCKOutList: TfrmSXCKOutList object ToolBar1: TToolBar Left = 0 Top = 0 - Width = 1298 + Width = 1306 Height = 33 ButtonHeight = 30 ButtonWidth = 83 @@ -151,7 +151,7 @@ object frmSXCKOutList: TfrmSXCKOutList object Panel1: TPanel Left = 0 Top = 33 - Width = 1298 + Width = 1306 Height = 72 Align = alTop BevelInner = bvRaised @@ -334,8 +334,8 @@ object frmSXCKOutList: TfrmSXCKOutList object cxGrid2: TcxGrid Left = 0 Top = 105 - Width = 1081 - Height = 428 + Width = 1089 + Height = 436 Align = alClient TabOrder = 2 object Tv1: TcxGridDBTableView @@ -612,16 +612,22 @@ object frmSXCKOutList: TfrmSXCKOutList HeaderAlignmentHorz = taCenter Width = 68 end + object Tv1Column8: TcxGridDBColumn + Caption = #25209#21495 + DataBinding.FieldName = 'BatchNo' + HeaderAlignmentHorz = taCenter + Width = 70 + end end object cxGrid2Level1: TcxGridLevel GridView = Tv1 end end object Panel2: TPanel - Left = 1081 + Left = 1089 Top = 105 Width = 217 - Height = 428 + Height = 436 Align = alRight Caption = 'Panel2' TabOrder = 3 @@ -629,7 +635,7 @@ object frmSXCKOutList: TfrmSXCKOutList Left = 1 Top = 1 Width = 215 - Height = 426 + Height = 434 Align = alClient TabOrder = 0 object TvMX: TcxGridDBTableView diff --git a/坯布码单待检(PBMDDJ.dll)/U_SXCKOutList.pas b/坯布码单待检(PBMDDJ.dll)/U_SXCKOutList.pas index cec24c4..a8a2cb2 100644 --- a/坯布码单待检(PBMDDJ.dll)/U_SXCKOutList.pas +++ b/坯布码单待检(PBMDDJ.dll)/U_SXCKOutList.pas @@ -121,6 +121,7 @@ type Tv1Column5: TcxGridDBColumn; Tv1Column6: TcxGridDBColumn; Tv1Column7: TcxGridDBColumn; + Tv1Column8: TcxGridDBColumn; procedure FormDestroy(Sender: TObject); procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure FormCreate(Sender: TObject); diff --git a/坯布码单待检(PBMDDJ.dll)/U_SXCKOutPut.dfm b/坯布码单待检(PBMDDJ.dll)/U_SXCKOutPut.dfm index c910437..d33edd7 100644 --- a/坯布码单待检(PBMDDJ.dll)/U_SXCKOutPut.dfm +++ b/坯布码单待检(PBMDDJ.dll)/U_SXCKOutPut.dfm @@ -1,8 +1,8 @@ object frmSXCKOutPut: TfrmSXCKOutPut - Left = 167 - Top = 162 + Left = 657 + Top = 566 Width = 1215 - Height = 502 + Height = 489 Align = alClient Caption = #22383#24067#20986#24211 Color = clBtnFace @@ -20,7 +20,7 @@ object frmSXCKOutPut: TfrmSXCKOutPut object ToolBar1: TToolBar Left = 0 Top = 0 - Width = 1199 + Width = 1207 Height = 33 ButtonHeight = 30 ButtonWidth = 83 @@ -82,8 +82,8 @@ object frmSXCKOutPut: TfrmSXCKOutPut object cxGrid2: TcxGrid Left = 0 Top = 33 - Width = 1199 - Height = 430 + Width = 1207 + Height = 425 Align = alClient TabOrder = 1 object Tv1: TcxGridDBTableView @@ -337,6 +337,13 @@ object frmSXCKOutPut: TfrmSXCKOutPut HeaderAlignmentHorz = taCenter Width = 79 end + object Tv1Column4: TcxGridDBColumn + Tag = 2 + Caption = #25209#21495 + DataBinding.FieldName = 'BatchNo' + HeaderAlignmentHorz = taCenter + Width = 70 + end end object cxGrid2Level1: TcxGridLevel GridView = Tv1 diff --git a/坯布码单待检(PBMDDJ.dll)/U_SXCKOutPut.pas b/坯布码单待检(PBMDDJ.dll)/U_SXCKOutPut.pas index 074b43e..31ca619 100644 --- a/坯布码单待检(PBMDDJ.dll)/U_SXCKOutPut.pas +++ b/坯布码单待检(PBMDDJ.dll)/U_SXCKOutPut.pas @@ -72,6 +72,7 @@ type Tv1Column1: TcxGridDBColumn; Tv1Column2: TcxGridDBColumn; Tv1Column3: TcxGridDBColumn; + Tv1Column4: TcxGridDBColumn; procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure TBAddClick(Sender: TObject); procedure TBCloseClick(Sender: TObject); @@ -278,6 +279,8 @@ begin FieldByName('PiQty').Value := frmSXCKKCSelList.CDS_Main.fieldbyname('MXKCPiQty').Value; FieldByName('Qty').Value := frmSXCKKCSelList.CDS_Main.fieldbyname('MXKCQty').Value; FieldByName('FZSPID').Value := frmSXCKKCSelList.CDS_Main.fieldbyname('SPID').Value; + FieldByName('note').Value := frmSXCKKCSelList.CDS_Main.fieldbyname('note').Value; + FieldByName('BatchNo').Value := frmSXCKKCSelList.CDS_Main.fieldbyname('BatchNo').Value; end; frmSXCKKCSelList.CDS_Main.Delete; end; diff --git a/布匹检验(FabricInspection.dll)/ProjectGroup1.bpg b/布匹检验(FabricInspection.dll)/ProjectGroup1.bpg index 6db2015..59e1fa6 100644 --- a/布匹检验(FabricInspection.dll)/ProjectGroup1.bpg +++ b/布匹检验(FabricInspection.dll)/ProjectGroup1.bpg @@ -14,10 +14,10 @@ PROJECTS = TradeManage.dll testDll.exe default: $(PROJECTS) #------------------------------------------------------------------------------ -TradeManage.dll: ..\..\..\Dp7Repo\Ŀ\D7DJpingfeng\\TradeManage.dpr +TradeManage.dll: ..\..\..\Dp7Repo\Ŀ\D7DJqianjing\\TradeManage.dpr $(DCC) -testDll.exe: ..\..\..\Dp7Repo\Ŀ\D7DJpingfeng\\testDll.dpr +testDll.exe: ..\..\..\Dp7Repo\Ŀ\D7DJqianjing\\testDll.dpr $(DCC) diff --git a/布匹检验(FabricInspection.dll)/U_ClothSCDCGAnPai.dfm b/布匹检验(FabricInspection.dll)/U_ClothSCDCGAnPai.dfm index cdd315d..99fa1b8 100644 --- a/布匹检验(FabricInspection.dll)/U_ClothSCDCGAnPai.dfm +++ b/布匹检验(FabricInspection.dll)/U_ClothSCDCGAnPai.dfm @@ -1,6 +1,6 @@ object frmClothSCDCGAnPai: TfrmClothSCDCGAnPai - Left = 474 - Top = 293 + Left = 447 + Top = 334 Width = 1413 Height = 719 Caption = #26631#31614#25171#21360 diff --git a/布匹检验(FabricInspection.dll)/U_ClothSCDCGAnPai.pas b/布匹检验(FabricInspection.dll)/U_ClothSCDCGAnPai.pas index ccef535..f799242 100644 --- a/布匹检验(FabricInspection.dll)/U_ClothSCDCGAnPai.pas +++ b/布匹检验(FabricInspection.dll)/U_ClothSCDCGAnPai.pas @@ -172,7 +172,7 @@ begin sql.Add(' where A.Filltime>=' + quotedstr(FormatDateTime('yyyy-MM-dd', BegDate.DateTime))); sql.Add(' and A.Filltime<' + quotedstr(FormatDateTime('yyyy-MM-dd', enddate.DateTime + 1))); SQL.Add(' order by A.Filltime desc'); -// ShowMessage(SQL.Text); + //ShowMessage(SQL.Text); Open; end; SCreateCDS20(ADOQueryMain, ClientDataSet3); diff --git a/布匹检验(FabricInspection.dll)/U_DataLink.dfm b/布匹检验(FabricInspection.dll)/U_DataLink.dfm index a1d2159..ffb4b66 100644 --- a/布匹检验(FabricInspection.dll)/U_DataLink.dfm +++ b/布匹检验(FabricInspection.dll)/U_DataLink.dfm @@ -2,8 +2,8 @@ object DataLink_FabricInspection: TDataLink_FabricInspection OldCreateOrder = False OnCreate = DataModuleCreate OnDestroy = DataModuleDestroy - Left = 343 - Top = 231 + Left = 344 + Top = 232 Height = 349 Width = 482 object AdoDataLink: TADOQuery diff --git a/布匹检验(FabricInspection.dll)/U_GreyInspection.dfm b/布匹检验(FabricInspection.dll)/U_GreyInspection.dfm index 861f75b..a1f5a1e 100644 --- a/布匹检验(FabricInspection.dll)/U_GreyInspection.dfm +++ b/布匹检验(FabricInspection.dll)/U_GreyInspection.dfm @@ -1,6 +1,6 @@ object frmGreyInspection: TfrmGreyInspection - Left = 450 - Top = 348 + Left = 658 + Top = 388 Width = 1316 Height = 755 Caption = #26797#32455#22383#24067#26816#39564 @@ -1242,7 +1242,7 @@ object frmGreyInspection: TfrmGreyInspection end object Tv3Column6: TcxGridDBColumn Caption = #25209#21495 - DataBinding.FieldName = 'edZDFNo' + DataBinding.FieldName = 'BatchNo' HeaderAlignmentHorz = taCenter Width = 70 end diff --git a/布匹检验(FabricInspection.dll)/U_GreyInspection.pas b/布匹检验(FabricInspection.dll)/U_GreyInspection.pas index fc6e741..4f466c1 100644 --- a/布匹检验(FabricInspection.dll)/U_GreyInspection.pas +++ b/布匹检验(FabricInspection.dll)/U_GreyInspection.pas @@ -207,7 +207,7 @@ type private { Private declarations } FColumn, FFFMJID, FOperationStatus: string; - FAPID, FSPID, FMainId, FSubId, FMJCode, FPCID, FMJName, FMJSpec, FMJMF, FMJKZ, FMJColor, FAPBatchNo, FCarNo, FISJSKZ: string; // ƷϢ + FAPID, FSPID, FMainId, FSubId, FMJCode, FPCID, FMJName, FMJSpec, FMJMF, FMJKZ, FMJColor, FAPBatchNo, FCarNo, FISJSKZ,FBatchNo: string; // ƷϢ FMF_Wai, FJSKZ, FKONGJIA, fkongjiawei: Double; FCDName: string; //õ isCommopen, IsJsMessage: boolean; @@ -725,7 +725,7 @@ end; procedure TfrmGreyInspection.ScanAnPai(); var - FAPXH, FCAPXH: string; + FAPXH, FCAPXH, FBatchNO: string; begin with ADOTmp do @@ -739,7 +739,7 @@ begin if not ADOTmp.IsEmpty then begin // FAPID := Trim(ADOTmp.fieldbyname('apid').AsString); - + FBatchNO := Trim(ADOTmp.fieldbyname('BatchNO').AsString); FMainId := Trim(ADOTmp.fieldbyname('MainId').AsString); FSubId := Trim(ADOTmp.fieldbyname('SubId').AsString); FMJCode := Trim(ADOTmp.fieldbyname('P_Code').AsString); @@ -1177,7 +1177,6 @@ begin // SQL.Add(',p_name=(select P_CodeName from pd_plan_sub B WHERE B.SUBID=A.SUBID)'); sql.Add(',JTH=(SELECT MACHNO FROM BS_Machine k where k.machid= (SELECT top 1 e.CarNo FROM CK_YgCl E where a.PCID =E.MJID and E.ClType'); sql.Add('IN ('''',''ͷ'') and isnull(CarNo,'''')<>'''' order by e.Filltime desc))'); - SQL.Add(',APXH=(SELECT APXH FROM PD_Plan_AnPai E WHERE E.APID=A.APID)'); sql.Add('from JY_Cloth A where A.JYCRType in ('''',''δ'') '); @@ -1297,6 +1296,7 @@ begin FieldByName('pcid').value := Trim(FPCID); + FieldByName('BatchNO').value := Trim(FBatchNO); FieldByName('P_Code').value := Trim(FMJCode); FieldByName('P_CodeName').value := Trim(FMJName); FieldByName('P_Spec').value := Trim(FMJSpec); diff --git a/成品仓库(FinishedClothWarehouse.dll)/U_CPCKMdList.dfm b/成品仓库(FinishedClothWarehouse.dll)/U_CPCKMdList.dfm index 95cd010..9491113 100644 --- a/成品仓库(FinishedClothWarehouse.dll)/U_CPCKMdList.dfm +++ b/成品仓库(FinishedClothWarehouse.dll)/U_CPCKMdList.dfm @@ -20,7 +20,7 @@ object frmCPCKMdList: TfrmCPCKMdList object ToolBar1: TToolBar Left = 0 Top = 0 - Width = 1112 + Width = 1120 AutoSize = True ButtonHeight = 30 ButtonWidth = 95 @@ -128,7 +128,7 @@ object frmCPCKMdList: TfrmCPCKMdList object Panel1: TPanel Left = 0 Top = 32 - Width = 1112 + Width = 1120 Height = 93 Align = alTop BevelInner = bvRaised @@ -338,8 +338,8 @@ object frmCPCKMdList: TfrmCPCKMdList object cxGrid1: TcxGrid Left = 0 Top = 147 - Width = 1112 - Height = 330 + Width = 1120 + Height = 338 Align = alClient Font.Charset = GB2312_CHARSET Font.Color = clWindowText @@ -731,7 +731,7 @@ object frmCPCKMdList: TfrmCPCKMdList object cxTabControl1: TcxTabControl Left = 0 Top = 125 - Width = 1112 + Width = 1120 Height = 22 Align = alTop Font.Charset = GB2312_CHARSET diff --git a/成品仓库(FinishedClothWarehouse.dll)/U_CPCKMdList.pas b/成品仓库(FinishedClothWarehouse.dll)/U_CPCKMdList.pas index 749019d..f0c2ce6 100644 --- a/成品仓库(FinishedClothWarehouse.dll)/U_CPCKMdList.pas +++ b/成品仓库(FinishedClothWarehouse.dll)/U_CPCKMdList.pas @@ -875,7 +875,6 @@ begin Close; sql.Clear; sql.add('exec P_CPCK_Print_CKMD2 ' + quotedstr(Trim(CDS_Main.fieldbyname('FHMainID').AsString))); - sql.add(', ' + quotedstr(Trim(CDS_Main.fieldbyname('P_Code').AsString))); Open; @@ -888,7 +887,6 @@ begin Close; sql.Clear; sql.add('exec P_CPCK_Print_CKMD2_2 ' + quotedstr(Trim(CDS_Main.fieldbyname('FHMainID').AsString))); - sql.add(', ' + quotedstr(Trim(CDS_Main.fieldbyname('P_Code').AsString))); Open; diff --git a/成品仓库(FinishedClothWarehouse.dll)/U_CPFHSQInPut.dfm b/成品仓库(FinishedClothWarehouse.dll)/U_CPFHSQInPut.dfm index 3f5b6cf..80c4763 100644 --- a/成品仓库(FinishedClothWarehouse.dll)/U_CPFHSQInPut.dfm +++ b/成品仓库(FinishedClothWarehouse.dll)/U_CPFHSQInPut.dfm @@ -1,6 +1,6 @@ object frmPBFHSQInPut: TfrmPBFHSQInPut - Left = 230 - Top = 140 + Left = 897 + Top = 427 Width = 1075 Height = 664 Caption = #21457#36135#30003#35831#24405#20837 @@ -18,7 +18,7 @@ object frmPBFHSQInPut: TfrmPBFHSQInPut object ToolBar1: TToolBar Left = 0 Top = 0 - Width = 1059 + Width = 1067 Height = 29 ButtonHeight = 30 ButtonWidth = 59 @@ -58,7 +58,7 @@ object frmPBFHSQInPut: TfrmPBFHSQInPut object ScrollBox1: TScrollBox Left = 0 Top = 29 - Width = 1059 + Width = 1067 Height = 104 Align = alTop BevelInner = bvNone @@ -349,7 +349,7 @@ object frmPBFHSQInPut: TfrmPBFHSQInPut object ToolBar2: TToolBar Left = 0 Top = 133 - Width = 1059 + Width = 1067 Height = 29 ButtonHeight = 30 ButtonWidth = 59 @@ -389,8 +389,8 @@ object frmPBFHSQInPut: TfrmPBFHSQInPut object cxGrid1: TcxGrid Left = 0 Top = 162 - Width = 1059 - Height = 463 + Width = 1067 + Height = 471 Align = alClient TabOrder = 3 object Tv1: TcxGridDBTableView @@ -466,6 +466,12 @@ object frmPBFHSQInPut: TfrmPBFHSQInPut HeaderAlignmentHorz = taCenter Width = 80 end + object Tv1Column1: TcxGridDBColumn + Caption = #25209#21495 + DataBinding.FieldName = 'BatchNo' + HeaderAlignmentHorz = taCenter + Width = 70 + end end object cxGrid1Level1: TcxGridLevel GridView = Tv1 diff --git a/成品仓库(FinishedClothWarehouse.dll)/U_CPFHSQInPut.pas b/成品仓库(FinishedClothWarehouse.dll)/U_CPFHSQInPut.pas index 7cb9018..b0e5c71 100644 --- a/成品仓库(FinishedClothWarehouse.dll)/U_CPFHSQInPut.pas +++ b/成品仓库(FinishedClothWarehouse.dll)/U_CPFHSQInPut.pas @@ -70,6 +70,7 @@ type driver: TBtnEditC; Label9: TLabel; cktype: TEdit; + Tv1Column1: TcxGridDBColumn; procedure TBCloseClick(Sender: TObject); procedure FormShow(Sender: TObject); procedure TBSaveClick(Sender: TObject); @@ -415,6 +416,7 @@ begin // FieldByName('FromKHName').Value := Trim(frmSQKCHZSelList2.CDS_Main.fieldbyname('KHName').AsString); // FieldByName('FromConNo').Value := Trim(frmSQKCHZSelList2.CDS_Main.fieldbyname('ConNO').AsString); FieldByName('SQPiQty').Value := frmSQKCHZSelList2.CDS_Main.fieldbyname('PiQty').Value; + FieldByName('BatchNo').Value := frmSQKCHZSelList2.CDS_Main.fieldbyname('BatchNo').Value; Post; end; diff --git a/成品仓库(FinishedClothWarehouse.dll)/U_CPFHSQList.dfm b/成品仓库(FinishedClothWarehouse.dll)/U_CPFHSQList.dfm index a184e42..9fd8eb6 100644 --- a/成品仓库(FinishedClothWarehouse.dll)/U_CPFHSQList.dfm +++ b/成品仓库(FinishedClothWarehouse.dll)/U_CPFHSQList.dfm @@ -1,6 +1,6 @@ object frmCPFHSQList: TfrmCPFHSQList - Left = 125 - Top = 61 + Left = 613 + Top = 386 Width = 1308 Height = 679 Caption = #25104#21697#21457#36135#30003#35831 @@ -19,7 +19,7 @@ object frmCPFHSQList: TfrmCPFHSQList object ToolBar1: TToolBar Left = 0 Top = 0 - Width = 1292 + Width = 1300 AutoSize = True ButtonHeight = 30 ButtonWidth = 95 @@ -146,8 +146,8 @@ object frmCPFHSQList: TfrmCPFHSQList object cxGrid1: TcxGrid Left = 0 Top = 97 - Width = 1292 - Height = 285 + Width = 1300 + Height = 293 Align = alClient TabOrder = 3 object Tv1: TcxGridDBTableView @@ -410,6 +410,7 @@ object frmCPFHSQList: TfrmCPFHSQList object v1Column7: TcxGridDBColumn Caption = #22791#27880 DataBinding.FieldName = 'Note' + HeaderAlignmentHorz = taCenter Options.Editing = False Width = 70 end @@ -421,7 +422,7 @@ object frmCPFHSQList: TfrmCPFHSQList object Panel1: TPanel Left = 0 Top = 32 - Width = 1292 + Width = 1300 Height = 43 Align = alTop BevelInner = bvRaised @@ -653,7 +654,7 @@ object frmCPFHSQList: TfrmCPFHSQList object cxTabControl1: TcxTabControl Left = 0 Top = 75 - Width = 1292 + Width = 1300 Height = 22 Align = alTop TabOrder = 2 @@ -667,13 +668,13 @@ object frmCPFHSQList: TfrmCPFHSQList #20840#37096) OnChange = cxTabControl1Change ClientRectBottom = 22 - ClientRectRight = 1292 + ClientRectRight = 1300 ClientRectTop = 19 end object cxSplitter1: TcxSplitter Left = 0 - Top = 382 - Width = 1292 + Top = 390 + Width = 1300 Height = 8 HotZoneClassName = 'TcxMediaPlayer9Style' AlignSplitter = salBottom @@ -681,8 +682,8 @@ object frmCPFHSQList: TfrmCPFHSQList end object cxGrid2: TcxGrid Left = 0 - Top = 390 - Width = 1292 + Top = 398 + Width = 1300 Height = 250 Align = alBottom TabOrder = 5 @@ -779,6 +780,12 @@ object frmCPFHSQList: TfrmCPFHSQList HeaderAlignmentHorz = taCenter Width = 68 end + object Tv2Column1: TcxGridDBColumn + Caption = #25209#21495 + DataBinding.FieldName = 'APBatchNo' + HeaderAlignmentHorz = taCenter + Width = 70 + end end object cxGridLevel1: TcxGridLevel GridView = Tv2 diff --git a/成品仓库(FinishedClothWarehouse.dll)/U_CPFHSQList.pas b/成品仓库(FinishedClothWarehouse.dll)/U_CPFHSQList.pas index 9702b94..aaf7abe 100644 --- a/成品仓库(FinishedClothWarehouse.dll)/U_CPFHSQList.pas +++ b/成品仓库(FinishedClothWarehouse.dll)/U_CPFHSQList.pas @@ -119,6 +119,7 @@ type Tv1Column7: TcxGridDBColumn; cktype: TComboBox; Label6: TLabel; + Tv2Column1: TcxGridDBColumn; procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure TBCloseClick(Sender: TObject); procedure TBFindClick(Sender: TObject); diff --git a/成品仓库(FinishedClothWarehouse.dll)/U_DataLink.dfm b/成品仓库(FinishedClothWarehouse.dll)/U_DataLink.dfm index 9f2cd02..3405689 100644 --- a/成品仓库(FinishedClothWarehouse.dll)/U_DataLink.dfm +++ b/成品仓库(FinishedClothWarehouse.dll)/U_DataLink.dfm @@ -1,8 +1,8 @@ object DataLink_FinishedClothWarehouse: TDataLink_FinishedClothWarehouse OldCreateOrder = False OnDestroy = DataModuleDestroy - Left = 343 - Top = 231 + Left = 459 + Top = 278 Height = 349 Width = 482 object AdoDataLink: TADOQuery diff --git a/成品仓库(FinishedClothWarehouse.dll)/U_FinishedClothKCList.dfm b/成品仓库(FinishedClothWarehouse.dll)/U_FinishedClothKCList.dfm index d4b6bdc..42eaa5e 100644 --- a/成品仓库(FinishedClothWarehouse.dll)/U_FinishedClothKCList.dfm +++ b/成品仓库(FinishedClothWarehouse.dll)/U_FinishedClothKCList.dfm @@ -1,6 +1,6 @@ object frmFinishedClothKCList: TfrmFinishedClothKCList - Left = 263 - Top = 140 + Left = 391 + Top = 296 Width = 1247 Height = 531 Caption = #25104#21697#24211#23384#21015#34920 @@ -18,7 +18,7 @@ object frmFinishedClothKCList: TfrmFinishedClothKCList object ToolBar1: TToolBar Left = 0 Top = 0 - Width = 1231 + Width = 1239 Height = 33 ButtonHeight = 30 ButtonWidth = 59 @@ -98,7 +98,7 @@ object frmFinishedClothKCList: TfrmFinishedClothKCList object Panel1: TPanel Left = 0 Top = 33 - Width = 1231 + Width = 1239 Height = 62 Align = alTop BevelInner = bvRaised @@ -283,7 +283,7 @@ object frmFinishedClothKCList: TfrmFinishedClothKCList object Panel2: TPanel Left = 0 Top = 95 - Width = 1231 + Width = 1239 Height = 30 Align = alTop BevelOuter = bvNone @@ -324,7 +324,7 @@ object frmFinishedClothKCList: TfrmFinishedClothKCList object Panel6: TPanel Left = 205 Top = 0 - Width = 1026 + Width = 1034 Height = 30 Align = alClient AutoSize = True @@ -332,7 +332,7 @@ object frmFinishedClothKCList: TfrmFinishedClothKCList BorderStyle = bsSingle TabOrder = 1 DesignSize = ( - 1022 + 1030 26) object Label1: TLabel Left = 64 @@ -424,8 +424,8 @@ object frmFinishedClothKCList: TfrmFinishedClothKCList object cxGrid2: TcxGrid Left = 0 Top = 125 - Width = 1231 - Height = 367 + Width = 1239 + Height = 375 Align = alClient PopupMenu = PopupMenu1 TabOrder = 4 diff --git a/成品仓库(FinishedClothWarehouse.dll)/U_SQKCHZSelList2.dfm b/成品仓库(FinishedClothWarehouse.dll)/U_SQKCHZSelList2.dfm index f847754..6eedebe 100644 --- a/成品仓库(FinishedClothWarehouse.dll)/U_SQKCHZSelList2.dfm +++ b/成品仓库(FinishedClothWarehouse.dll)/U_SQKCHZSelList2.dfm @@ -1,6 +1,6 @@ object frmSQKCHZSelList2: TfrmSQKCHZSelList2 - Left = 193 - Top = 141 + Left = 692 + Top = 374 Width = 1171 Height = 576 Caption = #22383#24067#24211#23384#27719#24635'2' @@ -20,7 +20,7 @@ object frmSQKCHZSelList2: TfrmSQKCHZSelList2 object ToolBar1: TToolBar Left = 0 Top = 0 - Width = 1155 + Width = 1163 Height = 33 ButtonHeight = 30 ButtonWidth = 59 @@ -73,8 +73,8 @@ object frmSQKCHZSelList2: TfrmSQKCHZSelList2 object cxGrid2: TcxGrid Left = 0 Top = 95 - Width = 1155 - Height = 442 + Width = 1163 + Height = 450 Align = alClient TabOrder = 1 object Tv1: TcxGridDBTableView @@ -140,24 +140,31 @@ object frmSQKCHZSelList2: TfrmSQKCHZSelList2 Caption = #27491#21697#21305#25968 DataBinding.FieldName = 'zpps' HeaderAlignmentHorz = taCenter - Width = 71 + Width = 106 end object Tv1Column4: TcxGridDBColumn Caption = #27491#21697#31859#25968 DataBinding.FieldName = 'ZPQTY' HeaderAlignmentHorz = taCenter - Width = 73 + Width = 104 end object Tv1Column5: TcxGridDBColumn Caption = #27425#21697#21305#25968 DataBinding.FieldName = 'Cpps' HeaderAlignmentHorz = taCenter - Width = 73 + Width = 97 end object Tv1Column6: TcxGridDBColumn Caption = #27425#21697#31859#25968 DataBinding.FieldName = 'CPQTY' HeaderAlignmentHorz = taCenter + Width = 89 + end + object Tv1Column1: TcxGridDBColumn + Caption = #25209#21495 + DataBinding.FieldName = 'BatchNo' + HeaderAlignmentHorz = taCenter + Width = 70 end end object cxGrid2Level1: TcxGridLevel @@ -184,7 +191,7 @@ object frmSQKCHZSelList2: TfrmSQKCHZSelList2 object Panel1: TPanel Left = 0 Top = 33 - Width = 1155 + Width = 1163 Height = 62 Align = alTop BevelInner = bvRaised diff --git a/成品仓库(FinishedClothWarehouse.dll)/U_SQKCHZSelList2.pas b/成品仓库(FinishedClothWarehouse.dll)/U_SQKCHZSelList2.pas index 0adce02..d935b89 100644 --- a/成品仓库(FinishedClothWarehouse.dll)/U_SQKCHZSelList2.pas +++ b/成品仓库(FinishedClothWarehouse.dll)/U_SQKCHZSelList2.pas @@ -57,6 +57,7 @@ type Tv1Column4: TcxGridDBColumn; Tv1Column5: TcxGridDBColumn; Tv1Column6: TcxGridDBColumn; + Tv1Column1: TcxGridDBColumn; procedure FormDestroy(Sender: TObject); procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure TBRafreshClick(Sender: TObject); @@ -115,7 +116,7 @@ begin Close; sql.Clear; //khname,orderno,CONNO - SQL.Add(' select a.p_code,a.p_codename'); + SQL.Add(' select a.p_code,a.p_codename,A.BatchNo'); SQL.Add(' ,COUNT(A.JYID) PiQty ,SUM(A.JYGW) JYGW,SUM(A.JYNW) JYNW,SUM(A.JYTare) JYTare,SUM(A.JSLen) JYLen'); SQL.Add(',sum(case when JYType=''Ʒ'' then 1 else 0 end )cpps'); SQL.Add(' ,sum(case when JYType=''Ʒ'' then 1 else 0 end )Zpps'); @@ -131,11 +132,11 @@ begin sql.Add('and p_code in(select p_code from Contract_sub E INNER JOIN Contract_MAIN F ON E.CONMAINID=F.CONMAINID WHERE CONNO=' + QuotedStr(Trim(fconno))); SQL.Add(') '); - SQL.Add(' group by p_code,p_codename'); + SQL.Add(' group by a.p_code, a.p_codename, a.pcid ,A.BatchNo'); //,khname,orderno,CONNO sql.Add(' ORDER BY a.p_code'); -// ShowMessage(sql.Text); + // ShowMessage(sql.Text); Open; end; SCreateCDS20(ADOQueryMain, CDS_Main); diff --git a/成品仓库(FinishedClothWarehouse.dll)/U_SXCKKCSelList.dfm b/成品仓库(FinishedClothWarehouse.dll)/U_SXCKKCSelList.dfm index 6280ac9..f2915fa 100644 --- a/成品仓库(FinishedClothWarehouse.dll)/U_SXCKKCSelList.dfm +++ b/成品仓库(FinishedClothWarehouse.dll)/U_SXCKKCSelList.dfm @@ -1,8 +1,8 @@ object frmSXCKKCSelList: TfrmSXCKKCSelList - Left = 198 - Top = 125 + Left = 386 + Top = 408 Width = 1181 - Height = 511 + Height = 515 Align = alClient Caption = #22383#24067#24211#23384#36873#25321#21015#34920 Color = clBtnFace @@ -21,7 +21,7 @@ object frmSXCKKCSelList: TfrmSXCKKCSelList object ToolBar1: TToolBar Left = 0 Top = 0 - Width = 1165 + Width = 1173 Height = 33 ButtonHeight = 30 ButtonWidth = 59 @@ -76,7 +76,7 @@ object frmSXCKKCSelList: TfrmSXCKKCSelList object Panel1: TPanel Left = 0 Top = 33 - Width = 1165 + Width = 1173 Height = 60 Align = alTop BevelInner = bvRaised @@ -239,8 +239,8 @@ object frmSXCKKCSelList: TfrmSXCKKCSelList object cxGrid2: TcxGrid Left = 0 Top = 93 - Width = 1165 - Height = 379 + Width = 1173 + Height = 391 Align = alClient PopupMenu = PopupMenu1 TabOrder = 2 diff --git a/梭织计划单(ShuttleSchedule.dll)/U_DataLink.dfm b/梭织计划单(ShuttleSchedule.dll)/U_DataLink.dfm index 7af73dd..bcb4b03 100644 --- a/梭织计划单(ShuttleSchedule.dll)/U_DataLink.dfm +++ b/梭织计划单(ShuttleSchedule.dll)/U_DataLink.dfm @@ -2,8 +2,8 @@ object DataLink_ShuttleSchedule: TDataLink_ShuttleSchedule OldCreateOrder = False OnCreate = DataModuleCreate OnDestroy = DataModuleDestroy - Left = 382 - Top = 233 + Left = 511 + Top = 281 Height = 349 Width = 482 object AdoDataLink: TADOQuery diff --git a/梭织计划单(ShuttleSchedule.dll)/U_PlanCardList.dfm b/梭织计划单(ShuttleSchedule.dll)/U_PlanCardList.dfm index 1013e62..f0498a4 100644 --- a/梭织计划单(ShuttleSchedule.dll)/U_PlanCardList.dfm +++ b/梭织计划单(ShuttleSchedule.dll)/U_PlanCardList.dfm @@ -1,6 +1,6 @@ object frmPlanCardList: TfrmPlanCardList - Left = 280 - Top = 296 + Left = 375 + Top = 358 Width = 1540 Height = 764 Caption = #32463#36724#35745#21010 diff --git a/梭织计划单(ShuttleSchedule.dll)/U_ShuttleClothSCInPut.dfm b/梭织计划单(ShuttleSchedule.dll)/U_ShuttleClothSCInPut.dfm index 36114fd..b895106 100644 --- a/梭织计划单(ShuttleSchedule.dll)/U_ShuttleClothSCInPut.dfm +++ b/梭织计划单(ShuttleSchedule.dll)/U_ShuttleClothSCInPut.dfm @@ -1,6 +1,6 @@ object frmClothSCInPut: TfrmClothSCInPut - Left = 246 - Top = 71 + Left = 329 + Top = 86 Width = 1474 Height = 760 Align = alClient @@ -19,7 +19,7 @@ object frmClothSCInPut: TfrmClothSCInPut object ToolBar1: TToolBar Left = 0 Top = 0 - Width = 1458 + Width = 1466 Height = 29 ButtonHeight = 30 ButtonWidth = 95 @@ -65,7 +65,7 @@ object frmClothSCInPut: TfrmClothSCInPut object ScrollBox1: TScrollBox Left = 0 Top = 29 - Width = 1458 + Width = 1466 Height = 416 Align = alTop BevelInner = bvNone @@ -1273,8 +1273,8 @@ object frmClothSCInPut: TfrmClothSCInPut object cxPageControl1: TcxPageControl Left = 0 Top = 474 - Width = 1458 - Height = 247 + Width = 1466 + Height = 255 Align = alClient Font.Charset = GB2312_CHARSET Font.Color = clWindowText @@ -1287,8 +1287,8 @@ object frmClothSCInPut: TfrmClothSCInPut Properties.CustomButtons.Buttons = <> Properties.Style = 9 OnChange = cxPageControl1Change - ClientRectBottom = 247 - ClientRectRight = 1458 + ClientRectBottom = 255 + ClientRectRight = 1466 ClientRectTop = 23 object cxTabSheet1: TcxTabSheet Caption = #32463#19997#32452#21512 @@ -1296,8 +1296,8 @@ object frmClothSCInPut: TfrmClothSCInPut object GroupBox1: TGroupBox Left = 980 Top = 0 - Width = 478 - Height = 224 + Width = 486 + Height = 232 Align = alClient Caption = #32463#25490#21015 Font.Charset = GB2312_CHARSET @@ -1311,8 +1311,8 @@ object frmClothSCInPut: TfrmClothSCInPut Tag = 2 Left = 2 Top = 31 - Width = 474 - Height = 191 + Width = 482 + Height = 199 Align = alClient Font.Charset = GB2312_CHARSET Font.Color = clWindowText @@ -1327,7 +1327,7 @@ object frmClothSCInPut: TfrmClothSCInPut Left = 0 Top = 0 Width = 980 - Height = 224 + Height = 232 Align = alLeft TabOrder = 1 object TV1: TcxGridDBTableView @@ -2674,7 +2674,7 @@ object frmClothSCInPut: TfrmClothSCInPut Properties.ShowFocusRect = False Style.BorderStyle = ebsSingle TabOrder = 0 - Height = 203 + Height = 211 Width = 481 end object YWBian: TMemo @@ -2682,7 +2682,7 @@ object frmClothSCInPut: TfrmClothSCInPut Left = 701 Top = 0 Width = 794 - Height = 203 + Height = 211 Align = alRight TabOrder = 1 end @@ -2692,7 +2692,7 @@ object frmClothSCInPut: TfrmClothSCInPut object ToolBar2: TToolBar Left = 0 Top = 445 - Width = 1458 + Width = 1466 Height = 29 ButtonHeight = 30 ButtonWidth = 59 diff --git a/梭织计划单(ShuttleSchedule.dll)/U_ShuttleClothSCList.dfm b/梭织计划单(ShuttleSchedule.dll)/U_ShuttleClothSCList.dfm index df73a39..994394f 100644 --- a/梭织计划单(ShuttleSchedule.dll)/U_ShuttleClothSCList.dfm +++ b/梭织计划单(ShuttleSchedule.dll)/U_ShuttleClothSCList.dfm @@ -1,6 +1,6 @@ object frmShuttleClothSCList: TfrmShuttleClothSCList - Left = 367 - Top = 493 + Left = 491 + Top = 593 Width = 1377 Height = 579 Caption = #26797#32455#32455#36896#21333 diff --git a/经轴仓库(Warehouse.dll)/ProjectGroup1.bpg b/经轴仓库(Warehouse.dll)/ProjectGroup1.bpg index 7c050f6..0587f54 100644 --- a/经轴仓库(Warehouse.dll)/ProjectGroup1.bpg +++ b/经轴仓库(Warehouse.dll)/ProjectGroup1.bpg @@ -9,15 +9,15 @@ MAKE = $(ROOT)\bin\make.exe -$(MAKEFLAGS) -f$** DCC = $(ROOT)\bin\dcc32.exe $** BRCC = $(ROOT)\bin\brcc32.exe $** #------------------------------------------------------------------------------ -PROJECTS = testDll.exe ProductPrice.dll +PROJECTS = PBMDDJ.dll testDll.exe #------------------------------------------------------------------------------ default: $(PROJECTS) #------------------------------------------------------------------------------ -testDll.exe: testDll.dpr +PBMDDJ.dll: ..\뵥(PBMDDJ.dll)\PBMDDJ.dpr $(DCC) -ProductPrice.dll: ProductPrice.dpr +testDll.exe: ..\뵥(PBMDDJ.dll)\testDll.dpr $(DCC)