diff --git a/复合检验管理/U_ClothHCList.pas b/复合检验管理/U_ClothHCList.pas index 4767899..f6843ae 100644 --- a/复合检验管理/U_ClothHCList.pas +++ b/复合检验管理/U_ClothHCList.pas @@ -11,7 +11,20 @@ uses cxGridDBTableView, cxGrid, DBClient, cxCalendar, cxButtonEdit, cxSplitter, RM_Common, RM_Class, RM_e_Xls, RM_Dataset, RM_System, RM_GridReport, cxTextEdit, cxDropDownEdit, cxCheckBox, cxLookAndFeels, - cxLookAndFeelPainters, cxNavigator; + cxLookAndFeelPainters, cxNavigator, dxSkinsCore, 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, dxSkinsDefaultPainters, dxSkinValentine, + dxSkinVS2010, dxSkinWhiteprint, dxSkinXmas2008Blue, dxSkinscxPCPainter; type TfrmClothHCList = class(TForm) diff --git a/复合检验管理/U_JYOrderCDOne.dfm b/复合检验管理/U_JYOrderCDOne.dfm index 38f0800..ec56d0e 100644 --- a/复合检验管理/U_JYOrderCDOne.dfm +++ b/复合检验管理/U_JYOrderCDOne.dfm @@ -284,7 +284,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne Color = clSkyBlue TabOrder = 1 object Label3: TLabel - Left = 179 + Left = 174 Top = 15 Width = 53 Height = 12 @@ -297,8 +297,8 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne ParentFont = False end object TLabel - Left = 582 - Top = 43 + Left = 736 + Top = 41 Width = 40 Height = 12 Caption = #38376' '#24133 @@ -323,8 +323,8 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne ParentFont = False end object Label8: TLabel - Left = 448 - Top = 43 + Left = 583 + Top = 42 Width = 39 Height = 12 Caption = #25171#30721#20154 @@ -336,7 +336,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne ParentFont = False end object Label10: TLabel - Left = 179 + Left = 174 Top = 41 Width = 53 Height = 12 @@ -472,8 +472,8 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne ParentFont = False end object Label16: TLabel - Left = 319 - Top = 43 + Left = 452 + Top = 42 Width = 33 Height = 12 Caption = #27454' '#21495 @@ -537,8 +537,8 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne ParentFont = False end object Label1: TLabel - Left = 723 - Top = 42 + Left = 874 + Top = 41 Width = 52 Height = 12 Caption = #20986#24211#29366#24577 @@ -562,6 +562,20 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne Font.Style = [fsBold] ParentFont = False end + object Label40: TLabel + Left = 303 + Top = 42 + Width = 52 + Height = 12 + Caption = #23376#34920#23458#25143 + Font.Charset = GB2312_CHARSET + Font.Color = clWindowText + Font.Height = -12 + Font.Name = #23435#20307 + Font.Style = [fsBold] + ParentFont = False + Visible = False + end object EndDate: TDateTimePicker Left = 84 Top = 34 @@ -574,7 +588,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne end object OrderNo: TEdit Tag = 2 - Left = 232 + Left = 227 Top = 11 Width = 77 Height = 20 @@ -584,8 +598,8 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne end object PRTMF: TEdit Tag = 1 - Left = 626 - Top = 39 + Left = 780 + Top = 37 Width = 76 Height = 20 TabOrder = 3 @@ -593,7 +607,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne end object MJID: TEdit Tag = 2 - Left = 232 + Left = 227 Top = 37 Width = 77 Height = 20 @@ -640,8 +654,8 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne end object Filler: TComboBox Tag = 1 - Left = 489 - Top = 39 + Left = 624 + Top = 38 Width = 78 Height = 20 Style = csDropDownList @@ -747,8 +761,8 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne end object PRTkuanNo: TEdit Tag = 2 - Left = 358 - Top = 38 + Left = 492 + Top = 37 Width = 77 Height = 20 TabOrder = 16 @@ -780,8 +794,8 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne end object CKFlag: TComboBox Tag = 2 - Left = 780 - Top = 37 + Left = 931 + Top = 36 Width = 78 Height = 20 Style = csDropDownList @@ -809,7 +823,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne TabOrder = 21 OnClick = CheckBox3Click end - object CustomerNoName: TEdit + object KH: TEdit Tag = 2 Left = 357 Top = 11 @@ -818,6 +832,16 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne TabOrder = 22 OnChange = PRTCodeNameChange end + object PRTkh: TEdit + Tag = 2 + Left = 357 + Top = 38 + Width = 77 + Height = 20 + TabOrder = 23 + Visible = False + OnChange = PRTCodeNameChange + end end object cxGrid1: TcxGrid Left = 0 @@ -1167,6 +1191,12 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne HeaderAlignmentHorz = taCenter Width = 65 end + object Tv1Column7: TcxGridDBColumn + Caption = #23376#34920#23458#25143 + DataBinding.FieldName = 'PRTkh' + HeaderAlignmentHorz = taCenter + Width = 70 + end end object cxGrid1Level1: TcxGridLevel GridView = Tv1 diff --git a/复合检验管理/U_JYOrderCDOne.pas b/复合检验管理/U_JYOrderCDOne.pas index a6918fb..5d66222 100644 --- a/复合检验管理/U_JYOrderCDOne.pas +++ b/复合检验管理/U_JYOrderCDOne.pas @@ -11,7 +11,20 @@ uses cxGrid, DBClient, cxCheckBox, cxCalendar, cxSplitter, RM_Dataset, RM_System, RM_Common, RM_Class, RM_GridReport, RM_e_Xls, Menus, MovePanel, cxTextEdit, cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, cxContainer, ShellAPI, - cxCurrencyEdit, MMSystem; + cxCurrencyEdit, MMSystem, dxSkinsCore, 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, dxSkinsDefaultPainters, + dxSkinValentine, dxSkinVS2010, dxSkinWhiteprint, dxSkinXmas2008Blue, + dxSkinscxPCPainter; type TfrmJYOrderCDOne = class(TForm) @@ -209,7 +222,7 @@ type Label36: TLabel; ComboBox3: TComboBox; Label37: TLabel; - CustomerNoName: TEdit; + KH: TEdit; v1Column29: TcxGridDBColumn; ToolButton14: TToolButton; Panel14: TPanel; @@ -224,6 +237,9 @@ type Tv1Column4: TcxGridDBColumn; Tv1Column5: TcxGridDBColumn; Tv1Column6: TcxGridDBColumn; + Label40: TLabel; + PRTkh: TEdit; + Tv1Column7: TcxGridDBColumn; procedure FormDestroy(Sender: TObject); procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure FormCreate(Sender: TObject); @@ -397,7 +413,7 @@ begin sql.Clear; sql.Add('select A.*,'); SQL.Add('cast(A.MJSTR4 as varchar(20)) as gangno,'); - sql.Add('C.OrderNo,C.MPRTCodeName,C.MPRTMF,C.MPRTKZ,B.*,'); + sql.Add('C.OrderNo,C.CustomerNoName,B.*,'); sql.Add('KouFenQty=(select Sum(X.KouFenQty) from WFB_MJJY_CD X where X.MJID=A.MJID),'); sql.Add('CDQty=(select count(X.MJID) from WFB_MJJY_CD X where X.MJID=A.MJID)'); SQL.Add('from WFB_MJJY A'); @@ -516,7 +532,7 @@ end; procedure TfrmJYOrderCDOne.TBRafreshClick(Sender: TObject); begin - Tv1.DataController.Filter.AutoDataSetFilter := false; + Tv1.DataController.Filter.AutoDataSetFilter := false; OrderNo.SetFocus; MovePanel2.Visible := True; MovePanel2.Refresh; @@ -1492,10 +1508,10 @@ begin begin if Trim(Order_Main.fieldbyname('mainID').AsString) <> FMainID then begin - application.MessageBox('ѡIJͬһָʾһӡ', 'ʾϢ', 0); - ADOQueryCmd.Connection.RollbackTrans; - EnableControls; - exit; +// application.MessageBox('ѡIJͬһָʾһӡ', 'ʾϢ', 0); +// ADOQueryCmd.Connection.RollbackTrans; +// EnableControls; +// exit; end; end; sqlStr := sqlStr + 'insert into TBSubID(SubId,Dname) '; diff --git a/复合检验管理/U_MJManageNewFDNew.pas b/复合检验管理/U_MJManageNewFDNew.pas index 1bf700b..c156ec0 100644 --- a/复合检验管理/U_MJManageNewFDNew.pas +++ b/复合检验管理/U_MJManageNewFDNew.pas @@ -2509,8 +2509,8 @@ var i: Integer; begin Panel3.Visible := True; - with Panel3 do - begin + with Panel3 do + begin for i := 0 to ControlCount - 1 do begin if Controls[i] is TSpeedButton then @@ -2530,7 +2530,7 @@ begin begin Close; sql.Clear; - sql.Add('select COALESCE(B.CustomerNoName,C.PRTkh)CustomerNoName,B.*,B.OrderNo OrderNoM,C.*, '); + sql.Add('select CASE WHEN isnull(B.CustomerNoName,'''') = '''' THEN C.PRTkh ELSE B.CustomerNoName END AS CustomerNoName,B.*,B.OrderNo OrderNoM,C.*, '); sql.Add('maxMJxh=isnull((select max(mjxh) from WFB_MJJY X where X.SubID=C.subID),0),'); sql.Add('minMJxh=isnull((select min(mjxh) from WFB_MJJY X where X.SubID=C.subID),1),'); // sql.Add('maxBaoNO=1+isnull((select max(cast(baoNO as int)) from WFB_MJJY X where X.subID=C.subID ),0)'); @@ -2540,6 +2540,7 @@ begin sql.Add('from JYOrder_Sub C'); SQL.Add('inner join JYOrder_Main B on B.MainId=C.MainId '); sql.Add('where C.SubID=''' + Trim(APID.Text) + ''''); + Open; end; if ADOTmp.IsEmpty = False then