From bb37d1d1c606f7e06119048b2fe54dddee79046a Mon Sep 17 00:00:00 2001 From: ldj_willow Date: Mon, 17 Oct 2022 16:27:58 +0800 Subject: [PATCH] =?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 --- .../acs/service/impl/AcsToWmsServiceImpl.java | 4 +- .../pdm/service/ProduceshiftorderService.java | 4 +- .../pdm/service/dto/ProduceshiftorderDto.java | 2 +- .../impl/ProduceshiftorderServiceImpl.java | 50 +++++++++--------- .../org/nl/wms/pdm/wql/MPS_PRODUCEDURE001.wql | 4 +- .../src/main/java/org/nl/wms/pdm/wql/pdm.xls | Bin 177664 -> 166912 bytes .../src/main/java/org/nl/wms/sch/wql/sch.xls | Bin 190976 -> 191488 bytes .../src/views/wms/pdm/produce/ViewDialog.vue | 4 +- .../src/views/wms/pdm/produce/index.vue | 8 +-- 9 files changed, 38 insertions(+), 38 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java index e0cee6c..279fe48 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java @@ -128,14 +128,14 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { String now = DateUtil.now(); WQLObject wo = WQLObject.getWQLObject("MPS_BD_ProduceShiftOrder"); JSONObject map = new JSONObject(); - map.put("produceorder_id", ext_order_id); + map.put("workorder_id", ext_order_id); map.put("order_status", "04"); map.put("update_optid", 1111111111); map.put("device_id", ""); map.put("update_optname", "acs"); map.put("update_time", now); map.put("realproduceend_date", now); - wo.update(map, "produceorder_id = '" + ext_order_id + "'"); + wo.update(map, "workorder_id = '" + ext_order_id + "'"); JSONObject result = new JSONObject(); result.put("status", HttpStatus.OK.value()); result.put("message", "任务状态反馈成功!"); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/ProduceshiftorderService.java b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/ProduceshiftorderService.java index 4a3ff90..eed2bda 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/ProduceshiftorderService.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/ProduceshiftorderService.java @@ -32,10 +32,10 @@ public interface ProduceshiftorderService { /** * 根据ID查询 - * @param produceorder_id ID + * @param workorder_id ID * @return Produceshiftorder */ - ProduceshiftorderDto findById(Long produceorder_id); + ProduceshiftorderDto findById(Long workorder_id); /** * 根据编码查询 diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/dto/ProduceshiftorderDto.java b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/dto/ProduceshiftorderDto.java index c32b3b4..c251643 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/dto/ProduceshiftorderDto.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/dto/ProduceshiftorderDto.java @@ -20,7 +20,7 @@ public class ProduceshiftorderDto implements Serializable { * 防止精度丢失 */ @JsonSerialize(using = ToStringSerializer.class) - private Long produceorder_id; + private Long workorder_id; /** * 生产班次工单编号 diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/ProduceshiftorderServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/ProduceshiftorderServiceImpl.java index 9967272..9e44b78 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/ProduceshiftorderServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/ProduceshiftorderServiceImpl.java @@ -90,9 +90,9 @@ public class ProduceshiftorderServiceImpl implements ProduceshiftorderService { } @Override - public ProduceshiftorderDto findById(Long produceorder_id) { + public ProduceshiftorderDto findById(Long workorder_id) { WQLObject wo = WQLObject.getWQLObject("mps_bd_produceshiftorder"); - JSONObject json = wo.query("produceorder_id = '" + produceorder_id + "'").uniqueResult(0); + JSONObject json = wo.query("workorder_id = '" + workorder_id + "'").uniqueResult(0); if (ObjectUtil.isNotEmpty(json)) { return json.toJavaObject(ProduceshiftorderDto.class); } @@ -162,9 +162,9 @@ public class ProduceshiftorderServiceImpl implements ProduceshiftorderService { String now = DateUtil.now(); WQLObject wo = WQLObject.getWQLObject("mps_bd_produceshiftorder"); - for (Long produceorder_id : ids) { + for (Long workorder_id : ids) { JSONObject param = new JSONObject(); - param.put("produceorder_id", String.valueOf(produceorder_id)); + param.put("workorder_id", String.valueOf(workorder_id)); param.put("is_delete", "1"); param.put("update_optid", currentUserId); param.put("update_optname", nickName); @@ -181,7 +181,7 @@ public class ProduceshiftorderServiceImpl implements ProduceshiftorderService { String now = DateUtil.now(); WQLObject wo = WQLObject.getWQLObject("mps_bd_produceshiftorder"); - JSONObject json = wo.query("produceorder_id = '" + param.getString("produceorder_id") + "'").uniqueResult(0); + JSONObject json = wo.query("workorder_id = '" + param.getString("workorder_id") + "'").uniqueResult(0); if (ObjectUtil.isEmpty(json.getString("device_id"))) throw new BadRequestException("请先绑定设备"); JSONArray orderArr = wo.query("device_id = '" + param.getString("device_id") + "' and order_status = '02'").getResultJSONArray(0); @@ -250,7 +250,7 @@ public class ProduceshiftorderServiceImpl implements ProduceshiftorderService { JSONObject device = wo_device.query("device_id = '" + device_id + "'").uniqueResult(0); String device_code = device.getString("device_code"); JSONObject row = param.getJSONObject("row"); - String produceorder_id = row.getString("produceorder_id"); + String workorder_id = row.getString("workorder_id"); String workprocedure_id = row.getString("workprocedure_id"); String produceorder_code = row.getString("produceorder_code"); String material_id = row.getString("material_id"); @@ -262,9 +262,9 @@ public class ProduceshiftorderServiceImpl implements ProduceshiftorderService { String order_status = row.getString("order_status"); //开工时修改生产班次工单表 生产设备、以及工单状态 WQLObject wo = WQLObject.getWQLObject("MPS_BD_ProduceShiftOrder"); - JSONObject jsonObject1 = wo.query("produceorder_id = '" + produceorder_id + "'").uniqueResult(0); + JSONObject jsonObject1 = wo.query("workorder_id = '" + workorder_id + "'").uniqueResult(0); JSONObject produceorderMap = new JSONObject(); - produceorderMap.put("produceorder_id", produceorder_id); + produceorderMap.put("workorder_id", workorder_id); produceorderMap.put("device_id", device_id); produceorderMap.put("order_status", "02"); produceorderMap.put("update_optid", currentUserId); @@ -280,11 +280,11 @@ public class ProduceshiftorderServiceImpl implements ProduceshiftorderService { recordMap.put("macoperate_id", IdUtil.getSnowflake(1, 1).nextId()); recordMap.put("device_id", device_id); recordMap.put("workprocedure_id", workprocedure_id); - recordMap.put("produceorder_id", produceorder_id); + recordMap.put("workorder_id", workorder_id); recordMap.put("produceorder_code", produceorder_code); recordMap.put("init_qty", jsonObject1.getString("real_qty")); //填写生产记录表中的生产数量时，先判断是否已经生产过了，如果没有生产过，就将工单记录表中的计划数量付给记录表中的生产数量 - final JSONArray alreadyPro = wo_record.query("produceorder_id = '" + produceorder_id + "'").getResultJSONArray(0); + final JSONArray alreadyPro = wo_record.query("workorder_id = '" + workorder_id + "'").getResultJSONArray(0); if (ObjectUtil.isEmpty(alreadyPro)) { recordMap.put("produce_qty", plan_qty); //同时向acs系统下发工单 问题是现在一个工单分多次执行，现在是每开工一次，向acs发送一次工单 @@ -293,7 +293,7 @@ public class ProduceshiftorderServiceImpl implements ProduceshiftorderService { // TODO JSONArray array = new JSONArray(); JSONObject acsObj = new JSONObject(); - acsObj.put("ext_order_id",produceorder_id); + acsObj.put("ext_order_id",workorder_id); acsObj.put("is_needmove",is_needmove); acsObj.put("order_code",produceorder_code); acsObj.put("qty",plan_qty); @@ -319,7 +319,7 @@ public class ProduceshiftorderServiceImpl implements ProduceshiftorderService { // TODO JSONArray array = new JSONArray(); JSONObject map = new JSONObject(); - map.put("ext_order_id",produceorder_id); + map.put("ext_order_id",workorder_id); map.put("type","2"); array.add(map); wmsToAcsService.orderStatusUpdate(array); @@ -337,12 +337,12 @@ public class ProduceshiftorderServiceImpl implements ProduceshiftorderService { String now = DateUtil.now(); final String report_qty = param.getString("report_qty"); final JSONObject row = param.getJSONObject("row"); - final String produceorder_id = row.getString("produceorder_id"); + final String workorder_id = row.getString("workorder_id"); //报工时工单的工单状态为暂停，报工数量为这条工单上次加这次报工数量的和，也就是这条工单每次记录的和 WQLObject wo = WQLObject.getWQLObject("MPS_BD_ProduceShiftOrder"); - JSONObject jsonObject = wo.query("produceorder_id = '" + produceorder_id + "'").uniqueResult(0); + JSONObject jsonObject = wo.query("workorder_id = '" + workorder_id + "'").uniqueResult(0); JSONObject produceorderMap = new JSONObject(); - produceorderMap.put("produceorder_id",produceorder_id); + produceorderMap.put("workorder_id",workorder_id); if (row.getString("report_qty").equals("0") || StrUtil.isEmpty(row.getString("report_qty"))){ produceorderMap.put("report_qty",report_qty); }else { @@ -357,7 +357,7 @@ public class ProduceshiftorderServiceImpl implements ProduceshiftorderService { //同时修改这条工单对应的记录表中最新的一条数据的报工数量 WQLObject wo_record = WQLObject.getWQLObject("MPS_BD_MacOperateRecord"); //获取最新的工单的对应记录信息 - JSONObject newRecord = wo_record.query("produceorder_id = '"+produceorder_id+"' and (operatetime_end is null or operatetime_end = '')").uniqueResult(0); + JSONObject newRecord = wo_record.query("workorder_id = '"+workorder_id+"' and (operatetime_end is null or operatetime_end = '')").uniqueResult(0); newRecord.put("report_qty",report_qty); newRecord.put("finish_qty",jsonObject.getString("real_qty")); Integer finishproduct_qty = Integer.parseInt(jsonObject.getString("real_qty")) - Integer.parseInt(newRecord.getString("init_qty")); @@ -369,7 +369,7 @@ public class ProduceshiftorderServiceImpl implements ProduceshiftorderService { // TODO JSONArray array = new JSONArray(); JSONObject map = new JSONObject(); - map.put("ext_order_id",produceorder_id); + map.put("ext_order_id",workorder_id); map.put("type","1"); array.add(map); wmsToAcsService.orderStatusUpdate(array); @@ -382,10 +382,10 @@ public class ProduceshiftorderServiceImpl implements ProduceshiftorderService { String nickName = SecurityUtils.getCurrentNickName(); String now = DateUtil.now(); JSONObject row = param.getJSONObject("row"); - String produceorder_id = row.getString("produceorder_id"); + String workorder_id = row.getString("workorder_id"); WQLObject wo = WQLObject.getWQLObject("MPS_BD_ProduceShiftOrder"); JSONObject produceorderMap = new JSONObject(); - produceorderMap.put("produceorder_id",produceorder_id); + produceorderMap.put("workorder_id",workorder_id); produceorderMap.put("order_status","04"); produceorderMap.put("update_optid", currentUserId); produceorderMap.put("device_id", null); @@ -397,7 +397,7 @@ public class ProduceshiftorderServiceImpl implements ProduceshiftorderService { // TODO JSONArray array = new JSONArray(); JSONObject map = new JSONObject(); - map.put("ext_order_id",produceorder_id); + map.put("ext_order_id",workorder_id); map.put("type","3"); array.add(map); wmsToAcsService.orderStatusUpdate(array); @@ -405,12 +405,12 @@ public class ProduceshiftorderServiceImpl implements ProduceshiftorderService { @Override public JSONObject getReportWork(JSONObject param) { - String produceorder_id = param.getString("produceorder_id"); + String workorder_id = param.getString("workorder_id"); WQLObject wo = WQLObject.getWQLObject("MPS_BD_ProduceShiftOrder"); - JSONObject jsonProduceShiftOrder = wo.query("produceorder_id = '" + produceorder_id + "'").uniqueResult(0); + JSONObject jsonProduceShiftOrder = wo.query("workorder_id = '" + workorder_id + "'").uniqueResult(0); WQLObject wo_record = WQLObject.getWQLObject("MPS_BD_MacOperateRecord"); //获取最新的工单的对应记录信息 - JSONObject jsonObject = wo_record.query("produceorder_id = '"+produceorder_id+"' and (operatetime_end is null or operatetime_end = '')").uniqueResult(0); + JSONObject jsonObject = wo_record.query("workorder_id = '"+workorder_id+"' and (operatetime_end is null or operatetime_end = '')").uniqueResult(0); String finish_qty = jsonProduceShiftOrder.getString("real_qty"); jsonObject.put("finish_qty",finish_qty); Integer finishproduct_qty = Integer.parseInt(finish_qty) - Integer.parseInt(jsonObject.getString("init_qty")); @@ -426,10 +426,10 @@ public class ProduceshiftorderServiceImpl implements ProduceshiftorderService { @Override public JSONArray getDtl(JSONObject param) { - final String produceorder_id = param.getString("produceorder_id"); + final String workorder_id = param.getString("workorder_id"); JSONObject map = new JSONObject(); map.put("flag","5"); - map.put("produceorder_id",produceorder_id); + map.put("workorder_id",workorder_id); JSONArray resultJSONArray = WQL.getWO("MPS_PRODUCEDURE001").addParamMap(map).process().getResultJSONArray(0); return resultJSONArray; } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/MPS_PRODUCEDURE001.wql b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/MPS_PRODUCEDURE001.wql index 3b9fa7e..f04634e 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/MPS_PRODUCEDURE001.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/MPS_PRODUCEDURE001.wql @@ -15,7 +15,7 @@ ################################################# 输入.flag TYPEAS s_string 输入.jockey_id TYPEAS s_string - 输入.produceorder_id TYPEAS s_string + 输入.workorder_id TYPEAS s_string 输入.workprocedure_id TYPEAS s_string 输入.order_type_scode TYPEAS s_string 输入.order_status TYPEAS s_string @@ -165,7 +165,7 @@ LEFT JOIN PDM_BI_Device device ON record.device_id = device.device_id LEFT JOIN sys_user user ON user.user_id = record.jockey_id WHERE - record.produceorder_id = 输入.produceorder_id + record.workorder_id = 输入.workorder_id order by record.operatetime_start ENDSELECT diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/pdm.xls b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/pdm.xls index af565c7d906b304fef8bacd4e3c6df69d7d2b37a..94526fb03838efb4b61cac8510d8de8aab6fc96a 100644 GIT binary patch delta 19518 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 Qzk4Z|rz&d8c0v9B0AMn0s{jB1 delta 27837 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 diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/wql/sch.xls b/lms/nladmin-system/src/main/java/org/nl/wms/sch/wql/sch.xls index fce6e3bd302812605f90845c8bc4fd27b391acf6..af6734fc668166ab3a469e1f77194dcc65917ed6 100644 GIT binary patch delta 7736 zcmaJ`30zgx_Fntk%P3q%kx7utAoFkm6(t2OkcOH{hWVTkMI0F{4fW!bnwsKGPZXM_ zIijhQH#2c~+2DjGB))oTFSEdUVGcbN<^Sz{&%I{8_vic$d#|0eFkDsQMQw&@XJycyfqxFfc2ZA#o#N&W4rm5sHXb;r{T`Ns%95@RFA$&1OA zUOdTVHCs}UUwC`DW&+o}a>1;dQ7|pPe9rPbt~>jaS@*+0HY=!z>ohdp8H7m13YTi< zb{x%nec;VCYNlGTbyQGMo*0?(oLN^sIB;gV1NF@19czn>6H5ytF56D9=XT9M61fny zerd}k+t%$US$`EZK)SHMY?ZCirOeg1>Q!I6LOb4XOzqxR{Z!6z#9AdaTq3*H5Mz+K zqoLhw&HCGOq84puRp_Jkx#vIF(5_!OA*HZTW@lu+uhVO1O4gIEVg^-fW9vn27C7YW91v0HObjUj|v>e+GlyDr&q1( z_~MZ9i(D5i%Tz7fJmggM0Jnoh=VOnrkI}Apy<6j`*WHI7EE=2bH|fi)@yBk@{i80i z)HvVkgTy(d^(lX}9eHp$SzF>f=xw@CBYkr=va)>smk076ev!2zwc^uG_Z{nB`(<%S z+lkD(K9yZ>81A~qof%x_%Qc6-~aka(!7(=c>ECzF*bjYxn6!|9_>u>F|7hmwh=e zr`ONv?Q(YZKO8gaC){ZMLZ{Q@@>f}|I`Y0vq?BIuwb`H&w>Y%bmSFuU%d+?t_L0GlvDYB}Xh=o4mI!d}g8MbM3yoHF3sO zYYh7G#@Zh)e~UhoJD;wfGvd;&lMRF47_#L0xnWiDTX`3K`Hv4WN=Cme%)|$t_ufG}KeS|0X%tCwnT-tX!gh4fy-rYm-R0_#0D z-5eUQcu((fb%we1P0zbuO>M~tSU$yZcJEb&(lp!t{x^2kwO#FZHz#o3jcsw7>f(R2 zx4(Pi_;)u}IE7x&&)t5a?>AxJr}j(ke&ipA3c|~`zx!bM;i*%;xEwX2ao`=7BZi{G zGq0SHAKdRh)6lZ;&@Qj?8|R99AL-rxUCpU4QYzoNQfz21o%ep)Z?mwB|>rk%`)15EnUd^Q){!J|2Yx2DdKcZBTm%xA_==j&`VI1%bR1N%4H~B-XOY-GIBNQo*-Tc;wb-(@r!c#5%m_0ot zM?z%iImV4}8@90V9DDLH+d$-=YI%;?8-x)=3ylcAFyiz-jX3{zBf^GXF0D!`;ab(a2$VjFIQF>_iRqm;Y2h{CdvCWxZwvd>to#C5arzevCIY-TN=7c1DJfQjCmTnH~JYDH1;qKX^c1O zZh0BcHD=mQIfb=(9us+#*{!*nT4eW7LSL^_pUPAwQ5|``J{gv9%~ z3A?{T;@-Gf?YarOx2$@LT{mI(7wc$l_aY>|l-zJnT&F6!M(>EH8o4Y-$I(J9coWh% zqB}7Us-fG833m{#2=3R>49^h9cczb}~HM$EUoVN%3 zw&=OvIF6NGcC?#nthVei<_omdfrSS-{E6!xg)85bE%L|t%q9GuV#E^^_R@Vw9Lf_E zHVNaNB1BCj|CY~QkOwSeA?jmf!{o{1nXgS91yDy>GoA&>N5(UE`N%?+7R1BGZFpfi z)(ab62-#lR4T5##OI~uko^_V{6fkXoq>%0;rUdtj=->=`9Boupk46;Iq^tjhpnrv2~qn6#yRrV5b=J0l=FA z*hc{HP04|MtgFw*3SidTDXY~-tPq$M?)qQ`*3*8f<&T`IXU+&)H2KQ?C$KmdzEca> z9?@4zesWq23pMbqx`uFB3V455`U!(Ak_72PtE56tein0g{6X|5`p7ETpzVNFvV~-_ zN_J$VkFAnD+74PI0~oKNPb?w~uR-o@f#?9~Q>)|z>9AFDhJ>qDA)|p*2Z`?vWCHXv z-qt>xXlJ<8OcRv2cShWsX`)r~P|+T&9PEfxabLgxNBlQ0kV0w+-5OjB?I z1l@>0B+L|tE9rQR$`UZ=-DJ! zOlBR`W$;?An#{s;J%yPdVWw2+8YIk=LE>=172#3xEg0koE}xEhef>(OUpGFh2T`*KuGi zc5^$u0y})7w3sMjj7j`4FcmW&{=o_n|1>@%7(@=zEQLrgh&0n|g-Eb<#RP*$Greln z+bAnG*y<^tieM1A0qf@75DYSER<4j?!E!|*>o__@LGL2aLx66><|ybPKp#bOt&$4I z9r6?5S_l}76WKU-IRv4w6_yJ~LgeVFh&5kqd`)NtNGL!Y*gVBhC_o&U!78b! z1G60Fp#X7U6=>rip#X6ZAfW(pVwMdU3OAhKs+FXe`b4qZiuMM{URqQhc^QCCdJY7vgEVCu#!ORp=Kx(G&H z!PK3ZFA^{6DsP;|d`5>W49r_38~~5ENH_ot7|p{G4iNMD4hIO| zG2Cr03K#2pbc6yDF1&~UNF%+bco6{*AGX9Qsc46FA4UMAkqQ+LBLLDUJd6Oy4(le0 zkXKh=Vj~rhNC6TF5I?q5F&haGKekLU6bVnv30Win{Fv6Nx7@jr0C=33L}F6?+3QwY zJaJkMiEpGxOl%8|q82%PK64%&rI3ggB%(l~4Qt4}Ort=ejaFDC6$LU&IHN$MjaH(K zhcgPEns;*)hy+^aEK2sD0Z*e9kXQi{4Uii813JEE`4_@9`VS;-C>oxc^Pgw{?6aQh z(Eu>#G|>Q9Z%x6X;b|9!gkG`5^PM*!aZjV+>3ZDQwQ~3(=KQx9g+#m{5d#v<);u)^ zB${cJ;!O-lm@lyykZ7jWR=wpCivfui!e_czG%>P&G4n}_RRGM1Xe_tLUaV}+-MNa9Oav`ULFi;X2LG*>5h;t!=T^St6+L8= zY~6T~dBU`qiFnIQh*T_k5p$3am*S&1Niax2x9d3D&5=p~gX{QHw?*PB-x8?=uyA0O z?UevG&7UI)U?Gd?;4BibCV~Zv1h7Cn6&4A9W`T8~k>eLJ8w0MOMb|eva8K?V$myBT;}_(&0n_YDtF^ z0cuW%69uRx9Zs}@CO!e0_+LRUVmD0bKs1NV!fCgZR?sZGWq8;u`SfCZM--H?fvl69 z`Wg%G#LrmFG)_s>+JD4e!fAvg`BoVlZu=E-y|{Az*?iwL;AK|pCLdL?m)9+2vk$}H*sL{Aa}BMY^2Tk< z%aDZyoJe{+-6D!JdVWi;G(W;Ys8p z)AE@PqLm)HtJrXlx z5J6p5Op-nYq07+sNRP=#rlj~}eL}aSM0E<+PVLBTl&)h5h<}B6}|7Y37R=&3O zNzXb~&Tv&BbrSz~b7*g8Sfwgb%U45LM^oD&smgi9Z-A+n9-DW(c9>LYcPpP+^l+xTvo>KpZt4p6!_d6vGm#>_b`pRFN zl3eAyGg3(947L0l7hF!`SNkccP~Lost7{CVp=V#;Uha}!TRNqA{jxoqF+B(fQN)t8 zevMo6vi4+Ep6gwGx6q=`?zQ&U^PgSK*+8xUF*3$BzoK*G||KFwnbr zkww2CwV=yzuWS7)pKm!F)$2rqMc?f}VaP`XzCi<*k4$n2JC>pEi?1RMY?4n@?_Yc? zdtIHYEWfy5lF9F^^a@T=xx)o1SU&Kz@Lcs?+G)WOEg0{vVh@V=Djv delta 7577 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 { + crudProduceshiftorder.getDtl({ workorder_id: this.form.workorder_id }).then(res => { this.tableData = res }) }, diff --git a/lms/nladmin-ui/src/views/wms/pdm/produce/index.vue b/lms/nladmin-ui/src/views/wms/pdm/produce/index.vue index 8f91e80..3043182 100644 --- a/lms/nladmin-ui/src/views/wms/pdm/produce/index.vue +++ b/lms/nladmin-ui/src/views/wms/pdm/produce/index.vue @@ -238,7 +238,7 @@ @selection-change="crud.selectionChangeHandler" > - +