~

检验管理/TradeManage.dof

@@ -101,7 +101,7 @@ DebugSourceDirs=
 UsePackages=0
 [Parameters]
 RunParams=
-HostApplication=D:\D7W\项目代码\D7djRuishun\检验管理\testDll.exe
+HostApplication=D:\Dp7Repo\项目代码\D7djRuishun\检验管理\testDll.exe
 Launcher=
 UseLauncher=0
 DebugCWD=

检验管理/U_CKProductBCPOutList.dfm

@@ -1,7 +1,7 @@
 object frmCKProductBCPOutList: TfrmCKProductBCPOutList
-  Left = 119
+  Left = 226
-  Top = 120
+  Top = 149
-  Width = 1378
+  Width = 1719
   Height = 754
   Caption = #25104#21697#20986#24211#21015#34920
   Color = clBtnFace
@@ -20,7 +20,7 @@ object frmCKProductBCPOutList: TfrmCKProductBCPOutList
   object ToolBar1: TToolBar
     Left = 0
     Top = 0
-    Width = 1362
+    Width = 1703
     Height = 33
     ButtonHeight = 30
     ButtonWidth = 83
@@ -116,7 +116,7 @@ object frmCKProductBCPOutList: TfrmCKProductBCPOutList
   object Panel1: TPanel
     Left = 0
     Top = 33
-    Width = 1362
+    Width = 1703
     Height = 80
     Align = alTop
     BevelInner = bvRaised
@@ -381,7 +381,7 @@ object frmCKProductBCPOutList: TfrmCKProductBCPOutList
   object cxGrid2: TcxGrid
     Left = 0
     Top = 113
-    Width = 1362
+    Width = 1703
     Height = 602
     Align = alClient
     PopupMenu = PopupMenu1

检验管理/U_CKProductBCPOutList.pas

@@ -11,7 +11,20 @@ uses
   ExtCtrls, ToolWin, cxGridCustomPopupMenu, cxGridPopupMenu, ADODB, DBClient,
   cxDropDownEdit, RM_Common, RM_Class, RM_e_Xls, RM_Dataset, RM_System,
   RM_GridReport, cxCheckBox, Menus, MovePanel, cxLookAndFeels,
-  cxLookAndFeelPainters, cxNavigator;
+  cxLookAndFeelPainters, cxNavigator, dxSkinsCore, dxSkinBlack, dxSkinBlue,
+  dxSkinBlueprint, dxSkinCaramel, dxSkinCoffee, dxSkinDarkRoom, dxSkinDarkSide,
+  dxSkinDevExpressDarkStyle, dxSkinDevExpressStyle, dxSkinFoggy,
+  dxSkinGlassOceans, dxSkinHighContrast, dxSkiniMaginary, dxSkinLilian,
+  dxSkinLiquidSky, dxSkinLondonLiquidSky, dxSkinMcSkin, dxSkinMetropolis,
+  dxSkinMetropolisDark, dxSkinMoneyTwins, dxSkinOffice2007Black,
+  dxSkinOffice2007Blue, dxSkinOffice2007Green, dxSkinOffice2007Pink,
+  dxSkinOffice2007Silver, dxSkinOffice2010Black, dxSkinOffice2010Blue,
+  dxSkinOffice2010Silver, dxSkinOffice2013DarkGray, dxSkinOffice2013LightGray,
+  dxSkinOffice2013White, dxSkinPumpkin, dxSkinSeven, dxSkinSevenClassic,
+  dxSkinSharp, dxSkinSharpPlus, dxSkinSilver, dxSkinSpringTime, dxSkinStardust,
+  dxSkinSummer2008, dxSkinTheAsphaltWorld, dxSkinsDefaultPainters,
+  dxSkinValentine, dxSkinVS2010, dxSkinWhiteprint, dxSkinXmas2008Blue,
+  dxSkinscxPCPainter;
 
 type
   TfrmCKProductBCPOutList = class(TForm)
@@ -214,10 +227,11 @@ begin
       Filtered := False;
       Close;                         
       sql.Clear;
-      SQL.Add('select A.*,cast(D.baono as varchar(20)) as Strbaono,B.OrderNo,C.PRTCodeName,C.PRTSpec,C.PRTColor,C.SOrddefstr1,C.PRTMF,C.PRTKZ,D.MJXH,D.baono as Fbaono , D.baoid as Fbaoid,C.PRTPrice,C.PRTHX ');
+      SQL.Add('select  A.CPType,A.CRTime,A.KGQty,A.Qty,A.QtyUnit,A.CKOrdNo,A.CRNote,A.mjid,A.BCID,A.CRID');
-      sql.Add(',C.SOrddefstr4,D.MJQty3,D.MJQty4');
+      SQL.Add(',cast(D.baono as varchar(20)) as Strbaono,B.OrderNo,C.PRTCodeName,C.PRTSpec,C.PRTColor,C.SOrddefstr1,C.PRTMF,C.PRTKZ,D.MJXH,D.baono as Fbaono , D.baoid as Fbaoid,C.PRTPrice,C.PRTHX ');
-      sql.Add(',PONO=(select Top 1 KHConNo from JYOrderCon_Main JCM where JCM.ConNo=B.OrderNo)');
+      sql.Add(',C.SOrddefstr4,D.MJQty3,D.MJQty4,D.baono');
-      sql.Add(',MPRTECodeName=(select Top 1 MPRTCodeName from JYOrderCon_Main JCM where JCM.ConNo=B.OrderNo)');
+//      sql.Add(',PONO=(select Top 1 KHConNo from JYOrderCon_Main JCM where JCM.ConNo=B.OrderNo)');
+//      sql.Add(',MPRTECodeName=(select Top 1 MPRTCodeName from JYOrderCon_Main JCM where JCM.ConNo=B.OrderNo)');
       sql.Add(',isnull(customerNoName,B.OrderNo) KHName');
       sql.Add(',D.mjstr4,D.MJstr5 ');
       sql.add('from CK_BanCP_CR A ');
@@ -228,6 +242,7 @@ begin
       sql.add('  and A.CRTime<''' + Trim(FormatDateTime('yyyy-MM-dd', enddate.DateTime + 1)) + '''');
       SQL.Add(' and CRType=''Õý³£³ö¿â'' ');
 //      sql.Add('order by cast(dbo.Get_ShuZi(C.SOrddefstr1) as bigint)');
+//      ShowMessage(sql.text);
       Open;
     end;
     SCreateCDS20(ADOQueryMain, CDS_Main);
@@ -1259,6 +1274,7 @@ begin
       Close;
       sql.Clear;                    
       sql.Add(strsql);
+//      ShowMessage(SQL.text);
       ExecSQL
     end;                                                 
     CDS_Main.EnableControls;

检验管理/U_JYOrderCDOne.dfm

@@ -1,6 +1,6 @@
 object frmJYOrderCDOne: TfrmJYOrderCDOne
-  Left = 146
+  Left = 239
-  Top = 52
+  Top = 166
   Width = 1382
   Height = 754
   Caption = #26816#39564#25253#21578

检验管理/U_JYOrderCDOne.pas

@@ -10,7 +10,20 @@ uses
   cxGridCustomView, cxGridCustomTableView, cxGridTableView, cxGridDBTableView,
   cxGrid, DBClient, cxCheckBox, cxCalendar, cxSplitter, RM_Dataset, RM_System,
   RM_Common, RM_Class, RM_GridReport, RM_e_Xls, Menus, MovePanel, cxTextEdit,
-  cxLookAndFeels, cxLookAndFeelPainters, cxNavigator,Math;
+  cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, Math, dxSkinsCore,
+  dxSkinBlack, dxSkinBlue, dxSkinBlueprint, dxSkinCaramel, dxSkinCoffee,
+  dxSkinDarkRoom, dxSkinDarkSide, dxSkinDevExpressDarkStyle,
+  dxSkinDevExpressStyle, dxSkinFoggy, dxSkinGlassOceans, dxSkinHighContrast,
+  dxSkiniMaginary, dxSkinLilian, dxSkinLiquidSky, dxSkinLondonLiquidSky,
+  dxSkinMcSkin, dxSkinMetropolis, dxSkinMetropolisDark, dxSkinMoneyTwins,
+  dxSkinOffice2007Black, dxSkinOffice2007Blue, dxSkinOffice2007Green,
+  dxSkinOffice2007Pink, dxSkinOffice2007Silver, dxSkinOffice2010Black,
+  dxSkinOffice2010Blue, dxSkinOffice2010Silver, dxSkinOffice2013DarkGray,
+  dxSkinOffice2013LightGray, dxSkinOffice2013White, dxSkinPumpkin, dxSkinSeven,
+  dxSkinSevenClassic, dxSkinSharp, dxSkinSharpPlus, dxSkinSilver,
+  dxSkinSpringTime, dxSkinStardust, dxSkinSummer2008, dxSkinTheAsphaltWorld,
+  dxSkinsDefaultPainters, dxSkinValentine, dxSkinVS2010, dxSkinWhiteprint,
+  dxSkinXmas2008Blue, dxSkinscxPCPainter;
 
 type
   TfrmJYOrderCDOne = class(TForm)
@@ -1800,6 +1813,14 @@ begin
             sql.Add('where MJID=''' + Trim(Order_Main.fieldbyname('MJID').AsString) + '''');
             ExecSQL;
           end;
+          with ADOQueryCmd do
+          begin
+            Close;
+            sql.Clear;
+            sql.Add('Update CK_BanCP_KC Set KCQty=''' + SL + ''' ');
+            sql.Add('where MJID=''' + Trim(Order_Main.fieldbyname('MJID').AsString) + '''');
+            ExecSQL;
+          end;
         end;
         Next;
       end;
@@ -1856,8 +1877,7 @@ begin
   InitGrid();
 end;
 
-procedure TfrmJYOrderCDOne.PRTCodeNameKeyPress(Sender: TObject;
+procedure TfrmJYOrderCDOne.PRTCodeNameKeyPress(Sender: TObject; var Key: Char);
-  var Key: Char);
 begin
   if Key = #13 then
   begin

检验管理/U_MJEdit.dfm

@@ -323,11 +323,11 @@ object frmMJEdit: TfrmMJEdit
     Left = 0
     Top = 105
     Width = 854
-    Height = 357
+    Height = 356
     Align = alClient
     TabOrder = 2
     object Tv2: TcxGridDBTableView
-      NavigatorButtons.ConfirmDelete = False
+      Navigator.Buttons.CustomButtons = <>
       DataController.DataSource = DataSource1
       DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost]
       DataController.Summary.DefaultGroupSummaryItems = <>

检验管理/U_MJEdit.pas

@@ -4,11 +4,24 @@ interface
 
 uses
   Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms,
-  Dialogs, cxStyles, cxCustomData, cxGraphics, cxFilter, cxData,
+  Dialogs, cxStyles, cxCustomData, cxGraphics, cxFilter, cxData, cxDataStorage,
-  cxDataStorage, cxEdit, DB, cxDBData, cxTextEdit, DBClient, ADODB,
+  cxEdit, DB, cxDBData, cxTextEdit, DBClient, ADODB, cxGridLevel,
-  cxGridLevel, cxGridCustomTableView, cxGridTableView, cxGridDBTableView,
+  cxGridCustomTableView, cxGridTableView, cxGridDBTableView, cxClasses,
-  cxClasses, cxControls, cxGridCustomView, cxGrid, StdCtrls, ExtCtrls,
+  cxControls, cxGridCustomView, cxGrid, StdCtrls, ExtCtrls, ComCtrls, ToolWin,
-  ComCtrls, ToolWin, cxButtonEdit;
+  cxButtonEdit, cxLookAndFeels, cxLookAndFeelPainters, dxSkinsCore, dxSkinBlack,
+  dxSkinBlue, dxSkinBlueprint, dxSkinCaramel, dxSkinCoffee, dxSkinDarkRoom,
+  dxSkinDarkSide, dxSkinDevExpressDarkStyle, dxSkinDevExpressStyle, dxSkinFoggy,
+  dxSkinGlassOceans, dxSkinHighContrast, dxSkiniMaginary, dxSkinLilian,
+  dxSkinLiquidSky, dxSkinLondonLiquidSky, dxSkinMcSkin, dxSkinMetropolis,
+  dxSkinMetropolisDark, dxSkinMoneyTwins, dxSkinOffice2007Black,
+  dxSkinOffice2007Blue, dxSkinOffice2007Green, dxSkinOffice2007Pink,
+  dxSkinOffice2007Silver, dxSkinOffice2010Black, dxSkinOffice2010Blue,
+  dxSkinOffice2010Silver, dxSkinOffice2013DarkGray, dxSkinOffice2013LightGray,
+  dxSkinOffice2013White, dxSkinPumpkin, dxSkinSeven, dxSkinSevenClassic,
+  dxSkinSharp, dxSkinSharpPlus, dxSkinSilver, dxSkinSpringTime, dxSkinStardust,
+  dxSkinSummer2008, dxSkinTheAsphaltWorld, dxSkinsDefaultPainters,
+  dxSkinValentine, dxSkinVS2010, dxSkinWhiteprint, dxSkinXmas2008Blue,
+  dxSkinscxPCPainter, cxNavigator;
 
 type
   TfrmMJEdit = class(TForm)
@@ -66,8 +79,7 @@ type
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure FormDestroy(Sender: TObject);
     procedure MJIDKeyPress(Sender: TObject; var Key: Char);
-    procedure tv2CDTypePropertiesButtonClick(Sender: TObject;
+    procedure tv2CDTypePropertiesButtonClick(Sender: TObject; AButtonIndex: Integer);
-      AButtonIndex: Integer);
     procedure tv2CDWZPropertiesEditValueChanged(Sender: TObject);
     procedure v2Column2PropertiesEditValueChanged(Sender: TObject);
     procedure ToolButton1Click(Sender: TObject);
@@ -87,6 +99,7 @@ var
   frmMJEdit: TfrmMJEdit;
 
 implementation
+
 uses
   U_Fun, U_ZDYHelp, U_DataLink;
 
@@ -145,12 +158,12 @@ begin
     if Trim(Trim(ADOTmp.fieldbyname('MJType').AsString)) = '正品' then
     begin
       RadioGroup1.ItemIndex := 0
-    end else
+    end
-    if Trim(Trim(ADOTmp.fieldbyname('MJType').AsString))='次品' then
+    else if Trim(Trim(ADOTmp.fieldbyname('MJType').AsString)) = '次品' then
     begin
       RadioGroup1.ItemIndex := 1;
-    end else
+    end
-    if Trim(Trim(ADOTmp.fieldbyname('MJType').AsString))='留样' then
+    else if Trim(Trim(ADOTmp.fieldbyname('MJType').AsString)) = '留样' then
     begin
       RadioGroup1.ItemIndex := 2;
     end;
@@ -170,8 +183,7 @@ begin
   end;
 end;
 
-procedure TfrmMJEdit.tv2CDTypePropertiesButtonClick(Sender: TObject;
+procedure TfrmMJEdit.tv2CDTypePropertiesButtonClick(Sender: TObject; AButtonIndex: Integer);
-  AButtonIndex: Integer);
 begin
   try
     frmZDYHelp := TfrmZDYHelp.Create(Application);
@@ -219,7 +231,8 @@ begin
         FieldByName('CDQty').Value := StrToFloat(CDEnd) - StrToFloat(CDBeg);
         Post;
       end;
-    end else
+    end
+    else
     begin
       Application.MessageBox('非法数字!', '提示', 0);
       Exit;
@@ -256,7 +269,8 @@ begin
         FieldByName('CDQty').Value := StrToFloat(CDEnd) - StrToFloat(CDBeg);
         Post;
       end;
-    end else
+    end
+    else
     begin
       Application.MessageBox('非法数字!', '提示', 0);
       Exit;
@@ -266,18 +280,22 @@ end;
 
 procedure TfrmMJEdit.ToolButton1Click(Sender: TObject);
 begin
-  if Trim(Label2.Caption)='' then Exit;
+  if Trim(Label2.Caption) = '' then
+    Exit;
   Order_MJ.Append;
   Order_MJ.Post;
 end;
 
 procedure TfrmMJEdit.ToolButton3Click(Sender: TObject);
 begin
-  if Trim(Label2.Caption)='' then Exit;
+  if Trim(Label2.Caption) = '' then
-  if Order_MJ.IsEmpty then Exit;
+    Exit;
+  if Order_MJ.IsEmpty then
+    Exit;
   if Trim(Order_MJ.fieldbyname('MCID').AsString) <> '' then
   begin
-    if Application.MessageBox('确定要删除数据吗？','提示',32+4)<>IDYES then Exit;
+    if Application.MessageBox('确定要删除数据吗？', '提示', 32 + 4) <> IDYES then
+      Exit;
     with ADOCmd do
     begin
       Close;
@@ -291,7 +309,7 @@ end;
 
 function TfrmMJEdit.SaveData(): Boolean;
 var
-  maxno:String;
+  maxno: string;
   FFreal: Double;
 begin
   try
@@ -310,7 +328,8 @@ begin
             Application.MessageBox('取子流水号失败！', '提示', 0);
             Exit;
           end;
-        end else
+        end
+        else
         begin
           maxno := Trim(Order_MJ.fieldbyname('MCID').AsString);
         end;
@@ -398,61 +417,114 @@ begin
       if Trim(MJLen.Text) <> '' then
       begin
         sql.Add(',MJLen=' + Trim(MJLen.Text));
-      end else
+      end
+      else
       begin
         sql.Add(',MJLen=0');
       end;
       if Trim(MJQty1.Text) <> '' then
       begin
         sql.Add(',MJQty1=' + Trim(MJQty1.Text));
-      end else
+      end
+      else
       begin
         sql.Add(',MJQty1=0');
       end;
       if Trim(MJQty2.Text) <> '' then
       begin
         sql.Add(',MJQty2=' + Trim(MJQty2.Text));
-      end else
+      end
+      else
       begin
         sql.Add(',MJQty2=0');
       end;
       if Trim(MJFK.Text) <> '' then
       begin
         sql.Add(',MJFK=''' + Trim(MJFK.Text) + '''');
-      end else
+      end
+      else
       begin
         sql.Add(',MJFK=0');
       end;
       if Trim(MJMaoZ.Text) <> '' then
       begin
         sql.Add(',MJMaoZ=' + Trim(MJMaoZ.Text));
-      end else
+      end
+      else
       begin
         sql.Add(',MJMaoZ=0');
       end;
       if Trim(MJSJKZ.Text) <> '' then
       begin
         sql.Add(',MJSJKZ=' + Trim(MJSJKZ.Text));
-      end else
+      end
+      else
       begin
         sql.Add(',MJSJKZ=0');
       end;
       if Trim(MJQty4.Text) <> '' then
       begin
         sql.Add(',MJQty4=' + Trim(MJQty4.Text));
-      end else
+      end
+      else
       begin
         sql.Add(',MJQty4=0');
       end;
       if RadioGroup1.ItemIndex = 0 then
       begin
         sql.Add(',MJType=''正品'' ');
-      end else
+      end
-      if RadioGroup1.ItemIndex=1 then
+      else if RadioGroup1.ItemIndex = 1 then
       begin
         sql.Add(',MJType=''次品'' ');
       end;
       sql.Add(' where MJID=''' + Trim(Label2.Caption) + '''');
+
+      sql.Add('UPdate CK_BanCP_CR Set QtyUnit=''' + Trim(M.Caption) + '''');
+      if Trim(MJLen.Text) <> '' then
+      begin
+        sql.Add(',Qty=' + Trim(MJLen.Text));
+      end
+      else
+      begin
+        sql.Add(',Qty=0');
+      end;
+      if Trim(MJMaoZ.Text) <> '' then
+      begin
+        sql.Add(',KGQty=' + Trim(MJMaoZ.Text));
+      end
+      else
+      begin
+        sql.Add(',KGQty=0');
+      end;
+      if RadioGroup1.ItemIndex = 0 then
+      begin
+        sql.Add(',CPType=''正品'' ');
+      end
+      else if RadioGroup1.ItemIndex = 1 then
+      begin
+        sql.Add(',CPType=''次品'' ');
+      end;
+      sql.Add(' where MJID=''' + Trim(Label2.Caption) + '''');
+
+      sql.Add('UPdate CK_BanCP_KC Set KCQtyUnit=''' + Trim(M.Caption) + '''');
+      if Trim(MJLen.Text) <> '' then
+      begin
+        sql.Add(',KCQty=' + Trim(MJLen.Text));
+      end
+      else
+      begin
+        sql.Add(',KCQty=0');
+      end;
+      if Trim(MJMaoZ.Text) <> '' then
+      begin
+        sql.Add(',KCKGQty=' + Trim(MJMaoZ.Text));
+      end
+      else
+      begin
+        sql.Add(',KCKGQty=0');
+      end;
+      sql.Add(' where MJID=''' + Trim(Label2.Caption) + '''');
 //            ShowMessage(SQL.Text);
       ExecSQL;
     end;
@@ -475,7 +547,8 @@ end;
 
 procedure TfrmMJEdit.ToolButton2Click(Sender: TObject);
 begin
-  if Trim(Label2.Caption)='' then Exit;
+  if Trim(Label2.Caption) = '' then
+    Exit;
   if SaveData() then
   begin
     Application.MessageBox('保存成功!', '提示', 0);
@@ -507,7 +580,8 @@ begin
   begin
     Application.MessageBox('已产生入库数据不能删除!', '提示', 0);
     Exit;
-  end else
+  end
+  else
   begin
     if Application.MessageBox('确定要作废数据吗？作废后数据不能恢复。', '提示', 32 + 4) = IDYES then
     begin
@@ -525,3 +599,4 @@ begin
 end;
 
 end.
+

检验管理/U_MJManageNewFDNew.pas

@@ -10,7 +10,21 @@ uses
   cxControls, cxGridCustomView, cxGrid, RM_Common, RM_Class, RM_GridReport,
   RM_System, RM_Dataset, ADODB, DBClient, cxGridCustomPopupMenu, cxGridPopupMenu,
   ExtCtrls, ComCtrls, ToolWin, cxTextEdit, Buttons, cxSplitter, cxCheckBox,
-  MovePanel, cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, BtnEdit;
+  MovePanel, cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, BtnEdit,
+  dxSkinsCore, dxSkinBlack, dxSkinBlue, dxSkinBlueprint, dxSkinCaramel,
+  dxSkinCoffee, dxSkinDarkRoom, dxSkinDarkSide, dxSkinDevExpressDarkStyle,
+  dxSkinDevExpressStyle, dxSkinFoggy, dxSkinGlassOceans,
+  dxSkinHighContrast, dxSkiniMaginary, dxSkinLilian, dxSkinLiquidSky,
+  dxSkinLondonLiquidSky, dxSkinMcSkin, dxSkinMetropolis,
+  dxSkinMetropolisDark, dxSkinMoneyTwins, dxSkinOffice2007Black,
+  dxSkinOffice2007Blue, dxSkinOffice2007Green, dxSkinOffice2007Pink,
+  dxSkinOffice2007Silver, dxSkinOffice2010Black, dxSkinOffice2010Blue,
+  dxSkinOffice2010Silver, dxSkinOffice2013DarkGray,
+  dxSkinOffice2013LightGray, dxSkinOffice2013White, dxSkinPumpkin,
+  dxSkinSeven, dxSkinSevenClassic, dxSkinSharp, dxSkinSharpPlus,
+  dxSkinSilver, dxSkinSpringTime, dxSkinStardust, dxSkinSummer2008,
+  dxSkinTheAsphaltWorld, dxSkinsDefaultPainters, dxSkinValentine,
+  dxSkinVS2010, dxSkinWhiteprint, dxSkinXmas2008Blue, dxSkinscxPCPainter;
 
 type
   TfrmMJManageNewFDNewSF = class(TForm)
@@ -1156,7 +1170,6 @@ begin
 
         end;
       end
-
       else
       begin
         with ADOCmd do
@@ -2213,8 +2226,7 @@ begin
     FSubId := Trim(ADOTmp.fieldbyname('SubId').AsString);
     FKJ := ADOTmp.fieldbyname('PRTKJ').AsFloat;
     FKJZ := ADOTmp.fieldbyname('PRTKJZ').AsFloat;
-    AOrdDefNote1.Text := '包装要求:' + #13 + Trim(ADOTmp.fieldbyname('MPRTBZNote').AsString) + #13
+    AOrdDefNote1.Text := '包装要求:' + #13 + Trim(ADOTmp.fieldbyname('MPRTBZNote').AsString) + #13                        //+'封条:'+Trim(ADOTmp.fieldbyname('MPRTYaoFeng').AsString)+#13
-                        //+'封条:'+Trim(ADOTmp.fieldbyname('MPRTYaoFeng').AsString)+#13
                         //+'烫金:'+Trim(ADOTmp.fieldbyname('MPRTTangJin').AsString)+#13
                         //+'开剪:'+Trim(ADOTmp.fieldbyname('MPRTKaiJian').AsString)+#13
                     //    +'门幅:'+Trim(ADOTmp.fieldbyname('PRTMF').AsString)+#13
@@ -2380,12 +2392,10 @@ begin
         MJXH.Text := Trim(fieldbyname('maxRoll').AsString);
       end;
     end
-
     else if fRollType = '无规则生成' then
     begin
 
     end
-
     else
     begin
       with ADOCmd do
@@ -2498,7 +2508,19 @@ begin
     Application.MessageBox('只能删除最新的检验数据!', '提示', 0);
     Exit;
   end;
-
+  with ADOTmp do
+  begin
+    Close;
+    sql.Clear;
+    sql.Add('select * from CK_BanCP_CR where MJID=''' + Trim(CDS_MJID.fieldbyname('MJID').AsString) + ''' and CRFlag=''出库'' ');
+    Open;
+  end;
+  if ADOTmp.IsEmpty = False then
+  begin
+    CDS_MJID.EnableControls;
+    Application.MessageBox('出库数据不能删除!', '提示', 0);
+    Exit;
+  end;
   if Application.MessageBox('确定要删除数据吗？', '提示', 32 + 4) <> IDYES then
     Exit;
 
@@ -2509,6 +2531,7 @@ begin
     sql.Add('delete WFB_MJJY where MJID=''' + trim(CDS_MJID.fieldbyName('MJID').AsString) + ''' ');
     sql.Add('delete WFB_MJJY_CD where MJID=''' + trim(CDS_MJID.fieldbyName('MJID').AsString) + ''' ');
     sql.Add('delete CK_BanCP_CR where MJID=''' + trim(CDS_MJID.fieldbyName('MJID').AsString) + ''' ');
+    sql.Add('delete CK_BanCP_KC where MJID=''' + trim(CDS_MJID.fieldbyName('MJID').AsString) + ''' ');
     sql.Add('insert into SY_SysLog(operor,opertime,Model,acction,opevent,result) values( ');
     sql.Add(' ' + quotedstr(trim(DName)));
     sql.Add(',getdate() ');