From 6aaf1ef14a2cfceaa455c181d86eb2f2f5c47589 Mon Sep 17 00:00:00 2001 From: "songnan.zhang" Date: Tue, 20 Sep 2022 12:00:40 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AD=98=E5=82=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- APP/QMAPP.Web/Web.config | 8 +++++++- APPMD/QMAPP.MD.Web/Web.config | 15 ++++++++++----- APPQ5/QMAPP.FJC.DAL/Basic/MachineInfoDAL.cs | 3 ++- APPQ5/QMAPP.FJC.DAL/TianJin/TWorkOrderDAL.cs | 2 +- .../TJDoorPlankPlanPrintController.cs | 2 +- .../68b954f7-cfc6-4e67-afc9-df7840250b0d.xlsx | Bin 0 -> 9615 bytes .../cd1538b0-f827-4ac7-9111-d27a5c0407be.xlsx | Bin 0 -> 9615 bytes .../de760407-2172-474d-8517-8a715069e144.xlsx | Bin 0 -> 7315 bytes .../e6609924-9e68-4d29-8dda-fd4beff0c1b4.xlsx | Bin 0 -> 9397 bytes APPQ5/QMAPP.FJC.Web/Web.config | 7 ++++++- APPQ5/QMAPP.WinForm/App.config | 9 +++++++-- .../QMAPP.WinForm/Forms/TianJin/TJFrmPlace.cs | 18 +++++++++--------- .../QMAPP.WinForm/Properties/AssemblyInfo.cs | 4 ++-- .../WCF/QMFrameWork.WebServiceHost/Web.config | 8 +++++++- 14 files changed, 52 insertions(+), 24 deletions(-) create mode 100644 APPQ5/QMAPP.FJC.Web/Temp/68b954f7-cfc6-4e67-afc9-df7840250b0d.xlsx create mode 100644 APPQ5/QMAPP.FJC.Web/Temp/cd1538b0-f827-4ac7-9111-d27a5c0407be.xlsx create mode 100644 APPQ5/QMAPP.FJC.Web/Temp/de760407-2172-474d-8517-8a715069e144.xlsx create mode 100644 APPQ5/QMAPP.FJC.Web/Temp/e6609924-9e68-4d29-8dda-fd4beff0c1b4.xlsx diff --git a/APP/QMAPP.Web/Web.config b/APP/QMAPP.Web/Web.config index 810f3b8..c665cf0 100644 --- a/APP/QMAPP.Web/Web.config +++ b/APP/QMAPP.Web/Web.config @@ -42,14 +42,20 @@ + + + + - + diff --git a/APPMD/QMAPP.MD.Web/Web.config b/APPMD/QMAPP.MD.Web/Web.config index 8c98a17..24b8e5c 100644 --- a/APPMD/QMAPP.MD.Web/Web.config +++ b/APPMD/QMAPP.MD.Web/Web.config @@ -33,8 +33,13 @@ + + + + @@ -105,19 +110,19 @@ - + contract="LoginService.ILoginService" name="BasicHttpBinding_ILoginService" /> - + contract="LoginService.ILoginService" name="BasicHttpBinding_ILoginService" />--> diff --git a/APPQ5/QMAPP.FJC.DAL/Basic/MachineInfoDAL.cs b/APPQ5/QMAPP.FJC.DAL/Basic/MachineInfoDAL.cs index 52ab0f8..e67e745 100644 --- a/APPQ5/QMAPP.FJC.DAL/Basic/MachineInfoDAL.cs +++ b/APPQ5/QMAPP.FJC.DAL/Basic/MachineInfoDAL.cs @@ -291,7 +291,8 @@ namespace QMAPP.FJC.DAL.Basic //设备编号 if (string.IsNullOrEmpty(condition.MACHINECODDE) == false) { - whereBuilder.Append(" AND MACHINECODDE LIKE '%'+" + "@MACHINECODDE" + "+'%'"); + //whereBuilder.Append(" AND MACHINECODDE LIKE '%'+" + "@MACHINECODDE" + "+'%'"); + whereBuilder.Append(" AND MACHINECODDE = @MACHINECODDE"); parameters.Add(new DataParameter { ParameterName = "MACHINECODDE", DataType = DbType.String, Value = condition.MACHINECODDE }); } diff --git a/APPQ5/QMAPP.FJC.DAL/TianJin/TWorkOrderDAL.cs b/APPQ5/QMAPP.FJC.DAL/TianJin/TWorkOrderDAL.cs index ca7300b..67cb654 100644 --- a/APPQ5/QMAPP.FJC.DAL/TianJin/TWorkOrderDAL.cs +++ b/APPQ5/QMAPP.FJC.DAL/TianJin/TWorkOrderDAL.cs @@ -401,7 +401,7 @@ namespace QMAPP.FJC.DAL.TianJin break; } } - sql.AppendFormat(" ORDER BY W.[UPDATEDATE],W.[PRI],W.[PLAN_DATE],P.PLAN_SEQ,W.[SEQ],W.[MATERIAL_CODE] "); + sql.AppendFormat(" ORDER BY W.[UPDATEDATE],W.[PRI],W.[PLAN_DATE],W.[ORDERPLAN_NO],P.PLAN_SEQ,W.[SEQ],W.[MATERIAL_CODE] "); List parameters = new List(); parameters.Add(new DataParameter("routecode", routecode)); using (var session = AppDataFactory.CreateMainSession()) diff --git a/APPQ5/QMAPP.FJC.Web/Controllers/TJDoorPlankPlanPrintController.cs b/APPQ5/QMAPP.FJC.Web/Controllers/TJDoorPlankPlanPrintController.cs index e1ed9c3..c3e45a5 100644 --- a/APPQ5/QMAPP.FJC.Web/Controllers/TJDoorPlankPlanPrintController.cs +++ b/APPQ5/QMAPP.FJC.Web/Controllers/TJDoorPlankPlanPrintController.cs @@ -380,7 +380,7 @@ namespace QMAPP.FJC.Web.Controllers { dt = this.GetTableByExcel("DoorPlankPlanImp", fileName, dt); //格式转换 - list = QMFrameWork.Common.Util.BindHelper.ConvertToList(dt).ToList(); + list = QMFrameWork.Common.Util.BindHelper.ConvertToList(dt).OrderBy(w => w.PLAN_NO).ToList(); serviceResult = wcfAgent.InvokeServiceFunction>("DoorPlankPlanBLL_GetImportData", list, materialmodel,machine, produceshiftmodel, workcell); if (serviceResult.Ex != null) { diff --git a/APPQ5/QMAPP.FJC.Web/Temp/68b954f7-cfc6-4e67-afc9-df7840250b0d.xlsx b/APPQ5/QMAPP.FJC.Web/Temp/68b954f7-cfc6-4e67-afc9-df7840250b0d.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..dda7939cfcbe1f80f86187147533a108315163ac GIT binary patch literal 9615 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 literal 0 HcmV?d00001 diff --git a/APPQ5/QMAPP.FJC.Web/Temp/cd1538b0-f827-4ac7-9111-d27a5c0407be.xlsx b/APPQ5/QMAPP.FJC.Web/Temp/cd1538b0-f827-4ac7-9111-d27a5c0407be.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..dda7939cfcbe1f80f86187147533a108315163ac GIT binary patch literal 9615 zcmaia1yo&2(lzcLT!I7%8r&fl4IbRx-Q6X)1PSg=u;6}ihv4q+?h@dKWMOkuFog8d8|1;DAko5sbNfFtyD^;js3fm zXZH4jqJk#kCMo_Ymc(QAGt28j)~~@#gGd!-62@7w(it!(aZPc0`fB>Vsuz&unJF_U zDX6x!e{IC2sW6EnV4NYELF32e8*ezK6gV{*x1Z&t~VpMOMbcgPCP&SGj`|w z!1(-rN6$KwQQz@0Cr21kH7`mGU1Xece&ro~4 zG`5M={Cd+>i%8?*_#mO&%=K~T$KO%DrZ*g6dq!F48D-SJqpW9TYw!ZIN0gR$2R(Y% zGGvQDpIdTO%qsuCWkoK@%}1LMTsILGTwUVVRIqIwqD8N40ftd zO6lz|j2PftN(5LkVpl2lO=gXI+_yS40FIzF)4;<;##X?^Xm!*PsyKcn8ZZ`NE0>vi z9iV$~gM@CUV!cCT$ytQaOzY8sgA^{Y2WcFR)K@ng)-Kk}(Pc zmt-qM&Rqmx!naF0DW=)AJ_1Yae_=!-GlKJ-ZAhoW!z6h)cd<*nsRF${Jcx}12 zPknU|hCwH?$|q>7)g}j1(>Ze3n}3J$(W%oApA0K?wGxd}TdbF0s}fn5 z_&(GROSAsd6A5(3u;XKymc>NLESo!IHk@t2%7^%Bjrb^pQH#;6FFA-*mLYC}w*1Bd z^BSjR51(4o(kUStl*;ec2jn`Dn2^8Iq>%_GfzD;ZO#BddQ)+u?=N z@g9z)!>D$^_7dv_u773-@MpN3&3|&kKMNrJ5^%DzHM27|FtGoVM|xOdMarM8sKA4O zVE>owPZfq22ZSqXSY@-LduW+FfuG$2QkW%Q`G=9`jD}TFE6m?IJGO}ygBe;-RNe1i z--Uwk*=vH;r`QeiG-It_Zr73^)5(i;4`8oa`+}+FaqDd|2)}PWe$SHupprEt-6jhk z<%-=o-x_{D#e((iOzI*20W>?$VCt}J$OpcoUTM; zke3%Hl*;6-`;e(5Tu^7nEH&t|4SI~CmPm1xi+zKp?Ji-_l(dihHzk00jm<=br7n97 zNc&;|CcA~kv?!W_@?=I|oy*^ZWPG2qUlA2dcIei|aM%auLuR=1Rl0}tt>gQlUlmt! z4~U94N*b3RMG%IBbcN7l_nK_ALP^?LfXZNsmM@2wG*0U=4$P+)e!@ldKt_|v9&NsM zbz@@vNYcCGlVTTp@&jvNf>Ky~L+|P2j@qCn##h&H6(90Pv901*%Z~rn3BB<3A~tF8 zsCsBVH#FG|B3xe2Ye-0!%Cus*X82Qd**wF=6lOKIZbq^MmQe3fvpXiojR+iix%dOABu}k@WAl6KT^;SXoa#ItuWL*R(LWy) zCO7YkE)+w419ukZ6KAvGguRR&2-!K*Z%FE3&%L|F1VI5U@{UFUnv?JEfZ4@x3a+6x z)FxF_g3g;0IGYobj97GDYO4x0HC%^i*-s39%noV{nOEzq3KgNz9W8X75;~v(bDR<0 zEDd#TQb=?{y`RUwM$FPfcV*O;|L|RW@=KZVj^imUSVv%{54SyWuwN@0TciP2MP+27 z$x<~S`($T_mi6e;>3CNO)ZId)hg_o1Taw^#t`q2JL7TJw>KZqWeK0`=9*1>rM^BjN zK`(n+DVL{?bB<{)`D=;4efU)#l}!ReHYTI_#Ar{L>s^nqP7KaYLBv(q)t0Flu|_s< zR|?;7u)rSy&*6e0JMFPtW`+tXY|nVu`1oO7Rb<-u7*gWz0=&8to)?E(TGBSmJ>WPw zKh)cYd~}?Qv#tayx~OOBFKseiKnRaQ@OPI5@l`1OQeJy=!t!a%ba>Y*H8ILyS7Mc} z9IQX3uE2<``q9JceB`h${XvK_>XQDIQ;AQAiYjf^>jWnd92yG&DS0alCp!e53`VYj zD%sqsVuvJI;B?FD|K^OBsN$J3?2Qd94E~5JP{Xa+0--=aqVaw)@qfgA3jZX6LzRzK zctYqcZ%zq>-K;Dq9C1H56wZ|68IKE>t4*vs^DL#hIvTMsN$ug8eiji4@^$6oS7#^6 zkfrt!yk({o$`yHlYf7BeIPNry{sIFr5vcF9#diGUc5Zle7VCy804*rezaFR5sClNkstG4*DfYY5a(x(^yaJr}^<(JZG#-dm2zQ zx@4E$!-87l#6}ez5S*>Wo1odK@9`tu`UMcgAz#scGxgLoIJbqg$_Y(S zt*9w0HS*kTux~T2&~*;cPGBmz-1{y*&*1^CZHhX5=*YFGDm4sJcI=m@7)SEm)e1N@ zWQ+;8vWarcpDUQsaQAuK^Bw%|*tlq%SD~B*rBApIe{;E~>S5N^h8NkzhIw*%rI=s2 zwSw5YHjQ}#6#rh`5XzPjIqF>DJ%x05DZ9s^KR7Ez=}xe+KZ(x!fsc7(G*>0er8urj z_0zHKD7ZHiW3h4A1P!s?fdICXH8VQ88I-f%N_!Z=*=Bp>mVeGW<1E#sd)R<43FB@L z2lLazX&KYQuL&2uT3=*dOnC_uAvfS#luR39V0{(2cjSU>4p6%HcVTJyU=U8HIpN z4Tc|zoDn3Fk0b1EDICE{IF6w~9ji^alN#XkEx2atl7s$Xpl+ct?6#TC28a`fkp-O? zqP65Xm9jH^xS#Eou4?C@p1X8+qn}<+^`Z%w0u#Jg&sAz9yY3MKJ~e)1!rPqfn@^Ew zhey(TGY;{0zT&)!J4iwn65^7K83GiMTcM7|5T1##y9lL@=9O-E)g090uF3dyA|fz@ zVxI_6wh~UM(x~ubqwrUPFc3WnipnH;c#x7Ez-r%)d*5-eIPAA_@Sh z9Pa6oh3I78a#Ciy5ZGx7TAqtibjrvE9FDWo=q|^+f{_Wks-yBdwq+Bz;JN|r5nuF3 zM(bIm!17gNwiZl+4oXW5LDSMCTL@l$3=3yqP=FF^ko)=u_eo{e5Ph#^^Q6YSwuyG8 zvp?EsTe(~_;2tY($AUZj8b-fs4fC>wzolek$*Y(jOu|J;ttN>j znqtAemR9Y>dH$R%wMnSo(S-ulN-J2)IpY2L>?XD8Ysu|dVeW{_&Tv!iSn2K$L|u6}@O5 z1>q?HUHijywLUj_GZkkeeU^oh*0^kcen^lfJEx!kE5<$c!Z!ho3mh3(w%2(iJ6LsT z<5R41mNrr`rOuRw){gjS-Uk0?7;MROBb1U#Rhe|_4Z|!7rvAds` z6fQi$lu(M^9D)*-20{vR%BjA_qS}!5kB+?K0S)*2N`OLZ-3336B5y5f@d$65@id=O z$t?R#2aghorjyuwbBNc~D45A96enov1iI2iM!eT9XeE1rU zctVmzbilif;Pd-yp6?kt8ObTS%^a~b%Wf7(KNeFzOBzb|mvrQ1_8p{$Ce%WoYfP51 z4O9Ya3xd)TYE>?2sJ&HmsEzYXo&rcxY>KKe%=p%0g~{=qZDjPY2l28X=%OPZ!S4w% zc;AqRT?TNj+)JyWy0?sU5}6YfzMJU=-vu*)4jf^h<-?Om`odx{$7xbzkbKGE)WET< z*F6=T+P!SV?6{Ote~_Zi{ZTI;)6v|bCoTz>+l^aD$2f&RKTK~hzhbS2hPMemVkux4 zN-i%a*8-621@ilU5M)IfWRK4Q@U9{V2;#5Do1MLjxq;nF=sKxxVKqO6@yM(F5aw{40nJ8S&^Gqi-bd;qgIpE+JLEYrE^+i zsq9xO`XrGvlYWQgcm&)4Zp+5Miy#Y$@J`5b9&#Dt80NY5k6)`=^X z(xft;D%-z0Sk){#@l#8!7Usiq+bT2SJQ^{@h$yyMz1w1IDQCEfz~A3$HgLf$z>ZM! z_Za4?Q>2M#yq{{t|JDdSh2pu}nC-LMHa)6o<4#{OxRd~cn3APQH5mdv{u+~&Eg*)^ zXeGS5lnckT#JBCE$w54uoAuaRV+pnSL(nhtbG2TaHbA!K$2|tFx!f#zqLsiA)@29`Xku3vDFhW3i5rjWNlVb+oeSj6_4idu_d<&se9XYJ@kdSL% zfuEV4wbuV&6;&7N>Bz=*cO*@!@(mEzm-s#WlxvP)9P}|(w5+joJ%Sn87(yk_C}68q zS4rZd=lR*Kfa_#42QK)1f_4|t_S@?p)X-NW1W_?UhJFt%;-zrKlfAOVpx~@(oRW~b zV9%9?c!_k2B1RrSYmg|G zp#{D(t!yl!5O&f5i&57!V@<_L};tnC>W@bUBF z(K2u?=BJyfQBZ`g0D5qu3raLmazeYyrCx5T{i=7O6!eY+jUNI&xmj?7e3EG~iV@{A z0WO)d;%%yCj~e5~G7_8~-eH|LNN4AV_6ApZcU<{7&Y4Wlb9EjgnC}wY=Cr%CYCrh&Z<{vJ+5TZ)u}*QvQmc|N`W2PDWuop7EF!=c)R$h*Ite5raQ6yVq zepjDmtWJh3-P~1FzF9F^N#BcX6R)}`c1G(8FiVJ_KY=q@NlZ)CP5t~LOkMtQS}E>* z6~9ii_IyT+M8ecjL-y;1;jtfTqSoTX?6vi)${xt%wr||5(tlhofHRiZ@eC8R@(r_I zFJ$hv>O`4{lEGg0tSBlMtsIW4shF=$q&Sy)orBq$JF!rLm*KYRZ z(pnPzi%o+3P}`8`3=$x*tYJ31mb)7QA-1Z7QG%R=Q2?>$t16*EcU~S`dLoX#O@9Gi zZiCFE84Zz%MNgL!&3s?{9r~C56PA2 zIjMYb_^k_GKJ(A3PLdqIYS8S1wLUWNH*h_s02P2RlTy&3#C4wlLzgkHq_H zGgu%rusHT^0?}U#U*ofXAQ+KysI<}sxX)*$mfv`GlwSvc!^1c6*zy$Zk3LY4fmlJs zM_N#(Et1`XH4y2PC*KA>pvZ3!&LXYeD?ve*`629GQ}}6^O=POcLKK+uwKuSQfTczP zBbAUdhL|LZN8zZ++>#}o&ES%ugPefjZ8wQBy+MoFGrxtwN5Dm_O2^k>-Z{z}h&yL2 z)`dEy={O+&04g*{lP&9lWawBycT{E{z2LH0g6C`CBIUykjdkjSf5(&GsX}BYks0mw zNOmC&lQ~hEjsU_LW4_OqoS*W$3XAV+R$TUy`hTU25 z5oGru&Lz-G$NE@EIY8--{6hXx$11qovKezX_`kf3u}e){+vIB>3(~5ubZI zS*~y$JqqL0omC`EcKEQL!Zcd{f$J%gX1msw=Bs3ujjOQ)dh^4_Qi%m7>rA!Fa^(N{ZX$cG=F@RS(`U&H2zwo zf{PKz1*LtOs}9WoQtK_7t+!cQ6IN@mD%iFPW|6dI!TABEJW2?ySEJ~OM^vT?WZwA) zI@3kSAtO8viIa`8!b}@J)!m zkwDybM%P`nxg^$yv(Ry`rR0ZI=evv1Sqj3`$2%s(5JIy-fKpCQ`w|=K0o+AqTC+1d z@QFQ=C|eyA0~6Z^SEmudjEGNh;1k4R2?1sTZ{79Tt>5l9PnWAz=w6|U06Nm$$|N1p zH={xo2;^VncLd0FXvc>?f>r6e)6fO3RZu(BngG<@$BKXd)+w8tPmxwhxD}O2q?ey_(FJ?$zn(EQQy^imaAM9-7+`%fa#P zc#D+RH81m**$-aZzKkA3=5Ql}xL8q?5N>toB>5kC{YM6mcwrM`Odzt+{fm$B(Lt6u z5?SdNLowHMa-3oyL09O~`QI|)EwBQMh$iHBYA&s{JzBH&dKY|xCtS?WbH*G%b?_Xs zsU{-#9DWF)P-&1OXD9`y{MelAdqYPe2W=@qDQK9!l=^UcdeL^Ae|`L&_c3~){{XZV zZnl>SvE4H^4o5+u245%X~OcXApK%R|IZ!|oK@ zScAs36ZnH^5@$en!D+v$w@jSrDSghhJG_tXeE^T*APu2j^AY*K3L4SyQQCWqE9WQ7vpz zRBk9=yr){(Pz_XMnNypePc;;MSH0}-DzOCWc35UU2!wXjcKUEMbLh6O;oLuUczsyP z@VmYoIS@Z);*{^fO-eh?W!wv7NBm(ArJkP6bvp?C|`fH0?E;7>eT>1XCa5Ia!)$T?@c>kNm+dadtGctHqQ@k zyBY&VrJUb9hAb5~lX%uneSTwgCyuzNzLTaLj(DMzKWqf8N-`8IcV~if+9$+EHh;=9 z6+H{&jkfV1BeSJM1M-?7v*+%8KGssfJKS%$8v#)H%yU5rUQ1VMgpBY*uZ6Zvk%CA^ z34-?1XdcS1=5uDFRYqJfKR&E9zFJ^4oG}>2Tl##AyY`@LXr_j(6J~1)m-z*uQbit+ zh{%zK3;RX9fT_K(Y0m?(^BB0aJz|yC%f1w0fL(1hV6z}&fX$gKl3LGxl(WtCbfv$= z4*4bGvi0ONjPQ3iK=o^_(m%Ul`}q&~udKVSm6h4gWP23D#}0ZFe<#vMzs*!mNj&*N z@>pp;dp?4ULGos1MT>NU#+)B+biracD(;?6Q~6HAMVGUf~@WrAqg8kqlC_Hbi&Yc>ONQ=6vLt#~tdkz4``GswWvf}z2?KT3{vFAIq`rrDg2dAZ`KxG^!)73#49!FX z^ykFet>k5Q{YJb+B29+8h$deL8DD@^uVb^!iMzA%qOV9Xa1z`_-nt#4aqmp`{*&Jp z_m??3(kKmg*%8J-F3K2_(Or3IKspzTP(H_dy*GZWKuc-M{xjk3^w-jo++9mlL2ivu zHthaQw^mk#`$H={iP-|fOw=3lQK=5*kr-iq?%6XfD3?M|P#nXy4!i@$PGW(@C5E(! zLhAkrav=+w>Mb@ji9PC4gdt=Z-){lqA10tNC$g=jINEv%NH{x7)S+qoK z&uELB{=a$Se}Z%KBn$iS8ODZZIB}n^&$RMO?4|DX?^FG6bWJ7QDTDF)^j>yIap$xZd>rS&=9BGBEj zPCzvy9V5TX2(mb-2?a$A6DgxUKCU60QHc|ur~;?7fz{8@d97JZKCNv<843=yE6;El zCzPj(JVjs;?i#Z_%=vKXZM*vQY6&oRPaz#>6S?sO)KjQNTF$yZVmOI~kqnpIdC$@3 zOxn#l*$aiaDG|h{73iXl5zr&0X_uF9QF8M=>6C`6ox>yAl`~Wgp(_a?KOtg*=xor2 zGRj<>6AK%7W3%~3a=qYG)z0YohDU__m0VX7u(Gr_u(a2bcd<6G(|Eb@OTG+9fia*5 zJeN5;a@3gQtaZY4v{wzjlCFVIT(vS^#HIP3T%}QJgYo%MBz%%jABb?*lOhl+;VEIISS7TR^?;BWB|g6v(}y2;(Gw3 z0t#CcB4#eezs3P@;l)wqM{0@zu|A~4i*T7#R=R68`moA&5YFcQT&fCuQSbsoCi-Urp|9t-aYNq(p zGtVa&1Qdkm`E`yE1mqw5^vl5iO*tn}T+&jk5TVb`A){>*9qWr5{6WO%XgpA6^!0_*p^E5iI#{deu}_Y?AG z_3y74J^rrtS1s_*CI1=L{AFPCxuE#GjDf9d|!(;zJl`4S&IclMxyKtIdb62E-b%7 literal 0 HcmV?d00001 diff --git a/APPQ5/QMAPP.FJC.Web/Temp/de760407-2172-474d-8517-8a715069e144.xlsx b/APPQ5/QMAPP.FJC.Web/Temp/de760407-2172-474d-8517-8a715069e144.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..e5fd266e5216ec9d4e644d4bf211bf29d0daf0af GIT binary patch literal 7315 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 Fe*j3rd!YaT literal 0 HcmV?d00001 diff --git a/APPQ5/QMAPP.FJC.Web/Temp/e6609924-9e68-4d29-8dda-fd4beff0c1b4.xlsx b/APPQ5/QMAPP.FJC.Web/Temp/e6609924-9e68-4d29-8dda-fd4beff0c1b4.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..94c0f708962a9ec77543c1c2e18e267e64758a94 GIT binary patch literal 9397 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 + + @@ -43,7 +48,7 @@ - + diff --git a/APPQ5/QMAPP.WinForm/App.config b/APPQ5/QMAPP.WinForm/App.config index cd3b02e..5984160 100644 --- a/APPQ5/QMAPP.WinForm/App.config +++ b/APPQ5/QMAPP.WinForm/App.config @@ -13,10 +13,15 @@ - + + + + + diff --git a/APPQ5/QMAPP.WinForm/Forms/TianJin/TJFrmPlace.cs b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJFrmPlace.cs index e025ba1..c86f8c3 100644 --- a/APPQ5/QMAPP.WinForm/Forms/TianJin/TJFrmPlace.cs +++ b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJFrmPlace.cs @@ -1401,15 +1401,15 @@ namespace QMAPP.WinForm.Forms.TianJin vinNumber = Convert.ToInt32(dgvMATChange.Rows[scanSum].Cells["REQUESTID"].Value.ToString()); } - if ((vinNumber - lastvinNumber) > 1) - { - var dresult = MessageBox.Show("出现顺序号间隔,是否继续发货?", "提示", MessageBoxButtons.YesNo); - if (dresult == DialogResult.No) - { - ArragetxtCode(); - return; - } - } + //if ((vinNumber - lastvinNumber) > 1) + //{ + // var dresult = MessageBox.Show("出现顺序号间隔,是否继续发货?", "提示", MessageBoxButtons.YesNo); + // if (dresult == DialogResult.No) + // { + // ArragetxtCode(); + // return; + // } + //} #endregion diff --git a/APPQ5/QMAPP.WinForm/Properties/AssemblyInfo.cs b/APPQ5/QMAPP.WinForm/Properties/AssemblyInfo.cs index 5809179..99966a9 100644 --- a/APPQ5/QMAPP.WinForm/Properties/AssemblyInfo.cs +++ b/APPQ5/QMAPP.WinForm/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // 可以指定所有这些值，也可以使用“内部版本号”和“修订号”的默认值， // 方法是按如下所示使用“*”: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("2022.08.17.01")] -[assembly: AssemblyFileVersion("2022.08.17.01")] +[assembly: AssemblyVersion("2022.09.01.01")] +[assembly: AssemblyFileVersion("2022.09.01.01")] diff --git a/ServicesCenter/WCF/QMFrameWork.WebServiceHost/Web.config b/ServicesCenter/WCF/QMFrameWork.WebServiceHost/Web.config index 5560056..c785078 100644 --- a/ServicesCenter/WCF/QMFrameWork.WebServiceHost/Web.config +++ b/ServicesCenter/WCF/QMFrameWork.WebServiceHost/Web.config @@ -73,7 +73,13 @@ - + + + +