~

A01基础公司管理/Company.skincfg

@@ -1,7 +1,7 @@
 [ExpressSkins]
 Default=1
 ShowNotifications=1
-Enabled=0
+Enabled=1
 dxSkinsDefaultPainters=1
 dxSkinBasic=0
 dxSkinBlack=0

B04采购计划管理/PurchasePlan.dproj

@@ -124,7 +124,7 @@
     </PropertyGroup>
     <PropertyGroup Condition="'$(Cfg_2_Win32)'!=''">
         <VerInfo_Keys>CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName)</VerInfo_Keys>
-        <Debugger_HostApplication>D:\Dp10RepoV1\项目代码\D10myXushang\B04采购计划管理\testDll.exe</Debugger_HostApplication>
+        <Debugger_HostApplication>D:\Dp10RepoV1\项目代码\D10xhGemei\B04采购计划管理\testDll.exe</Debugger_HostApplication>
     </PropertyGroup>
     <ItemGroup>
         <DelphiCompile Include="$(MainSource)">

B04采购计划管理/PurchasePlan.skincfg

@@ -1,5 +1,5 @@
 [ExpressSkins]
-Default=0
+Default=1
 ShowNotifications=1
 Enabled=1
 dxSkinBasic=1

T05贸易门市管理/TradeMarket.skincfg

@@ -1,7 +1,7 @@
 [ExpressSkins]
 Default=1
 ShowNotifications=1
-Enabled=0
+Enabled=1
 dxSkinsDefaultPainters=1
 dxSkinBasic=1
 dxSkinBlack=1

T05贸易门市管理/U_TradeMarketInPut.dfm

@@ -76,6 +76,7 @@ inherited frmTradeMarketInPut: TfrmTradeMarketInPut
       AutoSize = True
       Caption = #20462#25913
       ImageIndex = 3
+      OnClick = TBEditClick
     end
   end
   object ToolBar2: TToolBar [1]
@@ -86,7 +87,6 @@ inherited frmTradeMarketInPut: TfrmTradeMarketInPut
     Height = 30
     ButtonHeight = 30
     ButtonWidth = 99
-    Caption = 'ToolBar1'
     EdgeInner = esNone
     EdgeOuter = esNone
     Images = cxImageList_bar
@@ -140,8 +140,6 @@ inherited frmTradeMarketInPut: TfrmTradeMarketInPut
         Height = 509
         Align = alClient
         TabOrder = 0
-        ExplicitLeft = -4
-        ExplicitTop = -1
         object Tv1: TcxGridDBTableView
           OnDblClick = Tv1DblClick
           OnMouseDown = Tv1MouseDown
@@ -340,6 +338,7 @@ inherited frmTradeMarketInPut: TfrmTradeMarketInPut
           end
           object Tv1Column22: TcxGridDBColumn
             Caption = #21382#21490#20215#26684
+            DataBinding.FieldName = 'Lastprice'
             DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Width = 83
@@ -524,7 +523,7 @@ inherited frmTradeMarketInPut: TfrmTradeMarketInPut
             OptionsView.IndicatorWidth = 33
             object cxGridDBColumn8: TcxGridDBColumn
               Caption = #25968#37327
-              DataBinding.FieldName = 'Qty1'
+              DataBinding.FieldName = 'Qty'
               DataBinding.IsNullValueType = True
               PropertiesClassName = 'TcxTextEditProperties'
               Properties.Alignment.Horz = taCenter
@@ -934,8 +933,8 @@ inherited frmTradeMarketInPut: TfrmTradeMarketInPut
     Top = 219
   end
   object PopupMenu1: TPopupMenu
-    Left = 425
+    Left = 49
-    Top = 370
+    Top = 74
     object N5: TMenuItem
       Caption = #20445#23384#21518#31435#21363#25552#20132
       OnClick = N5Click

T05贸易门市管理/U_TradeMarketInPut.pas

@@ -183,6 +183,7 @@ type
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure Tv1CellDblClick(Sender: TcxCustomGridTableView; ACellViewInfo: TcxGridTableDataCellViewInfo; AButton: TMouseButton; AShift: TShiftState; var AHandled: Boolean);
     procedure TBAddClick(Sender: TObject);
+    procedure TBEditClick(Sender: TObject);
   private
     FSCXDH: string;
     procedure InitData();
@@ -205,6 +206,7 @@ type
     fordtype: string;
     FName, FColor, FColorNo: string;
     FTIMID: string;
+    FIncludeTax: Double;
     { Public declarations }
   end;
 
@@ -291,15 +293,17 @@ end;
 
 procedure TfrmTradeMarketInPut.TBAddClick(Sender: TObject);
 begin
-  CDS_1.Close;
+ { CDS_1.Close;
   InitData();
   SClearData(ScrollBox1, 2); //清空容器中控件的内容
   CustName.Text := '';
   if CDS_1.IsEmpty then
   begin
     AddLine();
-  end;
+  end;    }
-
+  PState := 0;
+  FTMMId := '';
+  FormShow(Self);
 end;
 
 procedure TfrmTradeMarketInPut.TBCloseClick(Sender: TObject);
@@ -309,6 +313,24 @@ begin
 
 end;
 
+procedure TfrmTradeMarketInPut.TBEditClick(Sender: TObject);
+begin
+//  if TBSave.Visible = False then
+//  begin
+  PState := 1;
+  FTMMId := self.FTMMId;
+
+  TBSave.Enabled := true;
+  ScrollBox1.Enabled := True;
+  ToolBar2.Enabled := true;
+  ToolButton2.Enabled := True;
+  ToolButton1.Enabled := True;
+  N2.Visible := true;
+//    FormShow(Self);
+//  end;
+
+end;
+
 procedure TfrmTradeMarketInPut.InitData();
 var
   FDate: TDateTime;
@@ -336,18 +358,18 @@ begin
   begin
     Close;
     SQL.Clear;
-    sql.Add(' select A.*,StkQty = isnull(B.StkQty,0),C.QTY  from Trade_Market_Sub A left join Bs_Cloth_IO B on A.C_Code=B.C_Code ');
+    sql.Add('select A.*,StkQty =(select sum(isnull(X.StkQty,0)) from Bs_Cloth_IO X where X.C_Code=A.C_Code and X.C_Color=A.C_Color)   ');
-    SQL.ADD('left join Trade_Market_Sub_Qty C on A.TMSID=C.TMSID');
+    sql.Add('from Trade_Market_Sub   A  ');
     SQL.adD('where 1=1 ');
     if PState = 1 then
     begin
-      sql.Add(' and C.TMMID=''' + Trim(FTMMID) + '''');
+      sql.Add(' and A.TMMID=''' + Trim(FTMMID) + '''');
     end;
     if PState = 0 then
     begin
       sql.Add(' and 1<>1');
     end;
-    ShowMessage(SQL.TEXT);
+//    ShowMessage(SQL.TEXT);
     Open;
 
   end;
@@ -665,14 +687,17 @@ begin
     end;
     if btnFlag = 3 then //保存后立即新增
     begin
-      CDS_1.Close;
+      PState := 0;
-      InitData();
+      FTMMId := '';
-      SClearData(ScrollBox1, 2); //Çå¿ÕÈÝÆ÷ÖпؼþµÄÄÚÈÝ
+      FormShow(Self);
-      CustName.Text := '';
+//      CDS_1.Close;
-      if CDS_1.IsEmpty then
+//      InitData();
-      begin
+//      SClearData(ScrollBox1, 2); //Çå¿ÕÈÝÆ÷ÖпؼþµÄÄÚÈÝ
-        AddLine();
+//      CustName.Text := '';
-      end;
+//      if CDS_1.IsEmpty then
+//      begin
+//        AddLine();
+//      end;
     end;
   except
     Result := False;
@@ -1055,6 +1080,7 @@ begin
   end;
   self.ShippingAddress.Text := Trim(adotemp.fieldbyname('mxaddress').AsString);
   self.CONTACT.Text := Trim(adotemp.fieldbyname('Telephone').AsString);
+
 end;
 
 procedure TfrmTradeMarketInPut.cxDBImage1DblClick(Sender: TObject);
@@ -1481,6 +1507,17 @@ procedure TfrmTradeMarketInPut.Tv1Column12PropertiesEditValueChanged(Sender: TOb
 var
   mvalue, FFieldName: string;
 begin
+  with ADOTemp do
+  begin
+    close;
+    sql.Clear;
+    sql.Add(' select isnull(IncludeTax,0)IncludeTax from Bs_Company a    ');
+    sql.Add('where CoCode=' + QuotedStr(CustName.hint));
+    open;
+  end;
+
+  FIncludeTax := ADOTemp.Fieldbyname('IncludeTax').asfloat;
+
   FFieldName := Trim(Tv1.Controller.FocusedColumn.DataBinding.FilterFieldName);
   mvalue := TcxTextEdit(Sender).EditingText;
 
@@ -1492,9 +1529,30 @@ begin
     ADO_YS.Locate('C_ColorNo', mvalue, []);
     Edit;
     FieldByName('C_Color').Value := ADO_YS.FieldByName('C_Color').Value;
-    FieldByName('price').Value := ADO_YS.FieldByName('price').Value;
+    FieldByName('price').Value := ADO_YS.FieldByName('price').Value * (1 + (FIncludeTax / 100));
+    FieldByName('referencePrice').Value := ADO_YS.FieldByName('Price').Value;
     Post;
   end;
+
+  with ADOTemp do
+  begin
+    close;
+    sql.Clear;
+    sql.Add('  SELECT top 1 isnull(Price,0) as Lastprice FROM Trade_Market_Main A inner join  Trade_Market_Sub B on A.TMMId=B.TMMId ');
+    sql.Add('where A.CustName=' + QuotedStr(CustName.Text));
+    sql.Add('and B.C_ColorNo=' + QuotedStr(CDS_1.FieldByName('C_ColorNo').AsString));
+    sql.add('order by A.filltime desc');
+    open;
+  end;
+  if ADOTemp.IsEmpty = false then
+  begin
+    with Self.CDS_1 do
+    begin
+      edit;
+      Fieldbyname('Lastprice').AsString := trim(ADOTemp.Fieldbyname('Lastprice').AsString);
+      Post;
+    end;
+  end;
 end;
 
 procedure TfrmTradeMarketInPut.Tv1Column1PropertiesButtonClick(Sender: TObject; AButtonIndex: Integer);
@@ -1558,6 +1616,7 @@ begin
   finally
     frmPictureUpload.free;
   end;
+
 end;
 
 procedure TfrmTradeMarketInPut.Tv1Column7PropertiesEditValueChanged(Sender: TObject);
@@ -1579,6 +1638,7 @@ begin
     FieldByName('TMSUnit').Value := ADO_PM.FieldByName('qtyunit').Value;
 
     FieldByName('StkQty').Value := ADO_PM.FieldByName('StkQty').Value;
+
     Post;
   end;
 

T05贸易门市管理/U_TradeMarketList.dfm

@@ -3,13 +3,13 @@ inherited frmTradeMarketList: TfrmTradeMarketList
   Top = 13
   Caption = #22823#36135#21333
   ClientHeight = 594
-  ClientWidth = 1985
+  ClientWidth = 1924
   Color = clBtnFace
   Font.Height = -16
   FormStyle = fsMDIChild
   Position = poScreenCenter
   Visible = True
-  ExplicitWidth = 2001
+  ExplicitWidth = 1940
   ExplicitHeight = 633
   PixelsPerInch = 96
   TextHeight = 21
@@ -17,7 +17,7 @@ inherited frmTradeMarketList: TfrmTradeMarketList
     Tag = 1
     Left = 0
     Top = 0
-    Width = 1985
+    Width = 1924
     Height = 30
     AutoSize = True
     ButtonHeight = 30
@@ -167,7 +167,7 @@ inherited frmTradeMarketList: TfrmTradeMarketList
   object Panel1: TPanel [1]
     Left = 0
     Top = 30
-    Width = 1985
+    Width = 1924
     Height = 91
     Align = alTop
     BevelInner = bvRaised
@@ -237,7 +237,7 @@ inherited frmTradeMarketList: TfrmTradeMarketList
     inline frmFrameDateSel1: TfrmFrameDateSel
       Left = 2
       Top = 2
-      Width = 1981
+      Width = 1920
       Height = 37
       Align = alTop
       Color = clWhite
@@ -246,7 +246,7 @@ inherited frmTradeMarketList: TfrmTradeMarketList
       TabOrder = 4
       ExplicitLeft = 2
       ExplicitTop = 2
-      ExplicitWidth = 1981
+      ExplicitWidth = 1920
       ExplicitHeight = 37
       inherited lbl2: TLabel
         Width = 16
@@ -259,7 +259,7 @@ inherited frmTradeMarketList: TfrmTradeMarketList
   object cxGrid1: TcxGrid [2]
     Left = 0
     Top = 152
-    Width = 1985
+    Width = 1924
     Height = 442
     Align = alClient
     PopupMenu = PM_1
@@ -507,13 +507,13 @@ inherited frmTradeMarketList: TfrmTradeMarketList
   object cxTabControl1: TcxTabControl [3]
     Left = 0
     Top = 121
-    Width = 1985
+    Width = 1924
     Height = 31
     Align = alTop
     TabOrder = 2
     Properties.CustomButtons.Buttons = <>
     Properties.Style = 9
-    Properties.TabIndex = 2
+    Properties.TabIndex = 3
     Properties.Tabs.Strings = (
       '      '#24453#25552#20132'       '
       '      '#24453#23457#26680'          '
@@ -522,7 +522,7 @@ inherited frmTradeMarketList: TfrmTradeMarketList
       '      '#20840#37096'      ')
     OnChange = cxTabControl1Change
     ClientRectBottom = 31
-    ClientRectRight = 1985
+    ClientRectRight = 1924
     ClientRectTop = 28
   end
   inherited loadProcess: TPanel

T05贸易门市管理/U_TradeMarketList.pas

@@ -15,7 +15,8 @@ uses
   IdFTP, ShellAPI, cxDropDownEdit, cxCheckBox, RM_e_Graphic, RM_e_Jpeg,
   cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, dxBarBuiltInMenu, Math,
   dxDateRanges, IdExplicitTLSClientServerBase, U_BaseList, Vcl.Clipbrd,
-  dxScrollbarAnnotations, cxProgressBar, FrameDateSel;
+  dxScrollbarAnnotations, cxProgressBar, FrameDateSel, dxSkinsCore,
+  dxSkinsDefaultPainters;
 
 type
   TfrmTradeMarketList = class(TfrmBaseList)
@@ -299,7 +300,7 @@ begin
       end;
 
   end;
- // ShowMessage(SqlStr);
+//  ShowMessage(SqlStr);
   InitCDSData(ADOQueryMain, Order_Main, Tv1, SqlStr, FilterStr, 'TMMId');
 end;
 
@@ -735,6 +736,7 @@ begin
       frmTradeMarketInPut.fordtype := self.fordtype;
       TvMX.OnCellDblClick := nil;
       Panel5.Enabled := False;
+      canshu4 := self.canshu4;
       if ShowModal = 1 then
       begin