~
This commit is contained in:
parent
64039917a5
commit
a02f5cc3ec
|
|
@ -2419,6 +2419,125 @@
|
||||||
ExplicitTop = 65
|
ExplicitTop = 65
|
||||||
ExplicitHeight = 29
|
ExplicitHeight = 29
|
||||||
end
|
end
|
||||||
|
object cxGroupBox_DJTYpe: TcxGroupBox [6]
|
||||||
|
Tag = 999
|
||||||
|
Left = 288
|
||||||
|
Top = 91
|
||||||
|
Caption = #25171#21367#26041#24335
|
||||||
|
TabOrder = 6
|
||||||
|
Visible = False
|
||||||
|
Height = 189
|
||||||
|
Width = 298
|
||||||
|
object MovePanel2: TMovePanel
|
||||||
|
Left = 61
|
||||||
|
Top = -27
|
||||||
|
Width = 177
|
||||||
|
Height = 33
|
||||||
|
BevelOuter = bvNone
|
||||||
|
TabOrder = 0
|
||||||
|
object dxPDFViewer1: TdxPDFViewer
|
||||||
|
Left = 160
|
||||||
|
Top = 16
|
||||||
|
Width = 200
|
||||||
|
Height = 150
|
||||||
|
OptionsNavigationPane.Attachments.Glyph.SourceDPI = 96
|
||||||
|
OptionsNavigationPane.Attachments.Glyph.Data = {
|
||||||
|
3C3F786D6C2076657273696F6E3D22312E302220656E636F64696E673D227574
|
||||||
|
662D38223F3E0D0A3C212D2D2047656E657261746F723A2041646F626520496C
|
||||||
|
6C7573747261746F722032302E312E302C20535647204578706F727420506C75
|
||||||
|
672D496E202E205356472056657273696F6E3A20362E3030204275696C642030
|
||||||
|
2920202D2D3E0D0A3C21444F435459504520737667205055424C494320222D2F
|
||||||
|
2F5733432F2F4454442053564720312E312F2F454E222022687474703A2F2F77
|
||||||
|
77772E77332E6F72672F47726170686963732F5356472F312E312F4454442F73
|
||||||
|
766731312E647464223E0D0A3C7376672076657273696F6E3D22312E31222069
|
||||||
|
643D224C617965725F312220786D6C6E733D22687474703A2F2F7777772E7733
|
||||||
|
2E6F72672F323030302F7376672220786D6C6E733A786C696E6B3D2268747470
|
||||||
|
3A2F2F7777772E77332E6F72672F313939392F786C696E6B2220783D22307078
|
||||||
|
2220793D22307078220D0A092076696577426F783D2230203020333220333222
|
||||||
|
207374796C653D22656E61626C652D6261636B67726F756E643A6E6577203020
|
||||||
|
302033322033323B2220786D6C3A73706163653D227072657365727665223E0D
|
||||||
|
0A3C7374796C6520747970653D22746578742F637373223E0D0A092E426C6163
|
||||||
|
6B7B66696C6C3A233732373237323B7D0D0A3C2F7374796C653E0D0A3C706174
|
||||||
|
682069643D224174746163686D656E742220636C6173733D22426C61636B2220
|
||||||
|
643D224D31372C3263332E392C302C372C332E312C372C37763133682D325639
|
||||||
|
63302D322E382D322E322D352D352D35732D352C322E322D352C357631366330
|
||||||
|
2C312E372C312E332C332C332C3373332D312E332C332D335631310D0A096330
|
||||||
|
2D302E362D302E342D312D312D31732D312C302E342D312C31763131682D3256
|
||||||
|
313163302D312E372C312E332D332C332D3373332C312E332C332C3376313463
|
||||||
|
302C322E382D322E322C352D352C35732D352D322E322D352D3556394331302C
|
||||||
|
352E312C31332E312C322C31372C327A222F3E0D0A3C2F7376673E0D0A}
|
||||||
|
OptionsNavigationPane.Bookmarks.Glyph.SourceDPI = 96
|
||||||
|
OptionsNavigationPane.Bookmarks.Glyph.Data = {
|
||||||
|
3C3F786D6C2076657273696F6E3D22312E302220656E636F64696E673D227574
|
||||||
|
662D38223F3E0D0A3C212D2D2047656E657261746F723A2041646F626520496C
|
||||||
|
6C7573747261746F722032302E312E302C20535647204578706F727420506C75
|
||||||
|
672D496E202E205356472056657273696F6E3A20362E3030204275696C642030
|
||||||
|
2920202D2D3E0D0A3C21444F435459504520737667205055424C494320222D2F
|
||||||
|
2F5733432F2F4454442053564720312E312F2F454E222022687474703A2F2F77
|
||||||
|
77772E77332E6F72672F47726170686963732F5356472F312E312F4454442F73
|
||||||
|
766731312E647464223E0D0A3C7376672076657273696F6E3D22312E31222069
|
||||||
|
643D224C617965725F312220786D6C6E733D22687474703A2F2F7777772E7733
|
||||||
|
2E6F72672F323030302F7376672220786D6C6E733A786C696E6B3D2268747470
|
||||||
|
3A2F2F7777772E77332E6F72672F313939392F786C696E6B2220783D22307078
|
||||||
|
2220793D22307078220D0A092076696577426F783D2230203020333220333222
|
||||||
|
207374796C653D22656E61626C652D6261636B67726F756E643A6E6577203020
|
||||||
|
302033322033323B2220786D6C3A73706163653D227072657365727665223E0D
|
||||||
|
0A3C7374796C6520747970653D22746578742F637373223E0D0A092E426C6163
|
||||||
|
6B7B66696C6C3A233732373237323B7D0D0A3C2F7374796C653E0D0A3C706F6C
|
||||||
|
79676F6E2069643D22426F6F6B6D61726B732220636C6173733D22426C61636B
|
||||||
|
2220706F696E74733D2232342C33302031362C323220382C333020382C342032
|
||||||
|
342C3420222F3E0D0A3C2F7376673E0D0A}
|
||||||
|
OptionsNavigationPane.Thumbnails.Glyph.SourceDPI = 96
|
||||||
|
OptionsNavigationPane.Thumbnails.Glyph.Data = {
|
||||||
|
3C3F786D6C2076657273696F6E3D22312E302220656E636F64696E673D227574
|
||||||
|
662D38223F3E0D0A3C212D2D2047656E657261746F723A2041646F626520496C
|
||||||
|
6C7573747261746F722032302E312E302C20535647204578706F727420506C75
|
||||||
|
672D496E202E205356472056657273696F6E3A20362E3030204275696C642030
|
||||||
|
2920202D2D3E0D0A3C21444F435459504520737667205055424C494320222D2F
|
||||||
|
2F5733432F2F4454442053564720312E312F2F454E222022687474703A2F2F77
|
||||||
|
77772E77332E6F72672F47726170686963732F5356472F312E312F4454442F73
|
||||||
|
766731312E647464223E0D0A3C7376672076657273696F6E3D22312E31222069
|
||||||
|
643D224C617965725F312220786D6C6E733D22687474703A2F2F7777772E7733
|
||||||
|
2E6F72672F323030302F7376672220786D6C6E733A786C696E6B3D2268747470
|
||||||
|
3A2F2F7777772E77332E6F72672F313939392F786C696E6B2220783D22307078
|
||||||
|
2220793D22307078220D0A092076696577426F783D2230203020333220333222
|
||||||
|
207374796C653D22656E61626C652D6261636B67726F756E643A6E6577203020
|
||||||
|
302033322033323B2220786D6C3A73706163653D227072657365727665223E0D
|
||||||
|
0A3C7374796C6520747970653D22746578742F637373223E0D0A092E426C6163
|
||||||
|
6B7B66696C6C3A233732373237323B7D0D0A3C2F7374796C653E0D0A3C706174
|
||||||
|
682069643D225468756D626E61696C732220636C6173733D22426C61636B2220
|
||||||
|
643D224D32382C38682D34563448313276364836763138683136762D36683656
|
||||||
|
387A204D32302C32364838563132683476313068385632367A204D32362C3230
|
||||||
|
682D34682D32682D36762D38762D3256366838763468345632307A220D0A092F
|
||||||
|
3E0D0A3C2F7376673E0D0A}
|
||||||
|
end
|
||||||
|
end
|
||||||
|
object DJTYpe: TComboBox
|
||||||
|
Left = 70
|
||||||
|
Top = 44
|
||||||
|
Width = 145
|
||||||
|
Height = 33
|
||||||
|
Font.Charset = GB2312_CHARSET
|
||||||
|
Font.Color = clWindowText
|
||||||
|
Font.Height = -19
|
||||||
|
Font.Name = #24494#36719#38597#40657
|
||||||
|
Font.Style = []
|
||||||
|
ParentFont = False
|
||||||
|
TabOrder = 1
|
||||||
|
Items.Strings = (
|
||||||
|
#27491#38754#26397#37324
|
||||||
|
#21453#38754#26397#37324)
|
||||||
|
end
|
||||||
|
object Button1: TButton
|
||||||
|
Left = 104
|
||||||
|
Top = 114
|
||||||
|
Width = 75
|
||||||
|
Height = 39
|
||||||
|
Caption = #30830#23450
|
||||||
|
TabOrder = 2
|
||||||
|
OnClick = Button1Click
|
||||||
|
end
|
||||||
|
end
|
||||||
inherited ADOQueryBaseCmd: TADOQuery
|
inherited ADOQueryBaseCmd: TADOQuery
|
||||||
Connection = DataLink_TradeInsp.ADOLink
|
Connection = DataLink_TradeInsp.ADOLink
|
||||||
Left = 617
|
Left = 617
|
||||||
|
|
|
||||||
|
|
@ -19,7 +19,9 @@ uses
|
||||||
RM_RichEdit, cxProgressBar, cxCurrencyEdit, dxSkinsCore, dxSkinWXI, frxBarcode,
|
RM_RichEdit, cxProgressBar, cxCurrencyEdit, dxSkinsCore, dxSkinWXI, frxBarcode,
|
||||||
frxOLE, frxRich, frxClass, frxDBSet, frxTableObject, frxExportPPTX,
|
frxOLE, frxRich, frxClass, frxDBSet, frxTableObject, frxExportPPTX,
|
||||||
frxExportXLSX, frxExportBaseDialog, frxExportXLS, Vcl.Mask, cxSplitter,
|
frxExportXLSX, frxExportBaseDialog, frxExportXLS, Vcl.Mask, cxSplitter,
|
||||||
Vcl.DBCtrls;
|
Vcl.DBCtrls, dxX509Certificate, dxPDFCore, dxPDFBase, dxPDFText,
|
||||||
|
dxPDFRecognizedObject, dxPDFForm, dxPDFFormData, dxPDFDocument, dxPrintUtils,
|
||||||
|
dxCustomPreview, dxPDFDocumentViewer, dxPDFViewer;
|
||||||
|
|
||||||
type
|
type
|
||||||
TfrmMachRollMain = class(TfrmBaseList)
|
TfrmMachRollMain = class(TfrmBaseList)
|
||||||
|
|
@ -273,6 +275,11 @@ type
|
||||||
dxLayoutAutoCreatedGroup10: TdxLayoutAutoCreatedGroup;
|
dxLayoutAutoCreatedGroup10: TdxLayoutAutoCreatedGroup;
|
||||||
C_StyleNo: TcxComboBox;
|
C_StyleNo: TcxComboBox;
|
||||||
dxLayoutItem_StyleNo: TdxLayoutItem;
|
dxLayoutItem_StyleNo: TdxLayoutItem;
|
||||||
|
cxGroupBox_DJTYpe: TcxGroupBox;
|
||||||
|
MovePanel2: TMovePanel;
|
||||||
|
dxPDFViewer1: TdxPDFViewer;
|
||||||
|
DJTYpe: TComboBox;
|
||||||
|
Button1: TButton;
|
||||||
procedure FormCreate(Sender: TObject);
|
procedure FormCreate(Sender: TObject);
|
||||||
procedure FormShow(Sender: TObject);
|
procedure FormShow(Sender: TObject);
|
||||||
procedure Button_badClick(Sender: TObject);
|
procedure Button_badClick(Sender: TObject);
|
||||||
|
|
@ -328,9 +335,10 @@ type
|
||||||
procedure C_StyleNoChange(Sender: TObject);
|
procedure C_StyleNoChange(Sender: TObject);
|
||||||
procedure C_StyleNoDropDown(Sender: TObject);
|
procedure C_StyleNoDropDown(Sender: TObject);
|
||||||
procedure C_StyleNoPropertiesChange(Sender: TObject);
|
procedure C_StyleNoPropertiesChange(Sender: TObject);
|
||||||
|
procedure Button1Click(Sender: TObject);
|
||||||
private
|
private
|
||||||
FCIID, FOperationStatus, FCIFName, FWorkshop: string;
|
FCIID, FOperationStatus, FCIFName, FWorkshop: string;
|
||||||
FBCIOID, FOrderNo, FMainId, FSubId, FPCId, FConNo, FConMId, fBuyConNo, FConSId: string;
|
FBCIOID, FOrderNo, FMainId, FSubId, FPCId, FConNo, FConMId, fBuyConNo, FConSId, FDJTYpe: string;
|
||||||
FBatchNO, FLenUnit, FC_Code, FC_Name, FC_EName, FC_Spec, FC_Width, FC_GramWeight: string;
|
FBatchNO, FLenUnit, FC_Code, FC_Name, FC_EName, FC_Spec, FC_Width, FC_GramWeight: string;
|
||||||
FC_Color, FC_EColor, FC_ColorNo, FC_StyleNo, FC_Composition, FC_EComposition, FC_Pattern, FC_CustPattern, FC_ColorDepth: string;
|
FC_Color, FC_EColor, FC_ColorNo, FC_StyleNo, FC_Composition, FC_EComposition, FC_Pattern, FC_CustPattern, FC_ColorDepth: string;
|
||||||
Faddwet, faddlen: double;
|
Faddwet, faddlen: double;
|
||||||
|
|
@ -383,7 +391,7 @@ type
|
||||||
|
|
||||||
public
|
public
|
||||||
fmanage: string;
|
fmanage: string;
|
||||||
fFlileFlag, FFsubid, FFactoryname: string;
|
fFlileFlag, FFsubid, FFactoryname, FSBuyConNo: string;
|
||||||
end;
|
end;
|
||||||
|
|
||||||
var
|
var
|
||||||
|
|
@ -428,12 +436,18 @@ var
|
||||||
mvalue: double;
|
mvalue: double;
|
||||||
i: Integer;
|
i: Integer;
|
||||||
begin
|
begin
|
||||||
|
|
||||||
try
|
try
|
||||||
BTPrint.Enabled := false;
|
BTPrint.Enabled := false;
|
||||||
|
|
||||||
edtScan.SetFocus;
|
edtScan.SetFocus;
|
||||||
if trim(OrderNo.Text) = '' then
|
if trim(OrderNo.Text) = '' then
|
||||||
exit;
|
exit;
|
||||||
|
if trim(DJTYpe.Text) = '' then
|
||||||
|
begin
|
||||||
|
Application.MessageBox('打卷类型不能为空!', '提示', 0);
|
||||||
|
exit;
|
||||||
|
end;
|
||||||
if trim(grade.Text) = '' then
|
if trim(grade.Text) = '' then
|
||||||
begin
|
begin
|
||||||
Application.MessageBox('等级不能为空!', '提示', 0);
|
Application.MessageBox('等级不能为空!', '提示', 0);
|
||||||
|
|
@ -659,6 +673,16 @@ begin
|
||||||
end;
|
end;
|
||||||
end;
|
end;
|
||||||
|
|
||||||
|
procedure TfrmMachRollMain.Button1Click(Sender: TObject);
|
||||||
|
begin
|
||||||
|
if trim(DJTYpe.text) <> '' then
|
||||||
|
begin
|
||||||
|
cxGroupBox_DJTYpe.Visible := false;
|
||||||
|
FDJTYpe := trim(DJTYpe.text);
|
||||||
|
end;
|
||||||
|
|
||||||
|
end;
|
||||||
|
|
||||||
procedure TfrmMachRollMain.Button_badClick(Sender: TObject);
|
procedure TfrmMachRollMain.Button_badClick(Sender: TObject);
|
||||||
begin
|
begin
|
||||||
inherited;
|
inherited;
|
||||||
|
|
@ -1415,7 +1439,7 @@ begin
|
||||||
// FPCId := Trim(ADOTmp.fieldbyname('ToPCId').AsString);
|
// FPCId := Trim(ADOTmp.fieldbyname('ToPCId').AsString);
|
||||||
// FC_CustPattern := Trim(ADOTmp.fieldbyname('C_CustPattern').AsString);
|
// FC_CustPattern := Trim(ADOTmp.fieldbyname('C_CustPattern').AsString);
|
||||||
// FC_ColorDepth := Trim(ADOTmp.fieldbyname('C_ColorDepth').AsString);
|
// FC_ColorDepth := Trim(ADOTmp.fieldbyname('C_ColorDepth').AsString);
|
||||||
// FWorkshop := Trim(ADOTmp.fieldbyname('Workshop').AsString);
|
FSBuyConNo := Trim(fieldbyname('BuyConNo').AsString);
|
||||||
FC_StyleNo := trim(fieldbyName('C_StyleNo').AsString);
|
FC_StyleNo := trim(fieldbyName('C_StyleNo').AsString);
|
||||||
FC_EComposition := trim(fieldbyName('C_EComposition').AsString);
|
FC_EComposition := trim(fieldbyName('C_EComposition').AsString);
|
||||||
FC_Composition := trim(fieldbyName('C_Composition').AsString);
|
FC_Composition := trim(fieldbyName('C_Composition').AsString);
|
||||||
|
|
@ -2513,16 +2537,23 @@ begin
|
||||||
begin
|
begin
|
||||||
Close;
|
Close;
|
||||||
SQL.Clear;
|
SQL.Clear;
|
||||||
SQL.Add('select factoryname from trade_plan_sub_style ' + 'where subid = ''' + FFSubId + ''' ' + // ×¢Òâ¼ÓÒýºÅ
|
SQL.Add('select factoryname,BuyConNo from trade_plan_sub_style ' + 'where subid = ''' + FFSubId + ''' ' + // 注意加引号
|
||||||
'and c_styleno = ''' + Trim(C_StyleNo.Text) + ''''); // 同样加引号
|
'and c_styleno = ''' + Trim(C_StyleNo.Text) + ''''); // 同样加引号
|
||||||
Open;
|
Open;
|
||||||
|
|
||||||
if not IsEmpty then
|
if not ADOQueryBaseTemp.IsEmpty then
|
||||||
FFactoryname := FieldByName('factoryname').AsString
|
begin
|
||||||
|
FFactoryname := ADOQueryBaseTemp.FieldByName('factoryname').AsString;
|
||||||
|
FSBuyConNo := ADOQueryBaseTemp.FieldByName('BuyConNo').AsString;
|
||||||
|
end
|
||||||
else
|
else
|
||||||
|
begin
|
||||||
|
|
||||||
FFactoryname := ''; // 没查到时置空
|
FFactoryname := ''; // 没查到时置空
|
||||||
|
// FSBuyConNo := '';
|
||||||
|
end;
|
||||||
end;
|
end;
|
||||||
//
|
|
||||||
// 测试输出(可删)
|
// 测试输出(可删)
|
||||||
// ShowMessage('工厂名称: ' + FFactoryname);
|
// ShowMessage('工厂名称: ' + FFactoryname);
|
||||||
|
|
||||||
|
|
@ -2690,7 +2721,8 @@ begin
|
||||||
if trim(OrderNo.Text) <> '' then
|
if trim(OrderNo.Text) <> '' then
|
||||||
InputLen.SetFocus;
|
InputLen.SetFocus;
|
||||||
cxGroupBox_keys.Visible := false;
|
cxGroupBox_keys.Visible := false;
|
||||||
|
DJTYpe.text := '';
|
||||||
|
cxGroupBox_DJTYpe.Visible := True;
|
||||||
end;
|
end;
|
||||||
end;
|
end;
|
||||||
|
|
||||||
|
|
@ -2760,6 +2792,7 @@ begin
|
||||||
// 系数
|
// 系数
|
||||||
fieldbyName('Coefficient').value := strtofloatdef(trim(Coefficient.Text), 0); // 系数
|
fieldbyName('Coefficient').value := strtofloatdef(trim(Coefficient.Text), 0); // 系数
|
||||||
fieldbyname('Factoryname').Value := FFactoryname;
|
fieldbyname('Factoryname').Value := FFactoryname;
|
||||||
|
fieldbyname('BuyConNo').Value := FSBuyConNo;
|
||||||
fieldbyname('c_styleno').value := C_StyleNo.Text;
|
fieldbyname('c_styleno').value := C_StyleNo.Text;
|
||||||
/// ////////////////////// 保存重量 /////////////////////////
|
/// ////////////////////// 保存重量 /////////////////////////
|
||||||
if cds_params.fieldbyName('weightRule').AsInteger = 0 then
|
if cds_params.fieldbyName('weightRule').AsInteger = 0 then
|
||||||
|
|
@ -2909,6 +2942,8 @@ begin
|
||||||
fieldbyName('C_CustPattern').value := FC_CustPattern;
|
fieldbyName('C_CustPattern').value := FC_CustPattern;
|
||||||
fieldbyName('C_ColorDepth').value := FC_ColorDepth;
|
fieldbyName('C_ColorDepth').value := FC_ColorDepth;
|
||||||
fieldbyName('CIMachNo').value := trim(SCXFlag);
|
fieldbyName('CIMachNo').value := trim(SCXFlag);
|
||||||
|
fieldbyName('DJTYpe').value := trim(FDJTYpe);
|
||||||
|
|
||||||
|
|
||||||
// 虚加重量
|
// 虚加重量
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user