From 68d72ada2b4e042c36d7976ac27d53b12c333cfd Mon Sep 17 00:00:00 2001 From: liyongde <1419499670@qq.com> Date: Tue, 12 Dec 2023 13:46:54 +0800 Subject: [PATCH] =?UTF-8?q?opt:=20=E4=BB=BB=E5=8A=A1=E4=B8=8E=E5=B7=A5?= =?UTF-8?q?=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nl/common/utils/YmlConfigFileUtil.java | 28 ++++++++++ .../org/nl/config/lucene/LuceneAppender.java | 9 ++- .../ext/acs/autotask/AutoCallMaterials.java | 22 ++++---- .../acs/service/impl/AcsToWmsServiceImpl.java | 5 +- .../ext/mes/service/dto/MesWorkOrderDto.java | 4 +- .../mes/service/impl/WmsToMesServiceImpl.java | 2 + .../SysInteractRecordController.java | 5 -- .../service/ISysInteractRecordService.java | 10 ++-- .../impl/SysInteractRecordServiceImpl.java | 15 +++-- .../IPdmBdRequestMaterialRecordService.java | 6 +- .../dao/PdmBdRequestMaterialRecord.java | 2 +- ...PdmBdRequestMaterialRecordServiceImpl.java | 12 +++- .../service/IPdmBdWorkorderService.java | 7 +++ .../impl/PdmBdWorkorderServiceImpl.java | 8 +++ .../SchBaseVehiclematerialgroupMapper.xml | 6 ++ .../dto/SchBaseVehiclematerialgroupQuery.java | 1 + .../service/impl/SchBasePointServiceImpl.java | 16 ++++++ .../task_manage/task/tasks/hn/HNMLTask.java | 17 +++--- .../task_manage/task/tasks/yao/GZYQLTask.java | 17 +++--- .../main/resources/config/application-dev.yml | 4 -- .../resources/config/application-prod.yml | 3 - .../src/main/resources/config/application.yml | 4 ++ .../nlsso-server/src/main/resources/ext.dic | 4 ++ .../src/main/resources/logback-spring.xml | 18 ++++++ .../src/views/wms/ext/record/index.vue | 56 +++++++++++++------ .../src/views/wms/pdm/workerorder/index.vue | 4 +- .../src/views/wms/sch/group/index.vue | 25 ++++++++- 27 files changed, 228 insertions(+), 82 deletions(-) create mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/YmlConfigFileUtil.java diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/YmlConfigFileUtil.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/YmlConfigFileUtil.java new file mode 100644 index 0000000..1c351b5 --- /dev/null +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/YmlConfigFileUtil.java @@ -0,0 +1,28 @@ +package org.nl.common.utils; + +import org.springframework.beans.factory.config.YamlPropertiesFactoryBean; +import org.springframework.core.io.ClassPathResource; +import org.springframework.core.io.Resource; + +import java.util.Properties; + +/** + * @Author: lyd + * @Description: 配置文件获取方法 + * @Date: 2023/12/6 + */ +public class YmlConfigFileUtil { + public static Properties readConfig(String configFile) { + // 创建 Resource 对象 + Resource resource = new ClassPathResource(configFile); + + // 创建 YamlPropertiesFactoryBean + YamlPropertiesFactoryBean yamlPropertiesFactoryBean = new YamlPropertiesFactoryBean(); + yamlPropertiesFactoryBean.setResources(resource); + + // 获取 Properties 对象 + Properties properties = yamlPropertiesFactoryBean.getObject(); + + return properties; + } +} diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/lucene/LuceneAppender.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/lucene/LuceneAppender.java index 0909ac0..f1fd585 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/lucene/LuceneAppender.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/lucene/LuceneAppender.java @@ -16,11 +16,13 @@ import org.apache.lucene.index.IndexWriter; import org.apache.lucene.index.IndexWriterConfig; import org.apache.lucene.store.Directory; import org.apache.lucene.store.FSDirectory; +import org.nl.common.utils.YmlConfigFileUtil; import org.wltea.analyzer.lucene.IKAnalyzer; import java.io.IOException; import java.nio.file.Paths; import java.util.Map; +import java.util.Properties; public class LuceneAppender extends AppenderBase { @@ -32,7 +34,12 @@ public class LuceneAppender extends AppenderBase { public void start() { super.start(); try { - index = FSDirectory.open(Paths.get(LogMessageConstant.INDEX_DIR)); + // 读取配置文件 + Properties properties = YmlConfigFileUtil.readConfig("config/application.yml"); + + // 获取配置值 + String luceneDir = properties.getProperty("lucene.index.path"); + index = FSDirectory.open(Paths.get(luceneDir)); } catch (IOException e) { e.printStackTrace(); } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/autotask/AutoCallMaterials.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/autotask/AutoCallMaterials.java index 20b1a10..702c5a3 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/autotask/AutoCallMaterials.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/autotask/AutoCallMaterials.java @@ -37,7 +37,8 @@ public class AutoCallMaterials { // 判断是否可以叫料，可以就下发给混碾系统 workorderList.forEach(workorder -> { if (workorder.getReal_weight().compareTo(workorder.getPlan_weight()) >= 0) { - return; // 不需要请求，等待工单完工 + // 不需要请求，等待工单完工 + return; } // 校验记录表是否达到两条 List list = requestMaterialRecordService.list( @@ -47,16 +48,6 @@ public class AutoCallMaterials { if (list.size() >= 2) { return; } - try { - // 记录数据 - PdmBdRequestMaterialRecord requestMaterialRecord = requestMaterialRecordService.recordData(workorder); - log.info("记录自动要料信息：{}", requestMaterialRecord); - } catch (Exception e) { - log.error("插入LMS数据库失败，{}", e.getMessage()); - log.error("插入LMS数据库失败数据：{}", workorder); - return; - } - // todo: 如何保证上下的一致性? try { // 下发混碾 wmsToMmsService.addRequestMaterial(workorder); @@ -64,6 +55,15 @@ public class AutoCallMaterials { } catch (Exception e) { log.error("下发混碾失败，{}", e.getMessage()); log.error("下发混碾失败数据：{}", workorder); + return; + } + try { + // 记录数据 + PdmBdRequestMaterialRecord requestMaterialRecord = requestMaterialRecordService.recordData(workorder); + log.info("记录自动要料信息：{}", requestMaterialRecord); + } catch (Exception e) { + log.error("插入LMS数据库失败，{}", e.getMessage()); + log.error("插入LMS数据库失败数据：{}", workorder); } }); } 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 8400ec6..0c39c67 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 @@ -657,7 +657,8 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { if (ObjectUtil.isEmpty(one)) { throw new BadRequestException("载具编码为" + baseRequest.getVehicle_code() + "组盘不存在!"); } - String yjDeviceCode = basePoint.getParent_point_code(); // 压机设备编码 + // 压机设备编码 + String yjDeviceCode = basePoint.getParent_point_code(); SchBasePoint devicePoint = pointService.getById(yjDeviceCode); // 获取当前工单 PdmBdWorkorder productionTask = workorderService.getDeviceProductionTask(yjDeviceCode); @@ -949,7 +950,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { ? schBasePoint.getPoint_status() : PointStatusEnum.EMPTY_POINT.getCode(); if ((pointStatus.equals(PointStatusEnum.FULL_POINT.getCode()) - && move.equals(PointStatusEnum.EMPTY_VEHICLE.getCode())) || (pointStatus.equals(move))) { // 不做操作 + && move.equals(PointStatusEnum.EMPTY_VEHICLE.getCode())) || (pointStatus.equals(move))) { return BaseResponse.responseOk(actionRequest.getRequestNo()); } // 载具类型不为空，并且不是0的情况，lmsVehicleTypeShift:转成lms的载具类型 diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/dto/MesWorkOrderDto.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/dto/MesWorkOrderDto.java index d6cc680..d6f5ecf 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/dto/MesWorkOrderDto.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/dto/MesWorkOrderDto.java @@ -40,10 +40,10 @@ public class MesWorkOrderDto { /** 辅单位 */ private String FPRODUCT_SUBUNIT; /** 数量 */ - private String FPRODUCT_NUM; + private BigDecimal FPRODUCT_NUM; /** 单位 */ private String FPRODUCT_UNIT; - /** 重量 */ + /** 转换率 */ private String FCONVERTRATE; /** 班组 */ private String FTEAM; diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/impl/WmsToMesServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/impl/WmsToMesServiceImpl.java index 895e3c7..416d317 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/impl/WmsToMesServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/impl/WmsToMesServiceImpl.java @@ -579,6 +579,8 @@ public class WmsToMesServiceImpl implements WmsToMesService { pdmBdWorkorder.setWorkorder_id(IdUtil.getSnowflake(1, 1).nextIdStr()); pdmBdWorkorder.setWorkorder_code(mesWorkOrderDto.getPWORKSCHE_ID()); pdmBdWorkorder.setPlan_qty(mesWorkOrderDto.getFPRODUCT_SUBNUM()); + // 转成千克 + pdmBdWorkorder.setPlan_weight(mesWorkOrderDto.getFPRODUCT_NUM().multiply(BigDecimal.valueOf(1000))); pdmBdWorkorder.setMaterial_id(materialDto.getMaterial_id()); pdmBdWorkorder.setRaw_material_code(materialDto.getRaw_material_code()); pdmBdWorkorder.setProduce_order(mesWorkOrderDto.getFORDER_NO()); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/record/controller/SysInteractRecordController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/record/controller/SysInteractRecordController.java index 39ebfb6..bc14d7c 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/record/controller/SysInteractRecordController.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/record/controller/SysInteractRecordController.java @@ -32,7 +32,6 @@ public class SysInteractRecordController { @GetMapping @Log("查询外部系统接口记录") @ApiOperation("查询外部系统接口记录") - //@SaCheckPermission("@el.check('sysInteractRecord:list')") public ResponseEntity query(@RequestParam Map whereJson, PageQuery page){ return new ResponseEntity<>(TableDataInfo.build(sysInteractRecordService.queryAll(whereJson,page)),HttpStatus.OK); } @@ -40,7 +39,6 @@ public class SysInteractRecordController { @PostMapping @Log("新增外部系统接口记录") @ApiOperation("新增外部系统接口记录") - //@SaCheckPermission("@el.check('sysInteractRecord:add')") public ResponseEntity create(@Validated @RequestBody SysInteractRecord entity){ sysInteractRecordService.create(entity); return new ResponseEntity<>(HttpStatus.CREATED); @@ -49,7 +47,6 @@ public class SysInteractRecordController { @PutMapping @Log("修改外部系统接口记录") @ApiOperation("修改外部系统接口记录") - //@SaCheckPermission("@el.check('sysInteractRecord:edit')") public ResponseEntity update(@Validated @RequestBody SysInteractRecord entity){ sysInteractRecordService.update(entity); return new ResponseEntity<>(HttpStatus.NO_CONTENT); @@ -57,14 +54,12 @@ public class SysInteractRecordController { @Log("删除外部系统接口记录") @ApiOperation("删除外部系统接口记录") - //@SaCheckPermission("@el.check('sysInteractRecord:del')") @DeleteMapping public ResponseEntity delete(@RequestBody Set ids) { sysInteractRecordService.deleteAll(ids); return new ResponseEntity<>(HttpStatus.OK); } - //@SaCheckPermission("@el.check('sysInteractRecord:del')") @GetMapping("/getAllName") public ResponseEntity getAllName() { return new ResponseEntity<>(sysInteractRecordService.getAllInteractName(), HttpStatus.OK); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/record/service/ISysInteractRecordService.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/record/service/ISysInteractRecordService.java index 61330a4..33aacc6 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/record/service/ISysInteractRecordService.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/record/service/ISysInteractRecordService.java @@ -65,11 +65,11 @@ public interface ISysInteractRecordService extends IService { void saveRecord(AcsWorkOrderVo workorder, ResultForAcs resultForAcs, String direction); /** - * - * @param name - * @param request - * @param response - * @param direction + * 保存对接记录 + * @param name 保存对接记录 + * @param request 请求参数 + * @param response 响应参数，分类别 + * @param direction 请求方向 */ void saveRecord(String name, K request, V response, String direction); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/record/service/impl/SysInteractRecordServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/record/service/impl/SysInteractRecordServiceImpl.java index 552e6ce..be5c5c0 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/record/service/impl/SysInteractRecordServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/record/service/impl/SysInteractRecordServiceImpl.java @@ -49,9 +49,12 @@ public class SysInteractRecordServiceImpl extends ServiceImpl lam = new LambdaQueryWrapper<>(); lam.eq(interactDirection!=null, SysInteractRecord::getDirection, interactDirection) .eq(ObjectUtil.isNotEmpty(interactName), SysInteractRecord::getInteract_name, interactName) + .eq(ObjectUtil.isNotEmpty(httpCode), SysInteractRecord::getCode, httpCode) .and(blurry != null, s -> s.like(SysInteractRecord::getInteract_name, blurry) .or() .like(SysInteractRecord::getMessage, blurry) @@ -126,25 +129,29 @@ public class SysInteractRecordServiceImpl extends ServiceImpl queryAll(Map whereJson, PageQuery page){ @@ -67,11 +72,16 @@ public class PdmBdRequestMaterialRecordServiceImpl extends ServiceImpl { */ PdmBdWorkorder getByCode(String orderCode); + /** + * 用锁-根据工单编码获取工单信息 + * @param orderCode + * @return + */ + PdmBdWorkorder getByCodeLock(String orderCode); + /** * 工单下发 * @param entity diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/service/impl/PdmBdWorkorderServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/service/impl/PdmBdWorkorderServiceImpl.java index f8de313..b9b5341 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/service/impl/PdmBdWorkorderServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/service/impl/PdmBdWorkorderServiceImpl.java @@ -178,6 +178,14 @@ public class PdmBdWorkorderServiceImpl extends ServiceImpl lam = new QueryWrapper().lambda(); + lam.eq(PdmBdWorkorder::getWorkorder_code, orderCode); + lam.apply("FOR UPDATE"); + return pdmBdWorkorderMapper.selectOne(lam); + } + @Override @Transactional(rollbackFor = Exception.class) public void submits(PdmBdWorkorder entity) { diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/dao/mapper/SchBaseVehiclematerialgroupMapper.xml b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/dao/mapper/SchBaseVehiclematerialgroupMapper.xml index 8a254ed..0a62297 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/dao/mapper/SchBaseVehiclematerialgroupMapper.xml +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/dao/mapper/SchBaseVehiclematerialgroupMapper.xml @@ -22,6 +22,12 @@ AND vg.group_bind_material_status = #{query.group_bind_material_status} + + AND ma.material_code LIKE '%${query.material_code}%' + + + AND ma.raw_material_code LIKE '%${query.raw_material_code}%' + AND vg.point_code IN ( SELECT p.point_code diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/dto/SchBaseVehiclematerialgroupQuery.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/dto/SchBaseVehiclematerialgroupQuery.java index bb43045..195496f 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/dto/SchBaseVehiclematerialgroupQuery.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/dto/SchBaseVehiclematerialgroupQuery.java @@ -17,4 +17,5 @@ public class SchBaseVehiclematerialgroupQuery implements Serializable { private String region_code; private String group_bind_material_status; private String raw_material_code; + private String material_code; } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/impl/SchBasePointServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/impl/SchBasePointServiceImpl.java index 1b17a74..624f4f4 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/impl/SchBasePointServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/impl/SchBasePointServiceImpl.java @@ -13,14 +13,18 @@ import lombok.extern.slf4j.Slf4j; import org.nl.common.domain.query.PageQuery; import org.nl.common.exception.BadRequestException; import org.nl.common.utils.SecurityUtils; +import org.nl.wms.sch.group.service.ISchBaseVehiclematerialgroupService; +import org.nl.wms.sch.group.service.dao.SchBaseVehiclematerialgroup; import org.nl.wms.sch.point.service.ISchBasePointService; import org.nl.wms.sch.point.service.dao.SchBasePoint; import org.nl.wms.sch.point.service.dao.mapper.SchBasePointMapper; import org.nl.wms.sch.point.service.dto.SchBasePointQuery; import org.nl.wms.sch.region.service.dao.SchBaseRegion; import org.nl.wms.sch.region.service.dao.mapper.SchBaseRegionMapper; +import org.nl.wms.sch.task_manage.enums.GroupBindMaterialStatusEnum; import org.nl.wms.sch.task_manage.enums.PointStatusEnum; import org.nl.wms.util.PointUtils; +import org.nl.wms.util.TaskUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -45,6 +49,8 @@ public class SchBasePointServiceImpl extends ServiceImpl queryAll(SchBasePointQuery whereJson, PageQuery page) { @@ -127,6 +133,16 @@ public class SchBasePointServiceImpl extends ServiceImpl " + endPointObj.getPoint_code()); @@ -261,7 +258,7 @@ public class HNMLTask extends AbstractTask { } // 更新组盘数据 groupEntity.setGroup_bind_material_status(GroupBindMaterialStatusEnum.BOUND.getValue()); - groupEntity.setTask_code(taskObj.getTask_code()); // 当前任务的编码 + groupEntity.setTask_code(taskObj.getTask_code()); TaskUtils.setGroupUpdateByType(groupEntity, taskFinishedType); vehiclematerialgroupService.updateById(groupEntity); // 起点清空 - 由ACS请求修改 @@ -274,7 +271,7 @@ public class HNMLTask extends AbstractTask { public void cancelTask(SchBaseTask taskObj, TaskFinishedTypeEnum taskFinishedType) { // 获取参数 - String endPoint = taskObj.getPoint_code2(); // 终点 + String endPoint = taskObj.getPoint_code2(); SchBasePoint one = ObjectUtil.isNotEmpty(endPoint) ? pointService.getOne(new LambdaQueryWrapper().eq(SchBasePoint::getPoint_code, endPoint)) : null; diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yao/GZYQLTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yao/GZYQLTask.java index bf732d1..0cd452a 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yao/GZYQLTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yao/GZYQLTask.java @@ -61,7 +61,7 @@ public class GZYQLTask extends AbstractTask { SchBaseTaskconfig taskConfig = taskConfigService.getOne(new LambdaQueryWrapper() .eq(SchBaseTaskconfig::getConfig_code, TASK_CONFIG_CODE)); for (SchBaseTask task : tasks) { - TaskUtils.setUpdateByAcs(task); // 修改修改者 + TaskUtils.setUpdateByAcs(task); List startRegionStr = Arrays.stream(taskConfig.getStart_region_str().split(",")) .collect(Collectors.toList()); // 找起点 @@ -136,19 +136,20 @@ public class GZYQLTask extends AbstractTask { // 如果一个有货一个没货，但是载具数量又是5的时候，就要不需要检测不能为5 LambdaQueryWrapper lam = new LambdaQueryWrapper<>(); lam.in(SchBasePoint::getRegion_code, startRegionStr) - .eq(SchBasePoint::getPoint_type, GeneralDefinition.EXIT) // 点位类型是缓存输送线出口 - .and(la -> la.isNull(SchBasePoint::getIng_task_code) // 当前执行的任务为空或者NULL，有数据表示锁住 + // 点位类型是缓存输送线出口 + .eq(SchBasePoint::getPoint_type, GeneralDefinition.EXIT) + // 当前执行的任务为空或者NULL，有数据表示锁住 + .and(la -> la.isNull(SchBasePoint::getIng_task_code) .or() .eq(SchBasePoint::getIng_task_code, "")) .eq(SchBasePoint::getPoint_status, PointStatusEnum.EMPTY_VEHICLE.getCode()) .eq(SchBasePoint::getIs_used, true); List list = pointService.list(lam); - boolean doDetection = true; // 如果只有一条符合的数据就不需要检验不符合5个托 - if (list.size() == 1) { - doDetection = false; - } + // 如果只有一条符合的数据就不需要检验不符合5个托 + boolean doDetection = list.size() != 1; // 默认认为缓存线有东西 - lam.ne(doDetection, SchBasePoint::getVehicle_qty, 5).orderByDesc(SchBasePoint::getVehicle_qty); // 每次都将载具数量+1，每次拿最大的 + // 每次都将载具数量+1，每次拿最大的 + lam.ne(doDetection, SchBasePoint::getVehicle_qty, 5).orderByDesc(SchBasePoint::getVehicle_qty); List schBasePoints = pointService.list(lam); return ObjectUtil.isNotEmpty(schBasePoints) ? schBasePoints.get(0) : null; } diff --git a/lms/nladmin-system/nlsso-server/src/main/resources/config/application-dev.yml b/lms/nladmin-system/nlsso-server/src/main/resources/config/application-dev.yml index b0fc496..299221e 100644 --- a/lms/nladmin-system/nlsso-server/src/main/resources/config/application-dev.yml +++ b/lms/nladmin-system/nlsso-server/src/main/resources/config/application-dev.yml @@ -149,7 +149,3 @@ sa-token: password: # 连接超时时间 timeout: 10s - -lucene: - index: - path: D:\lucene\index diff --git a/lms/nladmin-system/nlsso-server/src/main/resources/config/application-prod.yml b/lms/nladmin-system/nlsso-server/src/main/resources/config/application-prod.yml index fdfd1b8..14091fd 100644 --- a/lms/nladmin-system/nlsso-server/src/main/resources/config/application-prod.yml +++ b/lms/nladmin-system/nlsso-server/src/main/resources/config/application-prod.yml @@ -172,6 +172,3 @@ sa-token: password: # 连接超时时间 timeout: 10s -lucene: - index: - path: E:\lucene\index diff --git a/lms/nladmin-system/nlsso-server/src/main/resources/config/application.yml b/lms/nladmin-system/nlsso-server/src/main/resources/config/application.yml index eff644d..3944e81 100644 --- a/lms/nladmin-system/nlsso-server/src/main/resources/config/application.yml +++ b/lms/nladmin-system/nlsso-server/src/main/resources/config/application.yml @@ -129,3 +129,7 @@ mybatis-plus: global-config: db-config: id-type: INPUT + +lucene: + index: + path: D:\lucene\index diff --git a/lms/nladmin-system/nlsso-server/src/main/resources/ext.dic b/lms/nladmin-system/nlsso-server/src/main/resources/ext.dic index 41a152a..85a5d87 100644 --- a/lms/nladmin-system/nlsso-server/src/main/resources/ext.dic +++ b/lms/nladmin-system/nlsso-server/src/main/resources/ext.dic @@ -24,3 +24,7 @@ 插入压机检测失败 包装数据 更新成功：更新数据 +插入LMS数据库失败 +记录自动要料信息 +自动下发混碾 +下发混碾失败 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 d5e85cf..dfb520e 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 @@ -76,6 +76,24 @@ https://juejin.cn/post/6844903775631572999 + + + + + + + + + + + + + + + + + + diff --git a/lms/nladmin-ui/src/views/wms/ext/record/index.vue b/lms/nladmin-ui/src/views/wms/ext/record/index.vue index 2209f50..d1f75ae 100644 --- a/lms/nladmin-ui/src/views/wms/ext/record/index.vue +++ b/lms/nladmin-ui/src/views/wms/ext/record/index.vue @@ -25,8 +25,18 @@ v-for="item in interact_name_list" :key="item" :label="item" - :value="item"> - + :value="item" + /> + + + + + @@ -35,8 +45,8 @@ v-for="item in dict.interact_direction" :key="item.value" :label="item.label" - :value="item.value"> - + :value="item.value" + /> @@ -54,28 +64,28 @@ > - + - + - + - + - + - + - + @@ -197,12 +207,19 @@ export default { return { permission: {}, rules: {}, - interact_name_list: [] + interact_name_list: [], + http_codes: [ + { + 'label': '200', + 'value': '200' + }, + { + 'label': '400', + 'value': '400' + } + ] } }, - created() { - this.getNameList() - }, computed: { formattedRequestParam: { get() { @@ -233,13 +250,16 @@ export default { } } }, + created() { + this.getNameList() + }, methods: { // 钩子：在获取表格数据之前执行，false 则代表不获取数据 [CRUD.HOOK.beforeRefresh]() { return true }, getNameList() { - crudSysInteractRecord.getAllName().then((res)=>{ + crudSysInteractRecord.getAllName().then((res) => { this.interact_name_list = res }) } diff --git a/lms/nladmin-ui/src/views/wms/pdm/workerorder/index.vue b/lms/nladmin-ui/src/views/wms/pdm/workerorder/index.vue index b728a1f..ce2203c 100644 --- a/lms/nladmin-ui/src/views/wms/pdm/workerorder/index.vue +++ b/lms/nladmin-ui/src/views/wms/pdm/workerorder/index.vue @@ -668,7 +668,7 @@ export default { submits(row) { this.fullscreenLoading = true crudPdmBdWorkorder.submits(row).then(res => { - this.crud.notify('报工完成', CRUD.NOTIFICATION_TYPE.SUCCESS) + this.crud.notify('下发成功', CRUD.NOTIFICATION_TYPE.SUCCESS) this.crud.toQuery() }).catch(() => { this.fullscreenLoading = false @@ -690,7 +690,7 @@ export default { forceFinish(row) { this.fullscreenLoading = true crudPdmBdWorkorder.forceFinish(row).then(res => { - this.crud.notify('下发成功', CRUD.NOTIFICATION_TYPE.SUCCESS) + this.crud.notify('报工完成', CRUD.NOTIFICATION_TYPE.SUCCESS) this.crud.toQuery() }).catch(() => { this.fullscreenLoading = false diff --git a/lms/nladmin-ui/src/views/wms/sch/group/index.vue b/lms/nladmin-ui/src/views/wms/sch/group/index.vue index 313fbd5..24cdddd 100644 --- a/lms/nladmin-ui/src/views/wms/sch/group/index.vue +++ b/lms/nladmin-ui/src/views/wms/sch/group/index.vue @@ -47,6 +47,24 @@ @keyup.enter.native="crud.toQuery" /> + + + + + + - - - + + + +