diff --git a/E03梭织å�¯å¸ƒæ£€éªŒ/U_SCPersonColor.pas b/E03梭织å�¯å¸ƒæ£€éªŒ/U_SCPersonColor.pas index 1ce9f0b..95c01d5 100644 --- a/E03梭织å�¯å¸ƒæ£€éªŒ/U_SCPersonColor.pas +++ b/E03梭织å�¯å¸ƒæ£€éªŒ/U_SCPersonColor.pas @@ -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') else if ftype = '»ų́ºÏͬ' then begin - //Áгö¸Ã»ų́°ó¶¨µÄºÏͬ£¨FlagStr´«»ų́ºÅ£©£¬°´Å¥ÏÔʾ"ºÏͬºÅ+²úÆ·Ãû"£¬Hint´æ"ºÏͬºÅ|²úÆ·±àºÅ" + //Áгö¸Ã»ų́°ó¶¨µÄºÏͬ£¨FlagStr´«»ų́ºÅ£©£¬°´Å¥ÏÔʾ"ºÏͬºÅ+²úÆ·±àºÅ+²úÆ·Ãû"£¬Hint´æ"ºÏͬºÅ|²úÆ·±àºÅ" 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(' left join Bs_Cloth_Info B on B.C_Code = A.C_CodeName'); @@ -128,7 +128,7 @@ begin end else if ftype = '»ų́ºÏͬ' then 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); end else diff --git a/E03梭织å�¯å¸ƒæ£€éªŒ/U_TatClothInspList.pas b/E03梭织å�¯å¸ƒæ£€éªŒ/U_TatClothInspList.pas index fbecb46..5b93ade 100644 --- a/E03梭织å�¯å¸ƒæ£€éªŒ/U_TatClothInspList.pas +++ b/E03梭织å�¯å¸ƒæ£€éªŒ/U_TatClothInspList.pas @@ -613,7 +613,7 @@ begin if FileExists(fPrintFile) then begin RM1.LoadFromFile(fPrintFile); - Rm1.DefaultCopies := 2; + Rm1.DefaultCopies := 1; RM1.PrintReport; end else diff --git a/E03梭织å�¯å¸ƒæ£€éªŒ/U_TatMachInsp.dfm b/E03梭织å�¯å¸ƒæ£€éªŒ/U_TatMachInsp.dfm index ce47830..bcf204d 100644 --- a/E03梭织å�¯å¸ƒæ£€éªŒ/U_TatMachInsp.dfm +++ b/E03梭织å�¯å¸ƒæ£€éªŒ/U_TatMachInsp.dfm @@ -37,8 +37,6 @@ ParentBackground = False ParentFont = False TabOrder = 0 - ExplicitLeft = 2 - ExplicitTop = 126 object lblLenUnit: TLabel Left = 218 Top = 65 diff --git a/E03梭织å�¯å¸ƒæ£€éªŒ/U_TatMachInsp.pas b/E03梭织å�¯å¸ƒæ£€éªŒ/U_TatMachInsp.pas index c07585a..2792304 100644 --- a/E03梭织å�¯å¸ƒæ£€éªŒ/U_TatMachInsp.pas +++ b/E03梭织å�¯å¸ƒæ£€éªŒ/U_TatMachInsp.pas @@ -1135,6 +1135,8 @@ begin end; end; procedure TfrmTatMachInsp.CodeNameExit(Sender: TObject); +var + MHasAny: Boolean; begin if Trim(CodeName.Text) = '' then Exit; @@ -1146,35 +1148,46 @@ begin SQL.Add('SELECT * FROM Bs_Cloth_Info WHERE C_Name = ' + QuotedStr(CodeName.Text)); Open; end; - if (not ADOTmp.IsEmpty) and (ADOTmp.FieldByName('Status').AsInteger = 5) then - begin - code.Text := Trim(ADOTmp.FieldByName('C_Code').AsString); - CodeName.Text := Trim(ADOTmp.FieldByName('C_Name').AsString); - MF.Text := Trim(ADOTmp.FieldByName('C_Width').AsString); - KZ.Text := Trim(ADOTmp.FieldByName('C_GramWeight').AsString); - SPEC.Text := Trim(ADOTmp.FieldByName('C_SPEC').AsString); - C_LongitudeBatchNo.Text := Trim(ADOTmp.FieldByName('C_LongitudeBatchNo').AsString); - C_LatitudeBatchNo.Text := Trim(ADOTmp.FieldByName('C_LatitudeBatchNo').AsString); - FInLongitudeBatchShort := Trim(ADOTmp.FieldByName('c_longitude_batch_short').AsString); - FInLatitudeBatchShort := Trim(ADOTmp.FieldByName('c_latitude_batch_short').AsString); - FMainId := ''; - FSubId := ''; - Label14.Caption := '¶©µ¥ºÅ'; - end - else - begin - if ADOTmp.IsEmpty then - Application.MessageBox('δÕÒµ½¸Ã²úÆ·Ãû³Æ£¬ÇëÖØÐÂÊäÈ룡', 'Ìáʾ', MB_ICONWARNING) + MHasAny := not ADOTmp.IsEmpty; + //Ö»¿´ÆôÓÃ(Status=5)¼Ç¼£º²»Ö¹Ò»ÌõʱÎÞ·¨È·¶¨´øÄÄÌõ£¬²»´øÈëÒ²²»Çå¿Õ + ADOTmp.Filter := 'Status = 5'; + ADOTmp.Filtered := True; + try + if ADOTmp.RecordCount > 1 then + Exit; + if not ADOTmp.IsEmpty then + begin + code.Text := Trim(ADOTmp.FieldByName('C_Code').AsString); + CodeName.Text := Trim(ADOTmp.FieldByName('C_Name').AsString); + MF.Text := Trim(ADOTmp.FieldByName('C_Width').AsString); + KZ.Text := Trim(ADOTmp.FieldByName('C_GramWeight').AsString); + SPEC.Text := Trim(ADOTmp.FieldByName('C_SPEC').AsString); + C_LongitudeBatchNo.Text := Trim(ADOTmp.FieldByName('C_LongitudeBatchNo').AsString); + C_LatitudeBatchNo.Text := Trim(ADOTmp.FieldByName('C_LatitudeBatchNo').AsString); + FInLongitudeBatchShort := Trim(ADOTmp.FieldByName('c_longitude_batch_short').AsString); + FInLatitudeBatchShort := Trim(ADOTmp.FieldByName('c_latitude_batch_short').AsString); + FMainId := ''; + FSubId := ''; + Label14.Caption := '¶©µ¥ºÅ'; + end else - Application.MessageBox('¸Ã²úÆ·ÒÑÍ£Ó㬲»ÄÜʹÓã¡', 'Ìáʾ', MB_ICONWARNING); - code.Text := ''; - MF.Text := ''; - KZ.Text := ''; - SPEC.Text := ''; - C_LongitudeBatchNo.Text := ''; - C_LatitudeBatchNo.Text := ''; - FInLongitudeBatchShort := ''; - FInLatitudeBatchShort := ''; + begin + if not MHasAny then + Application.MessageBox('δÕÒµ½¸Ã²úÆ·Ãû³Æ£¬ÇëÖØÐÂÊäÈ룡', 'Ìáʾ', MB_ICONWARNING) + else + Application.MessageBox('¸Ã²úÆ·ÒÑÍ£Ó㬲»ÄÜʹÓã¡', 'Ìáʾ', MB_ICONWARNING); + code.Text := ''; + MF.Text := ''; + KZ.Text := ''; + SPEC.Text := ''; + C_LongitudeBatchNo.Text := ''; + C_LatitudeBatchNo.Text := ''; + FInLongitudeBatchShort := ''; + FInLatitudeBatchShort := ''; + end; + finally + ADOTmp.Filtered := False; + ADOTmp.Filter := ''; end; end; procedure TfrmTatMachInsp.ComboBox1Change(Sender: TObject); diff --git a/E04梭织å�¯å¸ƒä»“库/U_TatClothInList.dfm b/E04梭织å�¯å¸ƒä»“库/U_TatClothInList.dfm index cf89e44..670dde8 100644 --- a/E04梭织å�¯å¸ƒä»“库/U_TatClothInList.dfm +++ b/E04梭织å�¯å¸ƒä»“库/U_TatClothInList.dfm @@ -199,7 +199,7 @@ inherited frmTatClothInList: TfrmTatClothInList Width = 26 Height = 12 Hint = '0' - Caption = #33457#22411 + Caption = #21152#37325 Font.Charset = GB2312_CHARSET Font.Color = clWindowText Font.Height = -12 @@ -351,7 +351,7 @@ inherited frmTatClothInList: TfrmTatClothInList TabOrder = 10 OnKeyPress = carnoKeyPress end - object C_Pattern: TEdit + object add_weight: TEdit Tag = 2 Left = 553 Top = 32 @@ -499,6 +499,7 @@ inherited frmTatClothInList: TfrmTatClothInList ParentFont = False PopupMenu = PM_1 TabOrder = 3 + ExplicitTop = 131 object Tv1: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> ScrollbarAnnotations.CustomAnnotations = <> @@ -917,6 +918,14 @@ inherited frmTatClothInList: TfrmTatClothInList HeaderAlignmentHorz = taCenter Width = 80 end + object Tv1add_weight: TcxGridDBColumn + Caption = #21152#37325 + DataBinding.FieldName = 'add_weight' + DataBinding.IsNullValueType = True + Visible = False + HeaderAlignmentHorz = taCenter + Width = 80 + end end object cxGrid1Level1: TcxGridLevel GridView = Tv1 diff --git a/E04梭织å�¯å¸ƒä»“库/U_TatClothInList.pas b/E04梭织å�¯å¸ƒä»“库/U_TatClothInList.pas index 4d68de7..19bf9d2 100644 --- a/E04梭织å�¯å¸ƒä»“库/U_TatClothInList.pas +++ b/E04梭织å�¯å¸ƒä»“库/U_TatClothInList.pas @@ -87,7 +87,7 @@ type C_Name: TEdit; C_Color: TEdit; jyg: TEdit; - C_Pattern: TEdit; + add_weight: TEdit; C_Code: TEdit; VC_BaoID: TcxGridDBColumn; Tv1Column9: TcxGridDBColumn; @@ -113,6 +113,7 @@ type Tv1ContractBuyName: TcxGridDBColumn; Tv1in_longitude_batch_short: TcxGridDBColumn; Tv1in_latitude_batch_short: TcxGridDBColumn; + Tv1add_weight: TcxGridDBColumn; procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure FormCreate(Sender: TObject); procedure TBRafreshClick(Sender: TObject); diff --git a/E04梭织å�¯å¸ƒä»“库/U_TatDRList.dfm b/E04梭织å�¯å¸ƒä»“库/U_TatDRList.dfm index b15c209..450a56a 100644 --- a/E04梭织å�¯å¸ƒä»“库/U_TatDRList.dfm +++ b/E04梭织å�¯å¸ƒä»“库/U_TatDRList.dfm @@ -617,6 +617,14 @@ inherited frmTatDRList: TfrmTatDRList Options.Editing = False Width = 70 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 Caption = #25968#37327#21333#20301 DataBinding.FieldName = 'QtyUnit' diff --git a/E04梭织å�¯å¸ƒä»“库/U_TatDRList.pas b/E04梭织å�¯å¸ƒä»“库/U_TatDRList.pas index 48539bd..417643e 100644 --- a/E04梭织å�¯å¸ƒä»“库/U_TatDRList.pas +++ b/E04梭织å�¯å¸ƒä»“库/U_TatDRList.pas @@ -90,6 +90,7 @@ type TV2DR_LongitudeBatchNo: TcxGridDBColumn; TV2DR_LatitudeBatchNo: TcxGridDBColumn; TV2UnitPrice: TcxGridDBColumn; + TV2ISTax: TcxGridDBColumn; //RMllPDFExport1: TRMllPDFExport; procedure FormDestroy(Sender: TObject); procedure FormClose(Sender: TObject; var Action: TCloseAction); diff --git a/E04梭织å�¯å¸ƒä»“库/U_TatDRtInPut.dfm b/E04梭织å�¯å¸ƒä»“库/U_TatDRtInPut.dfm index 21b7ba2..c2285d5 100644 --- a/E04梭织å�¯å¸ƒä»“库/U_TatDRtInPut.dfm +++ b/E04梭织å�¯å¸ƒä»“库/U_TatDRtInPut.dfm @@ -387,6 +387,18 @@ object frmTatDRtInPut: TfrmTatDRtInPut HeaderAlignmentHorz = taCenter Width = 70 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 Caption = #35745#21010#21333#21495 DataBinding.FieldName = 'orderno' diff --git a/E04梭织å�¯å¸ƒä»“库/U_TatDRtInPut.pas b/E04梭织å�¯å¸ƒä»“库/U_TatDRtInPut.pas index ae38e18..63f0f6f 100644 --- a/E04梭织å�¯å¸ƒä»“库/U_TatDRtInPut.pas +++ b/E04梭织å�¯å¸ƒä»“库/U_TatDRtInPut.pas @@ -59,6 +59,7 @@ type Tv1DR_LongitudeBatchNo: TcxGridDBColumn; Tv1DR_LatitudeBatchNo: TcxGridDBColumn; Tv1UnitPrice: TcxGridDBColumn; + Tv1ISTax: TcxGridDBColumn; ToolButton7: TToolButton; procedure TBCloseClick(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_latitude_batch_short').Value := Order_Sub.fieldbyname('dr_latitude_batch_short').Value; + //ÊÇ·ñº¬Ë°(ÏÔʽ±£´æ£¬È·±£Áб»Òþ²ØÊ±Ò²ÄÜдÈë) + FieldByName('ISTax').Value := Order_Sub.fieldbyname('ISTax').Value; Post; end; Order_Sub.Edit; @@ -607,6 +610,7 @@ begin FieldByName('C_Pattern').Value := frmSalesContractSel.CDS_1.fieldbyname('C_Pattern').Value; FieldByName('Piece').Value := frmSalesContractSel.CDS_1.fieldbyname('ConPiece').Value; //ºÏͬƥÊý FieldByName('Qty').Value := frmSalesContractSel.CDS_1.fieldbyname('ConQty').Value; //ºÏͬÊýÁ¿ + FieldByName('ISTax').Value := frmSalesContractSel.CDS_1.fieldbyname('IsTax').Value; //ÊÇ·ñº¬Ë°(ºÏͬÖ÷±í´øÈë) end; //±íÍ·´ø³ö¿Í»§ÓëÊýÁ¿µ¥Î»£¨ÒÑÓÐֵʱ²»¸²¸Ç£© // if Trim(self.ToCoName.Text) = '' then