From ec365dfb69ae9b47932ec2b03c4e9fcadc4503cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=B1=9F=E7=8E=AE?= Date: Thu, 22 Sep 2022 18:45:42 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E9=80=9ALMS=E5=92=8CACS=EF=BC=8C?= =?UTF-8?q?=E6=8C=89=E4=B8=9A=E5=8A=A1=E9=9C=80=E6=B1=82=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E8=A1=A8=EF=BC=8C=E5=8E=BB=E9=99=A4=E5=89=8D=E7=AB=AFdebugger?= =?UTF-8?q?=EF=BC=8C=E6=89=8B=E6=8C=81=E7=82=B9=E4=BD=8D=E7=BB=91=E5=AE=9A?= =?UTF-8?q?=E7=A1=AE=E8=AE=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wms/service/impl/WmsToAcsServiceImpl.java | 1 - .../wms/basedata/st/StoreIvtServiceImpl.java | 12 +- .../java/org/nl/wms/basedata/st/wql/stivt.xls | Bin 238080 -> 243200 bytes .../acs/service/impl/AcsToWmsServiceImpl.java | 8 +- .../rest/EmptyAndQtyController.java | 15 +- .../service/EmptyAndQtyService.java | 10 +- .../service/impl/EmptyAndQtyServiceImpl.java | 77 +++++++--- .../org/nl/wms/sch/service/dto/PointDto.java | 5 + .../wms/sch/service/impl/TaskServiceImpl.java | 18 ++- .../wms/sch/service/wql/QSCH_BASE_POINT.wql | 3 +- .../nl/wms/sch/service/wql/SCH_Point_01.wql | 1 - .../java/org/nl/wms/sch/service/wql/sch.xls | Bin 169472 -> 174592 bytes .../nl/wms/sch/tasks/SendMaterialTask.java | 139 ++++++++++-------- .../service/impl/RegionioInServiceImpl.java | 11 +- lms/qd/src/components/Crud/crud.js | 1 - lms/qd/src/views/login.vue | 2 +- lms/qd/src/views/wms/pub/PointDialog.vue | 1 - lms/qd/src/views/wms/sch/point/index.vue | 48 +----- lms/qd/src/views/wms/sch/task/index.vue | 13 +- lms/qd/src/views/wms/st/inbill/index.vue | 56 +------ .../views/wms/st/vehiclebill/PointDialog.vue | 1 - 21 files changed, 193 insertions(+), 229 deletions(-) diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java index 86ea295..7a1b9aa 100644 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java +++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java @@ -39,7 +39,6 @@ import java.util.Map; @Slf4j public class WmsToAcsServiceImpl implements WmsToAcsService { - private final InstructionService InstructionService; private final TaskService TaskService; private final DeviceService DeviceService; private final DeviceAppService DeviceAppService; diff --git a/lms/hd/nladmin-system/src/main/java/org/nl/wms/basedata/st/StoreIvtServiceImpl.java b/lms/hd/nladmin-system/src/main/java/org/nl/wms/basedata/st/StoreIvtServiceImpl.java index db3236f..ec5a47b 100644 --- a/lms/hd/nladmin-system/src/main/java/org/nl/wms/basedata/st/StoreIvtServiceImpl.java +++ b/lms/hd/nladmin-system/src/main/java/org/nl/wms/basedata/st/StoreIvtServiceImpl.java @@ -32,12 +32,12 @@ public class StoreIvtServiceImpl { throw new BadRequestException("仓位标识不能为空!"); } String change_qty = disObj.getString("change_qty"); - if (StrUtil.isEmpty(change_qty)) { - change_qty = "0"; - } - if (StrUtil.equals("0", change_qty)) { - throw new BadRequestException("变动量不能都为0!"); - } +// if (StrUtil.isEmpty(change_qty)) { +// change_qty = "0"; +// } +// if (StrUtil.equals("0", change_qty)) { +// throw new BadRequestException("变动量不能都为0!"); +// } JSONObject param = new JSONObject(); param.put("change_id", IdUtil.getSnowflake(1, 1).nextId()); param.put("struct_id", struct_id); diff --git a/lms/hd/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/stivt.xls b/lms/hd/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/stivt.xls index da7dfd3403dedf4719bf74b48645e5e327a0ae5d..6ee22940288a45ee68128b6327504f4d00f1bc4e 100644 GIT binary patch delta 21223 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 q6c`Wr5Jrc$BDlp4nLM%K7`7n(y confirm(@RequestBody JSONObject whereJson) { - return new ResponseEntity<>(emptyAndQtyService.confirm(whereJson), HttpStatus.OK); + @Log("点位绑定确认") + @ApiOperation("点位绑定确认") + public ResponseEntity confirm(@RequestBody JSONObject whereJSON) { + return new ResponseEntity<>(emptyAndQtyService.confirm(whereJSON), HttpStatus.OK); } } diff --git a/lms/hd/nladmin-system/src/main/java/org/nl/wms/pda/emptyandqty/service/EmptyAndQtyService.java b/lms/hd/nladmin-system/src/main/java/org/nl/wms/pda/emptyandqty/service/EmptyAndQtyService.java index 70a1bd8..ab44908 100644 --- a/lms/hd/nladmin-system/src/main/java/org/nl/wms/pda/emptyandqty/service/EmptyAndQtyService.java +++ b/lms/hd/nladmin-system/src/main/java/org/nl/wms/pda/emptyandqty/service/EmptyAndQtyService.java @@ -5,9 +5,11 @@ import com.alibaba.fastjson.JSONObject; public interface EmptyAndQtyService { /** - * 绑定 - * @param whereJson / - * @return JSONObject + * 点位绑定确认 + * @param whereJSON String point_id 点位id + * String point_status 点位状态 + * String quality_scode 质量 (ONLY point_status = '03') + * @return 提示 */ - JSONObject confirm(JSONObject whereJson); + JSONObject confirm(JSONObject whereJSON); } diff --git a/lms/hd/nladmin-system/src/main/java/org/nl/wms/pda/emptyandqty/service/impl/EmptyAndQtyServiceImpl.java b/lms/hd/nladmin-system/src/main/java/org/nl/wms/pda/emptyandqty/service/impl/EmptyAndQtyServiceImpl.java index 6525b33..d972423 100644 --- a/lms/hd/nladmin-system/src/main/java/org/nl/wms/pda/emptyandqty/service/impl/EmptyAndQtyServiceImpl.java +++ b/lms/hd/nladmin-system/src/main/java/org/nl/wms/pda/emptyandqty/service/impl/EmptyAndQtyServiceImpl.java @@ -2,6 +2,7 @@ package org.nl.wms.pda.emptyandqty.service.impl; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.IdUtil; +import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONObject; import lombok.RequiredArgsConstructor; @@ -23,29 +24,57 @@ public class EmptyAndQtyServiceImpl implements EmptyAndQtyService { @Override @Transactional(rollbackFor = Exception.class) - public JSONObject confirm(JSONObject whereJson) { - String vehicle_code = whereJson.getString("vehicle_code"); - String qty = whereJson.getString("qty"); - - WQLObject vqTab = WQLObject.getWQLObject("PDM_BI_vehicleQty"); - StoragevehicleinfoDto byCode = SpringContextHolder.getBean(StoragevehicleinfoService.class).findByCode(vehicle_code); - - // 插入记录 - JSONObject json = new JSONObject(); - json.put("vehicleqty_id", IdUtil.getSnowflake(1, 1).nextId()); - json.put("vehicle_id", byCode.getStoragevehicle_id()); - json.put("vehicle_code", vehicle_code); - json.put("qty", qty); - json.put("is_task", "0"); - json.put("create_id", SecurityUtils.getCurrentUserId()); - json.put("create_name", SecurityUtils.getNickName()); - json.put("create_time", DateUtil.now()); - vqTab.insert(json); - // 返回成功 - JSONObject result = new JSONObject(); - result.put("srb", ""); - result.put("code", "1"); - result.put("desc", "操作成功"); - return result; + public JSONObject confirm(JSONObject whereJSON) { + // 返回值 + JSONObject resultJSON = new JSONObject(); + + // 参数校验 + String pointId = whereJSON.getString("point_id"); + if (StrUtil.isEmpty(pointId)) { + resultJSON.put("code", "0"); + resultJSON.put("desc", "点位不能为空"); + return resultJSON; + } + String pointStatus = whereJSON.getString("point_status"); + if (StrUtil.isEmpty(pointStatus)) { + resultJSON.put("code", "0"); + resultJSON.put("desc", "点位状态不能为空"); + return resultJSON; + } + String qualityScode = whereJSON.getString("quality_scode"); + if (StrUtil.equals(pointStatus, "03") && StrUtil.isEmpty(qualityScode)) { + resultJSON.put("code", "0"); + resultJSON.put("desc", "质量不能为空"); + return resultJSON; + } + + // 查询点位 + WQLObject pointTable = WQLObject.getWQLObject("sch_base_point"); + JSONObject point = pointTable + .query("point_id = " + pointId) + .uniqueResult(0); + if (!StrUtil.equals(point.getString("lock_type"), "00")) { + resultJSON.put("code", "0"); + resultJSON.put("desc", "当前点位已被锁定，请等待AGV任务完成"); + return resultJSON; + } + + // 修改点位 + point.put("point_status", pointStatus); + pointTable.update(point); + + if (StrUtil.equals(pointStatus, "03")) { + // 如果是有料桶，则需要修改库存表 + JSONObject struct = new JSONObject(); + struct.put("quality_scode", qualityScode); + WQLObject + .getWQLObject("st_ivt_structivt") + .update(struct, "struct_id = " + pointId); + } + + // 返回 + resultJSON.put("code", "1"); + resultJSON.put("desc", "绑定成功"); + return resultJSON; } } diff --git a/lms/hd/nladmin-system/src/main/java/org/nl/wms/sch/service/dto/PointDto.java b/lms/hd/nladmin-system/src/main/java/org/nl/wms/sch/service/dto/PointDto.java index 4e53a94..42a3dcf 100644 --- a/lms/hd/nladmin-system/src/main/java/org/nl/wms/sch/service/dto/PointDto.java +++ b/lms/hd/nladmin-system/src/main/java/org/nl/wms/sch/service/dto/PointDto.java @@ -125,4 +125,9 @@ public class PointDto implements Serializable { * 设备点位类型 */ private String device_point_type; + + /** + * 物料编码 + */ + private String material_code; } diff --git a/lms/hd/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/TaskServiceImpl.java b/lms/hd/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/TaskServiceImpl.java index be1694a..7fbcd50 100644 --- a/lms/hd/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/TaskServiceImpl.java +++ b/lms/hd/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/TaskServiceImpl.java @@ -84,7 +84,7 @@ public class TaskServiceImpl implements TaskService { if (StrUtil.isNotEmpty(whereJson.getString("end_time"))) { map.put("end_time", whereJson.getString("end_time")); } - JSONObject json = WQL.getWO("QSCH_TASK_01").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "task.update_time desc"); + JSONObject json = WQL.getWO("QSCH_TASK_01").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "task.create_time desc"); return json; } @@ -175,7 +175,7 @@ public class TaskServiceImpl implements TaskService { public void operation(Map map) { String task_id = MapUtil.getStr(map, "task_id"); String method_name = MapUtil.getStr(map, "method_name"); - TaskDto dto = this.findByDtlId(task_id); + TaskDto dto = this.findById(task_id); // 任务处理类 String processing_class = dto.getHandle_class(); String message = ""; @@ -187,6 +187,13 @@ public class TaskServiceImpl implements TaskService { Method m = obj.getClass().getMethod(method_name, String.class); JSONObject result = (JSONObject) m.invoke(obj, task_id); if (ObjectUtil.isEmpty(result)) return; + + // 路由不通的情况 + if (result.getInteger("status") != 200) { + log.error(result.getString("message")); + throw new BadRequestException("该起点不能送到该终点！"); + } + JSONArray arr = result.getJSONArray("errArr"); WQLObject wo = WQLObject.getWQLObject("sch_base_task"); if (ObjectUtil.isNotEmpty(arr)) { @@ -213,7 +220,12 @@ public class TaskServiceImpl implements TaskService { throw new BadRequestException(message); } catch (Exception e) { e.printStackTrace(); - throw new BadRequestException("任务操作失败!"); + message = e.getMessage(); + if (StrUtil.isEmpty(message)) { + throw new BadRequestException("任务操作失败!"); + } else { + throw new BadRequestException(message); + } } } diff --git a/lms/hd/nladmin-system/src/main/java/org/nl/wms/sch/service/wql/QSCH_BASE_POINT.wql b/lms/hd/nladmin-system/src/main/java/org/nl/wms/sch/service/wql/QSCH_BASE_POINT.wql index 221d83b..53f1603 100644 --- a/lms/hd/nladmin-system/src/main/java/org/nl/wms/sch/service/wql/QSCH_BASE_POINT.wql +++ b/lms/hd/nladmin-system/src/main/java/org/nl/wms/sch/service/wql/QSCH_BASE_POINT.wql @@ -77,7 +77,8 @@ point.update_time, point.vehicle_type, point.is_host, - point.device_point_type + point.device_point_type, + point.material_code FROM sch_base_point point LEFT JOIN SCH_BASE_Region region ON point.region_id = region.region_id diff --git a/lms/hd/nladmin-system/src/main/java/org/nl/wms/sch/service/wql/SCH_Point_01.wql b/lms/hd/nladmin-system/src/main/java/org/nl/wms/sch/service/wql/SCH_Point_01.wql index 7f179c7..e750e5f 100644 --- a/lms/hd/nladmin-system/src/main/java/org/nl/wms/sch/service/wql/SCH_Point_01.wql +++ b/lms/hd/nladmin-system/src/main/java/org/nl/wms/sch/service/wql/SCH_Point_01.wql @@ -105,7 +105,6 @@ point.lock_type = '00' AND point.is_used = '1' AND point.is_delete = '0' - AND point.point_status = '00' OPTION 输入.search <> "" (point.point_code like 输入.search or diff --git a/lms/hd/nladmin-system/src/main/java/org/nl/wms/sch/service/wql/sch.xls b/lms/hd/nladmin-system/src/main/java/org/nl/wms/sch/service/wql/sch.xls index 71b7df81ce4633589ec8937ca96725fe6fd537c5..da3252b4cb4d80f241fa62fe7f4436edfb469908 100644 GIT binary patch delta 14952 zcmcgz2Ut|cw?A{2veczWM_CpTMB1{2T@a~@6&o6oh*13*Y5aYsO7GOZ*zfa$)zS@JA7IJwEs;xxJ1<1S|0Odr>Q-i*ruVnsR7 z#N@bu66GTv-yYX9`F?%?IkK-Go2l7*+ z`dyDz)@nS6Wy5iokxIyMJ{6ps;J!m*Zb zp=BrXa@pAO+l#!PrPvOW8LKXvGmcEF*{%s zrRsZ+FB)0i{g}(Mmf1!E4rBl~Kcs66E;mugTE_W z@_8#9MV!5+j3cNeDVbuFb(+32ab1l0v_q%@pQ6nc>g}bj3u3V z{eA48*BfeH88Gj8Ra%^((}(fbqK6DAy)9oLUHD>b>im7rM$dgC&@U&U>tEYSoeZOg z^e-$9-sa>x;jOHSQVozn4ZUra^t*<@v*Rt_)hZ z`;=mM%&|3{c3r6GbHV4T^BUDV5$=YWf92gBp)jgO+}*I&>EajfCrIU&d|P6_dG6tN z%J70dS*6oW_mW43mNYuKNuq!HTBz}lSD>VaJ5^*deg8~PtPgYXfpYy z9ltRz^IV@9b3SyvvH|NhRKe};#L zADMn?jpv=qpRJs1T=w~^Ll(~JSyWV{T0@TSO*?;ON!elPL#|=<=3#N?LvBz1qB^lI zbEE9Wz-^v~LXYTkkA44s2*3FF@rIofS6p}2UehdfP5CtYZofs}9Z5J6^X}uo!o#;N zWOaR%b-~c{ySz8I7Ur&5_*7ofEwya^Cqv_WhYgjNgskk>@XK_~gGsk98t-3Tg?3)FV%vl7ccu)?80@l2IeO~# z*ZO#_-dmn2sRe&1^E;dVcG~GOul=*0>KlIesOgEMli|Dn+^|$~BzxVl;v?r{UcOt| zMK(rXmA$9v)Pbp4nnz#uE&e^^hw~ea-bdF>-C1<(sXI#H!QpiWntz%6>*)zQc8~9T zdf_Q~Yli9t&-T z%&Fzx$5u|hqu{H!&8%5?N*Mcn#E>!fC;mP5)`(jhK5QuJ_jKUu4`&V> zyQ(0za?np}w|qR&|6WGRKP~zt56YVx7Vi7${MGSik|s*R-yYEVp0Uqe#imn5f0$<6 zJN@OXyuFPls?L=c|8e8PsyR=m9E@B&Eo3w|_JFjOyqgt#*)4lQ( z4P$PeJUgWBRoBnR7h|@4t)F#q^`aX8AKp9D@}IOll6}yxle|^(QpMdkzG{4yYlM70 zdf6$aJ>!Fe-=EJpnX+FzNO+mxW^#KamNWHRJXgXWU$)G-C#XG$>6zsoF8uWuTur-I zE_C7(=DG5^#ePmo@FIM_c~ShmdGcttaW&604SBBIvo#q~AOYOQ$>y3%DpqPJd#*f? zU-6W{?tT(na%*;VE!lOYbOCTp&9(V z3g8cPm6g>1i_l<_$p8vBfc2Pvig{iQKpC2+FEPK2`D;@EKJWnOQwvam4gO@rhkN+2 zWGcXRFMzn`0Q!3ayo$LAb8Z?y6x!63=>Uc3*Op_x3-d>qcku-%p8>EC^OKn0#{Bv$ z09hyO`19Ct%-^4lbpZgo=Ky>kh;E_|AUYVpV=j8+5CEg}1%U48HP2#B!f^ES01jYY z|02MiaDYQE0i5d$ux38M!7c#XUIsW8fjwUU@B_|N&?^7|xOo4;{4nM}F9P@xjqbU{ zC=+KcWhp>1&eW1+I72v7-Bti}#hDrTD!>SLFnzT8h^PCE^#Jc~04UkaFW)?v#Ph#z z9)fq(mRZJlvj-qDka9kN0x@`NkD>4m7&g=a!&&Zt;f!~{{M%wiv0- zL5fwuZ2GNL77`50s1Ujgx0%1DLR|3aw%uixL6^q9=C&wWeVQnL`c zZuT`6A$0w2voX<*`2TB1=#n~;@i9ifbZMv4i|@W|tp6QRnjeJW(;a&8YquF(*%Lmu zw0Tb5Zo}toA7Q7zT~V&R{zf~%x;emN9AL2yuyypFrWG5PrhxX747 z%|`p~j#nkW(-c7}`EN|U1KQgWs&-xw&&ThMv0F7X__U_oi%!+u9;2#lkD*iOfT8*8 zfT44+VHT@{p27x-t47}u`$p*8+GFTEI$-EXI$(6OMBYg3MTKyQxNZ)sB!_8~XbPy!p!yB8~Uy?gVwq4_|cx_uE`9OylUnwnguw zb)uR`&7M7OHizzT54S>8CN+*8Sh|PmLwTqJvg6@b?NNEP!}y=}Qbe;sc-(s3oK)Cl9UHBh)=gLr3&D1gJ=hxoic?1;iBBbX`KS z_>j-SI#(hsW${F{ei|~6!(4L4(slmm>0MfSWjEV9RF zSY*XaQ;!^zxa@DnP0>~B+u7fA@tZKhKl*m8FnSCpEqwzyR%3b-(;7@`F};Op9j5h| z9^)A^h7j;BrVW@jV%mghGo~$=-ouoNQ?U*6?U;68(qMTP=1rJPn1mx^xM2RmiD0sm ze{`a^^aNrjG4TUV%B8>H13SpBJ-OWE`rQ|DW2LjrC{Tyh9AYyX9L6fmKDM$1-A^2z zsnHjm8WCz_0s?IH)W}r&*~-+&1hg?at~g!I8e6>-r2K$8Ba3aZj74<_c@^8BK|WO- z(&6W3RUnRhCQ{PgbHx5KIp1w2?&q%KZWp7t7yq%Y4c*eM{%2fDeVY!`0d5Jjb8 z6zPU{Z@wSiJ^4utd6nJwu=^>zd-IR+?pd!ONME1N?v;4=u3t)`@Y`9vi74;cP!2x882#eAHYFCyfbel`O@?R2DrskFDd|2pSAEPyv&m7Dd%U72XF! z9^}(c1;S`2;u0~qlO%~688>*{LoF@ECmB4+ahN~J;V}h2_}fu21p9+VytQ}VLNz{G ze|dce4p+ce&{Y!en>lipaHx#y?1sh#f6nOYO3pnXLX#_rH-3dkVZpF|w8jTMgjtXb zI#5GC=1RP0|1qs#-gVbL zK~0*u-yl8!jOI$~$2F0dmgDf5=9D=L(-WBJz9>{6PhDuetBoFAC^W~~%5LDsL7dRr zjZCp~OmrRm?RM6j1B_0uJsovw_83)O3sy(AvM7=U1{Mq~j)`so{2`3#K@-`-2yq!Z zVAQMG(^02pkI@}~Jw|r`_Lz}w0qjA#1+ex|G}F|p*<;kH$?Rr}?f~pD8r#}qbUTSy z`(p#Tm$WCO+ejIl6-Idw`$Hb;v+T)ffNzh{0AB_-@eWW&PO{0R0lqy(-#mMax-6?a z!P%2Urkf2hT~13RCL<$p?yX2xkQA;ZNa!Hwg;)3qiuUAn1&sx!MH; zXc4Y?lWf^7k;esjF2HReLq>wg9bvePM3bJvEE&m^{UegNBFRp;CmfcM{vP)c{1`&< zwQ>`(yOJ;=&4+Z7JrGHyjP#)}(g&rv2vdE?@YqLUog1rrj3wGFH+-?zv2M9xRJ;rK zF~VOyB$0p+=}Yu7B94>JOFeKxg)g=(L6ElXZfX0JFShL@l6o*wXW@}AYdgS?441iz zb)KwFD$MXBBcJ*Ke#Gl1_!;k~@cI!>n+xW zV%>4*Blw4qB)1keF@X>&91I~LLTLy#-d7|HV}$*Lmyr+~Zwx^p{l&U)RyRO+V6N*C zigj1S(RIeUO)yxf3Pmk$Mv%^4XVl_NZ1y^%FQ8hyHWam(I!CJ7T^P?b;YKJ4)6l;~ zqC8!!JY5(M?rB6~SKJ-`Xe~)$72FUq!-&%QCPkn;`X(8}+Pp~-);B4_EKk@GMl9dB zEG9h?#afJ`1*5^3Jw`Xu7R(Z%cXfb8GpxNg=++kNC%TB3wxEc`I>5R+z-Xv|mS4CP zP9lx*tYEQhe=-x9*aoxoHpu~&>;O|bz)~DwDl^szR}X)puc1L9PLr^)GfB5Q@z;q} ze|PTS4bsh3?IiVN*x7biMjJZIV)b%Bm&q{OB3Pp7*AQ1`p#lbi98JS{7>DAiKFU#l z&O^Ci>O!Ja=S7I=EpkxZl%oONDB@Bitw2U|RPF{1a6xd3AW@lvL}`&s8;4+tvPPmI z5g2PE8j?dW)QVdSeWdt`jE^8H-}5j*6r*6BnkejuAOVI8_#MnFPl0M}?xMoXhd3Pr z{&5c+gmf#j6#c}PSVz05K>N+QDJM}e7FQC5@?Xb~a%Qnn*v$qeCexp3;f^%dWe-w>8)E^Z_lK$krur`wDV=NA+8>@RL z%Ik*m%uc2o%3BF8LTh9jj}*g*EgmVxN*sg4%p*OoU><3!qK!w2MJDQzZYi*JiI5qE zty^4BcUI>tE=YG2XkMu9V(V+8+W4e6Ml2O1UCDUgOE5{C=pG1ffGWY*759jjgtxom zD|r#Bv6fDJ5A(#s8|+$*9*OEAePtUlWn|HXi$_(w%mPSriGwQ;F7_!N`_#-_r_zDwaFa+@vUWy^nGJk8G6fVLO!d?VbK8#t#n5nI$ zeNZvx0I^k-wN(|6iDx`{q9qH6g(@E&Wq^p_qKvB9HrT+ni zqI9)Yx>}U}CQ7&VRgKbDL6Gn*f?>f-nubXW7Nu!W+9en!_;$yEh6vrelY+2tMyF+T zp(34@(G3??nCUiCIys|DMY_G#_ahbQK7w$;Hx6BWXR(v1_&V$ZIyI?i6Zbbe;V??4hmsO4^kEu%LvjL zL6k_4&Iq~+Uh&vKwAes8Hefd7>Da(#481bqaW3K*e^2DEhi)Q&PvqYKF~VHr*UcH*Y|Cn)z{rbY^?9dFgItrRyFi9F50yk7u$onCu=RK?cgM$4I~{fds`Qh_W-R zvNPJr&S0_=h5iX7CM=Oj>%~Tj2U4u@UTma)3rkQMNfzEsKozvOx?Z?UuY*$f8Nsk* z#+-@FJMfdWnK=`gcS4E~lGtWLlxg0S1PSvKiNduOkCaZpbYVv#1}C<_fgaaoqZIpX zc8&uq*8!I205dqi@)>51;XoLkL}XzsPQim9IuMmO3t4O+YQdO5ot7hXHybH8~e=PNhxG_SSn-8N5)TJpvahyjGsb* zur`GpC!Ru;io`|-poX9z2*67!Z9oceyNE-VplhT%MsIY7iNbyr$-|>A8Cj_&rQUV9 zzp;OIs25J&C29=9AbIltiBlpzeefwAmcIYmr2cm!`4r zFfwYWky-+(()8uWg94!Maxx|*rW8z6tJRq3S3xc2bm{4?mFft6w<+FJ%&8*u!IXt5 z8&eLZTugL#Y`~O{iRvIdj-?ygegtD)x_cdfiK+&T#%X*$7!!@asqjJ}awBQnvx%&! z8KN^7@>ThHIDzW?RDFUPXHK1<%hl%Kl;!2CQ#3m4qI>S_S^9i~0dzXOAtB#@QPWXFNC$ukwy+7ZgH;;PsI(( zAVbomsDs}V4PML6La5J6iQMSL1)d(e$%$Om(6VO@v85HYl8T{C!n5#-q3J+H)n?Dxb(P6qm**lraTCS>9O?WQa^aeQWxZ0%$Vy6;h zUpu9I=MFXs&e8%$CYD_(5@+9^%7Y3pg83aX8C|s-NrVa5UaZn7s(K69*JQ}=fF~m;6lz=7r&4^kd zHLKI%lOF30tTq`9l8RZq9IU6-jB*-;4<>U_Zm5Y+f*(f4HU2W0Yvum!l?k89#raaR zslg`4B6}GMdR8c!%H{iJbbz;0xK{_*`8h7lH?spgn8H~d;5VM*vV5~Uz*i}p(*e$y z#ywt9oh2Nc&PfBP_d%1^?zdcMn$D#Qk{Mj=it1peU?dR+P3MAzDIy@NacG2=Pj%_`1wnVy)Ae_#;8BGxYrlF{xB%2 zyw$78f=AssacysQ@0>-|RoaI)kNwAj-#yCxnEd>Xe(&!%an{3>yVrtWJ4S{Sg%w8* zTy^jp?pOED*DMvwI$fT;c-_DOd$LaVnHo9mjv$-K1xja;=fH)$*RwHUCU>0dd7gWf z{f@LY`K* ztxM6WbXtQ(lWfqM6V~?5%}{8ST2-nhRcpRU&B5o<^TWy delta 13948 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 WorR?643Y5Pz0#|`;%%-%_P+qGwHqh^ diff --git a/lms/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/SendMaterialTask.java b/lms/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/SendMaterialTask.java index 84a1eaa..4e0d2f2 100644 --- a/lms/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/SendMaterialTask.java +++ b/lms/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/SendMaterialTask.java @@ -2,6 +2,7 @@ package org.nl.wms.sch.tasks; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.IdUtil; +import cn.hutool.core.util.NumberUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONArray; @@ -43,13 +44,14 @@ public class SendMaterialTask extends AbstractAcsTask { /** *改变任务状态 **/ - String task_id = taskObj.getString("task_id"); + String task_code = taskObj.getString("task_code"); WQLObject taskTab = WQLObject.getWQLObject("sch_base_task"); - JSONObject jsonTask = taskTab.query("task_id='" + task_id + "'").uniqueResult(0); + JSONObject jsonTask = taskTab.query("task_code='" + task_code + "'").uniqueResult(0); + String task_id = jsonTask.getString("task_id"); - if (StrUtil.equals(status,"0")) { + if (StrUtil.equals(status, "0")) { // 取消删除任务 - taskTab.delete("task_id = '"+task_id+"'"); + taskTab.delete("task_id = '" + task_id + "'"); } if (TaskStatusEnum.EXECUTING.getCode().equals(status)) { @@ -76,32 +78,32 @@ public class SendMaterialTask extends AbstractAcsTask { WQLObject mstTab = WQLObject.getWQLObject("ST_IVT_regionIO"); JSONObject mstObj = mstTab.query("task_id='" + task_id + "' and is_delete='0'").uniqueResult(0); //审核 加库存可和用数量 - StoreIvtServiceImpl ivtService = new StoreIvtServiceImpl(); +// 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 bill_code = mstObj.getString("bill_code"); - String bill_type_scode =mstObj.getString("bill_type"); - 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_code", bill_code); - param.put("bill_type_scode", bill_type_scode); - 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("region_id", mstObj.getString("start_region_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")); - param.put("io_type", mstObj.getString("io_type")); +// String iostorinv_id = mstObj.getString("iostorinv_id"); +// String bill_code = mstObj.getString("bill_code"); +// String bill_type_scode = mstObj.getString("bill_type"); + String next_point_code = jsonTask.getString("next_point_code"); + String start_point_code = jsonTask.getString("start_point_code"); +// JSONObject param = new JSONObject(); +// param.put("material_id", mstObj.getString("material_id")); +// param.put("bill_code", bill_code); +// param.put("bill_type_scode", bill_type_scode); +// 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("region_id", mstObj.getString("start_region_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")); +// param.put("io_type", mstObj.getString("io_type")); PointServiceImpl pointService = SpringContextHolder.getBean(PointServiceImpl.class); PointDto nextPointDto = pointService.findByCode(next_point_code); @@ -112,25 +114,40 @@ public class SendMaterialTask extends AbstractAcsTask { 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"); + + // 如果终点区域为待检区，则需要添加库存 + if (nextPointDto.getRegion_id().equals(1572481855792484352L)) { + JSONObject struct = new JSONObject(); + struct.put("stockrecord_id", IdUtil.getSnowflake(1, 1).nextId()); + struct.put("struct_id", nextPointDto.getPoint_id()); + struct.put("struct_code", nextPointDto.getPoint_code()); + struct.put("struct_name", nextPointDto.getPoint_name()); + struct.put("region_id", startPointDto.getRegion_id()); + struct.put("quality_scode", "00");// 待检品 + struct.put("instorage_time", DateUtil.now()); + WQLObject.getWQLObject("st_ivt_structivt").insert(struct); + } + +// param.put("struct_id", nextPointDto.getPoint_id()); +// ivtService.addIvtFlow(param, IvtChangeTypeEnum.ADD_IVT_AND_CAN_USE); + // 解锁点位 将起点的点位状态写给终点 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); - endpointObj.put("vehicle_type", jsonTask.getString("vehicle_type")); - pointTab.update(endpointObj); - taskTab.update(jsonTask); + JSONObject startPointObj = pointTab.query("point_code='" + start_point_code + "'").uniqueResult(0); + JSONObject endPointObj = pointTab.query("point_code='" + next_point_code + "'").uniqueResult(0); + + // 起点写给终点 + endPointObj.put("lock_type", "00"); + String pointStatus = startPointObj.getString("point_status"); + endPointObj.put("point_status", pointStatus); + 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);*/ + + // 更新任务 + taskTab.update(jsonTask); } } @@ -186,44 +203,48 @@ public class SendMaterialTask extends AbstractAcsTask { @Transactional(rollbackFor = Exception.class) public String createTask(JSONObject form) { //请求参数 载具、起点、终点 - String vehicle_code = form.getString("vehicle_code"); - String vehicle_type = form.getString("vehicle_type"); String start_point_code = form.getString("start_point_code"); - String next_point_code = form.getString("next_point_code"); + String next_point_code = form.getString("next_point_code");; WQLObject taskTable = WQLObject.getWQLObject("SCH_BASE_Task"); - WQLObject iosTable = WQLObject.getWQLObject("ST_IVT_regionIO"); if (StrUtil.isEmpty(start_point_code)) { throw new BadRequestException("起点不能为空！"); } + if (StrUtil.isEmpty(next_point_code)) { + throw new BadRequestException("终点不能为空！"); + } + + PointService pointService = SpringContextHolder.getBean(PointService.class); + // 起点是空位不能搬 + PointDto startPoint = pointService.findByCode(start_point_code); + if (StrUtil.equals(startPoint.getPoint_status(), "00")) { + throw new BadRequestException("起点是空位！"); + } + + // 终点不是不合格品区且不是空位不能搬 + PointDto nextPoint = pointService.findByCode(next_point_code); + if (!nextPoint.getRegion_id().equals(1572481902244401152L) && !StrUtil.equals(nextPoint.getPoint_status(), "00")) { + throw new BadRequestException("终点不是空位！"); + } + //判断起点有没有未完成的指令 JSONObject beforTaskObj = taskTable. query("is_delete='0' and start_point_code='" + start_point_code + "' and task_status <>'" + TaskStatusEnum.FINISHED.getCode() + "'") .uniqueResult(0); if (ObjectUtil.isNotEmpty(beforTaskObj)) { - throw new BadRequestException("存在指令号为'" + beforTaskObj.getString("task_code") + "' 未完成！"); + throw new BadRequestException("起点存在指令号为'" + beforTaskObj.getString("task_code") + "' 未完成！"); } - - if (StrUtil.isEmpty(next_point_code)) { - // 终点为空需要找终点 - JSONObject param = new JSONObject(); - param.put("start_point_code",start_point_code); - JSONObject endPoint = this.findEndPoint(param); - next_point_code = endPoint.getString("next_point_code"); - } + WQLObject pointTable = WQLObject.getWQLObject("sch_base_point"); //终点点加锁 - WQLObject pointTable = WQLObject.getWQLObject("sch_base_point"); JSONObject endPointObj = pointTable.query("point_code='" + next_point_code + "'").uniqueResult(0); endPointObj.put("lock_type", "01"); pointTable.update(endPointObj); // 创建任务 - PointService pointService = SpringContextHolder.getBean(PointService.class); - JSONObject taskObj = new JSONObject(); CodeUtil.getNewCode("TASK_CODE"); String task_id = IdUtil.getSnowflake(1, 1).nextId() + ""; @@ -231,18 +252,14 @@ public class SendMaterialTask extends AbstractAcsTask { taskObj.put("taskdtl_id", task_id); taskObj.put("task_code", CodeUtil.getNewCode("TASK_CODE")); taskObj.put("task_type", "01"); - taskObj.put("vehicle_type", vehicle_type); taskObj.put("taskdtl_type", "01"); taskObj.put("acs_task_type", "1"); taskObj.put("task_status", TaskStatusEnum.START_AND_POINT.getCode()); taskObj.put("start_point_code", start_point_code); - PointDto startPoint = pointService.findByCode(start_point_code); taskObj.put("start_area", startPoint.getRegion_id()); taskObj.put("request_param", form.toJSONString()); taskObj.put("next_point_code", next_point_code); - PointDto nextPoint = pointService.findByCode(next_point_code); taskObj.put("next_area", nextPoint.getRegion_id()); - taskObj.put("vehicle_code", vehicle_code); taskObj.put("handle_class", THIS_CLASS); taskObj.put("is_auto_issue", "1"); taskObj.put("create_name", SecurityUtils.getCurrentUsername()); @@ -287,7 +304,7 @@ public class SendMaterialTask extends AbstractAcsTask { * 2.豪凯线 --> 成品区 */ String next_point_code = ""; - if (StrUtil.equals(jsonStartRegion.getString("region_code"),RegionTypeEnum.GJQY.getCode())) { + if (StrUtil.equals(jsonStartRegion.getString("region_code"), RegionTypeEnum.GJQY.getCode())) { JSONObject map = new JSONObject(); map.put("flag", "2"); map.put("region_code", RegionTypeEnum.YSQA.getCode()); @@ -295,7 +312,7 @@ public class SendMaterialTask extends AbstractAcsTask { if (ObjectUtil.isEmpty(jsonEndPoint)) throw new BadRequestException("仓位不足"); next_point_code = jsonEndPoint.getString("point_code"); - } else if (StrUtil.equals(jsonStartRegion.getString("region_code"),RegionTypeEnum.HKQY.getCode())) { + } else if (StrUtil.equals(jsonStartRegion.getString("region_code"), RegionTypeEnum.HKQY.getCode())) { JSONObject map = new JSONObject(); map.put("flag", "2"); map.put("region_code", RegionTypeEnum.CPQYA.getCode()); @@ -306,7 +323,7 @@ public class SendMaterialTask extends AbstractAcsTask { } JSONObject resuft = new JSONObject(); - resuft.put("next_point_code",next_point_code); + resuft.put("next_point_code", next_point_code); return resuft; } diff --git a/lms/hd/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/RegionioInServiceImpl.java b/lms/hd/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/RegionioInServiceImpl.java index 60b1df5..bd7c764 100644 --- a/lms/hd/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/RegionioInServiceImpl.java +++ b/lms/hd/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/RegionioInServiceImpl.java @@ -208,17 +208,8 @@ public class RegionioInServiceImpl implements RegionioInService { form.put("create_mode", jsonIn.getString("create_mode")); form.put("pcsn", jsonIn.getString("pcsn")); form.put("iostorinv_id", iostorinv_id); + form.put("material_code", jsonObject.get("material_code")); - // 根据起点点位 找到对应设备，根据设备找到对应工单，根据工单获取载具类型 - String device_code = start_point_code.substring(0, start_point_code.indexOf("_")); - - DeviceService deviceBean = SpringContextHolder.getBean(DeviceService.class); - DeviceDto deviceDto = deviceBean.findByCode(device_code); - if (ObjectUtil.isEmpty(deviceDto)) throw new BadRequestException("此设备不存在"); - JSONObject jsonOrder = orderTab.query("device_id = '" + deviceDto.getDevice_id() + "' and order_status = '02' and is_delete = '0'").uniqueResult(0); - if (ObjectUtil.isEmpty(jsonOrder)) throw new BadRequestException("此设备未在生产中或不存在"); - - form.put("vehicle_type", jsonOrder.getString("vehicle_type")); SendMaterialTask sendMaterialTask = new SendMaterialTask(); String task_id = sendMaterialTask.createTask(form); diff --git a/lms/qd/src/components/Crud/crud.js b/lms/qd/src/components/Crud/crud.js index 3efbbd2..31a6cf0 100644 --- a/lms/qd/src/components/Crud/crud.js +++ b/lms/qd/src/components/Crud/crud.js @@ -309,7 +309,6 @@ function CRUD(options) { return } crud.status.edit = CRUD.STATUS.PROCESSING - debugger crud.crudMethod.edit(crud.form).then(() => { crud.status.edit = CRUD.STATUS.NORMAL crud.getDataStatus(crud.getDataId(crud.form)).edit = CRUD.STATUS.NORMAL diff --git a/lms/qd/src/views/login.vue b/lms/qd/src/views/login.vue index 8362302..a405da7 100644 --- a/lms/qd/src/views/login.vue +++ b/lms/qd/src/views/login.vue @@ -2,7 +2,7 @@