From db791f27cdef8f1495ed79968ac4154014bfd4a6 Mon Sep 17 00:00:00 2001 From: zhaoaomin <18366680202@163.com> Date: Fri, 10 Nov 2023 17:17:33 +0800 Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- shangjian/.vs/BL/v17/.suo | Bin 1298432 -> 1263104 bytes .../XGLFinishPro/Views/LanJu_Operator.xaml.cs | 18 ++++++++++++------ 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/shangjian/.vs/BL/v17/.suo b/shangjian/.vs/BL/v17/.suo index c1ac16cde2cb54d42a859e274dd8121af9ad89a1..528000bd24f0237056edd8ae27f44d949cc84a34 100644 GIT binary patch delta 15301 zcmeI333QZ2+V4~E)_eNxP6#0hp}`m;OK4(P#n1#qWQ~BRW5f`4M2s=4A~az!K!AjX zeh@K+h#llZ2#YCX9Hv=BLK?afK{;QJ!I(lcm`+eU%=bm%>oL{Qy zseON{>W#N_khgF^QMciX!@|NG;QEalH(-RxAR4?5RPZSa3p)+Fc2fGy<2-~uHD`SeUxzx<0Uw(1u+K6N9ly9;$n|1L0D9u*4Be!pT)8*$J zpBNFm3~}*$2V5)O(%7*XX*>sqDBCr#-`7@&?IT=WAx#DOU?@V301)5k0QXeb4}l2S z?*yyB)8JzuQaJ`QAO5}~CE9cV`Bp)&*SAGkrnz7{%zV8~DbfYaH$zS9GX((~LHeu! z_Q{|v>>e-$Oa)i8u(0Q0R)BlpKObf~XbR?lJg{8qU*8Tv&$aZ*-)o1vZf^%sA@K{f z2h5wzfb=%|ni^Z*_j^qts`;;)LZmF3;)ZXD68p<`h;u=H7&RFO^Y362$OU5{^JS`W z|Lv_~&Qe;SCw!yK3C25MNfnMFvqu#*yk5Me*|v*jE9*EB`Hu#}P!>_gC9sQnya2NR zh|sF3PA25y_avi}9;tD0(B2~qLAuvRsq?J+TMF4mB>66Ky#lkrPr1!5WM1FPo0`r3 z5>h*2Yz3de{y5A^AVPeM6htA8!rWIc6Y_@Nj(XXBxA|2gja6_v>vMaj-tSVq`;*(k zKEuLVggp!oQF}qduW@}~;eOM%c2k6}db2gUA(Sw`Kr-KAq>2!K*Y{|)r*liZ@mUY*v&Aax1zT}e*fw%+xKy0uSFMtcvk_F5B+=u_~xKbdvLdfwO< zj89dgA-wFHKDFJpq@-%oa%+;&YzPZ$kIwVCtvStu^}YEKGCc{lf>uBjVg_j8+Z`2a zdJmya!8P6YrM2Dc4`J&K-mQ<@73N@I0pCJC7l^WqhuaAnfmc8~$X7!C63mz3E{ACc z2G}v`!@^-^z|4l(61*>f`+G1G`~#pjoj1n9<8YnhMrZ6#mwm6rb}YmXum;^LZC1ZA~@#1#CWY?C`spnugSVrKt4ZGxiS zY7B@+C_&9`OOt&_KW<_}d{eu>_X zTTU}Jvl*%xVHBD^m0=QGsy4A%z8=#(yvI`ZXBLoH)bjK=UqZUBTM&_=g zWjC;*BF{tK8<>Fb6AXc0I^5kch_AtZ2=O|@od|cn@1evy*ayDpiT!5xgY0h58exK< zC+zEC{uwlZ{T;*`4s$2mMPMQ9{_|iy06KwpA%72`2sixj>kHXH@DWfz zFE9vXfFTUK*-1oyg2cCm{CYS{zFdHlY0h)6{TE>fp zu^fwkFzaP(j=+zATcd6;^D-0tIG7D$1}fI%CREduMWVfpGqavUvc6J;cbLQEnQr1GrOy{0; z#?UL1SsQ*Jz&aZO*-Y|hh-p>9s##zslLFfzu}XQ;A51jGD*c7_?qv6p*CzFp!XCcW zX_%`i(Er5j#*d1RNnL!84>EGk4i;p~+abZXk)VH~RAude!PODm1L*ifDLOQ->GDKr zo-w4qV&Kudr=*#IT}%tqq6qt$GI|cCZ9bR_=7ITO0eArvfQ4WYSPTlm60j6314W=1 zEC)WY0;~jnKwuSk5xhaoSIdKF`x?1_qup@t0eitd@D6}x{cT;7f548*{yjFmIG8~- zE?IHJpy_X*=4U`t*!$6g6J^c@3nP}*`nLS7XK^r(?IZSA_6jdO!m=3KLp}1O@A&yq zl9RC#V*kOGQ0W}W$xDy2tj0cXFYJlEs+n)k@)Y!AIQPtxg3PbTUjHmTm8zEO{n5>tOaG@Rj>}c21K8g!(0zu2OGeDfQ{e{unBAi z6<`b43bujm;7w!L?668$IM@N+0z1JU!Q0?ZU>Eo^2!h>U57-O#0g?HBm`6~FH$ZDt z;vn4b12^n{ftdocKd6HJVVDdcTIg5Kuxagr;4M&%0Dl9=z^C9is1-dp$nyiN7r@`a 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 delta 13973 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 diff --git a/shangjian/XGLFinishPro/Views/LanJu_Operator.xaml.cs b/shangjian/XGLFinishPro/Views/LanJu_Operator.xaml.cs index 5560c15..214e5a1 100644 --- a/shangjian/XGLFinishPro/Views/LanJu_Operator.xaml.cs +++ b/shangjian/XGLFinishPro/Views/LanJu_Operator.xaml.cs @@ -424,14 +424,22 @@ namespace XGLFinishPro.Views DataTable dtNewReportCode = formingMachineService.GetReportCode(); if (dtNewReportCode == null || dtNewReportCode.Rows.Count == 0) { - newReportCode = (Convert.ToInt64(dtNewReportCode.Rows[0]["report_code"].ToString()) + 1).ToString(); + newReportCode = DateTime.Now.ToString("yyyyMMdd") + "0001"; + } + else + { + if (string.IsNullOrEmpty(dtNewReportCode.Rows[0]["report_code"].ToString())) + { + newReportCode = DateTime.Now.ToString("yyyyMMdd") + "0001"; + } + else + { + newReportCode = (Convert.ToInt64(dtNewReportCode.Rows[0]["report_code"].ToString()) + 1).ToString(); + } } ExecReportWorkWin execReport = new ExecReportWorkWin(selectedRow["workorder_code"].ToString(), selectedRow["quantity_split"].ToString()); - - - if (execReport.ShowDialog() == true) { string workTime = execReport._workTime; @@ -472,8 +480,6 @@ namespace XGLFinishPro.Views { } - - } private void btnCheckLog_Click(object sender, RoutedEventArgs e)