diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java index 933dc5e..65f6426 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java @@ -482,14 +482,21 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { // 木托盘号(4)##物料编码(12)##数量(2-3)##吨量（单重X数量）##生产日期(2023/11/04)##客户编码##订单号(12)#型号##产品名称##客户名称** String requestNo = param.getString("requestNo"); ApplyTaskRequest baseRequest = param.toJavaObject(ApplyTaskRequest.class); - if (baseRequest.getVehicle_code() == null) { + String vehicleCode = TaskUtils.defaultVehicleCode(baseRequest.getVehicle_code()); + if (vehicleCode == null) { return ApplyTaskResponse.responseError(requestNo, "载具编码不能为空!"); } StringBuilder sb = new StringBuilder(); SchBaseVehiclematerialgroup groupInfo = vehiclematerialgroupService.getOneByVehicleCode( - baseRequest.getVehicle_code(), GroupBindMaterialStatusEnum.UNBOUND.getValue()); + vehicleCode, GroupBindMaterialStatusEnum.UNBOUND.getValue()); + if (groupInfo == null) { + throw new BadRequestException("载具号「" + vehicleCode + "」的组盘信息不存在"); + } String materialId = groupInfo.getMaterial_id(); MdBaseMaterial baseMaterial = materialService.getById(materialId); + if (ObjectUtil.isEmpty(baseMaterial)) { + throw new BadRequestException("物料id: " + materialId + " 不存在，请同步物料"); + } BigDecimal materialQty = ObjectUtil.isNotEmpty(groupInfo.getMaterial_qty()) ? BigDecimal.valueOf(groupInfo.getMaterial_qty()) : BigDecimal.valueOf(0); String singleWeightStr = baseMaterial.getSingle_weight(); @@ -497,7 +504,13 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { BigDecimal multiply = materialQty.multiply(singleWeight); // 获取工单 PdmBdWorkorder workorder = workorderService.getByCode(groupInfo.getWorkorder_code()); + if (ObjectUtil.isEmpty(workorder)) { + throw new BadRequestException("工单不存在，请检查工单：" + groupInfo.getWorkorder_code()); + } String extData = workorder.getExt_data(); + if (ObjectUtil.isEmpty(extData)) { + throw new BadRequestException("工单[ " + workorder.getWorkorder_code() + " ]外部数据为空"); + } JSONObject object = JSONObject.parseObject(extData); log.info("包装数据：{}", object); String custerNo = object.getString("custer_no"); @@ -510,7 +523,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { custer = wmsToMesService.getCusterByName(custerNo); } // 组合 - sb.append(baseRequest.getVehicle_code()).append("##") + sb.append(vehicleCode).append("##") .append(baseMaterial.getMaterial_code()).append("##") .append(groupInfo.getMaterial_qty()).append("##") .append(multiply).append("##") @@ -946,7 +959,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { ApplySignalStatusRequest actionRequest = param.toJavaObject(ApplySignalStatusRequest.class); String deviceCode = actionRequest.getDevice_code(); RLock lock = redissonClient.getLock(deviceCode); - boolean tryLock = lock.tryLock(3, TimeUnit.SECONDS); + boolean tryLock = lock.tryLock(0, TimeUnit.SECONDS); try { if (tryLock) { String move = null; @@ -988,6 +1001,8 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { // hint: 特殊处理 specialOperation(schBasePoint); log.info("点位" + schBasePoint.getPoint_code() + "更新之后：{}", schBasePoint); + } else { + throw new BadRequestException("系统繁忙，请稍后再试"); } } finally { if (tryLock) { diff --git a/lms/nladmin-system/nlsso-server/src/main/resources/logback-spring.xml b/lms/nladmin-system/nlsso-server/src/main/resources/logback-spring.xml index cf8dcc9..d6dd751 100644 --- a/lms/nladmin-system/nlsso-server/src/main/resources/logback-spring.xml +++ b/lms/nladmin-system/nlsso-server/src/main/resources/logback-spring.xml @@ -63,7 +63,7 @@ https://juejin.cn/post/6844903775631572999 - + 0 500 diff --git a/lms/nladmin-ui/public/index.html b/lms/nladmin-ui/public/index.html index fb5ee79..8bd280e 100644 --- a/lms/nladmin-ui/public/index.html +++ b/lms/nladmin-ui/public/index.html @@ -5,7 +5,7 @@ - + <%= webpackConfig.name %> diff --git a/lms/nladmin-ui/public/logo.ico b/lms/nladmin-ui/public/logo.ico new file mode 100644 index 0000000..457edf2 Binary files /dev/null and b/lms/nladmin-ui/public/logo.ico differ diff --git a/lms/nladmin-ui/public/nl.ico b/lms/nladmin-ui/public/nl.ico new file mode 100644 index 0000000..63a1585 Binary files /dev/null and b/lms/nladmin-ui/public/nl.ico differ diff --git a/lms/nladmin-ui/src/assets/styles/eladmin.scss b/lms/nladmin-ui/src/assets/styles/eladmin.scss index 57a62e5..9eed7c5 100644 --- a/lms/nladmin-ui/src/assets/styles/eladmin.scss +++ b/lms/nladmin-ui/src/assets/styles/eladmin.scss @@ -1,5 +1,8 @@ .head-container { - padding-bottom: 10px; + padding-top: 4px; + padding-bottom: 6px; + background-color: #ffffff; + border-radius: 4px; .filter-item { display: inline-block; @@ -188,7 +191,7 @@ input[type="number"]::-webkit-outer-spin-button { .el-table__fixed-header-wrapper { th { word-break: break-word; - background-color: #f8f8f9; + background-color: #f5f5f5; color: #515a6e; height: 35px; font-size: 13px; @@ -215,4 +218,13 @@ input[type="number"]::-webkit-outer-spin-button { .el-table--scrollable-y .el-table__body-wrapper { overflow-y: overlay !important; } +//左侧边框不显示start https://blog.csdn.net/m0_37922443/article/details/126487240 +.el-table__row td:not(.is-hidden):last-child { + right: -1px; +} + +thead th:not(.is-hidden):last-child { + right: -1px; +} +//左侧边框不显示end diff --git a/lms/nladmin-ui/src/assets/styles/index.scss b/lms/nladmin-ui/src/assets/styles/index.scss index 21fbda1..237be11 100644 --- a/lms/nladmin-ui/src/assets/styles/index.scss +++ b/lms/nladmin-ui/src/assets/styles/index.scss @@ -21,6 +21,7 @@ label { html { height: 100%; box-sizing: border-box; + //background-color: #eeeeee; } #app { @@ -98,7 +99,7 @@ div:focus { } aside { - background: #eef1f6; + background: #d40c70; padding: 8px 24px; margin-bottom: 20px; border-radius: 2px; @@ -122,7 +123,7 @@ aside { //main-container全局样式 .app-container { - padding: 20px 20px 45px 20px; + padding: 10px 20px 45px 10px; } .components-container { diff --git a/lms/nladmin-ui/src/assets/styles/variables.scss b/lms/nladmin-ui/src/assets/styles/variables.scss index 384517b..1d1c7bf 100644 --- a/lms/nladmin-ui/src/assets/styles/variables.scss +++ b/lms/nladmin-ui/src/assets/styles/variables.scss @@ -13,17 +13,17 @@ $base-logo-light-title-color: #001529; $base-menu-light-background:#ffffff; // sidebar -$menuText:#bfcbd9; +$menuText: #ffffff; $menuActiveText:#409EFF; -$subMenuActiveText:#f4f4f5; // https://github.com/ElemeFE/element/issues/12951 +$subMenuActiveText: #ffffff; // https://github.com/ElemeFE/element/issues/12951 -$menuBg:#304156; //https://cloud.tencent.com/developer/article/1753773 -$menuHover:#263445; +$menuBg: #001529; //https://cloud.tencent.com/developer/article/1753773 +$menuHover:#4e5465; $base-menu-light-color:rgba(0,0,0,.70); -$subMenuBg:#1f2d3d; -$subMenuHover:#001528; +$subMenuBg:#000c17; +$subMenuHover:#4e5465; $sideBarWidth: 205px; @@ -45,4 +45,4 @@ $sideBarWidth: 205px; logoLightTitleColor: $base-logo-light-title-color } -$base-sidebar-width: 200px; +$base-sidebar-width: 2010px;