From d70f326f96374e13e92a5414dc9fca89d4b138d3 Mon Sep 17 00:00:00 2001 From: liuxy Date: Mon, 11 Jul 2022 11:17:30 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/nl/wms/pf/service/impl/FormulaServiceImpl.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/FormulaServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/FormulaServiceImpl.java index 9f36c0b7..75c69797 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/FormulaServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/FormulaServiceImpl.java @@ -797,9 +797,10 @@ public class FormulaServiceImpl implements FormulaService { //设置相关打印选项 Paper paper = pageFormat.getPaper(); -// paper.setImageableArea(0, 0, pageFormat.getWidth(), pageFormat.getHeight()); - paper.setSize(1240,1754); - paper.setImageableArea(0, 0, 1240, 1754); + paper.setImageableArea(0, 0, pageFormat.getWidth(), pageFormat.getHeight()); +// paper.setSize(1240,1754); + paper.setSize(595,842); +// paper.setImageableArea(0, 0, 1240, 1754); pageFormat.setPaper(paper); printerJob.setCopies(1); printerJob.setPrintable(workbook, pageFormat); From 56757198210592998d176d2e369c342110e017ef Mon Sep 17 00:00:00 2001 From: liuxy Date: Mon, 11 Jul 2022 15:28:28 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mes/hd/nladmin-system/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mes/hd/nladmin-system/pom.xml b/mes/hd/nladmin-system/pom.xml index b88c3703..ca6ebf28 100644 --- a/mes/hd/nladmin-system/pom.xml +++ b/mes/hd/nladmin-system/pom.xml @@ -29,8 +29,8 @@ e-iceblue - spire.xls - 4.9.0 + spire.xls.free + 5.1.0 From 94006b7f29d411d37b4a7188abc47058a5a1f935 Mon Sep 17 00:00:00 2001 From: zds <2388969634@qq.com> Date: Mon, 11 Jul 2022 15:58:16 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nl/wms/pf/service/impl/AutoformulaServiceImpl.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/AutoformulaServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/AutoformulaServiceImpl.java index 4287e9ec..443dd5c7 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/AutoformulaServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/AutoformulaServiceImpl.java @@ -3653,6 +3653,7 @@ public class AutoformulaServiceImpl implements AutoformulaService { @Override public void autoAll(JSONObject map) { WQLObject MD_ME_ProductMaterialExt = WQLObject.getWQLObject("MD_ME_ProducMaterialExt"); + WQLObject pdm_bi_workprocedureparaproduct = WQLObject.getWQLObject("pdm_bi_workprocedureparaproduct"); WQLObject md_me_materialbase = WQLObject.getWQLObject("md_me_materialbase"); WQLObject PDM_BI_WorkOrder = WQLObject.getWQLObject("PDM_BI_WorkOrder"); JSONArray rows = map.getJSONArray("rows"); @@ -3665,14 +3666,21 @@ public class AutoformulaServiceImpl implements AutoformulaService { if(workorder == null){ throw new BadRequestException("当前工令信息查询失败！"); } + JSONObject result = new JSONObject(); if("20".equals(workorder.getString("status"))){ JSONObject material = MD_ME_ProductMaterialExt.query("material_id ='"+material_id+"'").uniqueResult(0); if(material == null ){ throw new BadRequestException("当前成品查询不到成品物料扩展信息！"); } + JSONObject materPa = pdm_bi_workprocedureparaproduct.query("para_code ='QM008' and workprocedure_code='GX002' and material_id ='"+material_id+"'").uniqueResult(0); + + if(materPa == null ){ + throw new BadRequestException("当前成品查询不到球磨工艺参数球磨时间！"); + } JSONObject mater = md_me_materialbase.query("material_id ='"+material_id+"'").uniqueResult(0); workorder.put("formula_type","01"); + workorder.put("ball_time",materPa.getDouble("value")); workorder.put("waste_limit_down","0"); workorder.put("waste_limit_up","0"); workorder.put("c_balance",material.getString("c_balance")); From 859e70ffdf2974ffed921db8f38063b9bbf70ec0 Mon Sep 17 00:00:00 2001 From: liuxy Date: Mon, 11 Jul 2022 20:24:41 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pf/service/impl/FormulaServiceImpl.java | 41 ++++++++----------- 1 file changed, 18 insertions(+), 23 deletions(-) diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/FormulaServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/FormulaServiceImpl.java index 75c69797..4c8622cb 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/FormulaServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/FormulaServiceImpl.java @@ -569,31 +569,26 @@ public class FormulaServiceImpl implements FormulaService { } // 系列设备 - JSONObject jsonWorkTask_QM = workTaskTab.query("workorder_id = '" + jsonWork.getString("workorder_id") + "' and workprocedure_code = 'GX002'").uniqueResult(0); - if (ObjectUtil.isNotEmpty(jsonWorkTask_QM)) { - HashMap map1 = new HashMap<>(); - map1.put("flag", "3"); - map1.put("product_series_id", jsonWorkTask_QM.getString("product_series_id")); - map1.put("workprocedure_id", jsonWorkTask_QM.getString("workprocedure_id")); - JSONObject jsonDevice1 = WQL.getWO("QPF_POINTCARD01").addParamMap(map1).process().uniqueResult(0); - map1.put("flag", "4"); - JSONObject jsonDevice2= WQL.getWO("QPF_POINTCARD01").addParamMap(map1).process().uniqueResult(0); - if (ObjectUtil.isNotEmpty(jsonDevice1) && ObjectUtil.isNotEmpty(jsonDevice2)) { - String device_code_1 = jsonDevice1.getString("device_code").substring(4, 6); - String device_code_2 = jsonDevice2.getString("device_code").substring(4, 6); - oneMap.put("device1", device_code_1 + "-" + device_code_2); - } + HashMap map1 = new HashMap<>(); + map1.put("flag", "3"); + map1.put("product_series_id", jsonMst.getString("product_series_id")); + map1.put("workprocedure_id", "1472449856613257216"); + JSONObject jsonDevice1 = WQL.getWO("QPF_POINTCARD01").addParamMap(map1).process().uniqueResult(0); + map1.put("flag", "4"); + JSONObject jsonDevice2= WQL.getWO("QPF_POINTCARD01").addParamMap(map1).process().uniqueResult(0); + if (ObjectUtil.isNotEmpty(jsonDevice1) && ObjectUtil.isNotEmpty(jsonDevice2)) { + String device_code_1 = jsonDevice1.getString("device_code").substring(4, 6); + String device_code_2 = jsonDevice2.getString("device_code").substring(4, 6); + oneMap.put("device1", device_code_1 + "-" + device_code_2); } - JSONObject jsonWorkTask_PW = workTaskTab.query("workorder_id = '" + jsonWork.getString("workorder_id") + "' and workprocedure_code = 'GX003'").uniqueResult(0); - if (ObjectUtil.isNotEmpty(jsonWorkTask_PW)) { - HashMap map2 = new HashMap<>(); - map2.put("flag", "5"); - map2.put("product_series_id", jsonWorkTask_PW.getString("product_series_id")); - map2.put("workprocedure_id", jsonWorkTask_PW.getString("workprocedure_id")); - JSONObject jsonDevice3= WQL.getWO("QPF_POINTCARD01").addParamMap(map2).process().uniqueResult(0); - if (ObjectUtil.isNotEmpty(jsonDevice3)) oneMap.put("device2",jsonDevice3.getString("device_name")); - } + HashMap map2 = new HashMap<>(); + map2.put("flag", "5"); + map2.put("product_series_id", jsonMst.getString("product_series_id")); + map2.put("workprocedure_id", "1472449923327856640"); + JSONObject jsonDevice3= WQL.getWO("QPF_POINTCARD01").addParamMap(map2).process().uniqueResult(0); + if (ObjectUtil.isNotEmpty(jsonDevice3)) oneMap.put("device2",jsonDevice3.getString("device_name")); + // 球磨 oneMap.put("ball_speed", jsonMaterExt.getString("ball_speed")); From 39d6dcba8f9fac4790264c08759f9c38cb13df7c Mon Sep 17 00:00:00 2001 From: liuxy Date: Tue, 12 Jul 2022 10:18:40 +0800 Subject: [PATCH 5/8] =?UTF-8?q?excel=20=E5=A2=9E=E5=8A=A0=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/nl/wms/basedata/master/wql/mdpb.xls | Bin 198144 -> 199680 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/mdpb.xls b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/mdpb.xls index b39f49421ec34bef3426642a1f0075af8339266b..bcc0d5f8e92a272ea3964d4fa8d114cdb2490e62 100644 GIT binary patch delta 47481 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 delta 46086 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 From 92206a6711c6e45b81e3653ef1a39553d1f23470 Mon Sep 17 00:00:00 2001 From: liuxy Date: Tue, 12 Jul 2022 14:48:33 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/nl/wms/basedata/master/wql/mdpb.xls | Bin 199680 -> 199680 bytes .../pf/service/impl/FormulaServiceImpl.java | 19 +++++++++++++++--- .../impl/ProductmaterialsetServiceImpl.java | 2 ++ .../pf/wql/QPD_PD_PRODUCTMATERIALSET01.wql | 1 + mes/qd/src/views/wms/pf/formula/PicDialog.vue | 4 ++-- .../wms/pf/productmaterialset/SetMaterial.vue | 5 +++++ 6 files changed, 26 insertions(+), 5 deletions(-) diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/mdpb.xls b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/mdpb.xls index bcc0d5f8e92a272ea3964d4fa8d114cdb2490e62..0d2f5442a36a00061b999b358450f1600f959560 100644 GIT binary patch delta 8902 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 Pbl_?jPC7wHuut?K8-W$4T#DcNlh#PECV`5_Y zjIPP1C>ne0C5a6SF-Ad+s9;zAGxzSo(&G0$`R{%1oVo8gbK0Dlxr^q0YL)w`)i)!> zCOry9uP&tH#Pd17h4iJk+}bO0`0B#KON3`=ADKL{vCj4Vh=;zh7`3`k`^d4A2_4~P z?aFavQNOhA3UGuH05FGT1PRRJXn~t^eQvW_?$7nP1XQqx(~o^rpUZ)B?buc=8faG4 za#QPb3B=ZFo?Vw)fd?_S5B-9S)hO)TTwYvpmQ z!YE^PC2KQT*RFPh`vQ^L6MdQz0{*a!nMC{qy`xN6~5djp1$yQsjZCvAGI}F;JApKwTq_J`T z%Ygqvo-X&5(ZJUB5@F5w&?~;lYF`}4*Vl?>%`}!8OAt5br`4|pA2w{C=RQvmhw*r8 z17682vPdU${V{}l#d*Ucc`6567?7hUfcs0cL3)a(Lnd0TA^IQk~|Ao$jn zzVwr+y$sx%QSb4i8sZjB;1NyWxHA4}VF-5VSFHm{5Ix^|pgIVVQqCK|1v~8Ggq#St z7u$@5s|Ht~JmOY$aVfr*a+sp2&6>q|#d(3Lur~-eDsO-@J#O{@IdumF)BGS0;!2kV zITIJYbz`lAhmi_%KFDAi86Y!}q2Wh#fXrF+h;yNXWKKx!_0&U8-H zW-k#OV-n7EX^=f#D089X0$pf)kc+3la|H<3`=$?`;g2{E^oLntJ~GO@WR&^Is0Y32 z?@W*SPo$zYE;K5jxkAxIas<3#aujrnzX$qzHo%$MD(o%fz>>vsMK1)jmdJTG?CAbL zXX@F;p6(2Ap{;^lcrgr~iQNkbp#1`yt66sVk&Q%B%HiSFD2~%u53ebQY{P5`b0B02 zO-`+g3-Wfj3L0lLFrcL8gQldg$QpB3NL0fK5%7j#C}`gx54uCzSD!0>il|?3f4Vc+ zg|B(S4v%`ZEof_q2l460HR6u$vCF6&__b3nSwd3G8^kE!7MQL2185tWY_Pz_AnT<} zz>SxdA@_!=sGIv5^Y!)6A7z^*!RS8$zIN$Md4D3KSLC?02D)G`GQfkzD%vOn4Y>W) z_Y=pKa>n(l_k^xe$Y`p{C56=+fkq+}tTw8VK*I@?(l$yNkKk({fF57js%VV@4A_#BY7YvKZlN}slsaKAfBjgwsCkg<3K%SiCO0|<>)BKwSz|1d%2K4)HXYjr1NbCwkqn;+m7@@VJY30?WSFy{gIQ} zOv`L=g!CVx$-`=Fwuilo$@~v9vnv(*GMc1zlYA~=GOM*&>L`)53`m8C7!`x0!k4xZ zJN2$+V~ws&!@ZGLCPEqUu)c@q(D9EaSN2>|F1~wpXEhu~oH-_3n})~5xK->$tiB}u zdyb#F_o>c3QypU;F1~d%J2XG3Q~Am4jQEd#J+k)l{M6wKTbsovF7S1fYiW*kjO}jqNnpqmxiBDU$tV-Zi{PQCb&uLe;VpsSs87+rb^}Xe4X@2i2I3xl=L5G z-zh2Sf3s|!a?{y`K56P!i+v(e@}m3n?#-R)cr18$^ue9(MY+NDf1bSaWOi1{u@DmF zJo&q&72W73u5X5gY&t#8mG*a|T8GIVyJpOe9lh=r*?Zf|^Oz!K=70fx3oAQDee3Zg zYlixUPgWpZ5_-vPW9wlidruB;x$y9&Zd-Z`E;=-{zuVApZ*Kqb(;eCG#p<^?)qCA~ zua3_gH)=xk(#_pAj&j<6BF+5J?2PqJH_MLB&d62%XM4d;mn+|YHh1N?E4eYbqGk8j z+FzEe`{ApHWZvxIxtq>>a(tvFV%jr{6%R_*$g&Tv`D^`>ut~=U_8J!a`>wU_SGGp9 zJhZEO{DwZ|2Peg;BGQKDY_z_2wVTJPgnNV3JA4cMe|Fy5XK&QgAEcF?_Wu6!>yt+d z_ipLpaeGMB@$~zPx8B5WQsneIV z=`No3_~wf5p02s;@z+m_hTd45H{k1w1Bx^=ciBAMqP*A9<%5>{I`!L{aKpAVXHCe2 ziY^Yh$1`uP&V8UR`Mi4Xnet})EN(_meihyP>qpbpCC4r!Y5Ac$Y-6V`pLXHZ!^@AZvh)n7dx96PY2d)V_g>L=e{&FLK8{rvp5Enkg_sGh#!l~38w(5f{dDGz$8 z)i3_~`Gx1?;*yK5S)UzIR_+^r@koo5KA&fvx%%nAXCv-f4ViWD`3vXbQ|hqTIdh)) zm{et??#cRY*7o_659&^B_Io~W?Df}2DsnnH&$j9zsp$U@qGMm$*qomDKplGFiy4&< z$W+bqhj~wL#fju%)s6gtAMDE+HBzdJ+#f&6^zHb;2I-XP z09p7kV><)?_JTAA=|~IwIg|rnVF|Dn>0+drGjXgHsKI6yz+3!zumI^)YXAxUAbo~( z57KQm0KIYnI^dRd4C(hs)8?STW&nGUZby3SV}J{IjP;lc5a)nD&5+(k+BFX#26w-R zc>sY<02`4mM`|`7;5pLKNCz}WBhRsOw>cVL0Fdnr;Ik0G!3AJ4(qTwD=L1B!0$f9S z3TfUVfJt~{b^ZkL7HACVZ%EfJ#>m_OJeOefc+_PsMQ2+AbXWoRF)DZrn&i|#|Zk^@+}0uAFP+Nltr6;46Vl>luq^@owJL3&C9unDIi>{9?6 zoPq~P4kCZ>^BV%4M)jI%K%ybdfMCAxuBq9$H{F!U*2f z=2Qm>-@|@iqyCq*eeL5@gGsH>nc4wg8ucHaS>zf{SOmrR^F0WU?+8+J)0Jo2T8G!Z zlL&hHY#0|oG-KBjM-oZh&w0_2=fY|9IXOLF*_{4(F45F~FV@pR+WqQIdZ)^kGXwhb zFYUCi&u4S$7=opMhH#BxB4SAGZOSK$%~veJ^5A6%%EXe|+mv^aO-C)pdIHW;TpwqZ zAj0Q8f~5w<-u$a2zP?AScx9}F>I|YLzlU1aMUsC{sE248Aa@#!3cOff&xnhm>N=YB zj^pyF>w_L=)z_Fjo2$lfmfFT}mQFpc)@M`57|Tgx18^s76lb&6m^>@-#&A~Bb@73M zVcat7F$5fU&PH+ENgKs+N3Dy~Hs>@KaRm3&nlg+hhPypxo|OzM!vuo+ZA}>_62sj=`)R444e3vdA3m{WnTo?F8lTph zG3$wwlQ($am$S$haCb#TzIdCM(7P3rP3K<$=vRWytk?7-q%R%t`0tb?vJJ)9X2yh* zNd4Qq#-C)eT`$R&MKY;()50e^xMcmhY)|`Dp0mifjz{kuJbLf2wWz&Q6(x#EB064+ zumFv%)kfZ#;67Xvc^6{1yV8L#W{__5>WeheoyuNz$5#C^0o#LoD|yBGow4mfmtvbr zFTC<0@6%^|+u}9r$MS6^wrO-ewyAV0kDTG#Cw%MthH;~?O{D{|eV=~Jx0`wV1hyUN zLu^y1!&}yd@ohi8RrBrVe0%imX5@~kW-=7pPE=R@)b@HA9!hWUyb1-|4fQ|IB11b*`;kP<<_vI~K-4+uC9VF_X7*w@KEv?UJ8)DLp`=Rvx|QREhrpQ)D*dWZbE zWRhlz@{9HIk?)Z2+Kv2Tf%0GLkVz5LjB$iEpy9IP#4h7u^6f{SxO zO%8RK!!;~@WqM8TNS_YVS746vZ}jqx@336Bkc629_9G#9D6&dy^$z)}0^)Dt--pOh zo^5n(@wiVXa(pA4DZYtdmL3;Fh9*Hn{A~M@fEr;l=%bmUAwGe6DcwTCb$d%l>Go8GG9fW3RDo_OBNA0o z6?&E+ZJ!VphAzny6BJ3I=!?9Aa^?&LIuRZcnh+{Q>vFkN6|O+D;mRbXR1uyVpU^%m zA|esebr18oN3kp~$GK_|qo=tT3mXwmuL*u8OYj32b62s2xD||bG$Hsx@GmqDn(>!8 zFG(g0g%4q{rsy))!|RJ!1H`+}_1%(KxZ#x5{UNWm8t?;qdbJ#SMx4Bh zT$)R_A8Td6!zOv3bi5K7(RFF$7~jX`{nr{8Ztb3ScD+2S%fj^3^OFLVDF!_LW}^F1 z+97H8XWhr%@Kt=In|PnAAlCeUy1@UBaW)i=MvF)4)nD7{{hp za?^3_g-UKNlgg+Pq!(6kfue~M$7sH-;szi?=k%1z6p`+_X)iciQHKzDh*GIiDV5>I zkGHi&VvqJQ-U_)wDOV}Ok!JGq;TDZ*W7kO--> - 打印 - + --> diff --git a/mes/qd/src/views/wms/pf/productmaterialset/SetMaterial.vue b/mes/qd/src/views/wms/pf/productmaterialset/SetMaterial.vue index 65876ac6..9bc8aa14 100644 --- a/mes/qd/src/views/wms/pf/productmaterialset/SetMaterial.vue +++ b/mes/qd/src/views/wms/pf/productmaterialset/SetMaterial.vue @@ -96,6 +96,11 @@ + + + @@ -138,11 +132,12 @@ import crudOperation from '@crud/CRUD.operation' import pagination from '@crud/Pagination' import crudStorattr from '@/api/wms/basedata/st/storattr' import Date from '@/utils/datetime' +import StructIvt from '@/views/wms/statistics/outStorQuery/StructIvt' import crudRawAssist from '@/api/wms/st/core/inbill/rawassist' export default { name: 'outStorQuery', - components: { crudOperation, rrOperation, pagination }, + components: { StructIvt, crudOperation, rrOperation, pagination }, cruds() { return CRUD({ title: '生产配粉领料', idField: 'iostorinv_id', url: 'api/checkoutbill/queryDtl', crudMethod: { ...checkoutbill }, optShow: { @@ -161,11 +156,8 @@ export default { height: document.documentElement.clientHeight - 180 + 'px;', permission: { }, - divShow: false, - openParam: [], - mstrow: {}, + structshow: false, currentRow: null, - checkrows: [], storlist: [], billtypelist: [] } @@ -187,31 +179,11 @@ export default { this.crud.toQuery() }, methods: { - [CRUD.HOOK.beforeRefresh]() { - this.handleCurrentChange(null) - }, onInput() { this.$forceUpdate() }, - handleSelectionChange(val, row) { - if (val.length > 1) { - this.$refs.table.clearSelection() - this.$refs.table.toggleRowSelection(val.pop()) - this.buttonChange(row) - } else if (val.length === 1) { - this.buttonChange(row) - } else { - this.handleCurrentChange(null) - } - }, - onSelectAll() { - this.$refs.table.clearSelection() - this.handleCurrentChange(null) - }, - buttonChange(current) { - if (current !== null) { - this.currentRow = current - } + async queryMater() { + this.structshow = true }, quality_scodeFormat(row, column) { return this.dict.label.ST_QUALITY_SCODE[row.quality_scode] @@ -222,14 +194,19 @@ export default { is_activeFormat(row, column) { return this.dict.label.is_usable[row.is_active] }, - handleCurrentChange(current) { - if (current === null) { - this.currentRow = {} + queryTableDtl(rows) { + let devices = '' + for (let i = 0; i < rows.length; i++) { + if ( i === 0 ) { + devices = rows[i].workorder_code + }else{ + devices = devices + ',' + rows[i].workorder_code + } + } + if(rows.length > 0){ + this.crud.query.source_bill_code = devices + this.crud.toQuery() } - }, - querytable() { - this.crud.toQuery() - this.handleCurrentChange(null) } } } From 793ae063199b14f67fb2353860032d90b8d602e3 Mon Sep 17 00:00:00 2001 From: zds <2388969634@qq.com> Date: Wed, 13 Jul 2022 10:36:34 +0800 Subject: [PATCH 8/8] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wms/pdm/service/impl/WorkTaskServiceImpl.java | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/WorkTaskServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/WorkTaskServiceImpl.java index b519efd3..f1e2ed3e 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/WorkTaskServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/WorkTaskServiceImpl.java @@ -143,6 +143,7 @@ public class WorkTaskServiceImpl implements WorkTaskService { Long currentUserId = SecurityUtils.getCurrentUserId(); String nickName = SecurityUtils.getNickName(); String now = DateUtil.now(); + WQLObject em_bi_deviceinfo = WQLObject.getWQLObject("em_bi_deviceinfo"); WQLObject PDM_BI_WorkOrder = WQLObject.getWQLObject("PDM_BI_WorkOrder"); // 工艺路线主表 WQLObject mstTab = WQLObject.getWQLObject("PDM_BI_WorkTask"); // 工艺路线主表 WQLObject PDM_BI_WorkTaskJob = WQLObject.getWQLObject("PDM_BI_WorkTaskJob"); // 工艺路线主表 @@ -161,6 +162,19 @@ public class WorkTaskServiceImpl implements WorkTaskService { if (StrUtil.isEmpty(device_id)) { throw new BadRequestException(jo.getString("worktask_code") + "当前记录未指定设备！"); } + String workprocedure_code = jsonMst.getString("workprocedure_code"); + if("GX002".contains(workprocedure_code)){ + JSONArray others = mstTab.query("worktask_id<>'"+worktask_id+"' and device_id='"+device_id+"' and status in('30')").getResultJSONArray(0); + if(others.size()>0){ + throw new BadRequestException(jo.getString("worktask_code") + "指定设备有其它已开始生产但未完成任务！"); + } + + } + JSONObject device = em_bi_deviceinfo.query("is_delete='0' and device_id='"+device_id+"'").uniqueResult(0); + + if(!workprocedure_code.equals(device.getString("workprocedure_code"))){ + throw new BadRequestException(jo.getString("worktask_code") + "指定设备所属工序与当前工序任务不一致！"); + } //更新任务 HashMap map = new HashMap<>(); map.put("status", "30");