From c0b5d25642d417a6920c6308461f262b4731f875 Mon Sep 17 00:00:00 2001 From: zds <2388969634@qq.com> Date: Mon, 28 Nov 2022 20:19:44 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= 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 -> 200192 bytes .../service/impl/WastecchangeServiceImpl.java | 21 +++- .../wms/basedata/pdm/wal/PDM_WASTECCHANGE.wql | 93 +++++++++--------- .../impl/ProductmaterialsetServiceImpl.java | 10 +- .../pf/wql/QPD_PD_PRODUCTMATERIALSET01.wql | 43 ++++---- .../wms/basedata/pdm/wastecchange/index.vue | 36 ++++--- .../views/wms/pf/productmaterialset/index.vue | 4 +- .../wms/sb/repair/devicegridcheck/index.vue | 9 +- .../wms/sb/repair/devicerepairpa/index.vue | 9 +- .../wms/sb/repair/devicerepairplan/index.vue | 9 +- .../wms/sb/repair/devicerepairudit/index.vue | 9 +- .../wms/sb/repair/devicerepaorout/index.vue | 9 +- .../wms/sb/upkeep/devicemaintenance/index.vue | 9 +- .../upkeep/devicemaintenanceaudit/index.vue | 9 +- .../sb/upkeep/devicemaintenancegrid/index.vue | 9 +- .../sb/upkeep/devicemaintenancepa/index.vue | 9 +- .../upkeep/devicemaintenancepagrid/index.vue | 9 +- .../sb/upkeep/devicemaintenanceplan/index.vue | 9 +- 18 files changed, 201 insertions(+), 105 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 89332cbf8b379d234fecc802b713e397430f1aec..9478f8cc4f0744e250c5b20add67696f3e9ee5b3 100644 GIT binary patch delta 3992 zcmZ{n4RBOf701tc`;pybv%ASAA$$ZjDTDyYLXyqbCfN;R9Tfutt#%wcqy!OKfd&ID zAEBE-A$$aq=0P4{Xc5}6#afitVW$?cDC1Px%13PxRBQ`caU7c&D2gM*|Gn?+>xPcJ zIs039 z!=D|nJHx}n>X5A??c9m1{4_P+GXU)Kj+k1L#}doq@@`V~*U zy4I7Yp3TV7U-vA@P$T(1wJtAT-8L#)|5pBqv`jzInyjp*U{jEsZgp9(AnpU^ynRec zd_wR8$|3LP;-x9^{FL^|c)5|MBbncbdt{yw+>|^8>WjfC>h<6Z_NrqFzckvQre=2= zt@U+!`!W&Y7VPy&3@jhzC5!)_0RLG z3+895>t~HqADQpx?dsfF(|8Ad$ErU;s~)TUPPMB!#=GF(uiyIW!N7f4G>M$VwF^#f z3sN-&se)7`lZwfn4A$zewYU{qA(gA=7mrsnmgcCQ*5d3ew6r?bqGP2#y|pthzVuZL zkrd{KTeZ#PrvpD1zMZ=lFIswYhxa=ocJ9|ktZng%Me93uJS1Z8T{dD@=kS`s$3)Ca z-?$=THeR~5XhUwxX3C~tT^A7t*Uu4sm(43#y_r1p&j2H;@P^(eo%2Mqy=r*v7ebpb-d`vX~R-e6g zTiU(k z5=<=JA7FoiZNgHBW&1Pi1K3BfClR}f`=hvvbLOx3`(qf?5*AcF{I3O?vxxor(c6yV zz>6hJ<04E~nwd^4VETKj6rOk^$X918^pG|*o=dcMR`51o6B10q`g+$e1-Hv)8k!Yp zoo#%Vo3sxLc~Rn{l{}QKEvw>&A9^=4J6wvN8nqv+ym8*L;U80IrOZNXFIQ=I7MpiVRHM5|mY zo<`kf+=Uh{NH~f5EhRS%&>GUTDYH0pVHuhW5yedcTP8)^XJX4ph?odZfXYaSFk0CW zf6xS#Spv$iYYhP>DG%+1fKF}ZOb*0DCZ*eXWMtN3} zD9=(n7Ufx~o!`m1+9SQ}io0a8uuN8FCJW1CAv0Ons>!g_+6+ws61KF4Q?!mpTxz95 zbeNu(*9$agUfFW8s*pkK2Y=I@R*a-d!l#??DhZ!q!mBKJm4q)c;Z+vAY6QGW!XHkB zYYY2$R6IwHvs$9^O;oi+Jtj^y$f%a6F~t3>aB^W$3%Q~_SakJdJ8Qkzh0oVmVVA{X)qzi3#LIrGE7K= zgm_Fy10Y5XHAqNuwi_%+!w5)&1&KGB5aadI2uLrLn>(oykUpxgJR3c2y-FJadIsY$ zM%f5Zzbw{9fcmW>ZUjg*<1RWvmB=N|sz$8pkLX!?E>6$kI*9jbnj$C0@dLGeW^&gM1R zOTXc1rB9flb-1sEt%r5NI$#@MPr>4_jj%0e`1l#++9aQ;BB>^E;}hkI&v|>2kf>c8 nR;FZ$?^!{58r{Twb0Sl*eZtS%l;d_=pTkx|)d|&YTdw>M@&P?e delta 3586 zcmZ{ne{fXQ701tcyZf@6-DEe}i1{Vi#3YRgnB7gX*&m_ADbqR-tf|a&#%W=I0V((+ zHdG-AY@!B&L=ti-F9<5O)FM(R?dz~3LX;WG*h+ywE&i%P!722QvKDHqQ%TRc@9k@# zb>5u3{hoL4{e16v_rCYiyUWu%>KVQ_y9)p=Q1qhK@d_6IvSScO6uavbr9Pneot~qd zMNc>V{Bm+~vWLzhZR^QO|9w`~`9tsOopuK*?+@r*j_Ef0Cm-9!^M$&v@p{p5zfbRs_jpC>u6*HZ_ldvF&Bu)b=aq=`Tptc( zeu=$vOT}2551$rC+UAVRvx}o`A<;pJLDAPX8=s+cqtshi>z~cr?Y}(-s=y8yU3hd; z0HPq2Jg5dWlZZe7!uo5ATuNacRo==+Dc?Yi%ONZ#mQ5G#6$Rp-i>vkUl6BLP>aS_0 zpdfy4iPjH3NE~Ku$BoODuDG^2cRA-CK4#=PmOZ?*yJz!vIoJ8Vk-KmYt|?#1xm>vR zC(hY$#X!ZnTNd?0J}kb>83!ir;l2;H*Zim-JTT}-$||^S=yA23n?*$9+Hc(I=LL{< zXK@!b9ktPE6k)l(Wo?5^|837nn`4;@G{fh53j=D^ZTa9*#HR=S`ib3+620k=TdAvs zK^T1u2m!EQBfwj9`}b}GD4h2ck>kht`t^&wHg)VT0J|?`F3B!k zmmke``>z8eya?~)sPLI;;;Tyi4R_iV2E$C{9zHq4)y@ zQQ;iLS&DZl-lO31e@O8Jm6FT;5yi(8=P4ee+@I;Zg3kP~(1u^ffEfF{U0?dybEqBe z#BRO&i=9>eZ`L3jj3M;2A>6+ZVPFZH)ZXmCiqxEPJThNVRdM84jaL5%Zt~8eA-Pif zA4ez{;Fc+B89~Fq3+2fN}+394bg5 zsjohAf&1J^eKtZF{WTPl;sO~;fdM#WDH~n$Tgpy~%P3nW!9kL%X>?Rcaa|3S1)F4r z4dtY3Tzf;gNO9#2l}(E4Zzwk@z7vM>km7q{s2oyxmP+Q5z|~n0H~ z$Il=)DZxQ%!eD6SZb1pIG*Llda1|*YJO~UnT1|xpEohLQEC$qQ&rqYili<}f&Nyx9 zAh@KFq~$~!37JNm(nv@e`I>1YB#qRVMnaa6keq!R^<-ekGQy9z|IR-2|7H*CS5n!- zCe$aPVF|s%goY)w)`W&FXjnp*n$WNX4O>t)6P8e(Zx~$K_lK~gu0TQ>B&5)UG)Txw z-i}oM1_>zw&|VnA`dp)W4Zzh~h1!QhSeY!8gEZ10n}Hr6vRk7ZWYSW6pJ)*Cnw=hf znFZ2FZj)wSrC+>2*li=Zea6f?xiuLYhhoaRpc8h$v+~#pyR@_ma~3yIH(oTQt?ar< znn808P11})iU)48%GM;yw!j27Sw@m`?54NT1f;jU`%o7@eyEk`a*%o5_es zhTUXDEJlPFgY^0{*b$2nu^8+rVof$erR}4akTKbacFu*jC7aF3RY-6%f%`x;!Oaq! zWvQu^ZYKB^uAQ8Cv$Zao<+`}V%4c>(v%IfP3D1XSs`N|nbJ&}Ny>z@xFHL?f@Lagk zmC{U9nsJ%(40iD83W<$(`R!eA1Lfs}b zCZQe^8Y8H&o?;T3DSga>#%_Sdz5<#Jag$k-l+ZXqhoH{fC2@id!wgH=;3;c?#|gaE zDtny3BfzUNPT&!1fyW6f%)Ar!!Au&9H)ov6{t7$~FUVszRXxdNPnd3MrI~~@bEk<< zNHg`8nrbF-gPDY7CUJwAgk>f{YhWJ)O*08Llf1zVn`tr4%#dbUq?v1!<5{*yGa(v) z*FcN423p9-Hu?n2<1bmZ`7 z*AM6deZs&h?d7+zZU(2;l3YX4MUkZFrs$zqN3ouwkAmB6IF1L7D;KN0ri+Z5)YVUw ykG$${E>x05?JU~vc*$;4a`@xxNwe!ysXWDY1-EwC52&_bhphoZDdDy~r2GdzHwzvB diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/pdm/service/impl/WastecchangeServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/pdm/service/impl/WastecchangeServiceImpl.java index dd0f7e92..474c775b 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/pdm/service/impl/WastecchangeServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/pdm/service/impl/WastecchangeServiceImpl.java @@ -6,6 +6,7 @@ import cn.hutool.core.map.MapUtil; import cn.hutool.core.util.NumberUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSON; +import com.google.common.collect.Maps; import lombok.RequiredArgsConstructor; import org.apache.poi.util.StringUtil; import org.nl.exception.BadRequestException; @@ -21,6 +22,7 @@ import org.springframework.data.domain.Pageable; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.IdUtil; @@ -51,12 +53,23 @@ public class WastecchangeServiceImpl implements WastecchangeService { HashMap map = new HashMap<>(); map.put("flag", "1"); map.put("tech_type", tech_type); - if (ObjectUtil.isNotEmpty(material_code)) map.put("material_code", "%" + material_code + "%"); + if (ObjectUtil.isNotEmpty(material_code)) { + map.put("material_code", "%" + material_code + "%"); + } map.put("class_ids", MaterOptTypeEnum.THW.getClass_idStr()); - JSONObject json = WQL.getWO("PDM_WASTECCHANGE").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "material_code ASC"); - - return json; + JSONObject allmaterialIds = WQL.getWO("PDM_WASTECCHANGE").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "mater.material_code"); + JSONArray array = allmaterialIds.getJSONArray("content"); + JSONArray array2 = new JSONArray(); + if (ObjectUtil.isNotEmpty(array)){ + for(int i=0;i "" - mater.material_type_id = 输入.class_ids - ENDOPTION - - OPTION 输入.material_code <> "" - (mater.material_code like 输入.material_code or - mater.material_name like 输入.material_code) - ENDOPTION - - - ENDSELECT - ENDPAGEQUERY - ENDIF + PAGEQUERY + SELECT + mater.material_code, + mater.material_id, + mater.material_name, + mater.material_model, + chan.change_id, + chan.cf_qty, + chan.yz_qty, + chan.cx_qty, + chan.yc_qty, + chan.jy_qty, + chan.lt_qty, + chan.sj_qty, + chan.ys_qty, + chan.ds_qty, + chan.cqx_qty, + chan.xqx_qty, + chan.qx_qty, + chan.jcf_qty, + chan.tb_qty, + chan.ycr_qty, + chan.gz_qty, + chan.create_id, + chan.create_name, + chan.create_time + FROM + md_me_materialbase mater + LEFT JOIN PDM_BI_WasteCChange chan ON mater.material_id = chan.material_id + WHERE + mater.is_delete = '0' + AND mater.is_used = '1' + and mater.material_type_id='1503644361664106496' + OPTION 输入.material_code <> "" + (mater.material_code like 输入.material_code or + mater.material_name like 输入.material_code) + ENDOPTION + OPTION 输入.tech_type <> "" + chan.tech_type = 输入.tech_type + ENDOPTION + ENDSELECT + ENDPAGEQUERY + ENDIF IF 输入.flag = "2" QUERY @@ -158,4 +155,4 @@ ENDSELECT ENDQUERY - ENDIF \ No newline at end of file + ENDIF diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/ProductmaterialsetServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/ProductmaterialsetServiceImpl.java index 27ac3a4c..c5f6973e 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/ProductmaterialsetServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/ProductmaterialsetServiceImpl.java @@ -91,7 +91,6 @@ public class ProductmaterialsetServiceImpl implements ProductmaterialsetService String nickName = SecurityUtils.getNickName(); String now = DateUtil.now(); - WQLObject wo = WQLObject.getWQLObject("md_pd_productmaterialset"); JSONObject json = JSONObject.parseObject(JSON.toJSONString(whereJon)); wo.insert(json); @@ -100,6 +99,9 @@ public class ProductmaterialsetServiceImpl implements ProductmaterialsetService @Override @Transactional(rollbackFor = Exception.class) public void update(Map whereJon) { + Long currentUserId = SecurityUtils.getCurrentUserId(); + String nickName = SecurityUtils.getNickName(); + String now = DateUtil.now(); WQLObject setTab = WQLObject.getWQLObject("MD_PD_ProductMaterialSet"); JSONArray jsonArr = JSONObject.parseArray(JSON.toJSONString(whereJon.get("tableData"))); //查询此产品是否有对应关系 @@ -118,6 +120,9 @@ public class ProductmaterialsetServiceImpl implements ProductmaterialsetService setJson.put("set_prior_level", (String) json.getString("set_prior_level")); setJson.put("is_calculate_forming", json.getString("is_calculate_forming")); setJson.put("add_rate", json.getString("add_rate")); + setJson.put("set_optid",currentUserId + ""); + setJson.put("set_optname", nickName); + setJson.put("set_time", now); setTab.insert(setJson); } } else { @@ -143,6 +148,9 @@ public class ProductmaterialsetServiceImpl implements ProductmaterialsetService setJson.put("set_prior_level", (String) json.getString("set_prior_level")); setJson.put("is_calculate_forming", json.getString("is_calculate_forming")); setJson.put("add_rate", json.getString("add_rate")); + setJson.put("set_optid",currentUserId + ""); + setJson.put("set_optname", nickName); + setJson.put("set_time", now); setTab.insert(setJson); } } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/wql/QPD_PD_PRODUCTMATERIALSET01.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/wql/QPD_PD_PRODUCTMATERIALSET01.wql index 3946cdce..d1a4b9a4 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/wql/QPD_PD_PRODUCTMATERIALSET01.wql +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/wql/QPD_PD_PRODUCTMATERIALSET01.wql @@ -46,32 +46,35 @@ IF 输入.flag = "1" PAGEQUERY SELECT - mater.material_id, - mater.material_code, - mater.material_name, - mater.update_optname, - mater.update_time, - mset.set_type, - mset.num, - d.label AS set_type_name, - ext.old_mark + mater.material_id, + mater.material_code, + mater.material_name, + mater.update_optname, + mater.update_time, + mset.set_type, + mset.num, + mset.set_optname, + mset.set_time, + d.label AS set_type_name, + ext.old_mark FROM - MD_ME_MaterialBase mater - LEFT JOIN - ( - SELECT + MD_ME_MaterialBase mater + LEFT JOIN + ( + SELECT ms.material_id, set_type, + set_optname, + set_time, COUNT( ms.product_material_id ) AS num - FROM md_pd_productmaterialset ms - GROUP BY material_id,set_type - ) - mset ON mset.material_id = mater.material_id - LEFT JOIN sys_dict_detail d ON mset.set_type = d.value and d.name = 'PD_SET_TYPE' - LEFT JOIN MD_ME_ProducMaterialExt ext ON mater.material_id = ext.material_id + FROM md_pd_productmaterialset ms + GROUP BY material_id,set_type,set_optname,set_time + ) + mset ON mset.material_id = mater.material_id + LEFT JOIN sys_dict_detail d ON mset.set_type = d.value and d.name = 'PD_SET_TYPE' + LEFT JOIN MD_ME_ProducMaterialExt ext ON mater.material_id = ext.material_id WHERE mater.is_delete = '0' - AND mater.is_used = '1' OPTION 输入.material_code <> "" (mater.material_code like 输入.material_code or diff --git a/mes/qd/src/views/wms/basedata/pdm/wastecchange/index.vue b/mes/qd/src/views/wms/basedata/pdm/wastecchange/index.vue index cb592694..813c06e0 100644 --- a/mes/qd/src/views/wms/basedata/pdm/wastecchange/index.vue +++ b/mes/qd/src/views/wms/basedata/pdm/wastecchange/index.vue @@ -44,7 +44,7 @@