diff --git a/成品仓库(FinishedClothWarehouse.dll)/FinishedClothWarehouse.dof b/成品仓库(FinishedClothWarehouse.dll)/FinishedClothWarehouse.dof index a53fc70..add4acd 100644 --- a/成品仓库(FinishedClothWarehouse.dll)/FinishedClothWarehouse.dof +++ b/成品仓库(FinishedClothWarehouse.dll)/FinishedClothWarehouse.dof @@ -101,7 +101,7 @@ DebugSourceDirs= UsePackages=0 [Parameters] RunParams= -HostApplication=E:\Ŀ\06_ó׹˾\Ⱥ\D7myGuhang\Ʒֿ(FinishedClothWarehouse.dll)\testDll.exe +HostApplication=D:\Ŀ\D7myGuhang\Ʒֿ(FinishedClothWarehouse.dll)\testDll.exe Launcher= UseLauncher=0 DebugCWD= diff --git a/成品仓库(FinishedClothWarehouse.dll)/U_CKGNProductBCPOutList.dfm b/成品仓库(FinishedClothWarehouse.dll)/U_CKGNProductBCPOutList.dfm index 35bb017..04c61a2 100644 --- a/成品仓库(FinishedClothWarehouse.dll)/U_CKGNProductBCPOutList.dfm +++ b/成品仓库(FinishedClothWarehouse.dll)/U_CKGNProductBCPOutList.dfm @@ -1,6 +1,6 @@ object frmCKGNProductBCPOutList: TfrmCKGNProductBCPOutList - Left = 166 - Top = 101 + Left = 362 + Top = 374 Width = 1347 Height = 659 Caption = #22269#20869#25104#21697#20986#24211#21015#34920 @@ -20,7 +20,7 @@ object frmCKGNProductBCPOutList: TfrmCKGNProductBCPOutList object ToolBar1: TToolBar Left = 0 Top = 0 - Width = 1331 + Width = 1339 Height = 33 ButtonHeight = 30 ButtonWidth = 107 @@ -137,7 +137,7 @@ object frmCKGNProductBCPOutList: TfrmCKGNProductBCPOutList object Panel1: TPanel Left = 0 Top = 33 - Width = 1331 + Width = 1339 Height = 68 Align = alTop BevelInner = bvRaised @@ -231,6 +231,22 @@ object frmCKGNProductBCPOutList: TfrmCKGNProductBCPOutList Hint = '1' Caption = #32568' '#21495 end + object Label11: TLabel + Left = 1040 + Top = 12 + Width = 48 + Height = 12 + Hint = '1' + Caption = #31859#25968#33539#22260 + end + object Label12: TLabel + Left = 1052 + Top = 39 + Width = 30 + Height = 12 + Hint = '1' + Caption = #31859' '#25968 + end object begtime: TDateTimePicker Left = 45 Top = 100 @@ -395,6 +411,26 @@ object frmCKGNProductBCPOutList: TfrmCKGNProductBCPOutList TabOrder = 14 OnKeyPress = orderNoKeyPress end + object msfw: TEdit + Tag = 2 + Left = 1094 + Top = 9 + Width = 90 + Height = 20 + Hint = '1' + TabOrder = 15 + OnKeyPress = orderNoKeyPress + end + object KCQty: TEdit + Tag = 2 + Left = 1094 + Top = 36 + Width = 90 + Height = 20 + Hint = '1' + TabOrder = 16 + OnKeyPress = orderNoKeyPress + end end object MovePanel2: TMovePanel Left = 472 @@ -416,7 +452,7 @@ object frmCKGNProductBCPOutList: TfrmCKGNProductBCPOutList object Panel2: TPanel Left = 0 Top = 101 - Width = 1331 + Width = 1339 Height = 30 Align = alTop BevelOuter = bvNone @@ -457,7 +493,7 @@ object frmCKGNProductBCPOutList: TfrmCKGNProductBCPOutList object Panel6: TPanel Left = 205 Top = 0 - Width = 1126 + Width = 1134 Height = 30 Align = alClient AutoSize = True @@ -465,7 +501,7 @@ object frmCKGNProductBCPOutList: TfrmCKGNProductBCPOutList BorderStyle = bsSingle TabOrder = 1 DesignSize = ( - 1122 + 1130 26) object Label1: TLabel Left = 64 @@ -558,8 +594,8 @@ object frmCKGNProductBCPOutList: TfrmCKGNProductBCPOutList object cxGrid2: TcxGrid Left = 0 Top = 131 - Width = 1331 - Height = 489 + Width = 1339 + Height = 497 Align = alClient PopupMenu = PopupMenu1 TabOrder = 4 @@ -807,7 +843,7 @@ object frmCKGNProductBCPOutList: TfrmCKGNProductBCPOutList TabOrder = 3 OnClick = Button8Click end - object msfw: TEdit + object edit3: TEdit Left = 63 Top = 65 Width = 120 @@ -820,23 +856,23 @@ object frmCKGNProductBCPOutList: TfrmCKGNProductBCPOutList Connection = DataLink_FinishedClothWarehouse.ADOLink CommandTimeout = 600 Parameters = <> - Left = 1124 - Top = 64 + Left = 1100 + Top = 240 end object ADOQueryMain: TADOQuery Connection = DataLink_FinishedClothWarehouse.ADOLink LockType = ltReadOnly Parameters = <> Left = 1148 - Top = 40 + Top = 232 end object ADOQueryTemp: TADOQuery Connection = DataLink_FinishedClothWarehouse.ADOLink LockType = ltReadOnly CommandTimeout = 6000 Parameters = <> - Left = 1188 - Top = 40 + Left = 1196 + Top = 232 end object DataSource1: TDataSource DataSet = CDS_Main diff --git a/成品仓库(FinishedClothWarehouse.dll)/U_CKGNProductBCPOutList.pas b/成品仓库(FinishedClothWarehouse.dll)/U_CKGNProductBCPOutList.pas index 79cbc43..3ee9b7f 100644 --- a/成品仓库(FinishedClothWarehouse.dll)/U_CKGNProductBCPOutList.pas +++ b/成品仓库(FinishedClothWarehouse.dll)/U_CKGNProductBCPOutList.pas @@ -12,20 +12,7 @@ uses cxDropDownEdit, RM_Common, RM_Class, RM_e_Xls, RM_Dataset, RM_System, RM_GridReport, cxCheckBox, Menus, MovePanel, RM_E_llPDF, cxCalendar, Math, Clipbrd, cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, dxBarBuiltInMenu, - cxPC, cxContainer, dxCore, cxDateUtils, cxTextEdit, cxMaskEdit, dxSkinsCore, - dxSkinsDefaultPainters, dxSkinscxPCPainter, cxCurrencyEdit, dxSkinBlack, - dxSkinBlue, dxSkinBlueprint, dxSkinCaramel, dxSkinCoffee, dxSkinDarkRoom, - dxSkinDarkSide, dxSkinDevExpressDarkStyle, dxSkinDevExpressStyle, dxSkinFoggy, - dxSkinGlassOceans, dxSkinHighContrast, dxSkiniMaginary, dxSkinLilian, - dxSkinLiquidSky, dxSkinLondonLiquidSky, dxSkinMcSkin, dxSkinMetropolis, - dxSkinMetropolisDark, dxSkinMoneyTwins, dxSkinOffice2007Black, - dxSkinOffice2007Blue, dxSkinOffice2007Green, dxSkinOffice2007Pink, - dxSkinOffice2007Silver, dxSkinOffice2010Black, dxSkinOffice2010Blue, - dxSkinOffice2010Silver, dxSkinOffice2013DarkGray, dxSkinOffice2013LightGray, - dxSkinOffice2013White, dxSkinPumpkin, dxSkinSeven, dxSkinSevenClassic, - dxSkinSharp, dxSkinSharpPlus, dxSkinSilver, dxSkinSpringTime, dxSkinStardust, - dxSkinSummer2008, dxSkinTheAsphaltWorld, dxSkinValentine, dxSkinVS2010, - dxSkinWhiteprint, dxSkinXmas2008Blue; + cxPC, cxContainer, dxCore, cxDateUtils, cxTextEdit, cxMaskEdit, cxCurrencyEdit; type TfrmCKGNProductBCPOutList = class(TForm) @@ -127,8 +114,12 @@ type Tv1Column3: TcxGridDBColumn; Label13: TLabel; Button8: TButton; - msfw: TEdit; + edit3: TEdit; Tv1Column4: TcxGridDBColumn; + Label11: TLabel; + msfw: TEdit; + Label12: TLabel; + KCQty: TEdit; procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure FormCreate(Sender: TObject); procedure TBRafreshClick(Sender: TObject); @@ -325,45 +316,81 @@ begin //ShowMessage(SQL.Text); end; 1: /////////////////////////ϸ////////////////////////////// +// begin +// sql.Add(' select top ' + IntToStr(RecordsNumber) + ' * from '); +// sql.Add('(select row_number() over(order by AA.filltime desc) as rownumber'); +// sql.Add(',COUNT(1) OVER() AS TotalCount'); +// sql.Add(',* from (select A.*,B.SPName,B.SPMF,SPKZ,SPCOLOR ,kcqty=(select kcqty from CK_BanCP_KC F WHERE F.MJID=A.MJID) '); +// SQL.Add(',ISDY=cast((CASE WHEN A.PrintCount>0 THEN 1 ELSE 0 END )as bit),kongjia=(select kongjia from WFB_MJJY g where g.mjid=a.mjid)'); +// sql.Add(' ,kckgqty=(select kckgqty from CK_BanCP_KC F WHERE F.MJID=A.MJID) from CK_BanCP_CR A inner join CK_SXPB_CR B ON A.APID=B.SPID '); +// +// sql.Add(' where A.CRFlag='''' AND isnull(ctype,'''')='''' '); +// +// if Self.Caption = 'ƥ' then +// begin +// sql.Add(' AND A.crtype in (''ƥ'',''ƥ'')'); +// end +// else +// begin +// sql.Add(' AND A.crtype <>''ƥ'' and A.crtype<>''ƥ'''); +// end; +// +// if IsJYTime.Checked then +// begin +// sql.Add(' and A.CRTime>' + quotedstr(BegDate.Text)); +// sql.Add(' and A.CRTime<=' + quotedstr(endDate.Text)); +// end; +// sql.Add(fwhere); +// sql.Add(' ) AA'); +// if ComboBox2.Text = 'Ѵӡ' then +// begin +// sql.Add('where ISDY=1'); +// end; +// if ComboBox2.Text = 'δӡ' then +// begin +// sql.Add('where ISDY=0'); +// end; +// sql.Add(') temp_row'); +// sql.Add(' where rownumber> ' + IntToStr((CurrentPage - 1) * RecordsNumber)); +// end; begin - sql.Add(' select top ' + IntToStr(RecordsNumber) + ' * from '); - sql.Add('(select row_number() over(order by AA.filltime desc) as rownumber'); - sql.Add(',COUNT(1) OVER() AS TotalCount'); - sql.Add(',* from (select A.*,B.SPName,B.SPMF,SPKZ,SPCOLOR ,kcqty=(select kcqty from CK_BanCP_KC F WHERE F.MJID=A.MJID) '); - SQL.Add(',ISDY=cast((CASE WHEN A.PrintCount>0 THEN 1 ELSE 0 END )as bit),kongjia=(select kongjia from WFB_MJJY g where g.mjid=a.mjid)'); - sql.Add(' ,kckgqty=(select kckgqty from CK_BanCP_KC F WHERE F.MJID=A.MJID) from CK_BanCP_CR A inner join CK_SXPB_CR B ON A.APID=B.SPID '); + begin + sql.Add('SELECT * FROM ('); + sql.Add(' SELECT ROW_NUMBER() OVER(ORDER BY A.filltime DESC) as rownumber, COUNT(1) OVER() AS TotalCount,'); + sql.Add(' A.*, B.SPName, B.SPMF, B.SPKZ, B.SPCOLOR, F.kcqty,'); + sql.Add(' ISDY = CAST((CASE WHEN A.PrintCount > 0 THEN 1 ELSE 0 END) as bit), G.kongjia, F.kckgqty'); + sql.Add(' FROM CK_BanCP_CR A'); + sql.Add(' INNER JOIN CK_SXPB_CR B ON A.APID = B.SPID'); + sql.Add(' LEFT JOIN CK_BanCP_KC F ON F.MJID = A.MJID'); + sql.Add(' LEFT JOIN WFB_MJJY G ON G.mjid = A.mjid'); + sql.Add(' WHERE A.CRFlag = '''' AND ISNULL(A.ctype, '''') = '''''); - sql.Add(' where A.CRFlag='''' AND isnull(ctype,'''')='''' '); + if Self.Caption = 'ƥ' then + sql.Add(' AND A.crtype IN (''ƥ'', ''ƥ'')') + else + sql.Add(' AND A.crtype NOT IN (''ƥ'', ''ƥ'')'); - if Self.Caption = 'ƥ' then - begin - sql.Add(' AND A.crtype in (''ƥ'',''ƥ'')'); - end - else - begin - sql.Add(' AND A.crtype <>''ƥ'' and A.crtype<>''ƥ'''); - end; + if IsJYTime.Checked then + begin + sql.Add(' AND A.CRTime > ' + QuotedStr(BegDate.Text)); + sql.Add(' AND A.CRTime <= ' + QuotedStr(EndDate.Text)); + end; - if IsJYTime.Checked then - begin - sql.Add(' and A.CRTime>' + quotedstr(BegDate.Text)); - sql.Add(' and A.CRTime<=' + quotedstr(endDate.Text)); + sql.Add(fwhere); + + if ComboBox2.Text = 'Ѵӡ' then + sql.Add(' AND A.PrintCount > 0') + else if ComboBox2.Text = 'δӡ' then + sql.Add(' AND (A.PrintCount = 0 OR A.PrintCount IS NULL)'); + + sql.Add(') AS temp_row'); + sql.Add('WHERE rownumber > ' + IntToStr((CurrentPage - 1) * RecordsNumber)); +// sql.Add(' AND rownumber <= ' + IntToStr(CurrentPage * RecordsNumber)); +// sql.Add('ORDER BY rownumber'); end; - sql.Add(fwhere); - sql.Add(' ) AA'); - if ComboBox2.Text = 'Ѵӡ' then - begin - sql.Add('where ISDY=1'); - end; - if ComboBox2.Text = 'δӡ' then - begin - sql.Add('where ISDY=0'); - end; - sql.Add(') temp_row'); - sql.Add(' where rownumber> ' + IntToStr((CurrentPage - 1) * RecordsNumber)); end; end; - + //ShowMessage(SQL.text); Open; end; // with ADOQueryMain do @@ -1098,7 +1125,6 @@ begin Close; sql.Clear; // sql.Add('Update WFB_MJJY Set MKXs='''+trim(i)+''',MJLen=cast(1.00000* MJQty4 *'''+trim(i)+''' as decimal(18,1)) '); - // sql.Add('Update WFB_MJJY Set mjlen=''' + trim(cxCurrencyEdit1.Text) + ''' '); // sql.Add('where MJID=''' + Trim(CDS_Main.fieldbyname('MJID').AsString) + ''''); sql.Add('Update CK_BanCP_CR Set QTY=''' + trim(cxCurrencyEdit1.Text) + ''' '); @@ -1262,10 +1288,9 @@ begin Close; sql.Clear; // sql.Add('Update WFB_MJJY Set MKXs='''+trim(i)+''',MJLen=cast(1.00000* MJQty4 *'''+trim(i)+''' as decimal(18,1)) '); - // sql.Add('Update WFB_MJJY Set mjlen=''' + trim(cxCurrencyEdit1.Text) + ''' '); // sql.Add('where MJID=''' + Trim(CDS_Main.fieldbyname('MJID').AsString) + ''''); - sql.Add('Update CK_BanCP_CR Set msfw=''' + trim(msfw.Text) + ''' '); + sql.Add('Update CK_BanCP_CR Set msfw=''' + trim(edit3.Text) + ''' '); sql.Add('where MJID=''' + Trim(CDS_Main.fieldbyname('MJID').AsString) + ''''); sql.Add('insert into SY_SysLog(operor,opertime,Model,acction,opevent,result) values( '); diff --git a/成品仓库(FinishedClothWarehouse.dll)/U_CKProductBCPInList.dfm b/成品仓库(FinishedClothWarehouse.dll)/U_CKProductBCPInList.dfm index 2e01253..be00f73 100644 --- a/成品仓库(FinishedClothWarehouse.dll)/U_CKProductBCPInList.dfm +++ b/成品仓库(FinishedClothWarehouse.dll)/U_CKProductBCPInList.dfm @@ -20,7 +20,7 @@ object frmCKProductBCPInList: TfrmCKProductBCPInList object ToolBar1: TToolBar Left = 0 Top = 0 - Width = 1212 + Width = 1220 Height = 33 ButtonHeight = 30 ButtonWidth = 83 @@ -128,7 +128,7 @@ object frmCKProductBCPInList: TfrmCKProductBCPInList object Panel1: TPanel Left = 0 Top = 33 - Width = 1212 + Width = 1220 Height = 68 Align = alTop BevelInner = bvRaised @@ -394,8 +394,8 @@ object frmCKProductBCPInList: TfrmCKProductBCPInList object cxGrid2: TcxGrid Left = 0 Top = 129 - Width = 1212 - Height = 470 + Width = 1220 + Height = 478 Align = alClient PopupMenu = PopupMenu1 TabOrder = 3 @@ -612,14 +612,14 @@ object frmCKProductBCPInList: TfrmCKProductBCPInList object Panel6: TPanel Left = 0 Top = 101 - Width = 1212 + Width = 1220 Height = 28 Align = alTop AutoSize = True BorderStyle = bsSingle TabOrder = 2 DesignSize = ( - 1208 + 1216 24) object Label31: TLabel Left = 25 diff --git a/成品仓库(FinishedClothWarehouse.dll)/U_CKProductBCPInList.pas b/成品仓库(FinishedClothWarehouse.dll)/U_CKProductBCPInList.pas index aeeed0f..be4c392 100644 --- a/成品仓库(FinishedClothWarehouse.dll)/U_CKProductBCPInList.pas +++ b/成品仓库(FinishedClothWarehouse.dll)/U_CKProductBCPInList.pas @@ -12,19 +12,7 @@ uses cxDropDownEdit, cxCheckBox, RM_Common, RM_Class, RM_e_Xls, RM_Dataset, RM_System, RM_GridReport, Menus, cxCalendar, MovePanel, Math, Clipbrd, cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, cxContainer, dxCore, - cxDateUtils, cxTextEdit, cxMaskEdit, dxSkinsCore, dxSkinsDefaultPainters, - dxSkinscxPCPainter, dxSkinBlack, dxSkinBlue, dxSkinBlueprint, dxSkinCaramel, - dxSkinCoffee, dxSkinDarkRoom, dxSkinDarkSide, dxSkinDevExpressDarkStyle, - dxSkinDevExpressStyle, dxSkinFoggy, dxSkinGlassOceans, dxSkinHighContrast, - dxSkiniMaginary, dxSkinLilian, dxSkinLiquidSky, dxSkinLondonLiquidSky, - dxSkinMcSkin, dxSkinMetropolis, dxSkinMetropolisDark, dxSkinMoneyTwins, - dxSkinOffice2007Black, dxSkinOffice2007Blue, dxSkinOffice2007Green, - dxSkinOffice2007Pink, dxSkinOffice2007Silver, dxSkinOffice2010Black, - dxSkinOffice2010Blue, dxSkinOffice2010Silver, dxSkinOffice2013DarkGray, - dxSkinOffice2013LightGray, dxSkinOffice2013White, dxSkinPumpkin, dxSkinSeven, - dxSkinSevenClassic, dxSkinSharp, dxSkinSharpPlus, dxSkinSilver, - dxSkinSpringTime, dxSkinStardust, dxSkinSummer2008, dxSkinTheAsphaltWorld, - dxSkinValentine, dxSkinVS2010, dxSkinWhiteprint, dxSkinXmas2008Blue; + cxDateUtils, cxTextEdit, cxMaskEdit; type TfrmCKProductBCPInList = class(TForm) diff --git a/染整计划(DyeingFinishingPlan.dll)/DyeingFinishingPlan.dof b/染整计划(DyeingFinishingPlan.dll)/DyeingFinishingPlan.dof index 0311613..c1531f4 100644 --- a/染整计划(DyeingFinishingPlan.dll)/DyeingFinishingPlan.dof +++ b/染整计划(DyeingFinishingPlan.dll)/DyeingFinishingPlan.dof @@ -101,7 +101,7 @@ DebugSourceDirs= UsePackages=0 [Parameters] RunParams= -HostApplication=D:\Dp7Repo\Ŀ\Ⱥ2\Ⱦƻ(DyeingFinishingPlan.dll)\testDll.exe +HostApplication=D:\Ŀ\D7myGuhang\Ⱦƻ(DyeingFinishingPlan.dll)\testDll.exe Launcher= UseLauncher=0 DebugCWD= diff --git a/染整计划(DyeingFinishingPlan.dll)/ProjectGroup1.bpg b/染整计划(DyeingFinishingPlan.dll)/ProjectGroup1.bpg index 7c050f6..9065282 100644 --- a/染整计划(DyeingFinishingPlan.dll)/ProjectGroup1.bpg +++ b/染整计划(DyeingFinishingPlan.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 = FinishedClothWarehouse.dll testDll.exe #------------------------------------------------------------------------------ default: $(PROJECTS) #------------------------------------------------------------------------------ -testDll.exe: testDll.dpr +FinishedClothWarehouse.dll: ..\Ʒֿ(FinishedClothWarehouse.dll)\FinishedClothWarehouse.dpr $(DCC) -ProductPrice.dll: ProductPrice.dpr +testDll.exe: ..\Ʒֿ(FinishedClothWarehouse.dll)\testDll.dpr $(DCC) diff --git a/染整计划(DyeingFinishingPlan.dll)/U_GetDllForm.pas b/染整计划(DyeingFinishingPlan.dll)/U_GetDllForm.pas index c4df953..441576e 100644 --- a/染整计划(DyeingFinishingPlan.dll)/U_GetDllForm.pas +++ b/染整计划(DyeingFinishingPlan.dll)/U_GetDllForm.pas @@ -72,16 +72,23 @@ begin SetLength(user, 255); SetLength(pswd, 255); - server := '139.224.59.117,7781'; + if Trim(DataBaseStr) = '' then + begin + server := '139.224.59.117,7781'; // server := '.'; - dtbase := 'guhangdata'; - user := 'guhangsa'; - pswd := 'rightsoft@8758'; + dtbase := 'guhangdata'; + user := 'guhangsa'; + pswd := 'rightsoft@8758'; // pswd := 'rightsoft'; - DConString := 'Provider=SQLOLEDB.1;Password=' + pswd + ';Persist Security Info=True;User ID=' + user + ';Initial Catalog=' + dtbase + ';Data Source=' + server; - DConString := DataBaseStr; -// DName:='XYB'; -// DParameters1 := 'Ȩ'; + DConString := 'Provider=SQLOLEDB.1;Password=' + pswd + ';Persist Security Info=True;User ID=' + user + ';Initial Catalog=' + dtbase + ';Data Source=' + server; + + // DName:='ܸ'; +// DParameters1:='Ȩ'; + end + else + begin + DConString := DataBaseStr; + end; if not ConnData() then begin result := 0; diff --git a/染整计划(DyeingFinishingPlan.dll)/U_JYOrderCDList.dfm b/染整计划(DyeingFinishingPlan.dll)/U_JYOrderCDList.dfm index 95a2862..fa6fc83 100644 --- a/染整计划(DyeingFinishingPlan.dll)/U_JYOrderCDList.dfm +++ b/染整计划(DyeingFinishingPlan.dll)/U_JYOrderCDList.dfm @@ -1,6 +1,6 @@ object frmJYOrderCDList: TfrmJYOrderCDList - Left = 161 - Top = 69 + Left = 389 + Top = 456 Width = 1357 Height = 727 Caption = #26816#39564#25253#21578 @@ -34,7 +34,7 @@ object frmJYOrderCDList: TfrmJYOrderCDList object ToolBar1: TToolBar Left = 0 Top = 0 - Width = 1341 + Width = 1349 AutoSize = True ButtonHeight = 30 ButtonWidth = 107 @@ -148,7 +148,7 @@ object frmJYOrderCDList: TfrmJYOrderCDList object Panel1: TPanel Left = 0 Top = 32 - Width = 1341 + Width = 1349 Height = 63 Align = alTop BevelInner = bvRaised @@ -279,7 +279,7 @@ object frmJYOrderCDList: TfrmJYOrderCDList ParentFont = False end object Label3: TLabel - Left = 942 + Left = 1094 Top = 28 Width = 68 Height = 16 @@ -305,6 +305,34 @@ object frmJYOrderCDList: TfrmJYOrderCDList Font.Style = [fsBold] ParentFont = False end + object Label14: TLabel + Left = 924 + Top = 12 + Width = 52 + Height = 12 + Hint = '1' + Caption = #31859#25968#33539#22260 + Font.Charset = GB2312_CHARSET + Font.Color = clWindowText + Font.Height = -12 + Font.Name = #23435#20307 + Font.Style = [fsBold] + ParentFont = False + end + object Label16: TLabel + Left = 934 + Top = 36 + Width = 33 + Height = 12 + Hint = '1' + Caption = #31859' '#25968 + Font.Charset = GB2312_CHARSET + Font.Color = clWindowText + Font.Height = -12 + Font.Name = #23435#20307 + Font.Style = [fsBold] + ParentFont = False + end object BegDate: TDateTimePicker Left = 81 Top = 8 @@ -430,7 +458,7 @@ object frmJYOrderCDList: TfrmJYOrderCDList OnKeyPress = KHConNOKeyPress end object ComboBox2: TComboBox - Left = 1012 + Left = 1164 Top = 25 Width = 106 Height = 24 @@ -466,12 +494,32 @@ object frmJYOrderCDList: TfrmJYOrderCDList TabOrder = 13 OnKeyPress = conNOKeyPress end + object msfw: TEdit + Tag = 2 + Left = 979 + Top = 8 + Width = 100 + Height = 20 + Hint = '1' + TabOrder = 14 + OnKeyPress = conNOKeyPress + end + object kcqty: TEdit + Tag = 2 + Left = 979 + Top = 32 + Width = 100 + Height = 20 + Hint = '1' + TabOrder = 15 + OnKeyPress = conNOKeyPress + end end object cxGrid1: TcxGrid Left = 0 Top = 148 - Width = 1341 - Height = 540 + Width = 1349 + Height = 548 Align = alClient PopupMenu = PopupMenu1 TabOrder = 4 @@ -850,7 +898,7 @@ object frmJYOrderCDList: TfrmJYOrderCDList TabOrder = 3 OnClick = Button8Click end - object msfw: TEdit + object edit3: TEdit Left = 55 Top = 65 Width = 122 @@ -909,7 +957,7 @@ object frmJYOrderCDList: TfrmJYOrderCDList object Panel6: TPanel Left = 0 Top = 95 - Width = 1341 + Width = 1349 Height = 28 Align = alTop AutoSize = True @@ -917,7 +965,7 @@ object frmJYOrderCDList: TfrmJYOrderCDList TabOrder = 2 Visible = False DesignSize = ( - 1337 + 1345 24) object Label31: TLabel Left = 25 @@ -1010,7 +1058,7 @@ object frmJYOrderCDList: TfrmJYOrderCDList object cxTabControl1: TcxTabControl Left = 0 Top = 123 - Width = 1341 + Width = 1349 Height = 25 Align = alTop Font.Charset = GB2312_CHARSET @@ -1028,7 +1076,7 @@ object frmJYOrderCDList: TfrmJYOrderCDList #22269#20869#26126#32454#24211#23384) OnChange = cxTabControl1Change ClientRectBottom = 27 - ClientRectRight = 1341 + ClientRectRight = 1349 ClientRectTop = 27 end object Panel3: TPanel diff --git a/染整计划(DyeingFinishingPlan.dll)/U_JYOrderCDList.pas b/染整计划(DyeingFinishingPlan.dll)/U_JYOrderCDList.pas index f0c4cb4..183d2b6 100644 --- a/染整计划(DyeingFinishingPlan.dll)/U_JYOrderCDList.pas +++ b/染整计划(DyeingFinishingPlan.dll)/U_JYOrderCDList.pas @@ -152,8 +152,12 @@ type Tv1Column3: TcxGridDBColumn; Label13: TLabel; Button8: TButton; - msfw: TEdit; + edit3: TEdit; Tv1Column4: TcxGridDBColumn; + Label14: TLabel; + msfw: TEdit; + Label16: TLabel; + kcqty: TEdit; procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure FormCreate(Sender: TObject); procedure TBCloseClick(Sender: TObject); @@ -1480,7 +1484,7 @@ begin Application.MessageBox('ûѡ!', 'ʾ', 0); Exit; end; - if msfw.Text = '' then + if edit3.Text = '' then Exit; try Order_Main.DisableControls; @@ -1498,9 +1502,9 @@ begin sql.Clear; // sql.Add('Update WFB_MJJY Set MKXs='''+trim(i)+''',MJLen=cast(1.00000* MJQty4 *'''+trim(i)+''' as decimal(18,1)) '); - sql.Add('Update WFB_MJJY Set msfw=''' + trim(msfw.Text) + ''' '); + sql.Add('Update WFB_MJJY Set msfw=''' + trim(edit3.Text) + ''' '); sql.Add('where MJID=''' + Trim(Order_Main.fieldbyname('MJID').AsString) + ''''); - sql.Add('Update CK_BanCP_CR Set msfw=''' + trim(msfw.Text) + ''' '); + sql.Add('Update CK_BanCP_CR Set msfw=''' + trim(edit3.Text) + ''' '); sql.Add('where MJID=''' + Trim(Order_Main.fieldbyname('MJID').AsString) + ''''); sql.Add('insert into SY_SysLog(operor,opertime,Model,acction,opevent,result) values( '); @@ -1508,7 +1512,7 @@ begin sql.Add(',getdate() '); sql.Add(',' + quotedstr(trim(self.Caption))); sql.Add(',' + quotedstr(trim('޸Χ'))); - sql.Add(',' + quotedstr(trim('ţ' + trim(Order_Main.fieldbyname('MJID').AsString) + ' Ϊ:' + trim(msfw.Text)))); + sql.Add(',' + quotedstr(trim('ţ' + trim(Order_Main.fieldbyname('MJID').AsString) + ' Ϊ:' + trim(edit3.Text)))); sql.Add(',' + quotedstr(trim('ɹ'))); sql.Add(')'); ExecSQL;