修改

云翔一码通/U_KuWeiList.dfm

@@ -234,7 +234,7 @@ object frmKuWeiList: TfrmKuWeiList
       Left = 53
       Top = 12
       Width = 60
-      Height = 24
+      Height = 23
       Font.Charset = GB2312_CHARSET
       Font.Color = clWindowText
       Font.Height = -15
@@ -249,7 +249,7 @@ object frmKuWeiList: TfrmKuWeiList
       Left = 165
       Top = 12
       Width = 60
-      Height = 24
+      Height = 23
       Font.Charset = GB2312_CHARSET
       Font.Color = clWindowText
       Font.Height = -15
@@ -264,7 +264,7 @@ object frmKuWeiList: TfrmKuWeiList
       Left = 261
       Top = 12
       Width = 60
-      Height = 24
+      Height = 23
       Font.Charset = GB2312_CHARSET
       Font.Color = clWindowText
       Font.Height = -15
@@ -279,7 +279,7 @@ object frmKuWeiList: TfrmKuWeiList
       Left = 497
       Top = 12
       Width = 152
-      Height = 24
+      Height = 23
       Font.Charset = GB2312_CHARSET
       Font.Color = clWindowText
       Font.Height = -15
@@ -294,7 +294,7 @@ object frmKuWeiList: TfrmKuWeiList
       Left = 357
       Top = 12
       Width = 60
-      Height = 24
+      Height = 23
       Font.Charset = GB2312_CHARSET
       Font.Color = clWindowText
       Font.Height = -15

云翔一码通/U_KuWeiList.pas

@@ -80,7 +80,6 @@ type
     procedure N1Click(Sender: TObject);
     procedure cxTabControl1Change(Sender: TObject);
     procedure ZJStatusChange(Sender: TObject);
-    procedure ToolButton4Click(Sender: TObject);
     procedure TbSelectClick(Sender: TObject);
     procedure Tv1DblClick(Sender: TObject);
   private
@@ -88,7 +87,6 @@ type
     DQdate:TDateTime;
     procedure InitGrid();
     procedure InitForm();
-    procedure PrtData(KWID:String);
     { Private declarations }
   public
     FFInt,FCloth:Integer;
@@ -212,82 +210,6 @@ begin
   TBFind.Click;
 end;
 
-procedure TfrmKuWeiList.ToolButton4Click(Sender: TObject);
-begin
-  if Order_Main.IsEmpty then Exit;
-  if Trim(ComboBox1.Text)='' then
-  begin
-    Application.MessageBox('方向不能为空！','提示',0);
-    Exit;
-  end;
-  if Order_Main.Locate('SSel',True,[])=False then
-  begin
-    Application.MessageBox('没有选择数据!','提示',0);
-    Exit;
-  end;
-  Order_Main.DisableControls;
-  with Order_Main do
-  begin
-    First;
-    while Locate('SSel',True,[]) do
-    begin
-      PrtData(Trim(Order_Main.fieldbyname('KWID').AsString));
-      Edit;
-      FieldByName('SSel').Value:=False;
-    end;
-  end;
-  Order_Main.EnableControls;
-end;
-procedure TfrmKuWeiList.PrtData(KWID:String);
-var
-   fPrintFile,Txt,fImagePath:string;
-   i,j:Integer;
-   Moudle: THandle;
-   Makebar:TMakebar;
-   Mixtext:TMixtext;
-begin
-  fPrintFile:= ExtractFilePath(Application.ExeName) + 'Report\库位标签.rmf';
-  if FileExists(fPrintFile)=False then
-  begin
-    Application.MessageBox(PChar('没有找'+ExtractFilePath(Application.ExeName)+'Report\库位标签.rmf'),'提示',0);
-    exit;
-  end;
-  with ADOQueryTemp do
-  begin
-    Close;
-    SQL.Clear;
-    sql.Add('select * from KuWei where KWID='''+Trim(KWID)+'''');
-    Open;
-  end;
-  SCreateCDS20(ADOQueryTemp,CDS_PRT);
-  SInitCDSData20(ADOQueryTemp,CDS_PRT);
-  try
-    Moudle:=LoadLibrary('MakeQRBarcode.dll');
-    @Makebar:=GetProcAddress(Moudle,'Make');
-    @Mixtext:=GetProcAddress(Moudle,'MixText');
-    Txt:=Trim(KWID);
-    fImagePath:=ExtractFilePath(Application.ExeName)+'image\temp.bmp';
-    if not DirectoryExists(pchar(ExtractFilePath(Application.ExeName)+'image')) then
-      CreateDirectory(pchar(ExtractFilePath(Application.ExeName)+'image'),nil);
-    if FileExists(fImagePath) then DeleteFile(fImagePath);
-    Makebar(pchar(Txt),Length(Txt),3,3,0,PChar(fImagePath),3);
-  except
-    application.MessageBox('二维码生成失败！','提示信息',MB_ICONERROR);
-    exit;
-  end;
-  RMVariables['QRBARCODE']:=fImagePath;
-  if Trim(ComboBox1.Text)='→' then
-  begin
-    RMVariables['FangXiang']:='→→→→';
-  end else
-  if Trim(ComboBox1.Text)='←' then
-  begin
-    RMVariables['FangXiang']:='←←←←';
-  end;
-  RM1.LoadFromFile(fPrintFile);
-  //RM1.ShowReport;
-  RM1.PrintReport;
-end;
 
 procedure TfrmKuWeiList.TbSelectClick(Sender: TObject);
 begin

云翔一码通/U_KuWeiList.pas.rej

@@ -0,0 +1,84 @@
+diff a/云翔一码通/U_KuWeiList.pas b/云翔一码通/U_KuWeiList.pas	(rejected hunks)
+@@ -212,6 +212,82 @@
+   TBFind.Click;
+ end;
+ 
++procedure TfrmKuWeiList.ToolButton4Click(Sender: TObject);
++begin
++  if Order_Main.IsEmpty then Exit;
++  if Trim(ComboBox1.Text)='' then
++  begin
++    Application.MessageBox('<27><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ϊ<EFBFBD>գ<EFBFBD>','<27><>ʾ',0);
++    Exit;
++  end;
++  if Order_Main.Locate('SSel',True,[])=False then
++  begin
++    Application.MessageBox('û<><C3BB>ѡ<EFBFBD><D1A1><EFBFBD><EFBFBD><EFBFBD><EFBFBD>!','<27><>ʾ',0);
++    Exit;
++  end;
++  Order_Main.DisableControls;
++  with Order_Main do
++  begin
++    First;
++    while Locate('SSel',True,[]) do
++    begin
++      PrtData(Trim(Order_Main.fieldbyname('KWID').AsString));
++      Edit;
++      FieldByName('SSel').Value:=False;
++    end;
++  end;
++  Order_Main.EnableControls;
++end;
++procedure TfrmKuWeiList.PrtData(KWID:String);
++var
++   fPrintFile,Txt,fImagePath:string;
++   i,j:Integer;
++   Moudle: THandle;
++   Makebar:TMakebar;
++   Mixtext:TMixtext;
++begin
++  fPrintFile:= ExtractFilePath(Application.ExeName) + 'Report\<5C><>λ<EFBFBD><CEBB>ǩ.rmf';
++  if FileExists(fPrintFile)=False then
++  begin
++    Application.MessageBox(PChar('û<><C3BB><EFBFBD><EFBFBD>'+ExtractFilePath(Application.ExeName)+'Report\<5C><>λ<EFBFBD><CEBB>ǩ.rmf'),'<27><>ʾ',0);
++    exit;
++  end;
++  with ADOQueryTemp do
++  begin
++    Close;
++    SQL.Clear;
++    sql.Add('select * from KuWei where KWID='''+Trim(KWID)+'''');
++    Open;
++  end;
++  SCreateCDS20(ADOQueryTemp,CDS_PRT);
++  SInitCDSData20(ADOQueryTemp,CDS_PRT);
++  try
++    Moudle:=LoadLibrary('MakeQRBarcode.dll');
++    @Makebar:=GetProcAddress(Moudle,'Make');
++    @Mixtext:=GetProcAddress(Moudle,'MixText');
++    Txt:=Trim(KWID);
++    fImagePath:=ExtractFilePath(Application.ExeName)+'image\temp.bmp';
++    if not DirectoryExists(pchar(ExtractFilePath(Application.ExeName)+'image')) then
++      CreateDirectory(pchar(ExtractFilePath(Application.ExeName)+'image'),nil);
++    if FileExists(fImagePath) then DeleteFile(fImagePath);
++    Makebar(pchar(Txt),Length(Txt),3,3,0,PChar(fImagePath),3);
++  except
++    application.MessageBox('<27><>ά<EFBFBD><CEAC><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʧ<EFBFBD>ܣ<EFBFBD>','<27><>ʾ<EFBFBD><CABE>Ϣ',MB_ICONERROR);
++    exit;
++  end;
++  RMVariables['QRBARCODE']:=fImagePath;
++  if Trim(ComboBox1.Text)='<27><>' then
++  begin
++    RMVariables['FangXiang']:='<27><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>';
++  end else
++  if Trim(ComboBox1.Text)='<27><>' then
++  begin
++    RMVariables['FangXiang']:='<27><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>';
++  end;
++  RM1.LoadFromFile(fPrintFile);
++  //RM1.ShowReport;
++  RM1.PrintReport;
++end;
+ 
+ procedure TfrmKuWeiList.TbSelectClick(Sender: TObject);
+ begin

云翔一码通/U_YMTJGWCList.pas

@@ -125,7 +125,7 @@ implementation
 
 uses
   U_DataLink, U_RTFun, U_YMTRKInPut, U_ZdyAttachGYS, U_LabelPrintFun,
-  U_ZDYHelp;
+  U_ZDYHelp, U_KuWeiList;
 
 {$R *.dfm}
 
@@ -369,22 +369,20 @@ end;
 procedure TfrmYMTJGWCList.KuWeiPropertiesButtonClick(Sender: TObject; AButtonIndex: Integer);
 begin
    try
-    frmZDYHelp := TfrmZDYHelp.Create(Application);
+    frmKuWeiList := TfrmKuWeiList.Create(Application);
-    with frmZDYHelp do
+    with frmKuWeiList do
     begin
-      flag := 'KuWei';
-      flagname := '¿âλ';
       if ShowModal = 1 then
       begin
         with Self.CDS_Main do
         begin
           Edit;
-          KuWei.Text := Trim(frmZDYHelp.ClientDataSet1.fieldbyname('ZdyName').AsString);
+          FieldByName('KuWei').Value := Trim(frmKuWeiList.Order_Main.fieldbyname('KWName').AsString);
         end;
       end;
     end;
   finally
-    frmZDYHelp.Free;
+    frmKuWeiList.Free;
   end;
 end;
 

云翔一码通/U_YMTRKInPut.dfm

@@ -297,7 +297,7 @@ object frmYMTRKInPut: TfrmYMTRKInPut
       end
       object Tv1IsTax: TcxGridDBColumn
         Tag = 2
-        Caption = #31246#29366
+        Caption = #31246#20917
         DataBinding.FieldName = 'IsTax'
         PropertiesClassName = 'TcxComboBoxProperties'
         Properties.DropDownListStyle = lsFixedList

云翔一码通/U_YMTRKInPut.pas

@@ -98,10 +98,8 @@ type
     procedure FormShow(Sender: TObject);
     procedure TBDelClick(Sender: TObject);
     procedure TBSaveClick(Sender: TObject);
-    procedure v1Column3PropertiesButtonClick(Sender: TObject; AButtonIndex: Integer);
     procedure v1Column14PropertiesButtonClick(Sender: TObject; AButtonIndex: Integer);
     procedure v2Column1PropertiesButtonClick(Sender: TObject; AButtonIndex: Integer);
-    procedure v1Column5PropertiesButtonClick(Sender: TObject; AButtonIndex: Integer);
     procedure v1Column11PropertiesButtonClick(Sender: TObject; AButtonIndex: Integer);
     procedure v1Column16PropertiesButtonClick(Sender: TObject; AButtonIndex: Integer);
     procedure v1Column18PropertiesButtonClick(Sender: TObject; AButtonIndex: Integer);
@@ -124,6 +122,7 @@ type
     procedure InitMXGrid(SPID: string);
     procedure InitGrid();
     procedure AddRows();
+    function YFData(): Boolean;
   public
     { Public declarations }
     FBCId: string;
@@ -136,9 +135,181 @@ var
 implementation
 
 uses
-  U_DataLink, U_RTFun, U_ZDYHelp, U_ZdyAttachGYS, U_MLMangeYHSel, U_ZdyAttachKH;
+  U_DataLink, U_RTFun, U_ZDYHelp, U_ZdyAttachGYS, U_MLMangeYHSel, U_ZdyAttachKH,U_KuWeiList;
 
 {$R *.dfm}
+function TfrmYMTRKInPut.YFData(): Boolean;
+var
+  CRID, OrdMainId, YFID, FComTaiTou, FCRID, FFactoryName, FFactoryNo: string;
+begin
+  Result := False;
+  FFactoryName := Trim(CDS_Sub.FieldByName('FactoryName').AsString);
+  FFactoryNo := Trim(CDS_Sub.FieldByName('FactoryNo').AsString);
+  with ADOQueryTemp do
+  begin
+    Close;
+    SQL.Clear;
+    sql.Add('select * from YS_Money_KC where FactoryNo=' + quotedstr(Trim(FFactoryNo)));
+    sql.Add(' and KCType=''GYS'' ');
+    Open;
+  end;
+  if ADOQueryTemp.IsEmpty = False then
+  begin
+    CRID := ADOQueryTemp.fieldbyname('CRID').AsString;
+  end
+  else
+  begin
+    with ADOQueryTemp do
+    begin
+      Close;
+      sql.Clear;
+      sql.Add('select * from YS_Money_CRID');
+      Open;
+    end;
+    if ADOQueryTemp.IsEmpty = False then
+    begin
+      with ADOQueryCmd do
+      begin
+        Close;
+        sql.Clear;
+        sql.Add('Update YS_Money_CRID set CRID=CRID+1');
+        sql.Add('select * from YS_Money_CRID ');
+        Open;
+      end;
+    end
+    else
+    begin
+      with ADOQueryCmd do
+      begin
+        Close;
+        sql.Clear;
+        sql.Add('insert into YS_Money_CRID select 0 ');
+        sql.Add('select * from YS_Money_CRID ');
+        Open;
+      end;
+    end;
+
+    CRID := ADOQueryCmd.fieldbyname('CRID').AsString;
+    with ADOQueryCmd do
+    begin
+      Close;
+      SQL.Clear;
+      sql.Add('select * from YS_Money_KC where 1=2');
+      Open;
+    end;
+    with ADOQueryCmd do
+    begin
+      Append;
+      FieldByName('CRID').Value := StrToInt(CRID);
+      FieldByName('FactoryName').Value := Trim(FFactoryName);
+      FieldByName('FactoryNo').Value := Trim(FFactoryNo);
+      FieldByName('ZdyStr1').Value := '壇마마';
+      FieldByName('KCType').Value := 'GYS';
+      Post;
+    end;
+  end;
+
+  with ADOQueryTemp do
+  begin
+    Close;
+    sql.Clear;
+    sql.Add('select * from YS_Money_CR where FactoryNo=' + quotedstr(Trim(FFactoryNo)));
+    sql.Add(' and YFTypeId=''' + Trim(CDS_Sub.fieldbyname('SPID').AsString) + '''');
+    Open;
+  end;
+  if ADOQueryTemp.IsEmpty then
+  begin
+    if GetLSNo(ADOQueryCmd, YFID, 'JG', 'YS_Money_CR', 4, 1) = False then
+    begin
+      Application.MessageBox('혤壇마離댕뵀呵겨!', '瓊刻', 0);
+      Exit;
+    end;
+  end
+  else
+  begin
+    YFID := Trim(ADOQueryTemp.fieldbyname('YFID').AsString);
+  end;
+  with ADOQueryCmd do
+  begin
+    Close;
+    sql.Clear;
+    sql.Add('select * from YS_Money_CR where YFID=''' + Trim(YFID) + '''');
+    Open;
+  end;
+
+  with ADOQueryCmd do
+  begin
+    if ADOQueryTemp.IsEmpty then
+    begin
+      Append;
+      FieldByName('SCQty').Value := CDS_Sub.FieldByName('Qty').Asfloat;
+      FieldByName('SCPS').Value := CDS_Sub.FieldByName('PiQty').Asfloat;
+    end
+    else
+      Edit;
+
+    FieldByName('YFID').Value := Trim(YFID);
+    FieldByName('YFTypeId').Value := Trim(CDS_Sub.fieldbyname('SPID').AsString);
+    FieldByName('CRID').Value := StrToInt(CRID);
+    FieldByName('YFName').Value := '꽃뭔롤';
+    FieldByName('Filler').Value := Trim(DName);
+    FieldByName('CRType').Value := '壇마운되션';
+    FieldByName('CRFlag').Value := '壇마마';
+    FieldByName('ChkStatusP').Value := '灌<>뵙';
+    FieldByName('ChkStatusQ').Value := '灌<>뵙';
+    FieldByName('QtyFlag').Value := 1;
+    FieldByName('FactoryName').Value := Trim(FFactoryName);
+    FieldByName('FactoryNo').Value := Trim(FFactoryNo);
+    FieldByName('CRTime').Value := CDS_Sub.fieldbyname('CRTime').AsString;
+    if CDS_Sub.FieldByName('PriceType').Value = '쵠' then
+    begin
+      FieldByName('Qty').Value := CDS_Sub.FieldByName('Qty').Asfloat;
+      FieldByName('QtyUnit').Value := 'M';
+    end
+    else
+    begin
+      FieldByName('Qty').Value := CDS_Sub.FieldByName('KGQty').Asfloat;
+      FieldByName('QtyUnit').Value := 'KG';
+    end;
+    FieldByName('PS').Value := CDS_Sub.FieldByName('PiQty').Asfloat;
+    FieldByName('YFType').Value := '菱땡<E88FB1>냥';
+    FieldByName('Price').Value := CDS_Sub.FieldByName('Price').Asfloat;
+    FieldByName('Money').Value := CDS_Sub.FieldByName('Money').Asfloat;
+    if CDS_Sub.FieldByName('IsTax').Value = '벵江' then
+    begin
+      FieldByName('HanShui').Value := '벵江';
+    end
+    else
+    begin
+      FieldByName('HanShui').Value := '꼇벵江';
+    end;
+    FieldByName('CKNO').Value := trim(CDS_Sub.fieldbyname('SPID').AsString);
+    FieldByName('SJQty').Value := CDS_Sub.FieldByName('Money').Asfloat;
+    FieldByName('MiQty').Value := CDS_Sub.FieldByName('Qty').Asfloat;
+    FieldByName('KGQty').Value := CDS_Sub.FieldByName('KGQty').Asfloat;
+    FieldByName('JSmoney').Value := CDS_Sub.FieldByName('Money').Asfloat;
+    FieldByName('HSmoney').Value := CDS_Sub.FieldByName('Money').Asfloat;
+    FieldByName('P_CodeName').Value := CDS_Sub.FieldByName('SPName').Asstring;
+    FieldByName('P_MF').Value := CDS_Sub.FieldByName('SPMF').Asstring;
+    FieldByName('P_KZ').Value := CDS_Sub.FieldByName('SPKZ').Asstring;
+    FieldByName('P_Color').Value := CDS_Sub.FieldByName('SPColor').Asstring;
+//    FieldByName('P_ColorNo').Value := Trim(MYColorNo.Text); CDS_Sub.FieldByName('ColorNo').Asstring;
+    FieldByName('P_HX').Value := CDS_Sub.FieldByName('SPHX').Asstring;
+    FieldByName('BZType').Value := '＄';
+    FieldByName('status').Value := '0';
+    Post;
+  end;
+  with ADOQueryCmd do
+  begin
+    Close;
+    sql.Clear;
+    sql.Add('Update YS_Money_KC Set KCMoney=(select isnull(Sum(HSMoney*QtyFlag),0) from YS_Money_CR A where A.CRID=YS_Money_KC.CRID)');
+    sql.Add(' where CRID=' + CRID);
+    ExecSQL;
+  end;
+  Result := True;
+end;
+
 procedure TfrmYMTRKInPut.InitMXGrid(SPID: string);
 begin
   with ADOQueryTemp do
@@ -346,7 +517,7 @@ begin
           FieldByName('CRQtyFlag').Value := 1;
 
           RTSetSaveDataCDS(ADOQueryCmd, Tv1, CDS_Sub, 'YMT_CK_CR', 2);
-
+          YFData();
           if Trim(FFSPID) = '' then
             FieldByName('Filler').Value := Trim(DName)
           else
@@ -534,28 +705,6 @@ begin
   end;
 end;
 
-procedure TfrmYMTRKInPut.v1Column3PropertiesButtonClick(Sender: TObject; AButtonIndex: Integer);
-begin
-  try
-    frmZDYHelp := TfrmZDYHelp.Create(Application);
-    with frmZDYHelp do
-    begin
-      flag := 'SXKuWei';
-      flagname := '¿âλ';
-      if ShowModal = 1 then
-      begin
-        with Self.CDS_Sub do
-        begin
-          Edit;
-          FieldByName('KuWei').Value := Trim(frmZDYHelp.ClientDataSet1.fieldbyname('ZdyName').AsString);
-        end;
-      end;
-    end;
-  finally
-    frmZDYHelp.Free;
-  end;
-end;
-
 procedure TfrmYMTRKInPut.v1Column14PropertiesButtonClick(Sender: TObject; AButtonIndex: Integer);
 begin
   try
@@ -593,7 +742,7 @@ begin
         with Self.CDS_Sub do
         begin
           Edit;
-          FieldByName('spcode').Value := Trim(frmMLMangeYHSel.CDS_Main.fieldbyname('MLXXNO').AsString);
+          FieldByName('SPcode').Value := Trim(frmMLMangeYHSel.CDS_Main.fieldbyname('MLXXNO').AsString);
           FieldByName('SPName').Value := Trim(frmMLMangeYHSel.CDS_Main.fieldbyname('MLName').AsString);
           FieldByName('GYLXName').Value := Trim(frmMLMangeYHSel.CDS_Main.fieldbyname('GYLXName').AsString);
           FieldByName('SPCF').Value := Trim(frmMLMangeYHSel.CDS_Main.fieldbyname('MLCF').AsString);
@@ -608,28 +757,6 @@ begin
   end;
 end;
 
-procedure TfrmYMTRKInPut.v1Column5PropertiesButtonClick(Sender: TObject; AButtonIndex: Integer);
-begin
-  try
-    frmZDYHelp := TfrmZDYHelp.Create(Application);
-    with frmZDYHelp do
-    begin
-      flag := 'KuWei';
-      flagname := '¿âλ';
-      if ShowModal = 1 then
-      begin
-        with Self.CDS_Sub do
-        begin
-          Edit;
-          FieldByName('KuWei').Value := Trim(frmZDYHelp.ClientDataSet1.fieldbyname('ZdyName').AsString);
-        end;
-      end;
-    end;
-  finally
-    frmZDYHelp.Free;
-  end;
-end;
-
 procedure TfrmYMTRKInPut.v1Column11PropertiesButtonClick(Sender: TObject; AButtonIndex: Integer);
 begin
   try
@@ -676,22 +803,22 @@ end;
 
 procedure TfrmYMTRKInPut.v1Column18PropertiesButtonClick(Sender: TObject; AButtonIndex: Integer);
 begin
-//  try
+  try
-//    frmKuWeiList := TfrmKuWeiList.Create(Application);
+    frmKuWeiList := TfrmKuWeiList.Create(Application);
-//    with frmKuWeiList do
+    with frmKuWeiList do
-//    begin
+    begin
-//      if ShowModal = 1 then
+      if ShowModal = 1 then
-//      begin
+      begin
-//        with Self.CDS_Sub do
+        with Self.CDS_Sub do
-//        begin
+        begin
-//          Edit;
+          Edit;
-//          FieldByName('KuWei').Value := Trim(frmKuWeiList.Order_Main.fieldbyname('KWName').AsString);
+          FieldByName('KuWei').Value := Trim(frmKuWeiList.Order_Main.fieldbyname('KWName').AsString);
-//        end;
+        end;
-//      end;
+      end;
-//    end;
+    end;
-//  finally
+  finally
-//    frmKuWeiList.Free;
+    frmKuWeiList.Free;
-//  end;
+  end;
 end;
 
 procedure TfrmYMTRKInPut.Button2Click(Sender: TObject);
@@ -907,9 +1034,7 @@ begin
 
 end;
 
-
+procedure TfrmYMTRKInPut.Tv1PricePropertiesEditValueChanged(Sender: TObject);
-procedure TfrmYMTRKInPut.Tv1PricePropertiesEditValueChanged(
-  Sender: TObject);
 var
   mvalue, FFieldName: string;
 begin
@@ -933,8 +1058,7 @@ begin
   end;
 end;
 
-procedure TfrmYMTRKInPut.Tv1PriceTypePropertiesEditValueChanged(
+procedure TfrmYMTRKInPut.Tv1PriceTypePropertiesEditValueChanged(Sender: TObject);
-  Sender: TObject);
 var
   mvalue, FFieldName: string;
 begin

云翔一码通/U_YMTRKList.pas

@@ -180,7 +180,7 @@ implementation
 
 uses
   U_DataLink, U_RTFun, U_YMTRKInPut, U_ZdyAttachGYS, U_LabelPrintFun,
-  U_ZDYHelp;
+  U_ZDYHelp, U_KuWeiList;
 
 {$R *.dfm}
 procedure TfrmYMTRKList.InitMXGrid(SPID: string);
@@ -619,22 +619,20 @@ end;
 procedure TfrmYMTRKList.KuWeiPropertiesButtonClick(Sender: TObject; AButtonIndex: Integer);
 begin
   try
-    frmZDYHelp := TfrmZDYHelp.Create(Application);
+    frmKuWeiList := TfrmKuWeiList.Create(Application);
-    with frmZDYHelp do
+    with frmKuWeiList do
     begin
-      flag := 'KuWei';
-      flagname := '¿âλ';
       if ShowModal = 1 then
       begin
         with Self.CDS_Main do
         begin
           Edit;
-          KuWei.Text := Trim(frmZDYHelp.ClientDataSet1.fieldbyname('ZdyName').AsString);
+          FieldByName('KuWei').Value := Trim(frmKuWeiList.Order_Main.fieldbyname('KWName').AsString);
         end;
       end;
     end;
   finally
-    frmZDYHelp.Free;
+    frmKuWeiList.Free;
   end;
 end;
 

云翔生产管理(MYSC.dll)/U_CPXiaoShouList.pas

@@ -6,26 +6,26 @@ uses
   Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms,
   Dialogs, StdCtrls, ExtCtrls, ComCtrls, ToolWin, cxStyles, cxCustomData,
   cxGraphics, cxFilter, cxData, cxDataStorage, cxEdit, DB, cxDBData, ADODB,
-  cxGridCustomPopupMenu, cxGridPopupMenu, cxGridLevel, cxClasses,
+  cxGridCustomPopupMenu, cxGridPopupMenu, cxGridLevel, cxClasses, cxControls,
-  cxControls, cxGridCustomView, cxGridCustomTableView, cxGridTableView,
+  cxGridCustomView, cxGridCustomTableView, cxGridTableView, cxGridDBTableView,
-  cxGridDBTableView, cxGrid, DBClient, cxCheckBox, cxCalendar, cxSplitter,
+  cxGrid, DBClient, cxCheckBox, cxCalendar, cxSplitter, RM_Dataset, RM_System,
-  RM_Dataset, RM_System, RM_Common, RM_Class, RM_GridReport, RM_e_Xls,
+  RM_Common, RM_Class, RM_GridReport, RM_e_Xls, Menus, cxButtonEdit,
-  Menus, cxButtonEdit, cxDropDownEdit, cxPC, Buttons, cxTextEdit,
+  cxDropDownEdit, cxPC, Buttons, cxTextEdit, cxLookAndFeels,
-  cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, dxSkinsCore,
+  cxLookAndFeelPainters, cxNavigator, dxSkinsCore, dxSkinDarkRoom,
-      
+  dxSkinOffice2013White, dxSkinSharpPlus, dxSkinSpringTime,
-  dxSkinDarkRoom,  
+  dxSkinsDefaultPainters, dxSkinscxPCPainter, dxSkinBlack, dxSkinBlue,
-    
+  dxSkinBlueprint, dxSkinCaramel, dxSkinCoffee, dxSkinDarkSide,
-     
+  dxSkinDevExpressDarkStyle, dxSkinDevExpressStyle, dxSkinFoggy,
-    
+  dxSkinGlassOceans, dxSkinHighContrast, dxSkiniMaginary, dxSkinLilian,
-    
+  dxSkinLiquidSky, dxSkinLondonLiquidSky, dxSkinMcSkin, dxSkinMetropolis,
-    
+  dxSkinMetropolisDark, dxSkinMoneyTwins, dxSkinOffice2007Black,
-    
+  dxSkinOffice2007Blue, dxSkinOffice2007Green, dxSkinOffice2007Pink,
-   
+  dxSkinOffice2007Silver, dxSkinOffice2010Black, dxSkinOffice2010Blue,
-   dxSkinOffice2013White, 
+  dxSkinOffice2010Silver, dxSkinOffice2013DarkGray,
-     dxSkinSharpPlus,
+  dxSkinOffice2013LightGray, dxSkinPumpkin, dxSkinSeven,
-   dxSkinSpringTime,  
+  dxSkinSevenClassic, dxSkinSharp, dxSkinSilver, dxSkinStardust,
-   dxSkinsDefaultPainters, 
+  dxSkinSummer2008, dxSkinTheAsphaltWorld, dxSkinValentine, dxSkinVS2010,
-     dxSkinscxPCPainter;
+  dxSkinWhiteprint, dxSkinXmas2008Blue;
 
 type
   TfrmCPXiaoShouList = class(TForm)
@@ -120,8 +120,7 @@ type
     procedure SpeedButton1Click(Sender: TObject);
     procedure SpeedButton2Click(Sender: TObject);
     procedure SpeedButton3Click(Sender: TObject);
-    procedure Tv2MouseDown(Sender: TObject; Button: TMouseButton;
+    procedure Tv2MouseDown(Sender: TObject; Button: TMouseButton; Shift: TShiftState; X, Y: Integer);
-      Shift: TShiftState; X, Y: Integer);
     procedure Image1Click(Sender: TObject);
     procedure SpeedButton8Click(Sender: TObject);
     procedure SpeedButton4Click(Sender: TObject);
@@ -144,9 +143,10 @@ var
   frmCPXiaoShouList: TfrmCPXiaoShouList;
 
 implementation
+
 uses
-  U_DataLink,U_RTFun, U_XiShouInPut,U_ZDYHelp,U_XiShouInPutWKC,U_XiaoShouDataOldListQB,U_CKProductBCPOutList,
+  U_DataLink, U_RTFun, U_XiShouInPut, U_ZDYHelp, U_XiShouInPutWKC,
-  U_XiaoShouDataNewListQB;
+  U_XiaoShouDataOldListQB, U_CKProductBCPOutList, U_XiaoShouDataNewListQB;
 
 {$R *.dfm}
 
@@ -155,8 +155,7 @@ begin
   frmCPXiaoShouList := nil;
 end;
 
-procedure TfrmCPXiaoShouList.FormClose(Sender: TObject;
+procedure TfrmCPXiaoShouList.FormClose(Sender: TObject; var Action: TCloseAction);
-  var Action: TCloseAction);
 begin
   Action := caFree;
 end;
@@ -286,7 +285,6 @@ begin
   end;
 end;
 
-
 procedure TfrmCPXiaoShouList.InitForm();
 begin
   BegDate.Date := StrToDate(FormatDateTime('yyyy-MM', SGetServerDate(ADOQueryTemp)) + '-01');
@@ -298,7 +296,8 @@ end;
 
 procedure TfrmCPXiaoShouList.TBFindClick(Sender: TObject);
 begin
-  if ADOQueryCmd.Active=False then Exit;
+  if ADOQueryCmd.Active = False then
+    Exit;
   SDofilter(ADOQueryCmd, SGetFilters(Panel1, 1, 2));
   SCreateCDS20(ADOQueryCmd, Order_Main);
   SInitCDSData20(ADOQueryCmd, Order_Main);
@@ -306,7 +305,8 @@ end;
 
 procedure TfrmCPXiaoShouList.TBDelClick(Sender: TObject);
 begin
-  if Order_Main.IsEmpty then Exit;
+  if Order_Main.IsEmpty then
+    Exit;
   with ADOQueryTemp do
   begin
     Close;
@@ -322,7 +322,8 @@ begin
     Application.MessageBox('单价或数量已审核不能删除!', '提示', 0);
     Exit;
   end;
-  if Application.MessageBox('确定要删除数据吗？','提示',32+4)<>IDYES then Exit;
+  if Application.MessageBox('确定要删除数据吗？', '提示', 32 + 4) <> IDYES then
+    Exit;
   try
     ADOQueryCmd.Connection.BeginTrans;
     with ADOQueryCmd do
@@ -372,7 +373,6 @@ begin
     end;
     Order_Main.EnableControls;
 
-
     ADOQueryCmd.Connection.CommitTrans;
     Result := True;
   except
@@ -384,7 +384,8 @@ end;
 
 procedure TfrmCPXiaoShouList.TBExportClick(Sender: TObject);
 begin
-  if ADOQueryMain.IsEmpty then Exit;
+  if ADOQueryMain.IsEmpty then
+    Exit;
   TcxGridToExcel(Self.Caption, cxGrid1);
 end;
 
@@ -416,9 +417,10 @@ end;
 
 procedure TfrmCPXiaoShouList.ToolButton1Click(Sender: TObject);
 var
-  FFMYType:String;
+  FFMYType: string;
 begin
-  if Order_Main.IsEmpty then Exit;
+  if Order_Main.IsEmpty then
+    Exit;
   FFMYType := Trim(Order_Main.fieldbyname('CRType').AsString);
   if Trim(FFMYType) = '老系统销售' then
   begin
@@ -438,7 +440,8 @@ begin
     finally
       frmXiShouInPut.Free;
     end;
-  end else
+  end
+  else
   begin
     try
       frmXiShouInPutWKC := TfrmXiShouInPutWKC.Create(Application);
@@ -460,10 +463,10 @@ begin
 
 end;
 
-
 procedure TfrmCPXiaoShouList.CustomerNoNameChange(Sender: TObject);
 begin
-  if ADOQueryMain.Active=False then Exit;
+  if ADOQueryMain.Active = False then
+    Exit;
   SDofilter(ADOQueryMain, SGetFilters(Panel1, 1, 2));
   SCreateCDS20(ADOQueryMain, ClientDataSet2);
   SInitCDSData20(ADOQueryMain, ClientDataSet2);
@@ -493,8 +496,10 @@ procedure TfrmCPXiaoShouList.ToolButton4Click(Sender: TObject);
 var
   fPrintFile: string;
 begin
-  if Order_Main.IsEmpty then Exit;
+  if Order_Main.IsEmpty then
-  if Trim(Order_Main.fieldbyname('Chker').AsString)='' then exit;
+    Exit;
+  if Trim(Order_Main.fieldbyname('Chker').AsString) = '' then
+    exit;
   fPrintFile := ExtractFilePath(Application.ExeName) + 'Report\检测报告.rmf';
   RMXLSExport2 := TRMXLSExport.Create(RMXLSExport2);
   with ADOQueryTemp do
@@ -511,7 +516,8 @@ begin
     //RMVariables['OrderUnit']:=Order_Main.fieldbyname('OrderUnit').Value;
     RM1.LoadFromFile(fPrintFile);
     RM1.ShowReport;
-  end  else
+  end
+  else
   begin
     Application.MessageBox(PChar('没有找' + ExtractFilePath(Application.ExeName) + 'Report\检测报告.rmf'), '提示', 0);
   end;
@@ -533,9 +539,10 @@ end;
 
 procedure TfrmCPXiaoShouList.TBEditClick(Sender: TObject);
 var
-  FFMYType:String;
+  FFMYType: string;
 begin
-  if Order_Main.IsEmpty then Exit;
+  if Order_Main.IsEmpty then
+    Exit;
   with ADOQueryTemp do
   begin
     Close;
@@ -568,7 +575,8 @@ begin
     finally
       frmXiShouInPut.Free;
     end;
-  end else
+  end
+  else
   begin
     try
       frmXiShouInPutWKC := TfrmXiShouInPutWKC.Create(Application);
@@ -589,7 +597,6 @@ begin
 
 end;
 
-
 procedure TfrmCPXiaoShouList.Image2Click(Sender: TObject);
 begin
   Panel2.Visible := False;
@@ -652,15 +659,15 @@ begin
   end;
 end;
 
-procedure TfrmCPXiaoShouList.Tv2MouseDown(Sender: TObject;
+procedure TfrmCPXiaoShouList.Tv2MouseDown(Sender: TObject; Button: TMouseButton; Shift: TShiftState; X, Y: Integer);
-  Button: TMouseButton; Shift: TShiftState; X, Y: Integer);
 begin
   InitGridSub();
 end;
 
 procedure TfrmCPXiaoShouList.Image1Click(Sender: TObject);
 begin
-  if Order_Main.IsEmpty then exit;
+  if Order_Main.IsEmpty then
+    exit;
   Panel3.Visible := false;
 end;
 
@@ -668,7 +675,8 @@ procedure TfrmCPXiaoShouList.SpeedButton8Click(Sender: TObject);
 var
   fPrintFile: string;
 begin
-  if Order_Main.IsEmpty then Exit;
+  if Order_Main.IsEmpty then
+    Exit;
   if Order_Main.Locate('ssel', True, []) = false then
   begin
     application.MessageBox('没有选择数据', '提示');
@@ -741,7 +749,8 @@ begin
   begin
     RM1.LoadFromFile(fPrintFile);
     RM1.ShowReport;
-  end  else
+  end
+  else
   begin
     Application.MessageBox(PChar('没有找' + ExtractFilePath(Application.ExeName) + 'Report\销售码单新.rmf'), '提示', 0);
   end;
@@ -766,4 +775,3 @@ end;
 
 end.
 
-

云翔生产管理(MYSC.dll)/U_LLRKInPutMH_RCCG.pas

@@ -622,11 +622,6 @@ begin
     Application.MessageBox('供应商不能为空!', '提示', 0);
     Exit;
   end;
-  if (Trim(MDMLConNo.Text) = '') and (Trim(MLOrderNo.Text) = '') then
-  begin
-    Application.MessageBox('合同号和指示单号不能同时为空!', '提示', 0);
-    Exit;
-  end;
 
   if Trim(MYName.Text) = '' then
   begin

云翔生产管理(MYSC.dll)/U_XiaoShouDataNewListQB.pas

@@ -12,19 +12,20 @@ uses
   RM_Common, RM_Class, RM_GridReport, RM_e_Xls, Menus, cxButtonEdit,
   cxDropDownEdit, cxPC, Buttons, BtnEdit, cxTextEdit, cxLookAndFeels,
   cxLookAndFeelPainters, cxNavigator, dxBarBuiltInMenu, dxSkinsCore,
-      dxSkinDarkRoom,
+  dxSkinDarkRoom, dxSkinOffice2013White, dxSkinSharpPlus, dxSkinSpringTime,
-     
+  dxSkinsDefaultPainters, dxSkinscxPCPainter, dxSkinBlack, dxSkinBlue,
-     
+  dxSkinBlueprint, dxSkinCaramel, dxSkinCoffee, dxSkinDarkSide,
-     
+  dxSkinDevExpressDarkStyle, dxSkinDevExpressStyle, dxSkinFoggy,
-    
+  dxSkinGlassOceans, dxSkinHighContrast, dxSkiniMaginary, dxSkinLilian,
-    
+  dxSkinLiquidSky, dxSkinLondonLiquidSky, dxSkinMcSkin, dxSkinMetropolis,
-    
+  dxSkinMetropolisDark, dxSkinMoneyTwins, dxSkinOffice2007Black,
-    
+  dxSkinOffice2007Blue, dxSkinOffice2007Green, dxSkinOffice2007Pink,
-  dxSkinOffice2013White,   
+  dxSkinOffice2007Silver, dxSkinOffice2010Black, dxSkinOffice2010Blue,
-   dxSkinSharpPlus,  dxSkinSpringTime, 
+  dxSkinOffice2010Silver, dxSkinOffice2013DarkGray,
-    dxSkinsDefaultPainters,
+  dxSkinOffice2013LightGray, dxSkinPumpkin, dxSkinSeven,
-     
+  dxSkinSevenClassic, dxSkinSharp, dxSkinSilver, dxSkinStardust,
-  dxSkinscxPCPainter;
+  dxSkinSummer2008, dxSkinTheAsphaltWorld, dxSkinValentine, dxSkinVS2010,
+  dxSkinWhiteprint, dxSkinXmas2008Blue;
 
 type
   TfrmXiaoShouDataNewListQB = class(TForm)