~

复合检验管理/U_JYOrderCDOne.dfm

@@ -834,7 +834,6 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
       OnCellDblClick = Tv1CellDblClick
       DataController.DataSource = DataSource1
       DataController.Filter.AutoDataSetFilter = True
-      DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost]
       DataController.Summary.DefaultGroupSummaryItems = <>
       DataController.Summary.FooterSummaryItems = <
         item

复合检验管理/U_JYOrderCDOne.pas

@@ -12,19 +12,19 @@ uses
   RM_Common, RM_Class, RM_GridReport, RM_e_Xls, Menus, MovePanel, cxTextEdit,
   cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, cxContainer, ShellAPI,
   cxCurrencyEdit, MMSystem, dxSkinsCore, dxSkinBlack, dxSkinBlue,
-  dxSkinBlueprint, dxSkinCaramel, dxSkinCoffee, dxSkinDarkRoom,
+  dxSkinBlueprint, dxSkinCaramel, dxSkinCoffee, dxSkinDarkRoom, dxSkinDarkSide,
-  dxSkinDarkSide, dxSkinDevExpressDarkStyle, dxSkinDevExpressStyle,
+  dxSkinDevExpressDarkStyle, dxSkinDevExpressStyle, dxSkinFoggy,
-  dxSkinFoggy, dxSkinGlassOceans, dxSkinHighContrast, dxSkiniMaginary,
+  dxSkinGlassOceans, dxSkinHighContrast, dxSkiniMaginary, dxSkinLilian,
-  dxSkinLilian, dxSkinLiquidSky, dxSkinLondonLiquidSky, dxSkinMcSkin,
+  dxSkinLiquidSky, dxSkinLondonLiquidSky, dxSkinMcSkin, dxSkinMetropolis,
-  dxSkinMetropolis, dxSkinMetropolisDark, dxSkinMoneyTwins,
+  dxSkinMetropolisDark, dxSkinMoneyTwins, dxSkinOffice2007Black,
-  dxSkinOffice2007Black, dxSkinOffice2007Blue, dxSkinOffice2007Green,
+  dxSkinOffice2007Blue, dxSkinOffice2007Green, dxSkinOffice2007Pink,
-  dxSkinOffice2007Pink, dxSkinOffice2007Silver, dxSkinOffice2010Black,
+  dxSkinOffice2007Silver, dxSkinOffice2010Black, dxSkinOffice2010Blue,
-  dxSkinOffice2010Blue, dxSkinOffice2010Silver, dxSkinOffice2013DarkGray,
+  dxSkinOffice2010Silver, dxSkinOffice2013DarkGray, dxSkinOffice2013LightGray,
-  dxSkinOffice2013LightGray, dxSkinOffice2013White, dxSkinPumpkin,
+  dxSkinOffice2013White, dxSkinPumpkin, dxSkinSeven, dxSkinSevenClassic,
-  dxSkinSeven, dxSkinSevenClassic, dxSkinSharp, dxSkinSharpPlus,
+  dxSkinSharp, dxSkinSharpPlus, dxSkinSilver, dxSkinSpringTime, dxSkinStardust,
-  dxSkinSilver, dxSkinSpringTime, dxSkinStardust, dxSkinSummer2008,
+  dxSkinSummer2008, dxSkinTheAsphaltWorld, dxSkinsDefaultPainters,
-  dxSkinTheAsphaltWorld, dxSkinsDefaultPainters, dxSkinValentine,
+  dxSkinValentine, dxSkinVS2010, dxSkinWhiteprint, dxSkinXmas2008Blue,
-  dxSkinVS2010, dxSkinWhiteprint, dxSkinXmas2008Blue, dxSkinscxPCPainter;
+  dxSkinscxPCPainter;
 
 type
   TfrmJYOrderCDOne = class(TForm)
@@ -408,7 +408,7 @@ begin
       Close;
       Filtered := False;
       sql.Clear;
-      sql.Add('select A.*,');
+      sql.Add('select CASE WHEN TRY_CAST(isnull(mjstr4,0) AS INT)=0 THEN null ELSE TRY_CAST(MJstr4 AS INT) END as MJstr4,A.*,');
       SQL.Add('cast(A.MJSTR4 as varchar(20)) as gangno,');
       sql.Add('C.OrderNo,C.MPRTCodeName,C.MPRTMF,C.MPRTKZ,B.*,');
       sql.Add('KouFenQty=(select Sum(X.KouFenQty) from WFB_MJJY_CD X where X.MJID=A.MJID),');
@@ -422,7 +422,7 @@ begin
       begin
         sql.add('and mjtype=''´ÎÆ·'' ');
       end;
-      sql.add('order by A.mainid,B.prtcolor,gangno,A.mjxh');
+      sql.add('order by A.mainid,B.prtcolor,CASE WHEN TRY_CAST(isnull(mjstr4,0) AS INT)=0 THEN null ELSE TRY_CAST(MJstr4 AS INT) END,A.mjxh');
 //      ShowMessage(SQL.Text);
       Open;
     end;
@@ -876,7 +876,8 @@ begin
         Close;
         Filtered := False;                 
         sql.Clear;
-        sql.Add('select A.*,');
+        sql.Add('select CASE WHEN TRY_CAST(isnull(mjstr4,0) AS INT)=0 THEN null ELSE TRY_CAST(MJstr4 AS INT) END as MJstr4,A.*,');
+        SQL.Add('cast(A.MJSTR4 as varchar(20)) as gangno,');
         sql.Add('C.OrderNo,C.MPRTCodeName,C.MPRTMF,C.MPRTKZ,B.*,');
         sql.Add('KouFenQty=(select Sum(X.KouFenQty) from WFB_MJJY_CD X where X.MJID=A.MJID),');
         sql.Add('CDQty=(select count(X.MJID) from WFB_MJJY_CD X where X.MJID=A.MJID)');

复合检验管理/U_MJManageNewFDNew.pas

@@ -438,6 +438,7 @@ type
     function JsXj(str1: string): string;
   public
     fmanage, ftest: string;
+    Canprint: Boolean;
     { Public declarations }
 
   end;
@@ -737,7 +738,7 @@ begin
   end;
   if trim(Edit7.Text) = '√' then
     IsJsMessage := true;
-
+  Canprint := False;
   if trim(fmanage) <> '高权限' then
   begin
     if trim(DllName) <> '' then
@@ -1690,9 +1691,9 @@ var
   fRoll: Tstringlist;
 begin
 
-  if (strtofloatdef(trim(MJLen.Text), 0) = 0) and (strtofloatdef(trim(mjqty4.Text), 0) = 0) then
+  if (strtofloatdef(trim(MJLen.Text), 0) = 0) or (strtofloatdef(trim(mjqty4.Text), 0) = 0) then
   begin
-    application.MessageBox('长度或者重量不能都为零！', '提示信息', 0);
+    application.MessageBox('长度或者重量不能为零！', '提示信息', 0);
     exit;
   end;
 
@@ -1704,7 +1705,11 @@ begin
     application.MessageBox('卷号不能为空', '提示');
     exit;
   end;
-
+  if trim(MJStr4.text) = '' then
+  begin
+    application.MessageBox('缸号不能为空', '提示');
+    exit;
+  end;
   if trim(MJXH.text) = '0' then
   begin
     application.MessageBox('卷号不能为0', '提示');
@@ -1775,6 +1780,11 @@ begin
 
   BTPrint.Enabled := False;
   Timer1.Enabled := True;
+  if Canprint = false then
+  begin
+    Application.MessageBox('长度没有变化，不能提交!', '提示', 0);
+    Exit;
+  end;
   fRoll := Tstringlist.Create;
   for i := 1 to strtointdef(Edit14.Text, 1) do
   begin
@@ -1813,6 +1823,7 @@ begin
   BTAdd.Click;
   MJLen.SetFocus;
   MJLen.OnClick(Mjlen);
+  Canprint := False;
 
 //  if SaveData() then
 //  begin
@@ -2641,11 +2652,7 @@ begin
     kmxs.Text := Trim(ADOTmp.fieldbyname('kmxs').AsString);
     MJFK.Text := Trim(ADOTmp.fieldbyname('PRTMF').AsString);
     MJSJKZ.Text := Trim(ADOTmp.fieldbyname('PRTKZ').AsString);
-//    CustomerNoName.Text:=CustomerNoName.Text;
+
-//    PRTCodeName.Text:=PRTCodeName.Text;
-//    PRTHX.Text:=PRTHX.Text;
-//    PRTColor.Text:=PRTColor.Text;
-//    SOrddefstr1.Text:=SOrddefstr1.Text;
     if edit10.Text = '' then
     begin
       MJXH.Text := inttostr(ADOTmp.fieldbyname('maxMJxh').AsInteger + 1);
@@ -2747,6 +2754,11 @@ end;
 procedure TfrmMJManageNewFDNewSF.MJLenChange(Sender: TObject);
 begin
 //  MJLen.Text:=JsXj(MJLen.Text);
+  if StrToFloatDef((MJLen.Text), 0) > 5 then
+  begin
+    Canprint := True;
+  end;
+
 end;
 
 procedure TfrmMJManageNewFDNewSF.MJQty3Change(Sender: TObject);