From ff82bf945a61c85207e640e5c57ed48d4b9a88fb Mon Sep 17 00:00:00 2001 From: 18188916393 <2562295436@qq.com> Date: Tue, 6 Sep 2022 11:08:27 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/org/nl/wms/.~lock.wms.xls# | 1 - .../org/nl/wms/common/StructFindUtil.java | 1 + .../wms/sch/manage/buss/SendMaterialTask.java | 187 +++++++++--------- .../src/main/java/org/nl/wms/wms.xls | Bin 374784 -> 375296 bytes .../resources/config/application-test.yml | 164 --------------- .../main/resources/config/businessTpye.txt | 9 - .../src/main/resources/log/AcsToErp.xml | 32 --- .../src/main/resources/log/AcsToWms.xml | 32 --- .../src/main/resources/log/AgvServiceImpl.xml | 32 --- .../src/main/resources/log/AgvackServlet.xml | 32 --- .../src/main/resources/log/AutoCreateInst.xml | 31 --- .../log/NDCSocketConnectionAutoRun.xml | 32 --- .../main/resources/log/QueryAgvTaskStatus.xml | 32 --- .../resources/log/QueryXZAgvTaskStatus.xml | 32 --- .../src/main/resources/log/WmsToAcs.xml | 32 --- 15 files changed, 100 insertions(+), 549 deletions(-) delete mode 100644 wms/hd/nladmin-system/src/main/java/org/nl/wms/.~lock.wms.xls# delete mode 100644 wms/hd/nladmin-system/src/main/resources/config/application-test.yml delete mode 100644 wms/hd/nladmin-system/src/main/resources/config/businessTpye.txt delete mode 100644 wms/hd/nladmin-system/src/main/resources/log/AcsToErp.xml delete mode 100644 wms/hd/nladmin-system/src/main/resources/log/AcsToWms.xml delete mode 100644 wms/hd/nladmin-system/src/main/resources/log/AgvServiceImpl.xml delete mode 100644 wms/hd/nladmin-system/src/main/resources/log/AgvackServlet.xml delete mode 100644 wms/hd/nladmin-system/src/main/resources/log/AutoCreateInst.xml delete mode 100644 wms/hd/nladmin-system/src/main/resources/log/NDCSocketConnectionAutoRun.xml delete mode 100644 wms/hd/nladmin-system/src/main/resources/log/QueryAgvTaskStatus.xml delete mode 100644 wms/hd/nladmin-system/src/main/resources/log/QueryXZAgvTaskStatus.xml delete mode 100644 wms/hd/nladmin-system/src/main/resources/log/WmsToAcs.xml diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/.~lock.wms.xls# b/wms/hd/nladmin-system/src/main/java/org/nl/wms/.~lock.wms.xls# deleted file mode 100644 index 57d870a..0000000 --- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/.~lock.wms.xls# +++ /dev/null @@ -1 +0,0 @@ -,DESKTOP-BT6HP4E/zhang,DESKTOP-BT6HP4E,29.08.2022 16:51,file:///C:/Users/zhang/AppData/Roaming/LibreOffice/4; \ No newline at end of file diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/common/StructFindUtil.java b/wms/hd/nladmin-system/src/main/java/org/nl/wms/common/StructFindUtil.java index a236c8c..4580b2e 100644 --- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/common/StructFindUtil.java +++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/common/StructFindUtil.java @@ -15,6 +15,7 @@ public class StructFindUtil { String material_id = jsonObject.getString("material_id"); String area_type = jsonObject.getString("area_type"); String vehicle_code = jsonObject.getString("vehicle_code"); + String point_code = jsonObject.getString("point_code"); if (StrUtil.isEmpty(vehicle_code)) { throw new BadRequestException("托盘不能为空！"); } diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/manage/buss/SendMaterialTask.java b/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/manage/buss/SendMaterialTask.java index bea5ac1..ee5c712 100644 --- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/manage/buss/SendMaterialTask.java +++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/manage/buss/SendMaterialTask.java @@ -63,57 +63,60 @@ public class SendMaterialTask extends AbstractAcsTask { jsonTask.put("taskfinish_mode", taskObj.getString("taskfinish_mode")); jsonTask.put("update_time", DateUtil.now()); jsonTask.put("remark", "任务执行完成"); - ///审核单据 增加库存 改变出入库表的状态 - WQLObject mstTab = WQLObject.getWQLObject("ST_IVT_workProcedureIOS"); - JSONObject mstObj = mstTab.query("task_id='" + task_id + "' and is_delete='0'").uniqueResult(0); - //审核 加库存可和用数量 - StoreIvtServiceImpl ivtService = new StoreIvtServiceImpl(); - mstObj.put("bill_status", "50"); - mstObj.put("confirm_optid", SecurityUtils.getCurrentUserId()); - mstObj.put("confirm_optname", SecurityUtils.getNickName()); - mstObj.put("confirm_time", DateUtil.now()); - mstTab.update(mstObj); + String next_point_code = jsonTask.getString("next_point_code"); + if (!StrUtil.equals(next_point_code, "BZX01")) { + /// 如果终点不是包装线，审核单据 增加库存 改变出入库表的状态 + WQLObject mstTab = WQLObject.getWQLObject("ST_IVT_workProcedureIOS"); + JSONObject mstObj = mstTab.query("task_id='" + task_id + "' and is_delete='0'").uniqueResult(0); + //审核 加库存可和用数量 + StoreIvtServiceImpl ivtService = new StoreIvtServiceImpl(); + mstObj.put("bill_status", "50"); + mstObj.put("confirm_optid", SecurityUtils.getCurrentUserId()); + mstObj.put("confirm_optname", SecurityUtils.getNickName()); + mstObj.put("confirm_time", DateUtil.now()); + mstTab.update(mstObj); - String iostorinv_id = mstObj.getString("iostorinv_id"); - String next_point_code = mstObj.getString("end_point_code"); - String start_point_code = mstObj.getString("start_point_code"); - JSONObject param = new JSONObject(); - param.put("material_id", mstObj.getString("material_id")); - param.put("bill_id", iostorinv_id); - param.put("qty_unit_id", mstObj.getString("qty_unit_id")); - param.put("pcsn", mstObj.getString("pcsn")); - param.put("change_qty", mstObj.getString("qty")); - param.put("vehicle_code", mstObj.getString("vehicle_code")); - param.put("workprocedure_id", mstObj.getString("workprocedure_id")); - param.put("is_full", mstObj.getString("is_full")); - param.put("stewing_time", mstObj.getString("stewing_time")); - param.put("producetask_id", mstObj.getString("producetask_id")); + String iostorinv_id = mstObj.getString("iostorinv_id"); + String start_point_code = mstObj.getString("start_point_code"); + JSONObject param = new JSONObject(); + param.put("material_id", mstObj.getString("material_id")); + param.put("bill_id", iostorinv_id); + param.put("qty_unit_id", mstObj.getString("qty_unit_id")); + param.put("pcsn", mstObj.getString("pcsn")); + param.put("change_qty", mstObj.getString("qty")); + param.put("vehicle_code", mstObj.getString("vehicle_code")); + param.put("workprocedure_id", mstObj.getString("workprocedure_id")); + param.put("is_full", mstObj.getString("is_full")); + param.put("stewing_time", mstObj.getString("stewing_time")); + param.put("producetask_id", mstObj.getString("producetask_id")); - PointServiceImpl pointService = SpringContextHolder.getBean(PointServiceImpl.class); - PointDto nextPointDto = pointService.findByCode(next_point_code); - if (ObjectUtil.isNull(nextPointDto)) { - throw new BadRequestException("未找到可用点位:" + next_point_code); - } - PointDto startPointDto = pointService.findByCode(start_point_code); - if (ObjectUtil.isNull(startPointDto)) { - throw new BadRequestException("未找到可用点位:" + start_point_code); + PointServiceImpl pointService = SpringContextHolder.getBean(PointServiceImpl.class); + PointDto nextPointDto = pointService.findByCode(next_point_code); + if (ObjectUtil.isNull(nextPointDto)) { + throw new BadRequestException("未找到可用点位:" + next_point_code); + } + PointDto startPointDto = pointService.findByCode(start_point_code); + if (ObjectUtil.isNull(startPointDto)) { + throw new BadRequestException("未找到可用点位:" + start_point_code); + } + param.put("struct_id", nextPointDto.getPoint_id()); + ivtService.addIvtFlow(param, IvtChangeTypeEnum.ADD_IVT_AND_CAN_USE); + //解锁仓位，托盘信息，回写到点位上去 + String vehicle_code = jsonTask.getString("vehicle_code"); + WQLObject pointTab = WQLObject.getWQLObject("sch_base_point"); + JSONObject endpointObj = pointTab.query("point_code='" + jsonTask.getString("next_point_code") + "'").uniqueResult(0); + endpointObj.put("lock_type", "00"); + endpointObj.put("point_status", "02"); + endpointObj.put("vehicle_code", vehicle_code); + pointTab.update(endpointObj); + + JSONObject startPointObj = pointTab.query("point_code='" + jsonTask.getString("start_point_code") + "'").uniqueResult(0); + startPointObj.put("lock_type", "00"); + startPointObj.put("point_status", "00"); + startPointObj.put("vehicle_code", ""); + pointTab.update(startPointObj); } - param.put("struct_id", nextPointDto.getPoint_id()); - ivtService.addIvtFlow(param, IvtChangeTypeEnum.ADD_IVT_AND_CAN_USE); - //解锁仓位，托盘信息，回写到点位上去 - String vehicle_code = jsonTask.getString("vehicle_code"); - WQLObject pointTab = WQLObject.getWQLObject("sch_base_point"); - JSONObject endpointObj = pointTab.query("point_code='" + jsonTask.getString("next_point_code") + "'").uniqueResult(0); - endpointObj.put("lock_type", "00"); - endpointObj.put("point_status", "02"); - endpointObj.put("vehicle_code", vehicle_code); - pointTab.update(endpointObj); - JSONObject startPointObj = pointTab.query("point_code='" + jsonTask.getString("start_point_code") + "'").uniqueResult(0); - startPointObj.put("lock_type", "00"); - startPointObj.put("point_status", "00"); - startPointObj.put("vehicle_code", ""); - pointTab.update(startPointObj); taskTab.update(jsonTask); } @@ -261,6 +264,10 @@ public class SendMaterialTask extends AbstractAcsTask { bill_type = BillTypeEnum.FJRK.getCode(); endArea_type = AreaEnum.BZZC.getCode(); vehicle_code = startPoint.getVehicle_code(); + if (StrUtil.equals(is_full, "1")) { + next_point_code = "BZX01"; + } + break; default: qty_unit_id = BussConstant.HN_IN_QTY_UNIT_ID; @@ -271,48 +278,52 @@ public class SendMaterialTask extends AbstractAcsTask { param.put("area_type", endArea_type); param.put("vehicle_code", vehicle_code); param.put("vehilce_type", vehilce_type); - JSONObject inStructObj = StructFindUtil.getInStruct(param); - if (ObjectUtil.isEmpty(inStructObj)) { - throw new BadRequestException("未找到合适的入库仓位！"); + //如果是分拣送到包装线 则不生成入库单信息 + if (StrUtil.isEmpty(next_point_code)) { + JSONObject inStructObj = StructFindUtil.getInStruct(param); + if (ObjectUtil.isEmpty(inStructObj)) { + throw new BadRequestException("未找到合适的入库仓位！"); + } + next_point_code = inStructObj.getString("struct_code"); + //创建入库单据 + //假如静置时间为空，则取物料表上的静置时间 + if (StrUtil.isEmpty(stewing_time)) { + stewing_time = WQLObject + .getWQLObject("md_me_material") + .query("material_id ='" + material_id + "'") + .uniqueResult(0) + .getString("stewing_time"); + } + JSONObject iosObj = new JSONObject(); + iosObj.put("iostorinv_id", IdUtil.getSnowflake(1, 1).nextId()); + iosObj.put("bill_code", CodeUtil.getNewCode("IN_STORE_CODE")); + iosObj.put("io_type", "0"); + iosObj.put("bill_type", bill_type); + iosObj.put("workprocedure_id", workprocedure_id); + iosObj.put("ivt_workprocedure_id", workprocedure_id); + iosObj.put("material_id", material_id); + iosObj.put("vehicle_code", vehicle_code); + iosObj.put("producetask_id", producetask_id); + iosObj.put("stewing_time", stewing_time); + iosObj.put("qty", qty); + iosObj.put("qty_unit_id", qty_unit_id); + //默认是分配状态 + iosObj.put("bill_status", "20"); + iosObj.put("start_point_code", start_point_code); + iosObj.put("end_point_code", next_point_code); + iosObj.put("start_area", startPoint.getArea_type()); + iosObj.put("end_area", endArea_type); + iosObj.put("cust_id", cust_id); + iosObj.put("create_mode", create_mode); + iosObj.put("task_id", task_id); + iosObj.put("pcsn", pcsn); + iosObj.put("create_id", SecurityUtils.getCurrentUserId()); + iosObj.put("create_name", SecurityUtils.getNickName()); + iosObj.put("create_time", DateUtil.now()); + iosObj.put("is_full", is_full); + WQLObject.getWQLObject("ST_IVT_workProcedureIOS").insert(iosObj); } - next_point_code = inStructObj.getString("struct_code"); - //创建入库单据 - //假如静置时间为空，则取物料表上的静置时间 - if (StrUtil.isEmpty(stewing_time)) { - stewing_time = WQLObject - .getWQLObject("md_me_material") - .query("material_id ='" + material_id + "'") - .uniqueResult(0) - .getString("stewing_time"); - } - JSONObject iosObj = new JSONObject(); - iosObj.put("iostorinv_id", IdUtil.getSnowflake(1, 1).nextId()); - iosObj.put("bill_code", CodeUtil.getNewCode("IN_STORE_CODE")); - iosObj.put("io_type", "0"); - iosObj.put("bill_type", bill_type); - iosObj.put("workprocedure_id", workprocedure_id); - iosObj.put("ivt_workprocedure_id", workprocedure_id); - iosObj.put("material_id", material_id); - iosObj.put("vehicle_code", vehicle_code); - iosObj.put("producetask_id", producetask_id); - iosObj.put("stewing_time", stewing_time); - iosObj.put("qty", qty); - iosObj.put("qty_unit_id", qty_unit_id); - //默认是分配状态 - iosObj.put("bill_status", "20"); - iosObj.put("start_point_code", start_point_code); - iosObj.put("end_point_code", next_point_code); - iosObj.put("start_area", startPoint.getArea_type()); - iosObj.put("end_area", endArea_type); - iosObj.put("cust_id", cust_id); - iosObj.put("create_mode", create_mode); - iosObj.put("task_id", task_id); - iosObj.put("pcsn", pcsn); - iosObj.put("create_id", SecurityUtils.getCurrentUserId()); - iosObj.put("create_name", SecurityUtils.getNickName()); - iosObj.put("create_time", DateUtil.now()); - iosObj.put("is_full", is_full); - WQLObject.getWQLObject("ST_IVT_workProcedureIOS").insert(iosObj); + } String task_status = TaskStatusEnum.START_AND_POINT.getCode(); PointDto nextPoint = pointService.findByCode(next_point_code); diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/wms.xls b/wms/hd/nladmin-system/src/main/java/org/nl/wms/wms.xls index 4b1a61117a7ded61dd6c5fbe6d0fe97d969ef506..37930638e57b24da71ee60f32d233168070519ac 100644 GIT binary patch delta 19180 zcmc(H349dA)^By!Og0j-CzFtnh3xAjlaPdvoe;8;5D0{Xgs>xCl~oYD6E63Dq6mns z_LWUg6gS{v)ByzosK_F#fC?%uEDEB4ASf4j=Tvp~%w&1q_rCA_Ui#P5Q>RXytxlbP zb@xE)6~ET&eor;(ZwQ2p+uZV!AjG%n#fhSRbf)LVRnk=5W8&fg(jU6}+;#?>*syBX z=K||!o2swsAtk#Q+S)z5MCpCU9&N7P#X9qNLdcDK9)!FNU+_;C68a7CA)V=o-O%H@ zp(k}i?`2Dmuu+_B+hIdbkp6BcF?S~}p_@@AMxOv4*}K=f8+vdz^d6jU>?A0nn*k}D zE?qRNH&5&|ibrvhN{1`|+sQ_0QCG?2zeSJJ#E?G`G)d|g*lbM(ZQOrLy(Z<)v@33# z|4#?}5A)Zey#Ha3rHj3i115u9`z+*(<~}Jks3d-h+WU;Br`$vCL3DmB8SdBU6DG8W zw1*H~hO{jx%HulF*&jFcLFrUbNy(c5iQM0=?$%?qLZbJ7z6aSM*2(sFlIU%0xrPvCGYKFhQ{hl0 zf^dO=%{Bf3p`G;cQQ?v?&tGt6pMm)4@6t&QTHq`t6$S_~(wZoL>9Z;?sU_ba6+{ox z;sw!>9!xL@2B|tePuV6d~eA!&JZ$_c?XCw0>0p%gEPwkjIuL$ z4N)!)?b>UM=6@JvKF?lkh6AJ{kOS7)_V>1x!?m+ngg8~hoSP#JLVz;+25E4l0W(L+ zO6ZNTktRd5czj}5ZUwL?O-t|v4WlFcQ^58?;0pdJp3TB}u*(ERC$M-@53tdfdeUH! z<|`dc2!w1!dkvDu0ADFF@h7PUG@DZlkefge1gWaR;6p&=+$!$QL~G2`pecf5HAt;z>HuaoKi72i7j>U}sEM{HPb`adrxD0-&RR zR|8_CZ&LhQFnnG0V)(kEWB5Eg3DzgYJ??zx>Z2rwWGwWP?xq%L)$gfdKM@KnTm&jD zE%uj|nBIq?P?pv%eVcBON>dC1&3Z1C?DAwl3*PsqEjGzk4~IP1hD$e@`>7 z#fq<5s>F0wz*4b8E#lR~&}EHc26f2~25Iyh>k?-mpmnHp#p6auV*FD|1z%$^($2oD zYWfRMTLUE#O7JgzpD-)nWwWBvw9?7Unypp@PUrl=o%lK3wg{^H9Saqwt5)60SStxB zhPKU_nL-E#+f!X;m{(f0!>VS$s@4|VuaOF~rAKl~GB|A6>a>AL0`v|r$@y(y?mq^& z-T~cY9zh83lV*+dmcGqZvXvnG`%-7QXnm~b47-URe&5SGQc@}<^vF$^W%hB((C!{Evy!jZfao{ zTZ7q5VmCDsqu61^&5`yOl$7#Vf_)v*AD6m7u+Z2q3l7mhH-I|)QFg z=wTKF#A^r}pe1~!*iJ4_b5={xJ#BJ1ox1^r0>;7?0m68*$V-|(z##pY2c-n|DD}mL z!7NQN2(vu}*jZ_dgwsK4mvolyUGN7=M+UI{+a!BwGo<|k5H_I~AtF=hRb2+}1>ylU zH&D7}^z~-eDEmBRDdS#AavT_^XLd=45&~c+aHK3&nlli03a>}TO63W?wG9#M)ufvP zdt|Hxpero=dyO#lt;0@@HdZR2dSi0pP4DjoS5WJ?!H;`ok}+UaBkge3xX zk#-t8?0)zznC*(${#idAQ|3S3fp|keJLC`~PieA(6kf1H2=whDDV>!q1n$RTCFio) zxB{iABMnkYj0!UWZ1-i5^6UJidu7vLQ-d=V(`gCJlI}|gmYN48OG(k*09Y5xla;w} zVY|HxWnNw^Pwi@%G-YJ(|4z;F#(jhRs+uA7%MDgG;jopA^n*nzWJ}>* zHEhQ_ml;-&)O&)CTR-MIyJLV%-WlO9HCK5lUIwT|@Bh*rFYBGge^!Da#&LPU(nMIr z^57ShyBsV{VRo3z=gV1H{X7_034Y1*lANL5D)Xrn**G(A+vYxBfB&ybD6cjM6MoVw zH4XY1@TiO5RWXc{(uZur%!I1wQk!gJrI%7A`12fYy>0cdrQ3RCONX_iLApxEk`4S? zMOEpT{ejY!+Q%7EDS&1M2_4fARxs4 zp4TvfNx+saVp$;GXA7Qe#jtHKZX&GfM{vUL(qr{cuWpT#6fAVm}}F=%vfj(m7@4NEb&ZD+Q@@eO7(s z4~6*F1RsjPt-U0-#Kmh%xWhsihau(L6m?@D>Bdw_yIKad)r^S|rK1xd<;NLP9$}1N z)@*f~&QY4tyFm3vq*LQQE3%IA@`7Cu?6Y|&taQ(A=wT{dS~(%uM!Rx<*h!9Zf2h)> z!U@S{s}=%TK|s5W&A7^Edw2jp%c~a2t770m^mVNwSn_=%UC&}Xx4>68PVXbjuJe7nG z1Etkw4{5?tqqO>jhfpSEAB~sJL#y`*53zzuYdzfs4!_^_@lnfNU1b%N_G{F#c}#7r09fCtE8qs zhUc4SBk}p=R^r;Z4l|H8zb9pkQqzbAPV*w!u}ISk=SD4U`lDuijnsskt5$Q)keTbN zKqQkm^OTjQN{sxK)9910G^sSvWGX#wt3x-5wD1{NK&ngYOQB|F4V7GVhKF&kkDlSp3Gw=4bZ4 zG^-pD))6<9Tow1?kjfE}u@7=xZ%_DE*T)1$d$MY%i8xM^;l@Js#|8U~C z^S}OHIN|YU>lbDE=b3xnE?ew6cGH;Rn@`=oxaG~#zrp>g!8iMK#|{eIV}HlmlNL{L8u0*Piwmwb9X*o)Rx!$=!OA9Q*QnG;laklB^R!4tgRDbL!F0`$)kh5+4}8{^};(- z?_a$5qrLktRbF|ks>i>2I_+^f^vvF>5Bq)d=5gn1 zuj*gCa^&WMua-`H;>aKOxqmR++r0Tq`_~g!M(ZESJL%BRuRi#PZ6Vw9{mR5kPv`#o zNbLE_kZqTum)s2gZTr2OFFg9|wY!G);In1FKeYbXyz)nKA8p_B;Jyoezm)ryG`(+G zoLI0eB=OqSzlG%G{Qmu}uY_g4Er}X;>-K?Rzf3-V+FROm<8<~ZY1e%eoflGr*ZYf+z*Zi9R78v+fzUM*YqFfpYvY7DWNLiy6^4hj;){g?C%H3 zoQIN+H^)6)8!S(IKGY#-n&X=FLRrw~uErM{hdrFQYGTu!vv0n)s%LrcvmZSlJGu3b z=AE_Q_m`gjccK16K%lC&FaEuJjWFCYW0l|$Czk|#TeAE8hujMV;cf*u2b^3$ouNS(+X;zAstFNI=-K^YDpBZb-@Tn3gsdpfq9 z%uEPAbWfpJu2G0y7Q$qBvp)0&Wq5Zh!^cjBqhgc1<)|>-JAv}?UZfXCH!r_!EG zGTiDw1X8K>a9~lwiAtk@FQDBEI0R@}4+mxw&V!YP-#8s((~*uTK;bmu{+a9uXU!ha zG*MS340FeBkUaLZknUzrdik_a)PZ!PGpYE?P6Hq7Oxgz|vz>Uw{2m=GQRtX_UGd`- zbw$SjcSXmbDs;0FQyw>rOjiTotx1=3oV%|0F~hr}V@BK4o4I1&P92=?*A3mj8#>%? z*(;D6z81C$qQ&=&uuyP0{i#4+`c5E`=jFUZ!kcn_FVV*`@mrxk%}J;5WRj&Crej~K z9vKjOOdU+eOxj!F!F0@`>e0{g%~`?6!*PqVNapnr<<=P8DogBZ;@fVP3MzW|mS$6l z4Mg(!`-+Lq1)t@SuVMsvd>%;@;w1p-6TP5o?73@~9ATFkCi-h(&O@$}j1mtThKO#qxH% z43vd1v5!z9NAgQ4zx;(?mf>ZP{0>~?x5Gp)`67G(^BvwD7S4ti<7JRM87`b_bvWbN z%)3wU?%(l}BM0|^ORikNFXQ>;aemprFGu<1MjvrKaIT7A19ssh&vGt893Z&A7A%tT z6p>6V63H(Wq6KEmq_<3o7vH5lOX)tSD?9MPJ48tKED{6dUy`YloZ+TBX^A$91D$%7 z(JvGpEZ_3Cm7+loc}R4ztjZL}x#-I2ccNTUq%&I5i^SzFu@y89N)n390`>~p?P0l9 zDgNl@J-${XFH8_g%^Z=GE)vO<=M@uWFww`7-6Fn7dsfmsNJ`DlsczIjD`}<0VZ8V& zs+_Cz`u~Z_@Q1`XJ%E3;!XNu5{2$I0v%Gqg(^kc$Qn~3Z8fi&fBL1ug^5Y7*j+4uu z5x;W;@@ootEGLgzDH>e;OSg;UjUyu2^qoj@ZiuAFnUV!=R9iqxBi=nEej>PD2h)Co z^Ul3{_vFtHi!t(+gW{kNm>@!0g(n4Ep!ioqe^#7eQzu*%1BF^kza!!=-mybznlfd5 zz`>!k+ru*CtoVW}@Q+gXbN+-s@Tw@d#a7WJ3jYw`A56PDsx1TViox!{ze3@^|4;az zaHF4k^!UP?lKLo0hQ&}NU03v>4wweJZGG0#V1E?7;{=&_gvupZkcqdGX^?Zs`Xox+ z3MrX9l#=-qC|Ue4C7&*&qJ`}N&w;V|e zy$!7$BnY^ifJ@#~1K}zp)pGuBTJIhPo!+DljDcUm39|g^ZW>|^X3bXNRpKOikVtzL zMvJneeZ*+db~KsM;O&l$_~@J1S85@PGl_+AX+=%$yz8pMPEUlC(H4WKe13xa~Lq7ixOS`N_KqO}}h!EM!APULknc~5IP1MB-*%LQ87v{nyjZP!|^ z(AuH3+@OU!QEp66XthJ@uc8Y}+85yal|1ajI<%4mLI`*ZBcIbtYhvheU&%W${37&W zm?L3j@$g5&{oyK>2Y8DXDL-_G1~lL@SOF)=$DvW6WhV(z#74pV?j)G7C@4ys-zb>h zT|`~FQJ`QaQyc{fUeXjq$+;hc0$fvH!|B8nL^C&fD+;1n0);3FqBRB4EP;-}C{!G+ zc@S;qK{WHgj0^NfI6atx7*GJSq9}*~1$$U83W@;*60 zC5AYXz2qKnVQgZc__RZtFO?X`(vM-(Hu<;h)VBdE0($AgjKJN-88TKeA{LA|L&hmy z#)1*wFoCgP#J6O;M%M!uDvAX!zhlb;=P6eH<}M8|V|hU@4NO5CC|F1SfHn?@0|jfz z?^+8B0z3{^`miXd$q)yg@}dw2N_bJg$i#uCZz}v)5N^R}EC_LGL6G-asBd;WkkQK^ zW<)$Q;-;b~o*D5Qv`}C?c*(0$Je$j(<=*>gFZ~YEo5ahbkI^u50&t>3p-ff+lXXLp zg}3Ev$)}2}1Wi@~$a;~S(CDf&33kpTXwD?Sl&vM#fghboP@S<>w?ybdhr*c=iD1M^ z@+-74s)=C4N^(tWQCK``R1?9FHCj{?wFFIM3944OL@?3_1^?0 zTI;_FOtjX26PRhO|0XcgTK`R8slAB?c#M1QtkML{k& zMgxP<`~IMmV?uwnE>%qEFYmO_;Orbl5wBW!JGqXiSdhaMsaTN16k&LC*yQ~zZ#$-7 zK@P)$DY=R)Uc_>lEENlKnJg6xay41G%wQD@av^dY*m5CqR$$B3oXBNPT$fuvrHPrm zlI4LSYrW3{Mb>(s2a2rqJ`a>(y_diJREbU=2J#+Q=2{#js6;+^7^CsK5F)rUfpv`52Frnve1$f=3%(IHv{vB@IpHLY zjBgb-Ga(H&ovL8=Q)87nnf#N&?+F zNlR<_{bd0gs6t)=8>m8F0Sx4jSHK3UkXN8B>;ks15wH>R3N*;WiNdwa@4pH`hZXV) zL5CIc3bl+ZWErVKUZIweg<3|U3x$w4R>&)4S*b!^p%wB5fbvQj4O4=UHvkOi2zkZ8 zVTHV6;IKkoF_>tDykaoX3VFp~rWNvv!AvXU6@#f($SVd@t&mp?rrJPWu^r?UgJ)LA zE4G8YVmrtywu8K4JIEWTM4jLA3}iDKqrkvGHnZ-rT9ZTGye~A!D`EU9R>p+*$`72T{$}+Cs7y=OGM280 za%f|jR)fl5ZrX_-2*Eq(GMF0e4w}3SA;w)?xnes<+;XN?#lv!@R>i||7OXq{U{1@K z;VK}OYlf6FLsUR4XNIVNSgryh)+CG;N8k$3Xa&Ry&}aq33ed;_u>urY0kHxUazLyA zg;qeU0EJdStYF@&cV-p#fLN&*!BM#qjIaV?B^Y4^#7Z#23W$|p2;Ml!$zLfYzY>&k zK&)h|Rt3aL28i;5Ur{F$hutcsMMc9ZrbR`=Dy9W1K^2Sb&+_YEDQH;5&``byg2r-K z9n1u&P&k+gQlW6LCTK7-RfWRA5Hk*igCS;CC>*SrKbV<+U4GzefI^PB)u6}sl?==t3=o#9HKQS-jOEU#k^)^Dt08iYBsU8%~CS0i$U5 z2Y=FqSbacy(p3jz4rouh>cHp&+LNw2F#3S@q^k}LKcGG7ssqChn6*b;bzuDg?NL`9 zSbso!)Kv%8AJCq3)q(W~v?pD4;OhZcp?p_e2W9_&_N1#0%KibUM{1uNwA3eEbx@NI z5OX_pVrjy?##?amx<4Fz+DMX=iZ~p6`h+BFEedA(DME*XPX~z+`mh`h2cNdE?fr0Y zXN&eAYB;#Fg=}KyR&Z-8*}zL;4*R!L{{mtBo@oRqZX+p*su7_05J^>pkAPsl!-S6j zrEP>lVK_^J=q+J{<<__KwoqFSV$cbWE%i*6Ns(30WTh#x>NQ#QOqN>b>%oCGrlTGl zc!!*q-#beqhogZUa7Hqr>59;iOlV(4=txcING9|SjKZjl)P#;?LeByn5pASgbrzm0 z;jRs>=3vyoLa(Ai11Q)?R8(jH1w6bBOo0jt4O-Y6SlAI1a8ess*rCBZYJe=-L^8lw zM5qSHBAk+~_uI|~!R;b?%OR=}j9E!k{BHzfRuUEd8^IWc=S+Ab7-W6o*$4*lC!UR9 zkoAdYBg62BQJ?@l=BPA^d3+e!xNb**l1=cBGUcV`X_A-f$tdvT6mVS0lMkP#31&2r z!$}hxeN-9U#73Wn76!gai&qnvw+ZrHrK@S$#Nvf$j`3;S4K4qvk-lxnXvU~yVQ;uGs zF=l*eG6uTgNA)m-z@0}MvvD+hNAEd0jb;juLmP#TW(pCVcncLGCh?Z4khh$mFB>GI z-z~s{PH-S3C+=3wqCSA_}(Fy&nO1XMbkLa;ES_1?LpWWCM8#qGKQtE zYT6i03Ys;kGE`pq104lF_38sJ zB?uIiR5e@e1iogP}M2 z)hqNp5nj(lQ-1G&wra2EWO$K&$w{07vi{m8(Q5}^A{6yhy0K|0w%h_mbr z*KOAKTpFY!a*~d$$kUO>i_iuKCy)UxO{a~FcZ|9vPT*FJ(#?LOpuKgxKTG$SGxQEo zdbM{%?AHVL7wNW&AbP0Mi;vH3L=PLNd&B{{>y>VNf@RZvuRC;mibXBlHXejx3;<$fIN~@b_ikGZ+tY7eIn#04K^S z0L}sMtq?|~12qxGrux7a>@YD^Mi87z3M{3wbT17_+y=9RskZ~JAHjJT&RuYR04LHv zRIYpAdPEM`r|Xq<2)^!w^8}nn;XDTCr*IyJ^CX=3%aPCE{2b0xaH5#gcwIJCdUwBW z^|aceqO_u-tPBW5YPzu?F%2RxFflX3lmf2zP07qM4g{aG`kEe{n+DFBGWw>ZB!ZV2 z#>BLOEO4)IV0uPkaVp6u$TAgY8Z(_z3oKXr>wDx1O_n>4=pUxS$MVd->VI)#(*pm8 z&=DU8oF212*~MK4wOE8%1*`5k5P19CtP5Dy>LqVnqH~aUCFp!C*B{sa%Bi*(Pt=Qq_0o-Cl{s%SF9ZQYp;1vZXc-9e+~*=zCU|R$)frR#|{pR zXjJKC+p=cwxtLV2a@yt5zbBn~MWsLDzGAno%(c9I%js~(PZocy(qBE*7?hnlB(iW- z;*+zIW_@x=?eKKpeQ87;IjP$h3%#5@wJTo#aciz;S1xxEj{ZY|r`VCeGsO=aQDxf}I*^$H3&;1P@w z1oT<}CFlwW0R{CEq=YUANVQOvVnO)cnK@-Q+35fOJburY^PHTW_q_AAdFTDj%mx~+ z`!-zlT`)p_T|j932V++VLR7O}oFwWO^bngDk*T_8#kUH{Z@T;3r=U&i7HvBsuoul! z^_6a9xU)Nn@%C)~+3Ti2GThwAaf2s`HWQIh9aHi9)!@1yIu&bhY$2e7Z`L3 zbw?fPv7OMPI-$pPLhoTqx7a9-w|!wlkLiSN>V)pr3Eh!Fsnp}n6eKf26M)4&LcPdw zzmmX^PTnSRI%zY$Mea2jEIe+L6e;lJKU*1}8fS%!{${!n1T*v7DVRhu14>9nfKf|< zb{zlfrg6(41=OFv*>|o$m5v<7b`X94H!CJ>J>vZ*E9%v$#iz=>B%o(W;eE>6Mc&?$ zo8*RczAPc`SLqWcwgk2WB3&AzKcLXB!w2@WmCWlIMt1hhO?(*I_9+_8`b<&ipo7ce zI;N6LQ#{G=GgxvMU&j>h(g{7I6Z&6F2E`6F5~)m%vH3UCP`xmX)btr0I31V-?2k~o zw|8DpUJw%bpiEO4Qe@KUZHiO)3(!Hnq2eh1LsWnDVBPldap zV1)YFhlPa;MRee2jvxb-Mq0`ZBr?2|EH5&WqtO8+G{8^~90nKy?=U2$j&yL{L;~Xs z#6PqbNsE{!OegO|l)y0l6cKOXc7eUL@X#MQV4UvS2_3XM zcD>}Nbf8Zsrz7J79|1E31Ryw!S&WcPQn*4aAq8N({F3Mxt3mqnv7bRjVwRi!jzjB> zZL+nStz@2&G{a2(oeVHYt{w~Xp*+SyjdD1m1{-5-liaa60(LOc%!!VsO|waO@=UQo zh=BR%N7hCgNnoe}Qq9Oiih~d;wGZhGn$F;Pb(|0O#xN_wd<1XOtJuH9v3hUp*bQ%* z$m&=q?j<5`@?wTRiH~iQXF3dO2QD@ZXf=SjNoTHsTn+crfvuBCa!44-i0MTpfh#S2 z!Ie0pFoXOQH{ZlE2!ptGv1ap=RL1!WM&cFkL%xcC1e~X0L10(edD}UFgGqI$pWsS= zCw4O5aVPT~`qBdBN*06!kmu7q10Mqgf&;5KJ%C(I@FSk724`j^INDI`2Q$~`-!a#D zj|gg&KWI-Eyz`J&gxT!HptlH;u80oVf+D}M;9&%Uso0*6_HR$85uskSr&IfBlH1dH zv<*}XnO|fqqdD&7jcj0n+Y7nuXgp}rII5S}NXF#)k~>M!5wZr_UjVqVuTva`7@chE z)6K)4gG@_qftr_;(o)5(pmDIT&MMsn@gD^?pw(ForUhYdAHT$o^O;T>1~Bb>qD4mT z71}Wp@>H{p1i6@EvdE>WL$%{{m{ty|AZY18=lr0z9Y3c#;%8pKdT)dr6uHduUotw^uem8bS3U=eJpC{QXM|C@zrH2x>a4ZD1J_=0~hKQO?XgWMYoE!rMG^05OF5 zkk=y({%m9^;HKM8n`xvjH$F{$tNN(acd7>l(IGv6Ofk!=Hbhrgyr6HYHj`TwMsgw2 zKxXC9V*XNIOVy*yVnYZ0Y}%rZQ;E|%+RN#nIUjt^FEH^)1a&9}Y=ua6hxwE6$nMRB z1x^AO(!cOA7CO4Z$TLTh4Y@{G1k=?X7^V&*cbzLTk_EYb-C&}$4*;n#D+^5%mUC_Xi@V?-AyyKI$z z-$+hH`@pKGGR`O>e>MSHa=V89KUc;?*p{?&oliu%U~v!e`*+oW~hb& zt$}`Y3DaRTX*~ny9n$}_&N=Y_k@yf_4E4gM+~tt`N+TI)Hp&H94TpcH;UE<`CV8~j zUi9yU2*?O|FA8g>$E)6wcZf7(z3n#oym-P;I1ER}LL!H_6MkE)*2)TnDX5QhTjfv- z;4Q13u=>w6{OvG70g@#HnLn_u+jKZ{ZMU;0jkzY6y#X~X>gd7Y2Dw!erA2L~fk(}W zA2jl)*+$2fZku$rblc=o=uleh77z-ZgZr{U|7P=_LivK+fVgz~d7%PVyZORb0sP#9 zuMmt-5PTqMmDbh4zU1=Y=}Jal8Ehn$T4nhFAX4K?KCg{VQ}^iUFtg~7?TVU0wxjXH zCbGA`AITkJ_&<-|-XY87`pM2_>}JKrp@-G+rUiqp{@5`TWUAxRBEU)!W|cpTW4nQ% zvx2QC;JAsOEV;1x_wexN<<$mT3=+S(0`dXi;ncdBfgFfCi6LmJu7_P?eH6^!{`K?y z2A<$L$iV+jN5@K(M57?sKQ@7d7d4Jp7C-d$xb$LRe&m_kt z_R`(n=&`c-kBL8yTKD-pLBCBzD4Hz%;$gD>xrk=3FF$o5o^N=GC71~R>_sXMdJ&H| zy@XOSdtWrk+?POJT;(P9S6&8@H-SVMsz^&)v`|fdlZkDQkjr0riGw-Yvduwat@^RK zV1I(Zy3{k7pB@MTEkWW)O=jG|AhK*TS3H_*+tq_wMAjU1BKm&@C?<(xG1>RLvH8xy zKYT3STLth@6oe7uq-S91FzmmytrMP|Fn;p&xgHZKZB`qnO_}h}_}Nd)9ZG3?&vV+D zN?~U2`zXx=P3#I0L0FjlT<{#9(UhWx&2Z4>7VobgsAh-4DyAJu4z z#N3}a4bOXXltL2+_>$i*PL6!Yd7=x5mVZR#iO|(y&a~-tH65P9B8<*M>s<4KOYzR+ zv+DuQpE*;eP0eSo6I>C9gsbO3d@ypp`VBlq-G=8^PR`rnzW-!$modxNUR-e(Z2&qA z8viL7lb0QE^#h=_=OkBt>1naR3v_3uuzJXV(!m3}=Un+}{tA!GqKS8E`;T*Zru&+@ zm5ZMl9O3VyFBrFQReIFHbx#I~Ls#FQm|y*FY1G%(t};n2Uu~WeG1tjd^gb*M@V?KX57I@#^ghvlcv7INCDt z=z{EpTdOKo?)RSc@x=HWF>&)RZ+Z%~%^&uAL!tBIw?0cLdHtgwqfdU<=CQfYx#tEw zy?SNJlJu#!KW|)=kRKYeeagMovNykrd38Xn<^ANOByq{jtW)#T+ZH|WvUoagQCaz! zym8XSr<$5BJo$6>0R5AbR$N;@J|jsef9ty?doIjvvaDIWT9`$)~Uf~7bY`13$_9Z_w>(I8{J6=Ee?B+qy<6o(L?`+qMpn3k0h z_1OlG;g#Q8H|@IC&@}x{+RE~}6LV&^M9jIcXW+4G*>iSo3QKx@>84+H{_#>%Wh=aArwx%9fqu_Z}?Xb!)BVivRCrxbch68@>qs5jX8QV_cvo+c&-! zpF8uVU)!8d{`P$`p0nlV-MhYL_uqTM^xop@=N?+Tp*$z<#?nn^AM|W;yYu#!Qq{cQ z9-I5{mHN3)Z2sZct&mCQt(&)P-hcA=f3tT>EB9Q#acTC`*AM@4?M~$*7iZmn=Gou> z(ev|3Jy(a{I$nBeH8OiH2XMTIW?fU7ww>K@?IHY02 z_a_Zk8=v{1)jVzI_^iX;N0$BT_}Hud4U5o6c;1e>#gD}{O&WFMz2UQtNi*K>8h5i| zCpvpq+;`+`7J2D*fxZQRq@wxg?WM~EPwOME30?u#T~;B*>*d`->6>2)PEzS^A+<~N zHUX9F5D@-Sx^hZ*&zihP_)@S$(aDUqAYX)`0z_l`%LU#Tkq$WQ>9pm7{(w!Y6TFMT zw02M#P9P%&+h1G;Em-z++H$clA@r+*7)%Q-71Fg+A?}WaFd5z0JL(OU(XCS%-R)#J z%Qn5-CQR=Zi+Ohg>H*P+#c)agY7>f_*+*!!**1FZ*WOs~+b@h2G`<7cE2-B(o5pk*;9Xi2~xOgyYWAPNasyPR00=wKybKnO6w02~6ew9APZ zM#n;<(NCOC1Js^Q(*VPrNWYswTY_2B4VsC#D-%ZZ$F7s~?lB?N-JW#mm{8b`lzqGd z>4oDRI_~L6^8Q9hwb+T5&39{WiA<*n=!l<=lOs9}up>GRs!X@YG39Zik#W=kzEE;V zr(@@cpJuruI?ZZ(`e?4$r^5?Q_w9u4*9jdqU-k;56(@uZf?yqaQg}}2LiP)&{>3x_jxTxQZynntwwW z-={1C6UIyJ5Ksngf4QnsGw}|YlS<9R?Jnyjqj*kmYj78l=qsY1d`0Q%DWS#M*h9Q6 zW@q5nWRu#f(ag@lO)?Kvkc*WoPdeC3oGs)_0|UiDLV>g@P^^N-jX<#w9vMOGF^504 z(MO@A?+p*LRMuPUBNRyw^2b8{_>e!2!b3U`EE*&a_yx?pgBf!Xf85I-FTjIyeag8G za{90QVd?{Yiluz|$dV?|M?dM`{IQxp_VLFJ{_qcBEZHIATfljaw_HPkm~D*>70rVC zSd)lwqKG03Mf8^SA7SE;E|Depzfd@~z*3V&uLO5`NxmMsZ>$d|h{Z0ErTD1ai5Bfr z-05XKkuKif#jOmVmihZgTL&%F@-X!J44!(67wBb0H_0?NarN(7$$qc#(>oEtCDY z*r`**X>LGnlF5;r-0cZ5$pE%B$VQZL+h)8dUe*Ko-!gd!CzD0uX=fn6EtAJ{@~TGB z*ws(iETZvyMKlTgym4Jbzq??R<&LF>F!43(sT;z2cWbCsJm&lIUa|C}-Qq5x>kY8w zkGps8-h`)gWRDn;2?KyogD_8^bB+E~;mfkYbZDw^XV*aKR6hRII(wgZ(-2vMQZPJiNIHILNiv=s1ja zOlpP1IG6*e7C8vdkj4B(fo7WG{IyV90f*d)|h8qH z0J2KY1N#mP2)CyX zSoaS5Lv5<953G~lK_9B`Ftq4Wh`-Z8>m#+Lhn7`sIYH}VwdIW7MH|$X3%uK?v@Bri zJ7|;A1f}nwPt=whv^J})uF%?|w%nmb*Kyn!4`{VO>mOnlMDyZxxUc5YcOfj`0pK-n z(SY|*Tgf!ybXCS*(x{8@l14WKDNzrB9oB0svFRo!M9SNP{p)F_y$UzVqg`py*@}9~ zazi0-TUiEEL80ofhQg+98#)c0I9(51ytfm~Ejn|kf>3G7dQd>qmgbEMQxL}7=p`!% z0|kvJP_{HoRS*UWnoygpAWZcj%+7-_=7ELI0Xp}+n1XOn0K+0H2nPk9v$xdJa8N*) zrQx7p6QZVZx*kT0dJql@zEJ0WIC4f`qPxJw-_hj!5?Wi}q%|By{0r#yi3Kg95A`yz z!K0IqdflBF6#@2~MB`|78F5Qi6vd3V2`wrx z3Y_LuIEoGRWtFZN5TzQh1@%HvQo?@R+Y$|I)XN~IAet$-0d4AKG*hr&78I>2hz133 zpo1!1Q4p;vpaw;&9!A3-FfT{ffuDL9t$3)EcyCJ#yrNzPGb3Wah(`1?w5btvOWufn zQd<}%oD%97Fl3n;>KHYtW55ut7{-7hycouSA&ux7$fAbCD27OJt=NAkjY0@BAeI?$ zRaP0x47dU<>QyX6;WcJhtX-I6Rpqg&avJ7XX~72EJ1Y*lQxC(Kf;gt&kgOn%DYzsn zhyw+$GX-%>L5gJ9g^L&zN3hQE&{>1xc<8J_alAT4@obC~D2`XNFkT%a8r*mYjRwW> zY@8G*j#t9N#%bOW?9H&Q90$R4qBxPraUux}*Ki^UtkZBJ39Qp_A_=V1a3TpT)NmpR zEYxr!39Qs`A_=V2a3Tq;)Nmrn9w(B(DGeu*kS$Im!AX{e6G_MxCz9YB2n{Ea!6gkR zlG$kW2Cr$zlG$hlt1Ua6NM=K(%>86FCz4rCC}ljERoTQ8SqsOB6sAQ%qZFn^L8BB1 z+(L9lTDluoh4ZSP%GmX?8L5oj30gEqQz^UDeGeYcgIDmrjJc1@+?O$jNKfp+@xoc@ zy*)Ux2QR8=j4xE?OJjUt($zh9cr>qq>5RccW=LlYo@$F32|J!CdvPCE#o2V`?EM+C zv%HYem31S!4Ky0k3?`>5$f4F}FlRZPV%9m};&cUdGgvgwtG(&;rjSBU@G_9g%j>a^ z6uS=&GkHh66xYFVv5LMpm{g zj8`+dw_J%7(8y-O6wt_4g=I504oY78aSsz6&urD=Y-X{7582FMOOC9A7rh+NpT($6p+;Dcnnh{O0h}%@lGY!Y9r;y;u zI@dB}VfI4To?jEGf9)diK)Z(h)WtfKS?c2x35M zAa$@=`sEProy<3&d29?6$joD7pg?9Gi~)ztJT?X?QpI6hX5rhaeCVjbWj=J&;4)v$ z&U}`g3S8!^lPn*yM%%gOL)K_;na|Qzfy;a)bJ*T>33^3Za0I)vQ7*^f;1Y$*LJpZ` z@K1wGGgzoWrWq{MAkz#MYLICLD>cY8gOwU&n!!>HGRjJ!G08cQwc~ z+d-z;4l>PlkZHDq%p!0}gUli}S`pwiof$=Jv?A4(9b^`(Vw2SjtoEM?45vdyK8 zIa+NgNcZX2INU<(NvT>-N+H%QC5%sJkq@jH&X0 z7L{AZ+@L`$V{uY8aAj(o%A{e(;84g{dh{3$P3AD&pGj2UwLg=nz-xb1Vt*#_oV5EG z_VZWJv_Er1LDT*mO)a#dP=h&omxFi>P|HEQ2B_sAo&#z*h}QtM91P}wS`GuN0cttu z(*U)c1y9)!mMehjctc1_8a0Zed<7V#0cr&pr2%RM7^MMf1sJAn&?>+%zCo){=Q@pi z1sKKwwF0@@?$9bYpbn6=b2uNsv@3u*fN56%bpX>&$8Z3PH~{Ly-^dU#fCFl!ER3Ub zB@?CqY9$k<0BWTwtdhBLP`dMt45*c=#g(iwDS%qZ43=_FV3$c8v8zCVhNe}ZKtt0i zP@th{6)4frv`WpoDmFV6G_7JuLp`hl&48xTJ11~#3Wx4$rc6Q4YNkv<&uXTOcC1!H z<9SjJO*P*+4U|K}p?Dw@rog~JCQN~Wfgp^-z(6J}MQS<;Fu?Jn20CgmPy-z`7^qQW zTEk+hz(9?f8Z~NaP+M!jT@40mSg;issBs7b7K*g>IF?m~U^EzvsmGmP9;|FqByLp? z;A){yt9k%e3l6lZ2XM9EK&yHHR|`(Gst0hj;6$rMJ%OtQPg>OzxLWX}RXu^L1y5Sl z6S!LNq*XnDs|CMXVFvSxUJEGEsvf}A0!p+(xl`V`LrXb;s|A#3MV1zLNl)PDN@5+{ z`~+?Y__PMa$(3&i__Pbft1S#>`pQCwfKOkc1i2~>0iQl*F&YBye5{_24FPvPMr+x< z0o>YvR)c!bI|9+=%KLD0wzUOeLg=*)JQpWy)04d#0tRtAiY&0cXLUtVA2p zr5<&NqftE=(}O9Vs8V5vs={K*3tbM}@AW(Fi+_M}Ws)0}oHq5zJ$bNe1}mgR;ko zw)urd0z37XW6?-v%syz-axsz_a|}uQ&*L})-51laj+B+ae!1HP9K!}LIFIs=g5J$2 zLr#EE(7PFBsx6w5bRKX{B@wB_(XtI3L`E|y2V@&YGbt2AXur{H;18-TkYZx_%wM{I ziY!n;H!d;V*v7@@JJ`4sOBLVYNDI|92Kv(Ab37TtboG<18pCvDt1VlL$3UPzgrim- zgR$_WQR6@{mPt`+`&cF=N0u^Hvp57C7^{k*7LSDyQY>~spMt>d(o^5#k%B=w^*xTr z4FDb(ao7yQr!MCZJze5I9`HAzUhvTa*5<+NnF#*~j2o@SO{|K z1++6KFiO70zGf?a`66EFdI!GgO@fVDjI{b9_UoMtAGg3wzp71zyD!|Iz?}|v3EY{| zxr;bip9UXGCDSE*f7g59BmKH~0z9Qfm+*s9NDpza^@?8iiq5+K8r~wp7j)sU?W0== z#I_Lhd)2enRX6ZTPdDinMxJguG{{G1h3}+G^j7#Ty#~X#|F=LO>jTb@z@1$qt?=#t zKDWp*_+6Rb2>hM?tpF~udIjkI5QVW;50g%E5=L9!?4$cY@A-BQ9r_?vhd#{Fp%n$p zmSnwkNt~`t1Y2@-nk|1Odr_ipG5sESpv>Qm`D-1XsoU$SE5|iDX+WWvU>#}Jt)XHE z%WU*${LjRul<1yx0{-DLKRwC%GyW3;bS|zh57XV_zHI1L{$CsEuB}^SojOd1y@d?x zjC*y@>T!#Jtal&MSzRn^`M2tNq_)7v18~D% zJ)nJXx52$1?t^e2f%_2LhvBAwDMH13O`i*=N+0dgHBB32&PeN;iDKD6PP3js*`3(_>Q-GQhQhw8Xx#MQJGAoS&MW zP*~_vkZiq{qj$@Zf)?nUq|5VlPF9yW`UkM^xiq6ef5m+P9UA!Gr>ZyIqC@ngKE8`I zZLH3?u)!d$fi9jH%7-3iJ(zk|K%%rYO7yW_pR2#v^{@G)lqLFJuBi~(1h~?q`X%~G zPo>!xM5c*G>FzL{zqD_OK3-+)E4eP!7uYlh+c#fdsxP&9d)2;~|Ej)nVZ$;h`ZayT z!iF)@^hSNi!iKJr)Tl3A*r1ct{b)RVxDwk-H7#FC+|?`OT+$oo7~7LT4FqEnp@}DMWHYF+4R-+$dW5Bi{2ZP^PZbN zzwDK)M=#{`%iIjL99jLE^qX|L`43)nl{{AHgQS~p=(|fVy`c}0;#TO7;rc;UQqUXv z0BhJvy-pBUjgn$k={E{Uy0A*00R1KZH}!E;PT8CK?*-w!l>8t47-52S(SP)3u@GsU z^`1Ui99WcJlwMqvm{?Stm}+|myLT~H7i0&U)6A)b$q6Z`=ETC3f - - - - - - - - ${LOG_HOME}/ACS请求ERP/%d{yyyy-MM-dd}.%i.log - - 15 - - 200MB - - 20GB - - - - %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n - - - - - - - - - - - diff --git a/wms/hd/nladmin-system/src/main/resources/log/AcsToWms.xml b/wms/hd/nladmin-system/src/main/resources/log/AcsToWms.xml deleted file mode 100644 index 6cbff56..0000000 --- a/wms/hd/nladmin-system/src/main/resources/log/AcsToWms.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - ${LOG_HOME}/ACS请求WMS/%d{yyyy-MM-dd}.%i.log - - 15 - - 200MB - - 20GB - - - - %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n - - - - - - - - - - - diff --git a/wms/hd/nladmin-system/src/main/resources/log/AgvServiceImpl.xml b/wms/hd/nladmin-system/src/main/resources/log/AgvServiceImpl.xml deleted file mode 100644 index aa005b1..0000000 --- a/wms/hd/nladmin-system/src/main/resources/log/AgvServiceImpl.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - ${LOG_HOME}/反馈AGV请求/%d{yyyy-MM-dd}.%i.log - - 15 - - 200MB - - 20GB - - - - %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n - - - - - - - - - - - diff --git a/wms/hd/nladmin-system/src/main/resources/log/AgvackServlet.xml b/wms/hd/nladmin-system/src/main/resources/log/AgvackServlet.xml deleted file mode 100644 index 288d587..0000000 --- a/wms/hd/nladmin-system/src/main/resources/log/AgvackServlet.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - ${LOG_HOME}/AGV请求离开/%d{yyyy-MM-dd}.%i.log - - 15 - - 200MB - - 20GB - - - - %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n - - - - - - - - - - - diff --git a/wms/hd/nladmin-system/src/main/resources/log/AutoCreateInst.xml b/wms/hd/nladmin-system/src/main/resources/log/AutoCreateInst.xml deleted file mode 100644 index fe653c6..0000000 --- a/wms/hd/nladmin-system/src/main/resources/log/AutoCreateInst.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - ${LOG_HOME}/自动创建指令/%d{yyyy-MM-dd}.%i.log - - 15 - - 200MB - - 20GB - - - - %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n - - - - - - - - - - diff --git a/wms/hd/nladmin-system/src/main/resources/log/NDCSocketConnectionAutoRun.xml b/wms/hd/nladmin-system/src/main/resources/log/NDCSocketConnectionAutoRun.xml deleted file mode 100644 index adb00cb..0000000 --- a/wms/hd/nladmin-system/src/main/resources/log/NDCSocketConnectionAutoRun.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - ${LOG_HOME}/DNC/%d{yyyy-MM-dd}.%i.log - - 15 - - 200MB - - 20GB - - - - %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n - - - - - - - - - - - diff --git a/wms/hd/nladmin-system/src/main/resources/log/QueryAgvTaskStatus.xml b/wms/hd/nladmin-system/src/main/resources/log/QueryAgvTaskStatus.xml deleted file mode 100644 index 3d40818..0000000 --- a/wms/hd/nladmin-system/src/main/resources/log/QueryAgvTaskStatus.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - ${LOG_HOME}/查询AGV指令状态/%d{yyyy-MM-dd}.%i.log - - 15 - - 200MB - - 20GB - - - - %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n - - - - - - - - - - - diff --git a/wms/hd/nladmin-system/src/main/resources/log/QueryXZAgvTaskStatus.xml b/wms/hd/nladmin-system/src/main/resources/log/QueryXZAgvTaskStatus.xml deleted file mode 100644 index 5efe75a..0000000 --- a/wms/hd/nladmin-system/src/main/resources/log/QueryXZAgvTaskStatus.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - ${LOG_HOME}/查询仙知AGV指令状态/%d{yyyy-MM-dd}.%i.log - - 15 - - 200MB - - 20GB - - - - %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n - - - - - - - - - - - diff --git a/wms/hd/nladmin-system/src/main/resources/log/WmsToAcs.xml b/wms/hd/nladmin-system/src/main/resources/log/WmsToAcs.xml deleted file mode 100644 index 0efd084..0000000 --- a/wms/hd/nladmin-system/src/main/resources/log/WmsToAcs.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - ${LOG_HOME}/WMS下发ACS/%d{yyyy-MM-dd}.%i.log - - 15 - - 200MB - - 20GB - - - - %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n - - - - - - - - - - -