diff --git a/云翔一码通/U_KuWeiList.dfm b/云翔一码通/U_KuWeiList.dfm
index 7985259..6561ea9 100644
--- a/云翔一码通/U_KuWeiList.dfm
+++ b/云翔一码通/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
diff --git a/云翔一码通/U_KuWeiList.pas b/云翔一码通/U_KuWeiList.pas
index 1138ff6..5ccfdbd 100644
--- a/云翔一码通/U_KuWeiList.pas
+++ b/云翔一码通/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
diff --git a/云翔一码通/U_KuWeiList.pas.rej b/云翔一码通/U_KuWeiList.pas.rej
new file mode 100644
index 0000000..7f2be93
--- /dev/null
+++ b/云翔一码通/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('������Ϊ�գ�','��ʾ',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
diff --git a/云翔一码通/U_YMTJGWCList.pas b/云翔一码通/U_YMTJGWCList.pas
index 11a8248..6c8337a 100644
--- a/云翔一码通/U_YMTJGWCList.pas
+++ b/云翔一码通/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}
 
@@ -368,23 +368,21 @@ end;
 
 procedure TfrmYMTJGWCList.KuWeiPropertiesButtonClick(Sender: TObject; AButtonIndex: Integer);
 begin
-  try
-    frmZDYHelp := TfrmZDYHelp.Create(Application);
-    with frmZDYHelp do
+   try
+    frmKuWeiList := TfrmKuWeiList.Create(Application);
+    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;
 
diff --git a/云翔一码通/U_YMTRKInPut.dfm b/云翔一码通/U_YMTRKInPut.dfm
index fa0c1d6..70dfbd2 100644
--- a/云翔一码通/U_YMTRKInPut.dfm
+++ b/云翔一码通/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
diff --git a/云翔一码通/U_YMTRKInPut.pas b/云翔一码通/U_YMTRKInPut.pas
index d6de764..d6d23ea 100644
--- a/云翔一码通/U_YMTRKInPut.pas
+++ b/云翔一码通/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 := '�Զ�����';
+    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
-//    frmKuWeiList := TfrmKuWeiList.Create(Application);
-//    with frmKuWeiList do
-//    begin
-//      if ShowModal = 1 then
-//      begin
-//        with Self.CDS_Sub do
-//        begin
-//          Edit;
-//          FieldByName('KuWei').Value := Trim(frmKuWeiList.Order_Main.fieldbyname('KWName').AsString);
-//        end;
-//      end;
-//    end;
-//  finally
-//    frmKuWeiList.Free;
-//  end;
+  try
+    frmKuWeiList := TfrmKuWeiList.Create(Application);
+    with frmKuWeiList do
+    begin
+      if ShowModal = 1 then
+      begin
+        with Self.CDS_Sub do
+        begin
+          Edit;
+          FieldByName('KuWei').Value := Trim(frmKuWeiList.Order_Main.fieldbyname('KWName').AsString);
+        end;
+      end;
+    end;
+  finally
+    frmKuWeiList.Free;
+  end;
 end;
 
 procedure TfrmYMTRKInPut.Button2Click(Sender: TObject);
@@ -907,11 +1034,9 @@ begin
 
 end;
 
-
-procedure TfrmYMTRKInPut.Tv1PricePropertiesEditValueChanged(
-  Sender: TObject);
+procedure TfrmYMTRKInPut.Tv1PricePropertiesEditValueChanged(Sender: TObject);
 var
-  mvalue,FFieldName: string;
+  mvalue, FFieldName: string;
 begin
   mvalue := TcxCurrencyEdit(Sender).EditingText;
   FFieldName := Trim(Tv1.Controller.FocusedColumn.DataBinding.FilterFieldName);
@@ -933,10 +1058,9 @@ begin
   end;
 end;
 
-procedure TfrmYMTRKInPut.Tv1PriceTypePropertiesEditValueChanged(
-  Sender: TObject);
+procedure TfrmYMTRKInPut.Tv1PriceTypePropertiesEditValueChanged(Sender: TObject);
 var
-  mvalue,FFieldName: string;
+  mvalue, FFieldName: string;
 begin
   mvalue := TcxComboBox(Sender).EditingText;
   FFieldName := Trim(Tv1.Controller.FocusedColumn.DataBinding.FilterFieldName);
diff --git a/云翔一码通/U_YMTRKList.pas b/云翔一码通/U_YMTRKList.pas
index 71b3274..3113261 100644
--- a/云翔一码通/U_YMTRKList.pas
+++ b/云翔一码通/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);
-    with frmZDYHelp do
+    frmKuWeiList := TfrmKuWeiList.Create(Application);
+    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;
 
diff --git a/云翔生产管理(MYSC.dll)/U_CPXiaoShouList.pas b/云翔生产管理(MYSC.dll)/U_CPXiaoShouList.pas
index e42a7db..2a38837 100644
--- a/云翔生产管理(MYSC.dll)/U_CPXiaoShouList.pas
+++ b/云翔生产管理(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,
-  cxControls, cxGridCustomView, cxGridCustomTableView, cxGridTableView,
-  cxGridDBTableView, cxGrid, DBClient, cxCheckBox, cxCalendar, cxSplitter,
-  RM_Dataset, RM_System, RM_Common, RM_Class, RM_GridReport, RM_e_Xls,
-  Menus, cxButtonEdit, cxDropDownEdit, cxPC, Buttons, cxTextEdit,
-  cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, dxSkinsCore,
-      
-  dxSkinDarkRoom,  
-    
-     
-    
-    
-    
-    
-   
-   dxSkinOffice2013White, 
-     dxSkinSharpPlus,
-   dxSkinSpringTime,  
-   dxSkinsDefaultPainters, 
-     dxSkinscxPCPainter;
+  cxGridCustomPopupMenu, cxGridPopupMenu, cxGridLevel, cxClasses, cxControls,
+  cxGridCustomView, cxGridCustomTableView, cxGridTableView, cxGridDBTableView,
+  cxGrid, DBClient, cxCheckBox, cxCalendar, cxSplitter, RM_Dataset, RM_System,
+  RM_Common, RM_Class, RM_GridReport, RM_e_Xls, Menus, cxButtonEdit,
+  cxDropDownEdit, cxPC, Buttons, cxTextEdit, cxLookAndFeels,
+  cxLookAndFeelPainters, cxNavigator, dxSkinsCore, 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,
+  dxSkinOffice2007Silver, dxSkinOffice2010Black, dxSkinOffice2010Blue,
+  dxSkinOffice2010Silver, dxSkinOffice2013DarkGray,
+  dxSkinOffice2013LightGray, dxSkinPumpkin, dxSkinSeven,
+  dxSkinSevenClassic, dxSkinSharp, dxSkinSilver, dxSkinStardust,
+  dxSkinSummer2008, dxSkinTheAsphaltWorld, dxSkinValentine, dxSkinVS2010,
+  dxSkinWhiteprint, dxSkinXmas2008Blue;
 
 type
   TfrmCPXiaoShouList = class(TForm)
@@ -120,22 +120,21 @@ type
     procedure SpeedButton1Click(Sender: TObject);
     procedure SpeedButton2Click(Sender: TObject);
     procedure SpeedButton3Click(Sender: TObject);
-    procedure Tv2MouseDown(Sender: TObject; Button: TMouseButton;
-      Shift: TShiftState; X, Y: Integer);
+    procedure Tv2MouseDown(Sender: TObject; Button: TMouseButton; Shift: TShiftState; X, Y: Integer);
     procedure Image1Click(Sender: TObject);
     procedure SpeedButton8Click(Sender: TObject);
     procedure SpeedButton4Click(Sender: TObject);
   private
-    canshu1:string;
-    DQdate:TDateTime;
+    canshu1: string;
+    DQdate: TDateTime;
     procedure InitGrid();
     procedure InitGridKH();
     procedure InitGridSub();
     procedure InitForm();
-    function  DelData():Boolean;
+    function DelData(): Boolean;
     { Private declarations }
   public
-    FFInt,FCloth:Integer;
+    FFInt, FCloth: Integer;
 
     { Public declarations }
   end;
@@ -144,33 +143,33 @@ var
   frmCPXiaoShouList: TfrmCPXiaoShouList;
 
 implementation
+
 uses
-  U_DataLink,U_RTFun, U_XiShouInPut,U_ZDYHelp,U_XiShouInPutWKC,U_XiaoShouDataOldListQB,U_CKProductBCPOutList,
-  U_XiaoShouDataNewListQB;
+  U_DataLink, U_RTFun, U_XiShouInPut, U_ZDYHelp, U_XiShouInPutWKC,
+  U_XiaoShouDataOldListQB, U_CKProductBCPOutList, U_XiaoShouDataNewListQB;
 
 {$R *.dfm}
 
 procedure TfrmCPXiaoShouList.FormDestroy(Sender: TObject);
 begin
-  frmCPXiaoShouList:=nil;
+  frmCPXiaoShouList := nil;
 end;
 
-procedure TfrmCPXiaoShouList.FormClose(Sender: TObject;
-  var Action: TCloseAction);
+procedure TfrmCPXiaoShouList.FormClose(Sender: TObject; var Action: TCloseAction);
 begin
-  Action:=caFree;
+  Action := caFree;
 end;
 
 procedure TfrmCPXiaoShouList.FormCreate(Sender: TObject);
 begin
-  cxgrid1.Align:=alClient;
-  canshu1:=Trim(DParameters1);
+  cxgrid1.Align := alClient;
+  canshu1 := Trim(DParameters1);
 end;
 
 procedure TfrmCPXiaoShouList.TBCloseClick(Sender: TObject);
 begin
-  WriteCxGrid('�����뵥�Ǽ�YXMX',Tv1,'ó����������');
-  WriteCxGrid('�����뵥�Ǽ�YXZY',Tv2,'ó����������');
+  WriteCxGrid('�����뵥�Ǽ�YXMX', Tv1, 'ó����������');
+  WriteCxGrid('�����뵥�Ǽ�YXZY', Tv2, 'ó����������');
   Close;
 end;
 
@@ -180,7 +179,7 @@ begin
     ADOQueryCmd.DisableControls;
     with ADOQueryCmd do
     begin
-      Filtered:=False;
+      Filtered := False;
       Close;
       sql.Clear;
       sql.Add(' select AA.*,B.* ');
@@ -190,19 +189,19 @@ begin
       sql.Add(' from CK_YCL_CR A ');
       sql.Add(' inner join CK_YCL_CR_Main B on A.SMID=B.SMID ');
       sql.add(' where 1=1');
-      if CheckBox1.Checked=True then
+      if CheckBox1.Checked = True then
       begin
-        SQL.Add(' and B.CRTime>='''+Trim(FormatDateTime('yyyy-MM-dd',BegDate.DateTime))+'''');
-        sql.Add(' and B.CRTime<'''+Trim(FormatDateTime('yyyy-MM-dd',enddate.DateTime+1))+'''');
-        BegDate.Visible:=True;
-        EndDate.Visible:=true;
+        SQL.Add(' and B.CRTime>=''' + Trim(FormatDateTime('yyyy-MM-dd', BegDate.DateTime)) + '''');
+        sql.Add(' and B.CRTime<''' + Trim(FormatDateTime('yyyy-MM-dd', enddate.DateTime + 1)) + '''');
+        BegDate.Visible := True;
+        EndDate.Visible := true;
       end
       else
       begin
-        SQL.Add(' and B.CRTime>='''+Trim(FormatDateTime('yyyy-MM-dd',now))+'''');
-        sql.Add(' and B.CRTime<'''+Trim(FormatDateTime('yyyy-MM-dd',now+1))+'''');
-        BegDate.Visible:=false;
-        EndDate.Visible:=false;
+        SQL.Add(' and B.CRTime>=''' + Trim(FormatDateTime('yyyy-MM-dd', now)) + '''');
+        sql.Add(' and B.CRTime<''' + Trim(FormatDateTime('yyyy-MM-dd', now + 1)) + '''');
+        BegDate.Visible := false;
+        EndDate.Visible := false;
       end;
       sql.Add(' and isnull(B.CKName,'''')=''���۳���'' ');
       sql.Add(' Group by A.SMID,BZType )AA');
@@ -210,8 +209,8 @@ begin
       SQL.Add(' order by B.CRTime desc');
       Open;
     end;
-    SCreateCDS20(ADOQueryCmd,Order_Main);
-    SInitCDSData20(ADOQueryCmd,Order_Main);
+    SCreateCDS20(ADOQueryCmd, Order_Main);
+    SInitCDSData20(ADOQueryCmd, Order_Main);
   finally
     ADOQueryCmd.EnableControls;
   end;
@@ -223,7 +222,7 @@ begin
     ADOQueryTemp.DisableControls;
     with ADOQueryTemp do
     begin
-      Filtered:=False;
+      Filtered := False;
       Close;
       sql.Clear;
       sql.Add(' select AA.*,B.* ');
@@ -233,20 +232,20 @@ begin
       sql.Add(' from CK_YCL_CR A ');
       sql.Add(' inner join CK_YCL_CR_Main B on A.SMID=B.SMID ');
       sql.Add(' where 1=1');
-      if CheckBox1.Checked=true then
+      if CheckBox1.Checked = true then
       begin
-        sql.add(' and B.CRTime>='''+Trim(FormatDateTime('yyyy-MM-dd',BegDate.DateTime))+'''');
-        sql.Add(' and B.CRTime<'''+Trim(FormatDateTime('yyyy-MM-dd',enddate.DateTime+1))+'''');
+        sql.add(' and B.CRTime>=''' + Trim(FormatDateTime('yyyy-MM-dd', BegDate.DateTime)) + '''');
+        sql.Add(' and B.CRTime<''' + Trim(FormatDateTime('yyyy-MM-dd', enddate.DateTime + 1)) + '''');
       end
       else
       begin
-        sql.add(' and B.CRTime>='''+Trim(FormatDateTime('yyyy-MM-dd',Now))+'''');
-        sql.Add(' and B.CRTime<'''+Trim(FormatDateTime('yyyy-MM-dd',Now+1))+'''');
+        sql.add(' and B.CRTime>=''' + Trim(FormatDateTime('yyyy-MM-dd', Now)) + '''');
+        sql.Add(' and B.CRTime<''' + Trim(FormatDateTime('yyyy-MM-dd', Now + 1)) + '''');
       end;
       sql.Add(' and isnull(B.CKName,'''')=''���۳���'' ');
-      sql.Add(' and isnull(B.FactoryNo,'''')='''+Trim(ClientDataSet2.fieldbyname('FactoryNo').AsString)+'''');
-      sql.Add(' and isnull(B.CRType,'''')='''+Trim(ClientDataSet2.fieldbyname('CRType').AsString)+'''');
-      sql.Add(' and isnull(B.YWY,'''')='''+Trim(ClientDataSet2.fieldbyname('YWY').AsString)+'''');
+      sql.Add(' and isnull(B.FactoryNo,'''')=''' + Trim(ClientDataSet2.fieldbyname('FactoryNo').AsString) + '''');
+      sql.Add(' and isnull(B.CRType,'''')=''' + Trim(ClientDataSet2.fieldbyname('CRType').AsString) + '''');
+      sql.Add(' and isnull(B.YWY,'''')=''' + Trim(ClientDataSet2.fieldbyname('YWY').AsString) + '''');
       if ClientDataSet2.IsEmpty then
       begin
         sql.Add(' and 1=2');
@@ -256,8 +255,8 @@ begin
       SQL.Add(' order by B.CRTime desc');
       Open;
     end;
-    SCreateCDS20(ADOQueryTemp,Order_Main);
-    SInitCDSData20(ADOQueryTemp,Order_Main);
+    SCreateCDS20(ADOQueryTemp, Order_Main);
+    SInitCDSData20(ADOQueryTemp, Order_Main);
   finally
     ADOQueryTemp.EnableControls;
   end;
@@ -269,7 +268,7 @@ begin
     ADOQueryMain.DisableControls;
     with ADOQueryMain do
     begin
-      Filtered:=False;
+      Filtered := False;
       Close;
       sql.Clear;
       sql.Add(' select B.CRType,B.FactoryNo,B.YWY,FactoryName=KHNameJC ');
@@ -279,50 +278,52 @@ begin
       sql.Add(' Group by B.CRType,B.FactoryNo,B.YWY,A.KHNameJC');
       Open;
     end;
-    SCreateCDS20(ADOQueryMain,ClientDataSet2);
-    SInitCDSData20(ADOQueryMain,ClientDataSet2);
+    SCreateCDS20(ADOQueryMain, ClientDataSet2);
+    SInitCDSData20(ADOQueryMain, ClientDataSet2);
   finally
     ADOQueryMain.EnableControls;
   end;
 end;
 
-
 procedure TfrmCPXiaoShouList.InitForm();
 begin
-  BegDate.Date:=StrToDate(FormatDateTime('yyyy-MM',SGetServerDate(ADOQueryTemp))+'-01');
-  EndDate.Date:=SGetServerDate(ADOQueryTemp);
-  ReadCxGrid('�����뵥�Ǽ�YXMX',Tv1,'ó����������');
-  ReadCxGrid('�����뵥�Ǽ�YXZY',Tv2,'ó����������');
+  BegDate.Date := StrToDate(FormatDateTime('yyyy-MM', SGetServerDate(ADOQueryTemp)) + '-01');
+  EndDate.Date := SGetServerDate(ADOQueryTemp);
+  ReadCxGrid('�����뵥�Ǽ�YXMX', Tv1, 'ó����������');
+  ReadCxGrid('�����뵥�Ǽ�YXZY', Tv2, 'ó����������');
   InitGridKH();
 end;
 
 procedure TfrmCPXiaoShouList.TBFindClick(Sender: TObject);
 begin
-  if ADOQueryCmd.Active=False then Exit;
-  SDofilter(ADOQueryCmd,SGetFilters(Panel1,1,2));
-  SCreateCDS20(ADOQueryCmd,Order_Main);
-  SInitCDSData20(ADOQueryCmd,Order_Main);
+  if ADOQueryCmd.Active = False then
+    Exit;
+  SDofilter(ADOQueryCmd, SGetFilters(Panel1, 1, 2));
+  SCreateCDS20(ADOQueryCmd, Order_Main);
+  SInitCDSData20(ADOQueryCmd, Order_Main);
 end;
 
 procedure TfrmCPXiaoShouList.TBDelClick(Sender: TObject);
 begin
-  if Order_Main.IsEmpty then Exit;
+  if Order_Main.IsEmpty then
+    Exit;
   with ADOQueryTemp do
   begin
     Close;
     sql.Clear;
     sql.Add('select * from YS_Money_CR where YFTypeId in');
-    sql.Add('(select SPID from CK_YCL_CR where SMID='''+Trim(Order_Main.fieldbyname('SMID').AsString)+''')');
+    sql.Add('(select SPID from CK_YCL_CR where SMID=''' + Trim(Order_Main.fieldbyname('SMID').AsString) + ''')');
     sql.Add(' and (isnull(ChkerP,'''')<>'''' ');
     sql.Add(' or isnull(ChkerQ,'''')<>'''') ');
     Open;
   end;
-  if ADOQueryTemp.IsEmpty=False then
+  if ADOQueryTemp.IsEmpty = False then
   begin
-    Application.MessageBox('���ۻ���������˲���ɾ��!','��ʾ',0);
+    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
@@ -330,9 +331,9 @@ begin
       Close;
       sql.Clear;
       sql.Add(' delete YS_Money_CR where YFTypeId in');
-      sql.Add('(select SPID from CK_YCL_CR where SMID='''+Trim(Order_Main.fieldbyname('SMID').AsString)+''')');
-      sql.Add(' delete CK_YCL_CR where SMID='''+Trim(Order_Main.fieldbyname('SMID').AsString)+'''');
-      sql.Add(' delete CK_YCL_CR_Main where SMID='''+Trim(Order_Main.fieldbyname('SMID').AsString)+'''');
+      sql.Add('(select SPID from CK_YCL_CR where SMID=''' + Trim(Order_Main.fieldbyname('SMID').AsString) + ''')');
+      sql.Add(' delete CK_YCL_CR where SMID=''' + Trim(Order_Main.fieldbyname('SMID').AsString) + '''');
+      sql.Add(' delete CK_YCL_CR_Main where SMID=''' + Trim(Order_Main.fieldbyname('SMID').AsString) + '''');
 
       ExecSQL;
     end;
@@ -340,15 +341,15 @@ begin
     Order_Main.Delete;
   except
     ADOQueryCmd.Connection.RollbackTrans;
-    Application.MessageBox('ɾ���쳣!','��ʾ',0);
+    Application.MessageBox('ɾ���쳣!', '��ʾ', 0);
   end;
 
 end;
 
-function TfrmCPXiaoShouList.DelData():Boolean;
+function TfrmCPXiaoShouList.DelData(): Boolean;
 begin
   try
-    Result:=false;
+    Result := false;
     ADOQueryCmd.Connection.BeginTrans;
     Order_Main.DisableControls;
     with Order_Main do
@@ -361,10 +362,10 @@ begin
           Close;
           sql.Clear;
           sql.Add(' insert into CK_MYSC_CR_Log  ');
-          sql.Add(' select * from CK_MYSC_CR where MYID='''+Trim(Order_Main.fieldbyname('MYID').AsString)+'''');
-          sql.Add(' UPdate CK_MYSC_CR_Log Set DelTime=getdate(),DelerCode='''+Trim(DCode)+''',Deler='''+Trim(DName)+'''');
-          sql.Add(' where MYID='''+Trim(Order_Main.fieldbyname('MYID').AsString)+'''');
-          sql.Add('Delete CK_MYSC_CR  where MYId='''+Trim(Order_Main.fieldbyname('MYId').AsString)+'''');
+          sql.Add(' select * from CK_MYSC_CR where MYID=''' + Trim(Order_Main.fieldbyname('MYID').AsString) + '''');
+          sql.Add(' UPdate CK_MYSC_CR_Log Set DelTime=getdate(),DelerCode=''' + Trim(DCode) + ''',Deler=''' + Trim(DName) + '''');
+          sql.Add(' where MYID=''' + Trim(Order_Main.fieldbyname('MYID').AsString) + '''');
+          sql.Add('Delete CK_MYSC_CR  where MYId=''' + Trim(Order_Main.fieldbyname('MYId').AsString) + '''');
           ExecSQL;
         end;
         Order_Main.Delete;
@@ -372,20 +373,20 @@ begin
     end;
     Order_Main.EnableControls;
 
-
     ADOQueryCmd.Connection.CommitTrans;
-    Result:=True;
+    Result := True;
   except
     ADOQueryCmd.Connection.RollbackTrans;
-    Result:=False;
-    Application.MessageBox('����ɾ���쳣��','��ʾ',0);
+    Result := False;
+    Application.MessageBox('����ɾ���쳣��', '��ʾ', 0);
   end;
 end;
 
 procedure TfrmCPXiaoShouList.TBExportClick(Sender: TObject);
 begin
-  if ADOQueryMain.IsEmpty then Exit;
-  TcxGridToExcel(Self.Caption,cxGrid1);
+  if ADOQueryMain.IsEmpty then
+    Exit;
+  TcxGridToExcel(Self.Caption, cxGrid1);
 end;
 
 procedure TfrmCPXiaoShouList.TBRafreshClick(Sender: TObject);
@@ -396,7 +397,7 @@ end;
 
 procedure TfrmCPXiaoShouList.TBAddClick(Sender: TObject);
 begin
-  Panel2.Visible:=True;
+  Panel2.Visible := True;
 end;
 
 procedure TfrmCPXiaoShouList.FormShow(Sender: TObject);
@@ -416,21 +417,22 @@ end;
 
 procedure TfrmCPXiaoShouList.ToolButton1Click(Sender: TObject);
 var
-  FFMYType:String;
+  FFMYType: string;
 begin
-  if Order_Main.IsEmpty then Exit;
-  FFMYType:=Trim(Order_Main.fieldbyname('CRType').AsString);
-  if Trim(FFMYType)='��ϵͳ����' then
+  if Order_Main.IsEmpty then
+    Exit;
+  FFMYType := Trim(Order_Main.fieldbyname('CRType').AsString);
+  if Trim(FFMYType) = '��ϵͳ����' then
   begin
     try
-      frmXiShouInPut:=TfrmXiShouInPut.Create(Application);
+      frmXiShouInPut := TfrmXiShouInPut.Create(Application);
       with frmXiShouInPut do
       begin
-        TBSave.Visible:=False;
-        PState:=1;
-        FMainId:=Trim(Self.Order_Main.fieldbyname('SMID').AsString);
-        Label21.Caption:=FFMYType;
-        if ShowModal=1 then
+        TBSave.Visible := False;
+        PState := 1;
+        FMainId := Trim(Self.Order_Main.fieldbyname('SMID').AsString);
+        Label21.Caption := FFMYType;
+        if ShowModal = 1 then
         begin
 
         end;
@@ -438,19 +440,20 @@ begin
     finally
       frmXiShouInPut.Free;
     end;
-  end else
+  end
+  else
   begin
     try
-      frmXiShouInPutWKC:=TfrmXiShouInPutWKC.Create(Application);
+      frmXiShouInPutWKC := TfrmXiShouInPutWKC.Create(Application);
       with frmXiShouInPutWKC do
       begin
-        TBSave.Visible:=False;
-        PState:=1;
-        FMainId:=Trim(Self.Order_Main.fieldbyname('SMID').AsString);
-        Label21.Caption:=FFMYType;
-        if ShowModal=1 then
+        TBSave.Visible := False;
+        PState := 1;
+        FMainId := Trim(Self.Order_Main.fieldbyname('SMID').AsString);
+        Label21.Caption := FFMYType;
+        if ShowModal = 1 then
         begin
-       
+
         end;
       end;
     finally
@@ -460,18 +463,18 @@ begin
 
 end;
 
-
 procedure TfrmCPXiaoShouList.CustomerNoNameChange(Sender: TObject);
 begin
-  if ADOQueryMain.Active=False then Exit;
-  SDofilter(ADOQueryMain,SGetFilters(Panel1,1,2));
-  SCreateCDS20(ADOQueryMain,ClientDataSet2);
-  SInitCDSData20(ADOQueryMain,ClientDataSet2);
+  if ADOQueryMain.Active = False then
+    Exit;
+  SDofilter(ADOQueryMain, SGetFilters(Panel1, 1, 2));
+  SCreateCDS20(ADOQueryMain, ClientDataSet2);
+  SInitCDSData20(ADOQueryMain, ClientDataSet2);
 end;
 
 procedure TfrmCPXiaoShouList.N2Click(Sender: TObject);
 begin
-  SelOKNo(Order_Main,True);
+  SelOKNo(Order_Main, True);
 end;
 
 procedure TfrmCPXiaoShouList.N1Click(Sender: TObject);
@@ -491,39 +494,42 @@ end;
 
 procedure TfrmCPXiaoShouList.ToolButton4Click(Sender: TObject);
 var
-  fPrintFile:string;
+  fPrintFile: string;
 begin
-  if Order_Main.IsEmpty then Exit;
-  if Trim(Order_Main.fieldbyname('Chker').AsString)='' then exit;
-  fPrintFile:=ExtractFilePath(Application.ExeName)+'Report\��ⱨ��.rmf';
-  RMXLSExport2:= TRMXLSExport.Create(RMXLSExport2);
+  if Order_Main.IsEmpty then
+    Exit;
+  if Trim(Order_Main.fieldbyname('Chker').AsString) = '' then
+    exit;
+  fPrintFile := ExtractFilePath(Application.ExeName) + 'Report\��ⱨ��.rmf';
+  RMXLSExport2 := TRMXLSExport.Create(RMXLSExport2);
   with ADOQueryTemp do
   begin
     Close;
     sql.Clear;
-    sql.Add('select * from Test_Report where TRId='''+Trim(Order_Main.fieldbyname('TRId').AsString)+'''');
+    sql.Add('select * from Test_Report where TRId=''' + Trim(Order_Main.fieldbyname('TRId').AsString) + '''');
     Open;
   end;
-  SCreateCDS20(ADOQueryTemp,CDS_PRT);
-  SInitCDSData20(ADOQueryTemp,CDS_PRT);
+  SCreateCDS20(ADOQueryTemp, CDS_PRT);
+  SInitCDSData20(ADOQueryTemp, CDS_PRT);
   if FileExists(fPrintFile) then
   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);
+    Application.MessageBox(PChar('û����' + ExtractFilePath(Application.ExeName) + 'Report\��ⱨ��.rmf'), '��ʾ', 0);
   end;
 end;
 
 procedure TfrmCPXiaoShouList.Tv1DblClick(Sender: TObject);
 begin
-  frmCKProductBCPOutList:=TfrmCKProductBCPOutList.Create(self);
+  frmCKProductBCPOutList := TfrmCKProductBCPOutList.Create(self);
   with frmCKProductBCPOutList do
   begin
-    FCKNO:=trim(Order_Main.fieldbyname('CKNo').AsString);
-    if ShowModal=1 then
+    FCKNO := trim(Order_Main.fieldbyname('CKNo').AsString);
+    if ShowModal = 1 then
     begin
 
     end;
@@ -533,34 +539,35 @@ 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;
     sql.Clear;
     sql.Add('select * from YS_Money_CR where YFTypeId in');
-    sql.Add('(select SPID from CK_YCL_CR where SMID='''+Trim(Order_Main.fieldbyname('SMID').AsString)+''')');
+    sql.Add('(select SPID from CK_YCL_CR where SMID=''' + Trim(Order_Main.fieldbyname('SMID').AsString) + ''')');
     Open;
   end;
-  if ADOQueryTemp.IsEmpty=False then
+  if ADOQueryTemp.IsEmpty = False then
   begin
-    Application.MessageBox('�Ѿ�����Ӧ�տ���޸�!','��ʾ',0);
+    Application.MessageBox('�Ѿ�����Ӧ�տ���޸�!', '��ʾ', 0);
     Exit;
   end;
-  FFMYType:=Trim(Order_Main.fieldbyname('CRType').AsString);
-  if Trim(FFMYType)='��ϵͳ����' then
+  FFMYType := Trim(Order_Main.fieldbyname('CRType').AsString);
+  if Trim(FFMYType) = '��ϵͳ����' then
   begin
     try
-      frmXiShouInPut:=TfrmXiShouInPut.Create(Application);
+      frmXiShouInPut := TfrmXiShouInPut.Create(Application);
       with frmXiShouInPut do
       begin
-        PState:=1;
-        FMainId:=Trim(Self.Order_Main.fieldbyname('SMID').AsString);
-        Label21.Caption:=FFMYType;
-        Button1.Visible:=False;
-        if ShowModal=1 then
+        PState := 1;
+        FMainId := Trim(Self.Order_Main.fieldbyname('SMID').AsString);
+        Label21.Caption := FFMYType;
+        Button1.Visible := False;
+        if ShowModal = 1 then
         begin
           InitGridSub();
         end;
@@ -568,16 +575,17 @@ begin
     finally
       frmXiShouInPut.Free;
     end;
-  end else
+  end
+  else
   begin
     try
-      frmXiShouInPutWKC:=TfrmXiShouInPutWKC.Create(Application);
+      frmXiShouInPutWKC := TfrmXiShouInPutWKC.Create(Application);
       with frmXiShouInPutWKC do
       begin
-        PState:=1;
-        FMainId:=Trim(Self.Order_Main.fieldbyname('SMID').AsString);
-        Label21.Caption:=FFMYType;
-        if ShowModal=1 then
+        PState := 1;
+        FMainId := Trim(Self.Order_Main.fieldbyname('SMID').AsString);
+        Label21.Caption := FFMYType;
+        if ShowModal = 1 then
         begin
           InitGridSub();
         end;
@@ -589,20 +597,19 @@ begin
 
 end;
 
-
 procedure TfrmCPXiaoShouList.Image2Click(Sender: TObject);
 begin
-  Panel2.Visible:=False;
+  Panel2.Visible := False;
 end;
 
 procedure TfrmCPXiaoShouList.SpeedButton1Click(Sender: TObject);
 begin
-  Panel2.Visible:=False;
+  Panel2.Visible := False;
   try
-    frmXiaoShouDataOldListQB:=TfrmXiaoShouDataOldListQB.Create(Application);
+    frmXiaoShouDataOldListQB := TfrmXiaoShouDataOldListQB.Create(Application);
     with frmXiaoShouDataOldListQB do
     begin
-      if ShowModal=1 then
+      if ShowModal = 1 then
       begin
 
       end;
@@ -614,15 +621,15 @@ end;
 
 procedure TfrmCPXiaoShouList.SpeedButton2Click(Sender: TObject);
 begin
-  Panel2.Visible:=False;
+  Panel2.Visible := False;
   try
-    frmXiShouInPutWKC:=TfrmXiShouInPutWKC.Create(Application);
+    frmXiShouInPutWKC := TfrmXiShouInPutWKC.Create(Application);
     with frmXiShouInPutWKC do
     begin
-      PState:=0;
-      FMainId:='';
-      Label21.Caption:='�޿������';
-      if ShowModal=1 then
+      PState := 0;
+      FMainId := '';
+      Label21.Caption := '�޿������';
+      if ShowModal = 1 then
       begin
         InitGrid();
       end;
@@ -634,15 +641,15 @@ end;
 
 procedure TfrmCPXiaoShouList.SpeedButton3Click(Sender: TObject);
 begin
-  Panel2.Visible:=False;
+  Panel2.Visible := False;
   try
-    frmXiShouInPutWKC:=TfrmXiShouInPutWKC.Create(Application);
+    frmXiShouInPutWKC := TfrmXiShouInPutWKC.Create(Application);
     with frmXiShouInPutWKC do
     begin
-      PState:=0;
-      FMainId:='';
-      Label21.Caption:='�ⵥ����';
-      if ShowModal=1 then
+      PState := 0;
+      FMainId := '';
+      Label21.Caption := '�ⵥ����';
+      if ShowModal = 1 then
       begin
         InitGrid();
       end;
@@ -652,47 +659,48 @@ begin
   end;
 end;
 
-procedure TfrmCPXiaoShouList.Tv2MouseDown(Sender: TObject;
-  Button: TMouseButton; Shift: TShiftState; X, Y: Integer);
+procedure TfrmCPXiaoShouList.Tv2MouseDown(Sender: TObject; Button: TMouseButton; Shift: TShiftState; X, Y: Integer);
 begin
   InitGridSub();
 end;
 
 procedure TfrmCPXiaoShouList.Image1Click(Sender: TObject);
 begin
-  if Order_Main.IsEmpty then exit;
-  Panel3.Visible:=false;
+  if Order_Main.IsEmpty then
+    exit;
+  Panel3.Visible := false;
 end;
 
 procedure TfrmCPXiaoShouList.SpeedButton8Click(Sender: TObject);
 var
-  fPrintFile:string;
+  fPrintFile: string;
 begin
-  if Order_Main.IsEmpty then Exit;
-  if Order_Main.Locate('ssel',True,[])=false then
+  if Order_Main.IsEmpty then
+    Exit;
+  if Order_Main.Locate('ssel', True, []) = false then
   begin
-    application.MessageBox('û��ѡ������','��ʾ');
+    application.MessageBox('û��ѡ������', '��ʾ');
     exit;
   end;
   with ADOQueryTemp do
   begin
     Close;
     sql.Clear;
-    sql.Add('delete TBSubID where DName='''+Trim(DCode)+'''');
+    sql.Add('delete TBSubID where DName=''' + Trim(DCode) + '''');
     ExecSQL;
   end;
-  fPrintFile:=ExtractFilePath(Application.ExeName)+'Report\�����뵥��.rmf';
-  RMXLSExport2:= TRMXLSExport.Create(RMXLSExport2);
+  fPrintFile := ExtractFilePath(Application.ExeName) + 'Report\�����뵥��.rmf';
+  RMXLSExport2 := TRMXLSExport.Create(RMXLSExport2);
   with Order_Main do
   begin
     first;
     while not Eof do
     begin
-      if FieldByName('Ssel').AsBoolean=true then
+      if FieldByName('Ssel').AsBoolean = true then
       begin
         with ADOQuery1 do
         begin
-          Filtered:=False;
+          Filtered := False;
           Close;
           sql.Clear;
           sql.Add(' select distinct isnull(D.MJID,C.MJID) MJID');
@@ -700,7 +708,7 @@ begin
           sql.Add(' inner join CK_YCL_CR_Main B on A.SMID=B.SMID ');
           sql.Add(' left join CP_InOut1 C on C.InOutNo=B.CKNo');
           sql.Add(' left join CK_BanCP_CR D on D.CKOrdNo=B.CKNo');
-          sql.add(' where B.CKNO='''+Trim(Order_Main.fieldbyname('CKNO').AsString)+'''');
+          sql.add(' where B.CKNO=''' + Trim(Order_Main.fieldbyname('CKNO').AsString) + '''');
           Open;
         end;
         with ADOQueryTemp do
@@ -716,8 +724,8 @@ begin
           while not eof do
           begin
             ADOQueryTemp.append;
-            ADOQueryTemp.fieldbyname('SubId').Value:=Trim(ADOQuery1.fieldbyname('MJID').AsString);
-            ADOQueryTemp.fieldbyname('Dname').Value:=Trim(DCode);
+            ADOQueryTemp.fieldbyname('SubId').Value := Trim(ADOQuery1.fieldbyname('MJID').AsString);
+            ADOQueryTemp.fieldbyname('Dname').Value := Trim(DCode);
             ADOQueryTemp.post;
             next;
           end;
@@ -731,30 +739,31 @@ begin
     Close;
     sql.Clear;
     sql.add('exec P_Print_CKMD3 ');
-    sql.add('@mainID='+quotedstr(Trim('')));
-    sql.add(',@DName='+quotedstr(Trim(DCode)));
+    sql.add('@mainID=' + quotedstr(Trim('')));
+    sql.add(',@DName=' + quotedstr(Trim(DCode)));
     Open;
   end;
-  SCreateCDS20(ADOQueryTemp,CDS_PRT);
-  SInitCDSData20(ADOQueryTemp,CDS_PRT);
+  SCreateCDS20(ADOQueryTemp, CDS_PRT);
+  SInitCDSData20(ADOQueryTemp, CDS_PRT);
   if FileExists(fPrintFile) then
   begin
     RM1.LoadFromFile(fPrintFile);
     RM1.ShowReport;
-  end  else
+  end
+  else
   begin
-    Application.MessageBox(PChar('û����'+ExtractFilePath(Application.ExeName)+'Report\�����뵥��.rmf'),'��ʾ',0);
+    Application.MessageBox(PChar('û����' + ExtractFilePath(Application.ExeName) + 'Report\�����뵥��.rmf'), '��ʾ', 0);
   end;
 end;
 
 procedure TfrmCPXiaoShouList.SpeedButton4Click(Sender: TObject);
 begin
-  Panel2.Visible:=False;
+  Panel2.Visible := False;
   try
-    frmXiaoShouDataNewListQB:=TfrmXiaoShouDataNewListQB.Create(Application);
+    frmXiaoShouDataNewListQB := TfrmXiaoShouDataNewListQB.Create(Application);
     with frmXiaoShouDataNewListQB do
     begin
-      if ShowModal=1 then
+      if ShowModal = 1 then
       begin
 
       end;
@@ -766,4 +775,3 @@ end;
 
 end.
 
-
diff --git a/云翔生产管理(MYSC.dll)/U_LLRKInPutMH_RCCG.pas b/云翔生产管理(MYSC.dll)/U_LLRKInPutMH_RCCG.pas
index d97feb4..61803ec 100644
--- a/云翔生产管理(MYSC.dll)/U_LLRKInPutMH_RCCG.pas
+++ b/云翔生产管理(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
diff --git a/云翔生产管理(MYSC.dll)/U_XiaoShouDataNewListQB.pas b/云翔生产管理(MYSC.dll)/U_XiaoShouDataNewListQB.pas
index 43b5b8f..1f62ec7 100644
--- a/云翔生产管理(MYSC.dll)/U_XiaoShouDataNewListQB.pas
+++ b/云翔生产管理(MYSC.dll)/U_XiaoShouDataNewListQB.pas
@@ -11,20 +11,21 @@ uses
   cxGrid, DBClient, cxCheckBox, cxCalendar, cxSplitter, RM_Dataset, RM_System,
   RM_Common, RM_Class, RM_GridReport, RM_e_Xls, Menus, cxButtonEdit,
   cxDropDownEdit, cxPC, Buttons, BtnEdit, cxTextEdit, cxLookAndFeels,
-  cxLookAndFeelPainters, cxNavigator, dxBarBuiltInMenu, dxSkinsCore, 
-      dxSkinDarkRoom,
-     
-     
-     
-    
-    
-    
-    
-  dxSkinOffice2013White,   
-   dxSkinSharpPlus,  dxSkinSpringTime, 
-    dxSkinsDefaultPainters,
-     
-  dxSkinscxPCPainter;
+  cxLookAndFeelPainters, cxNavigator, dxBarBuiltInMenu, dxSkinsCore,
+  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,
+  dxSkinOffice2007Silver, dxSkinOffice2010Black, dxSkinOffice2010Blue,
+  dxSkinOffice2010Silver, dxSkinOffice2013DarkGray,
+  dxSkinOffice2013LightGray, dxSkinPumpkin, dxSkinSeven,
+  dxSkinSevenClassic, dxSkinSharp, dxSkinSilver, dxSkinStardust,
+  dxSkinSummer2008, dxSkinTheAsphaltWorld, dxSkinValentine, dxSkinVS2010,
+  dxSkinWhiteprint, dxSkinXmas2008Blue;
 
 type
   TfrmXiaoShouDataNewListQB = class(TForm)