检验 坯布仓库

This commit is contained in:
funa 2026-11-12 17:22:39 +08:00
parent 01db22083d
commit bc08f48404
10 changed files with 82 additions and 36 deletions

View File

@ -88,7 +88,7 @@ begin
sql.Add('select AA.*,row_number () over (order by code) as keyNo from(select DISTINCT B.C_Code as code, B.C_Name as name from Bs_Machine A join Bs_Cloth_Info B on B.C_Code in (A.C_CodeName, A.C_CodeName2) where A.MCNO=' + QuotedStr(Trim(FlagStr)) + ')AA') sql.Add('select AA.*,row_number () over (order by code) as keyNo from(select DISTINCT B.C_Code as code, B.C_Name as name from Bs_Machine A join Bs_Cloth_Info B on B.C_Code in (A.C_CodeName, A.C_CodeName2) where A.MCNO=' + QuotedStr(Trim(FlagStr)) + ')AA')
else if ftype = '»ų́ºÏͬ' then else if ftype = '»ų́ºÏͬ' then
begin begin
//列出该机台绑定的合同(FlagStr传机台号),按钮显示"合同号+产品名",Hint存"合同号|产品编号" //列出该机台绑定的合同(FlagStr传机台号),按钮显示"合同号+产品编号+产品名",Hint存"合同号|产品编号"
sql.Add('select AA.*,row_number () over (order by code) as keyNo from('); sql.Add('select AA.*,row_number () over (order by code) as keyNo from(');
sql.Add('select DISTINCT A.m_ConNo as code, ISNULL(B.C_Name,'''') as name, A.C_CodeName as pcode from Bs_Machine A'); sql.Add('select DISTINCT A.m_ConNo as code, ISNULL(B.C_Name,'''') as name, A.C_CodeName as pcode from Bs_Machine A');
sql.Add(' left join Bs_Cloth_Info B on B.C_Code = A.C_CodeName'); sql.Add(' left join Bs_Cloth_Info B on B.C_Code = A.C_CodeName');
@ -128,7 +128,7 @@ begin
end end
else if ftype = '»ų́ºÏͬ' then else if ftype = '»ų́ºÏͬ' then
begin begin
TSpeedButton(Controls[i]).Caption := Trim(ADOTmp.FieldByName('code').AsString) + #13 + Trim(ADOTmp.FieldByName('name').AsString); TSpeedButton(Controls[i]).Caption := Trim(ADOTmp.FieldByName('code').AsString) + #13 + Trim(ADOTmp.FieldByName('pcode').AsString) + #13 + Trim(ADOTmp.FieldByName('name').AsString);
TSpeedButton(Controls[i]).Hint := Trim(ADOTmp.FieldByName('code').AsString) + '|' + Trim(ADOTmp.FieldByName('pcode').AsString); TSpeedButton(Controls[i]).Hint := Trim(ADOTmp.FieldByName('code').AsString) + '|' + Trim(ADOTmp.FieldByName('pcode').AsString);
end end
else else

View File

@ -613,7 +613,7 @@ begin
if FileExists(fPrintFile) then if FileExists(fPrintFile) then
begin begin
RM1.LoadFromFile(fPrintFile); RM1.LoadFromFile(fPrintFile);
Rm1.DefaultCopies := 2; Rm1.DefaultCopies := 1;
RM1.PrintReport; RM1.PrintReport;
end end
else else

View File

@ -37,8 +37,6 @@
ParentBackground = False ParentBackground = False
ParentFont = False ParentFont = False
TabOrder = 0 TabOrder = 0
ExplicitLeft = 2
ExplicitTop = 126
object lblLenUnit: TLabel object lblLenUnit: TLabel
Left = 218 Left = 218
Top = 65 Top = 65

View File

@ -1135,6 +1135,8 @@ begin
end; end;
end; end;
procedure TfrmTatMachInsp.CodeNameExit(Sender: TObject); procedure TfrmTatMachInsp.CodeNameExit(Sender: TObject);
var
MHasAny: Boolean;
begin begin
if Trim(CodeName.Text) = '' then if Trim(CodeName.Text) = '' then
Exit; Exit;
@ -1146,35 +1148,46 @@ begin
SQL.Add('SELECT * FROM Bs_Cloth_Info WHERE C_Name = ' + QuotedStr(CodeName.Text)); SQL.Add('SELECT * FROM Bs_Cloth_Info WHERE C_Name = ' + QuotedStr(CodeName.Text));
Open; Open;
end; end;
if (not ADOTmp.IsEmpty) and (ADOTmp.FieldByName('Status').AsInteger = 5) then MHasAny := not ADOTmp.IsEmpty;
begin //只看启用(Status=5)记录:不止一条时无法确定带哪条,不带入也不清空
code.Text := Trim(ADOTmp.FieldByName('C_Code').AsString); ADOTmp.Filter := 'Status = 5';
CodeName.Text := Trim(ADOTmp.FieldByName('C_Name').AsString); ADOTmp.Filtered := True;
MF.Text := Trim(ADOTmp.FieldByName('C_Width').AsString); try
KZ.Text := Trim(ADOTmp.FieldByName('C_GramWeight').AsString); if ADOTmp.RecordCount > 1 then
SPEC.Text := Trim(ADOTmp.FieldByName('C_SPEC').AsString); Exit;
C_LongitudeBatchNo.Text := Trim(ADOTmp.FieldByName('C_LongitudeBatchNo').AsString); if not ADOTmp.IsEmpty then
C_LatitudeBatchNo.Text := Trim(ADOTmp.FieldByName('C_LatitudeBatchNo').AsString); begin
FInLongitudeBatchShort := Trim(ADOTmp.FieldByName('c_longitude_batch_short').AsString); code.Text := Trim(ADOTmp.FieldByName('C_Code').AsString);
FInLatitudeBatchShort := Trim(ADOTmp.FieldByName('c_latitude_batch_short').AsString); CodeName.Text := Trim(ADOTmp.FieldByName('C_Name').AsString);
FMainId := ''; MF.Text := Trim(ADOTmp.FieldByName('C_Width').AsString);
FSubId := ''; KZ.Text := Trim(ADOTmp.FieldByName('C_GramWeight').AsString);
Label14.Caption := '订单号'; SPEC.Text := Trim(ADOTmp.FieldByName('C_SPEC').AsString);
end C_LongitudeBatchNo.Text := Trim(ADOTmp.FieldByName('C_LongitudeBatchNo').AsString);
else C_LatitudeBatchNo.Text := Trim(ADOTmp.FieldByName('C_LatitudeBatchNo').AsString);
begin FInLongitudeBatchShort := Trim(ADOTmp.FieldByName('c_longitude_batch_short').AsString);
if ADOTmp.IsEmpty then FInLatitudeBatchShort := Trim(ADOTmp.FieldByName('c_latitude_batch_short').AsString);
Application.MessageBox('未找到该产品名称,请重新输入!', '提示', MB_ICONWARNING) FMainId := '';
FSubId := '';
Label14.Caption := '订单号';
end
else else
Application.MessageBox('该产品已停用,不能使用!', '提示', MB_ICONWARNING); begin
code.Text := ''; if not MHasAny then
MF.Text := ''; Application.MessageBox('未找到该产品名称,请重新输入!', '提示', MB_ICONWARNING)
KZ.Text := ''; else
SPEC.Text := ''; Application.MessageBox('该产品已停用,不能使用!', '提示', MB_ICONWARNING);
C_LongitudeBatchNo.Text := ''; code.Text := '';
C_LatitudeBatchNo.Text := ''; MF.Text := '';
FInLongitudeBatchShort := ''; KZ.Text := '';
FInLatitudeBatchShort := ''; SPEC.Text := '';
C_LongitudeBatchNo.Text := '';
C_LatitudeBatchNo.Text := '';
FInLongitudeBatchShort := '';
FInLatitudeBatchShort := '';
end;
finally
ADOTmp.Filtered := False;
ADOTmp.Filter := '';
end; end;
end; end;
procedure TfrmTatMachInsp.ComboBox1Change(Sender: TObject); procedure TfrmTatMachInsp.ComboBox1Change(Sender: TObject);

View File

@ -199,7 +199,7 @@ inherited frmTatClothInList: TfrmTatClothInList
Width = 26 Width = 26
Height = 12 Height = 12
Hint = '0' Hint = '0'
Caption = #33457#22411 Caption = #21152#37325
Font.Charset = GB2312_CHARSET Font.Charset = GB2312_CHARSET
Font.Color = clWindowText Font.Color = clWindowText
Font.Height = -12 Font.Height = -12
@ -351,7 +351,7 @@ inherited frmTatClothInList: TfrmTatClothInList
TabOrder = 10 TabOrder = 10
OnKeyPress = carnoKeyPress OnKeyPress = carnoKeyPress
end end
object C_Pattern: TEdit object add_weight: TEdit
Tag = 2 Tag = 2
Left = 553 Left = 553
Top = 32 Top = 32
@ -499,6 +499,7 @@ inherited frmTatClothInList: TfrmTatClothInList
ParentFont = False ParentFont = False
PopupMenu = PM_1 PopupMenu = PM_1
TabOrder = 3 TabOrder = 3
ExplicitTop = 131
object Tv1: TcxGridDBTableView object Tv1: TcxGridDBTableView
Navigator.Buttons.CustomButtons = <> Navigator.Buttons.CustomButtons = <>
ScrollbarAnnotations.CustomAnnotations = <> ScrollbarAnnotations.CustomAnnotations = <>
@ -917,6 +918,14 @@ inherited frmTatClothInList: TfrmTatClothInList
HeaderAlignmentHorz = taCenter HeaderAlignmentHorz = taCenter
Width = 80 Width = 80
end end
object Tv1add_weight: TcxGridDBColumn
Caption = #21152#37325
DataBinding.FieldName = 'add_weight'
DataBinding.IsNullValueType = True
Visible = False
HeaderAlignmentHorz = taCenter
Width = 80
end
end end
object cxGrid1Level1: TcxGridLevel object cxGrid1Level1: TcxGridLevel
GridView = Tv1 GridView = Tv1

View File

@ -87,7 +87,7 @@ type
C_Name: TEdit; C_Name: TEdit;
C_Color: TEdit; C_Color: TEdit;
jyg: TEdit; jyg: TEdit;
C_Pattern: TEdit; add_weight: TEdit;
C_Code: TEdit; C_Code: TEdit;
VC_BaoID: TcxGridDBColumn; VC_BaoID: TcxGridDBColumn;
Tv1Column9: TcxGridDBColumn; Tv1Column9: TcxGridDBColumn;
@ -113,6 +113,7 @@ type
Tv1ContractBuyName: TcxGridDBColumn; Tv1ContractBuyName: TcxGridDBColumn;
Tv1in_longitude_batch_short: TcxGridDBColumn; Tv1in_longitude_batch_short: TcxGridDBColumn;
Tv1in_latitude_batch_short: TcxGridDBColumn; Tv1in_latitude_batch_short: TcxGridDBColumn;
Tv1add_weight: TcxGridDBColumn;
procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure FormClose(Sender: TObject; var Action: TCloseAction);
procedure FormCreate(Sender: TObject); procedure FormCreate(Sender: TObject);
procedure TBRafreshClick(Sender: TObject); procedure TBRafreshClick(Sender: TObject);

View File

@ -617,6 +617,14 @@ inherited frmTatDRList: TfrmTatDRList
Options.Editing = False Options.Editing = False
Width = 70 Width = 70
end end
object TV2ISTax: TcxGridDBColumn
Caption = #26159#21542#21547#31246
DataBinding.FieldName = 'ISTax'
DataBinding.IsNullValueType = True
HeaderAlignmentHorz = taCenter
Options.Editing = False
Width = 60
end
object TV2Column1: TcxGridDBColumn object TV2Column1: TcxGridDBColumn
Caption = #25968#37327#21333#20301 Caption = #25968#37327#21333#20301
DataBinding.FieldName = 'QtyUnit' DataBinding.FieldName = 'QtyUnit'

View File

@ -90,6 +90,7 @@ type
TV2DR_LongitudeBatchNo: TcxGridDBColumn; TV2DR_LongitudeBatchNo: TcxGridDBColumn;
TV2DR_LatitudeBatchNo: TcxGridDBColumn; TV2DR_LatitudeBatchNo: TcxGridDBColumn;
TV2UnitPrice: TcxGridDBColumn; TV2UnitPrice: TcxGridDBColumn;
TV2ISTax: TcxGridDBColumn;
//RMllPDFExport1: TRMllPDFExport; //RMllPDFExport1: TRMllPDFExport;
procedure FormDestroy(Sender: TObject); procedure FormDestroy(Sender: TObject);
procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure FormClose(Sender: TObject; var Action: TCloseAction);

View File

@ -387,6 +387,18 @@ object frmTatDRtInPut: TfrmTatDRtInPut
HeaderAlignmentHorz = taCenter HeaderAlignmentHorz = taCenter
Width = 70 Width = 70
end end
object Tv1ISTax: TcxGridDBColumn
Caption = #26159#21542#21547#31246
DataBinding.FieldName = 'ISTax'
DataBinding.IsNullValueType = True
PropertiesClassName = 'TcxComboBoxProperties'
Properties.DropDownListStyle = lsFixedList
Properties.Items.Strings = (
#26159
#21542)
HeaderAlignmentHorz = taCenter
Width = 60
end
object Tv1Column3: TcxGridDBColumn object Tv1Column3: TcxGridDBColumn
Caption = #35745#21010#21333#21495 Caption = #35745#21010#21333#21495
DataBinding.FieldName = 'orderno' DataBinding.FieldName = 'orderno'

View File

@ -59,6 +59,7 @@ type
Tv1DR_LongitudeBatchNo: TcxGridDBColumn; Tv1DR_LongitudeBatchNo: TcxGridDBColumn;
Tv1DR_LatitudeBatchNo: TcxGridDBColumn; Tv1DR_LatitudeBatchNo: TcxGridDBColumn;
Tv1UnitPrice: TcxGridDBColumn; Tv1UnitPrice: TcxGridDBColumn;
Tv1ISTax: TcxGridDBColumn;
ToolButton7: TToolButton; ToolButton7: TToolButton;
procedure TBCloseClick(Sender: TObject); procedure TBCloseClick(Sender: TObject);
procedure FormShow(Sender: TObject); procedure FormShow(Sender: TObject);
@ -283,6 +284,8 @@ begin
//经/纬纱批号简称(网格未绑定列,需显式保存) //经/纬纱批号简称(网格未绑定列,需显式保存)
FieldByName('dr_longitude_batch_short').Value := Order_Sub.fieldbyname('dr_longitude_batch_short').Value; FieldByName('dr_longitude_batch_short').Value := Order_Sub.fieldbyname('dr_longitude_batch_short').Value;
FieldByName('dr_latitude_batch_short').Value := Order_Sub.fieldbyname('dr_latitude_batch_short').Value; FieldByName('dr_latitude_batch_short').Value := Order_Sub.fieldbyname('dr_latitude_batch_short').Value;
//是否含税(显式保存,确保列被隐藏时也能写入)
FieldByName('ISTax').Value := Order_Sub.fieldbyname('ISTax').Value;
Post; Post;
end; end;
Order_Sub.Edit; Order_Sub.Edit;
@ -607,6 +610,7 @@ begin
FieldByName('C_Pattern').Value := frmSalesContractSel.CDS_1.fieldbyname('C_Pattern').Value; FieldByName('C_Pattern').Value := frmSalesContractSel.CDS_1.fieldbyname('C_Pattern').Value;
FieldByName('Piece').Value := frmSalesContractSel.CDS_1.fieldbyname('ConPiece').Value; //合同匹数 FieldByName('Piece').Value := frmSalesContractSel.CDS_1.fieldbyname('ConPiece').Value; //合同匹数
FieldByName('Qty').Value := frmSalesContractSel.CDS_1.fieldbyname('ConQty').Value; //合同数量 FieldByName('Qty').Value := frmSalesContractSel.CDS_1.fieldbyname('ConQty').Value; //合同数量
FieldByName('ISTax').Value := frmSalesContractSel.CDS_1.fieldbyname('IsTax').Value; //是否含税(合同主表带入)
end; end;
//表头带出客户与数量单位(已有值时不覆盖) //表头带出客户与数量单位(已有值时不覆盖)
// if Trim(self.ToCoName.Text) = '' then // if Trim(self.ToCoName.Text) = '' then