From d6a063608225fbe8459449fc5ede2a6c11cea556 Mon Sep 17 00:00:00 2001 From: liyongde <1419499670@qq.com> Date: Thu, 1 Feb 2024 15:14:28 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=8A=A0=E6=80=A5=E5=B7=A5=E5=8D=95?= =?UTF-8?q?=E5=85=A5=E7=AA=91=E3=80=81=E5=88=86=E6=8B=A3=E6=89=B9=E6=AC=A1?= =?UTF-8?q?=E5=85=B3=E7=B3=BB=E5=AF=B9=E5=BA=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/nl/common/utils/CodeUtil.java | 2 +- .../controller/user/UserController.java | 4 +- .../acs/service/impl/AcsToWmsServiceImpl.java | 19 ++-- .../wms/ext/mes/autotask/AutoSaveGdyInfo.java | 3 + .../wms/ext/mes/service/WmsToMesService.java | 23 ++++- .../service/dao/mapper/MesRequestMapper.java | 12 +++ .../service/dao/mapper/MesRequestMapper.xml | 33 ++++++- .../mes/service/dto/MesMudConsumptionDto.java | 22 +++++ .../ext/mes/service/dto/MesSemiProDto.java | 44 +++++++++ .../wms/ext/mes/service/dto/MesSemiProVo.java | 30 ++++++ .../mes/service/impl/WmsToMesServiceImpl.java | 36 +++++++ .../wms/pda/service/impl/PdaServiceImpl.java | 6 ++ .../PdmBdVehicleBindingController.java | 13 ++- .../service/IPdmBdVehicleBindingService.java | 5 +- .../impl/PdmBdVehicleBindingServiceImpl.java | 88 ++++++++++++++--- .../ISchBaseVehiclematerialgroupService.java | 16 +++ .../SchBaseVehiclematerialgroupMapper.java | 8 ++ .../SchBaseVehiclematerialgroupMapper.xml | 10 ++ ...chBaseVehiclematerialgroupServiceImpl.java | 37 ++++--- .../service/impl/SchBaseTaskServiceImpl.java | 4 +- .../task_manage/task/tasks/fj/FJMKTask.java | 41 +++++++- .../task/tasks/gtx/HCSSXMLTask.java | 6 +- .../task_manage/task/tasks/hn/HNMLTask.java | 4 +- .../java/org/nl/wms/util/CommonUtils.java | 20 ++++ .../nlsso-server/src/main/resources/ext.dic | 2 + .../src/main/resources/logback-spring.xml | 2 +- .../src/test/java/org/nl/ext/TestDemo.java | 9 ++ .../src/layout/components/Navbar.vue | 2 +- .../src/views/system/menu/index.vue | 2 +- .../src/views/wms/pdm/vehiclebiding/index.vue | 99 ++++++++++--------- 30 files changed, 496 insertions(+), 106 deletions(-) create mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/dto/MesSemiProDto.java create mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/dto/MesSemiProVo.java diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/CodeUtil.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/CodeUtil.java index 32f0c3b..e22db65 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/CodeUtil.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/CodeUtil.java @@ -12,7 +12,7 @@ import java.util.concurrent.TimeUnit; /** * @Author: lyd - * @Description: 代码生成工具 + * @Description: 编码生成工具 * @Date: 2023/8/14 */ public class CodeUtil { diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/user/UserController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/user/UserController.java index e7b62ad..81b68e1 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/user/UserController.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/user/UserController.java @@ -106,10 +106,10 @@ public class UserController { String oldPass = RsaUtils.decryptByPrivateKey(RsaProperties.privateKey, passVo.getString("oldPass")); String newPass = RsaUtils.decryptByPrivateKey(RsaProperties.privateKey, passVo.getString("newPass")); SysUser user = userService.getOne(new LambdaQueryWrapper().eq(SysUser::getUsername, SecurityUtils.getCurrentUsername())); - if (!SaSecureUtil.md5BySalt(user.getPassword(), GeneralDefinition.SALT).equals(SaSecureUtil.md5BySalt(oldPass, GeneralDefinition.SALT))) { + if (!user.getPassword().equals(SaSecureUtil.md5BySalt(oldPass, GeneralDefinition.SALT))) { throw new BadRequestException("修改失败，旧密码错误"); } - if (!SaSecureUtil.md5BySalt(user.getPassword(), GeneralDefinition.SALT).equals(SaSecureUtil.md5BySalt(newPass, GeneralDefinition.SALT))) { + if (user.getPassword().equals(SaSecureUtil.md5BySalt(newPass, GeneralDefinition.SALT))) { throw new BadRequestException("新密码不能与旧密码相同"); } user.setPassword(SaSecureUtil.md5BySalt(newPass, GeneralDefinition.SALT)); 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 043a481..c0415ff 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 @@ -425,6 +425,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { * 分拣 - 记录钢托与木托的绑定 */ @Override + @Deprecated public BaseResponse applyGetPutStation(JSONObject param) { FeedBackSplitPalletStationRequest request = param.toJavaObject(FeedBackSplitPalletStationRequest.class); String getStation = request.getGet_station(); @@ -457,7 +458,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { if (productionTask != null) { vehicleBinding.setOrder_code(productionTask.getWorkorder_code()); } - vehicleBindingService.create(vehicleBinding); +// vehicleBindingService.create(vehicleBinding); return BaseResponse.responseOk(request.getRequestNo()); } @@ -623,12 +624,16 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { boolean tryLock = lock.tryLock(5, TimeUnit.SECONDS); try { if (tryLock) { - SchBasePoint basePoint = pointService.getById(deviceCode); // 获取点位实体 + // 获取点位实体 + SchBasePoint basePoint = pointService.getById(deviceCode); switch (basePoint.getRegion_code()) { - case GeneralDefinition.LZKLX: // 如果是困料线位置就是判断是否静置完成 - return this.isStandingFinish(baseRequest); // 直接返回 - case GeneralDefinition.GZY: // 如果是入窑口就是记录数据 - return this.recordKilnTime(baseRequest); // 直接返回 + // 如果是困料线位置就是判断是否静置完成 + case GeneralDefinition.LZKLX: + // 直接返回 + return this.isStandingFinish(baseRequest); + // 如果是入窑口就是记录数据 + case GeneralDefinition.GZY: + return this.recordKilnTime(baseRequest); default: taskResponse.setMessage("参数错误！"); taskResponse.setCode(HttpStatus.HTTP_BAD_REQUEST); @@ -703,6 +708,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { mesMudConsumptionDto.setSENDTIM(DateUtil.now()); mesMudConsumptionDto.setCREATE_TM(DateUtil.now()); mesMudConsumptionDto.setOP_FLAG(GeneralDefinition.NO); + mesMudConsumptionDto.setSLEEP_TIME(CommonUtils.dTOAMinutes(one.getInstorage_time(), DateUtil.now())); log.info("泥料消耗上报参数：{}", mesMudConsumptionDto); // 反馈数据给acs taskResponse.setMix_number(one.getMix_times()); @@ -996,6 +1002,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { PointUtils.setUpdateByAcs(endPointObj); pointService.update(endPointObj, new LambdaQueryWrapper() .eq(SchBasePoint::getPoint_code, "RYK01")); + log.info("入窑口02引发入窑口01点位更新解锁！"); } } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/autotask/AutoSaveGdyInfo.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/autotask/AutoSaveGdyInfo.java index 893a429..45bfb2c 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/autotask/AutoSaveGdyInfo.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/autotask/AutoSaveGdyInfo.java @@ -53,6 +53,9 @@ public class AutoSaveGdyInfo { if (ObjectUtil.isEmpty(mesGdyInfoDto.getBATCHNO())) { mesGdyInfoDto.setBATCHNO("-"); } + if (ObjectUtil.isEmpty(mesGdyInfoDto.getPRESSUNIT())) { + mesGdyInfoDto.setPRESSUNIT("-"); + } try { mesRequestMapper.insertGdyMaterial(mesGdyInfoDto); successNum.incrementAndGet(); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/WmsToMesService.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/WmsToMesService.java index 65412f3..6595be5 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/WmsToMesService.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/WmsToMesService.java @@ -8,6 +8,7 @@ import org.nl.wms.pdm.workorder.service.dao.PdmBdWorkorder; import org.nl.wms.sch.group.service.dao.SchBaseVehiclematerialgroup; import java.util.List; +import java.util.Map; /** * @Author: lyd @@ -190,7 +191,27 @@ public interface WmsToMesService { /** * 新增工序报废 * - * @param entity + * @param entity / */ void addScrap(ScrapDto entity); + + /** + * 上报分拣木托盘与钢托盘关系提供给MES + * @param mesSemiProDto / + */ + void reportSemiProToMes(MesSemiProDto mesSemiProDto); + + /** + * 分页获取绑定数据 + * @param whereJson / + * @param page / + * @return / + */ + IPage queryAllVehicleBinding(Map whereJson, PageQuery page); + + /** + * 更新上报数据 + * @param entity / + */ + void updateByMesSemiProVo(MesSemiProVo entity); } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/dao/mapper/MesRequestMapper.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/dao/mapper/MesRequestMapper.java index 88b2a77..d372cdf 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/dao/mapper/MesRequestMapper.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/dao/mapper/MesRequestMapper.java @@ -121,4 +121,16 @@ public interface MesRequestMapper { @DS("oracle") void reportSemiProductGXPF(SemiProductGXPFDo semiProductGXPFDo); + + @DS("oracle") + void reportSemiProToMes(MesSemiProDto mesSemiProDto); + + @DS("oracle") + List selectMesSemiProInfo(int currentPage, int currentSize); + + @DS("oracle") + int getSemiProTotal(); + + @DS("oracle") + void updateByMesSemiProVo(MesSemiProVo entity); } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/dao/mapper/MesRequestMapper.xml b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/dao/mapper/MesRequestMapper.xml index bc55cf1..b278aff 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/dao/mapper/MesRequestMapper.xml +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/dao/mapper/MesRequestMapper.xml @@ -4,9 +4,9 @@ INSERT INTO "LMSTELCOM"."RECEIVE_MUDMATERIEL_OUT"( MSGID, PWORKSCHE_ID, OUT_FINNUM, PRESSUNIT, FBAGCODE, LOGT , SENDTIM - , CREATE_TM, OP_FLAG) + , CREATE_TM, OP_FLAG, SLEEP_TIME) VALUES ( #{MSGID}, #{PWORKSCHE_ID}, #{OUT_FINNUM}, #{PRESSUNIT}, #{FBAGCODE}, #{LOGT} - , #{SENDTIM}, #{CREATE_TM}, #{OP_FLAG}) + , #{SENDTIM}, #{CREATE_TM}, #{OP_FLAG}, #{SLEEP_TIME}) INSERT INTO "LMSTELCOM"."RECEIVE_R_SEMIPRODUCT"( MSGID, FORDER_NO, PWORKSCHE_ID, FPRODUCT_MATERIAL_ID @@ -157,6 +157,16 @@ , #{EDTPFJJ_PROMATNO} , #{CHECKERIN}, #{CHECKERIN_TIM}, #{CREATE_TM}, #{OP_FLAG}) + + INSERT INTO "LMSTELCOM"."RECEIVE_SEMIPRO_VS_PRO"( RECORD_ID, WOOD_VEHICLE_CODE, WOOD_QTY, WOOD_PCSN + , STEEL_VEHICLE_CODE1, STEEL_QTY1 , STEEL_PCSN1 + , STEEL_VEHICLE_CODE2, STEEL_QTY2, STEEL_PCSN2 + , STEEL_VEHICLE_CODE3, STEEL_QTY3 + , STEEL_PCSN3, RECORD_TIME, CREATE_TM, OP_FLAG) + VALUES ( #{RECORD_ID}, #{WOOD_VEHICLE_CODE}, #{WOOD_QTY}, #{WOOD_PCSN}, #{STEEL_VEHICLE_CODE1}, #{STEEL_QTY1} + , #{STEEL_PCSN1} , #{STEEL_VEHICLE_CODE2}, #{STEEL_QTY2}, #{STEEL_PCSN2}, #{STEEL_VEHICLE_CODE3} + , #{STEEL_QTY3}, #{STEEL_PCSN3}, #{RECORD_TIME}, #{CREATE_TM}, #{OP_FLAG}) + UPDATE "LMSTELCOM"."SEND_POP_SCHEDULE_PRESS" SET OP_FLAG = '1' @@ -165,6 +175,15 @@ #{item} + + UPDATE "LMSTELCOM"."RECEIVE_SEMIPRO_VS_PRO" + SET WOOD_VEHICLE_CODE = #{wood_VEHICLE_CODE}, WOOD_QTY = #{wood_QTY}, WOOD_PCSN = #{wood_PCSN} + , STEEL_VEHICLE_CODE1 = #{steel_VEHICLE_CODE1}, STEEL_QTY1 = #{steel_QTY1}, STEEL_PCSN1 = #{steel_PCSN1} + , STEEL_VEHICLE_CODE2 = #{steel_VEHICLE_CODE2}, STEEL_QTY2 = #{steel_QTY2}, STEEL_PCSN2 = #{steel_PCSN2} + , STEEL_VEHICLE_CODE3 = #{steel_VEHICLE_CODE3}, STEEL_QTY3 = #{steel_PCSN2} + , STEEL_PCSN3 = #{steel_PCSN3}, RECORD_TIME = #{record_TIME} + WHERE RECORD_ID = #{record_ID} + + + diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/dto/MesMudConsumptionDto.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/dto/MesMudConsumptionDto.java index 050f915..5b308a2 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/dto/MesMudConsumptionDto.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/dto/MesMudConsumptionDto.java @@ -61,11 +61,33 @@ public class MesMudConsumptionDto implements Serializable { * 出库理论重量 */ private BigDecimal OUT_THEONUM; + /** + * 压机 + */ private String PRESSUNIT; + /** + * 用料时间 + */ private String SENDTIM; + /** + * 用料人 + */ private String SENDER; + /** + * 创建时间 + */ private String CREATE_TM; + /** + * 标记 + */ private String OP_FLAG; + /** + * 读取时间 + */ private String OP_TM; + /** + * 实际困料时间 + */ + private BigDecimal SLEEP_TIME; } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/dto/MesSemiProDto.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/dto/MesSemiProDto.java new file mode 100644 index 0000000..39fd403 --- /dev/null +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/dto/MesSemiProDto.java @@ -0,0 +1,44 @@ +package org.nl.wms.ext.mes.service.dto; + +import lombok.Data; + +/** + * @Author: lyd + * @Description: 提供MES的人工码垛的对应关系和自动码垛的对应关系表 + * @Date: 2024/1/24 + * 标识 + * 木托盘编码 + * 木托盘对应的数量 + * 木托盘对应的批次 + * 钢托盘1编码 + * 钢托盘1数量 + * 钢托盘1批次 + * 钢托盘2编码 + * 钢托盘2数量 + * 钢托盘2批次 + * 钢托盘3编码 + * 钢托盘3数量 + * 钢托盘3批次 + * 保存时间 + */ +@Data +public class MesSemiProDto { + private String RECORD_ID; + private String WOOD_VEHICLE_CODE; + private String WOOD_QTY; + private String WOOD_PCSN; + private String STEEL_VEHICLE_CODE1; + private String STEEL_QTY1; + private String STEEL_PCSN1; + private String STEEL_VEHICLE_CODE2; + private String STEEL_QTY2; + private String STEEL_PCSN2; + private String STEEL_VEHICLE_CODE3; + private String STEEL_QTY3; + private String STEEL_PCSN3; + private String RECORD_TIME; + private String CREATE_TM; + private String OP_FLAG; + private String OP_TM; + private String OP_REPLAY; +} diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/dto/MesSemiProVo.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/dto/MesSemiProVo.java new file mode 100644 index 0000000..f439f7c --- /dev/null +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/dto/MesSemiProVo.java @@ -0,0 +1,30 @@ +package org.nl.wms.ext.mes.service.dto; + +import lombok.Data; + +/** + * @Author: lyd + * @Description: + * @Date: 2024/1/24 + */ +@Data +public class MesSemiProVo { + private String record_ID; + private String wood_VEHICLE_CODE; + private String wood_QTY; + private String wood_PCSN; + private String steel_VEHICLE_CODE1; + private String steel_QTY1; + private String steel_PCSN1; + private String steel_VEHICLE_CODE2; + private String steel_QTY2; + private String steel_PCSN2; + private String steel_VEHICLE_CODE3; + private String steel_QTY3; + private String steel_PCSN3; + private String record_TIME; + private String create_TM; + private String op_FLAG; + private String op_TM; + private String op_REPLAY; +} 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 018a0f1..602f4fa 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 @@ -35,6 +35,7 @@ import org.springframework.stereotype.Service; import java.math.BigDecimal; import java.util.ArrayList; import java.util.List; +import java.util.Map; import java.util.stream.Collectors; /** @@ -512,6 +513,41 @@ public class WmsToMesServiceImpl implements WmsToMesService { mesRequestMapper.reportSemiProductGXPF(semiProductGXPFDo); } + @Override + public void reportSemiProToMes(MesSemiProDto mesSemiProDto) { + log.info("分拣上报信息：{}", mesSemiProDto); + try { + mesRequestMapper.reportSemiProToMes(mesSemiProDto); + } catch (Exception e) { + log.error("分拣-上报MES分拣对应关系数据：{}", mesSemiProDto); + log.error("分拣插入MES分拣对应关系失败：{}", e.getMessage()); + noticeService.createNotice("分拣插入MES分拣对应关系失败", "分拣" + mesSemiProDto.getRECORD_ID(), + NoticeTypeEnum.EXCEPTION.getCode()); + } + } + + @Override + public IPage queryAllVehicleBinding(Map whereJson, PageQuery pageQuery) { + Integer page = pageQuery.getPage(); + Integer size = pageQuery.getSize(); + IPage pages = new Page<>(page, size); + // start + int currentPage = page * size + 1; + // end + int currentSize = (pageQuery.getPage() + 1) * size; + List mesSemiProDtos = mesRequestMapper.selectMesSemiProInfo(currentPage, currentSize); + pages.setRecords(mesSemiProDtos); + int total = mesRequestMapper.getSemiProTotal(); + pages.setTotal(total); + return pages; + } + + @Override + public void updateByMesSemiProVo(MesSemiProVo entity) { + entity.setRecord_TIME(DateUtil.now()); + mesRequestMapper.updateByMesSemiProVo(entity); + } + /** * 转换 * diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/impl/PdaServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/impl/PdaServiceImpl.java index 1ac6f66..17f26ca 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/impl/PdaServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/impl/PdaServiceImpl.java @@ -325,6 +325,9 @@ public class PdaServiceImpl implements PdaService { @Override public PdaResponseVo bindingVehicle(VehicleBindingDto vehicleBindingDto) { + if (true) { + throw new BadRequestException("该功能未开放，请到PC端操作。"); + } PdmBdWorkorder workOrder = workorderService.getDeviceProductionTask("RGFJ01"); if (ObjectUtil.isEmpty(workOrder)) { throw new BadRequestException("人工分拣未开工"); @@ -368,6 +371,9 @@ public class PdaServiceImpl implements PdaService { // 获取点位 shelfSaveDto.setPoint_code(pointCode); SchBasePoint basePoint = pointService.getById(shelfSaveDto.getPoint_code()); + if (ObjectUtil.isEmpty(basePoint)) { + throw new BadRequestException("库位【" + pointCode + "】不存在"); + } basePoint.setPoint_status(shelfSaveDto.getPoint_status()); PointUtils.setUpdateByPC(basePoint); if (shelfSaveDto.getPoint_status().equals(PointStatusEnum.EMPTY_POINT.getCode())) { diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/vehiclebiding/controller/PdmBdVehicleBindingController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/vehiclebiding/controller/PdmBdVehicleBindingController.java index 222c19d..65a4379 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/vehiclebiding/controller/PdmBdVehicleBindingController.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/vehiclebiding/controller/PdmBdVehicleBindingController.java @@ -5,6 +5,9 @@ import lombok.extern.slf4j.Slf4j; import org.nl.common.base.TableDataInfo; import org.nl.common.domain.query.PageQuery; import org.nl.common.logging.annotation.Log; +import org.nl.wms.ext.mes.service.WmsToMesService; +import org.nl.wms.ext.mes.service.dto.MesSemiProDto; +import org.nl.wms.ext.mes.service.dto.MesSemiProVo; import org.nl.wms.pdm.vehiclebiding.service.IPdmBdVehicleBindingService; import org.nl.wms.pdm.vehiclebiding.service.dao.PdmBdVehicleBinding; import org.springframework.beans.factory.annotation.Autowired; @@ -28,20 +31,20 @@ public class PdmBdVehicleBindingController { @Autowired private IPdmBdVehicleBindingService pdmBdVehicleBindingService; + @Autowired + private WmsToMesService wmsToMesService; @GetMapping @Log("查询分拣载具关联记录") - //@SaCheckPermission("@el.check('pdmBdVehicleBinding:list')") public ResponseEntity query(@RequestParam Map whereJson, PageQuery page) { - return new ResponseEntity<>(TableDataInfo.build(pdmBdVehicleBindingService.queryAll(whereJson, page)), HttpStatus.OK); + return new ResponseEntity<>(TableDataInfo.build(wmsToMesService.queryAllVehicleBinding(whereJson, page)), HttpStatus.OK); } @PostMapping @Log("新增分拣载具关联记录") - //@SaCheckPermission("@el.check('pdmBdVehicleBinding:add')") - public ResponseEntity create(@Validated @RequestBody PdmBdVehicleBinding entity) { + public ResponseEntity create(@RequestBody MesSemiProVo entity) { pdmBdVehicleBindingService.create(entity); return new ResponseEntity<>(HttpStatus.CREATED); } @@ -50,7 +53,7 @@ public class PdmBdVehicleBindingController { @Log("修改分拣载具关联记录") //@SaCheckPermission("@el.check('pdmBdVehicleBinding:edit')") - public ResponseEntity update(@Validated @RequestBody PdmBdVehicleBinding entity) { + public ResponseEntity update( @RequestBody MesSemiProVo entity) { pdmBdVehicleBindingService.update(entity); return new ResponseEntity<>(HttpStatus.NO_CONTENT); } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/vehiclebiding/service/IPdmBdVehicleBindingService.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/vehiclebiding/service/IPdmBdVehicleBindingService.java index 0b32c06..4977271 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/vehiclebiding/service/IPdmBdVehicleBindingService.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/vehiclebiding/service/IPdmBdVehicleBindingService.java @@ -3,6 +3,7 @@ package org.nl.wms.pdm.vehiclebiding.service; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; import org.nl.common.domain.query.PageQuery; +import org.nl.wms.ext.mes.service.dto.MesSemiProVo; import org.nl.wms.pdm.vehiclebiding.service.dao.PdmBdVehicleBinding; import java.util.Map; @@ -29,14 +30,14 @@ public interface IPdmBdVehicleBindingService extends IService queryAll(Map whereJson, PageQuery page) { + // update: 换成从MES获取 LambdaQueryWrapper lam = new LambdaQueryWrapper<>(); IPage pages = new Page<>(page.getPage() + 1, page.getSize()); pdmBdVehicleBindingMapper.selectPage(pages, lam); @@ -39,23 +52,70 @@ public class PdmBdVehicleBindingServiceImpl extends ServiceImpl + diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/impl/SchBaseVehiclematerialgroupServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/impl/SchBaseVehiclematerialgroupServiceImpl.java index 6a34554..a5ed855 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/impl/SchBaseVehiclematerialgroupServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/impl/SchBaseVehiclematerialgroupServiceImpl.java @@ -12,13 +12,10 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import lombok.extern.slf4j.Slf4j; import org.nl.common.domain.query.PageQuery; import org.nl.common.utils.SecurityUtils; -import org.nl.wms.database.material.service.IMdBaseMaterialService; -import org.nl.wms.pdm.workorder.service.IPdmBdWorkorderService; import org.nl.wms.sch.group.service.ISchBaseVehiclematerialgroupService; import org.nl.wms.sch.group.service.dao.SchBaseVehiclematerialgroup; import org.nl.wms.sch.group.service.dao.mapper.SchBaseVehiclematerialgroupMapper; import org.nl.wms.sch.group.service.dto.SchBaseVehiclematerialgroupQuery; -import org.nl.wms.sch.point.service.ISchBasePointService; import org.nl.wms.sch.task_manage.GeneralDefinition; import org.nl.wms.sch.task_manage.enums.GroupBindMaterialStatusEnum; import org.nl.wms.util.TaskUtils; @@ -40,12 +37,6 @@ public class SchBaseVehiclematerialgroupServiceImpl extends ServiceImpl queryAll(SchBaseVehiclematerialgroupQuery whereJson, PageQuery page) { @@ -123,7 +114,8 @@ public class SchBaseVehiclematerialgroupServiceImpl extends ServiceImpl lambda = new QueryWrapper().lambda(); lambda.eq(SchBaseVehiclematerialgroup::getVehicle_code, vehicleCode) .eq(SchBaseVehiclematerialgroup::getGroup_bind_material_status, value) - .eq(SchBaseVehiclematerialgroup::getIs_delete, false); + .eq(SchBaseVehiclematerialgroup::getIs_delete, false) + .orderByDesc(SchBaseVehiclematerialgroup::getUpdate_time); List selectOne = vehiclematerialgroupMapper.selectList(lambda); return selectOne.size() > 0 ? selectOne.get(0) : null; } @@ -138,7 +130,8 @@ public class SchBaseVehiclematerialgroupServiceImpl extends ServiceImpl lambda = new QueryWrapper().lambda(); lambda.eq(SchBaseVehiclematerialgroup::getVehicle_code, vehicleCode) .eq(SchBaseVehiclematerialgroup::getVehicle_type, vehicleType) - .ne(SchBaseVehiclematerialgroup::getGroup_bind_material_status, GroupBindMaterialStatusEnum.BOUND.getValue()) + // 不是解绑的 + .ne(SchBaseVehiclematerialgroup::getGroup_bind_material_status, GroupBindMaterialStatusEnum.UNBOUND.getValue()) .eq(SchBaseVehiclematerialgroup::getIs_delete, false); List list = vehiclematerialgroupMapper.selectList(lambda); list.forEach(schBaseVehiclematerialgroup -> { @@ -163,4 +156,26 @@ public class SchBaseVehiclematerialgroupServiceImpl extends ServiceImpl 0 ? selectOne.get(0) : null; } + @Override + public String getNowOrOldPcsnByVehicleCode(String vehicleCode, String vehicleType) { + if ("-".equals(vehicleCode)) { + return "-"; + } + String pcsn = vehiclematerialgroupMapper.getNowOrOldPcsnByVehicleCode(vehicleCode, vehicleType); + return ObjectUtil.isNotEmpty(pcsn) ? pcsn : "-"; + } + + @Override + public SchBaseVehiclematerialgroup getGroupInfoNoTypeAndWood(String vehicleCode, String value) { + LambdaQueryWrapper lambda = new QueryWrapper().lambda(); + lambda.eq(SchBaseVehiclematerialgroup::getVehicle_code, vehicleCode) + .eq(SchBaseVehiclematerialgroup::getGroup_bind_material_status, value) + .eq(SchBaseVehiclematerialgroup::getIs_delete, false) + .ne(SchBaseVehiclematerialgroup::getVehicle_type, GeneralDefinition.STEEL_TRAY) + .ne(SchBaseVehiclematerialgroup::getVehicle_type, GeneralDefinition.MATERIAL_CUP) + .orderByDesc(SchBaseVehiclematerialgroup::getUpdate_time); + List selectOne = vehiclematerialgroupMapper.selectList(lambda); + return selectOne.size() > 0 ? selectOne.get(0) : null; + } + } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/impl/SchBaseTaskServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/impl/SchBaseTaskServiceImpl.java index 78d1237..3e80cfa 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/impl/SchBaseTaskServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/impl/SchBaseTaskServiceImpl.java @@ -142,8 +142,8 @@ public class SchBaseTaskServiceImpl extends ServiceImpl findApplyTasksByTaskStatus(String... config_code) { - List configList = Arrays.stream(config_code).collect(Collectors.toList()); + public List findApplyTasksByTaskStatus(String... configCode) { + List configList = Arrays.stream(configCode).collect(Collectors.toList()); LambdaQueryWrapper lam = new LambdaQueryWrapper<>(); lam.in(SchBaseTask::getConfig_code, configList) .eq(SchBaseTask::getTask_status, TaskStatus.APPLY.getCode()) diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJMKTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJMKTask.java index f5d7457..625e24d 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJMKTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJMKTask.java @@ -5,10 +5,12 @@ import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.ObjectUtil; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; +import com.baomidou.dynamic.datasource.annotation.DSTransactional; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import org.nl.common.exception.BadRequestException; import org.nl.system.service.notice.ISysNoticeService; -import org.nl.wms.ext.acs.service.WmsToAcsService; +import org.nl.wms.ext.mes.service.WmsToMesService; +import org.nl.wms.ext.mes.service.dto.MesSemiProDto; import org.nl.wms.pdm.workorder.service.IPdmBdWorkorderService; import org.nl.wms.pdm.workorder.service.dao.PdmBdWorkorder; import org.nl.wms.sch.group.service.ISchBaseVehiclematerialgroupService; @@ -60,7 +62,7 @@ public class FJMKTask extends AbstractTask { @Autowired private ISchBaseVehiclematerialgroupService vehiclematerialgroupService; @Autowired - private WmsToAcsService wmsToAcsService; + private WmsToMesService wmsToMesService; @Override public void create() throws BadRequestException { @@ -135,7 +137,7 @@ public class FJMKTask extends AbstractTask { } @Override - @Transactional(rollbackFor = Exception.class) + @DSTransactional(rollbackFor = Exception.class) public void createCompletion(SchBaseTask task) { // 配置信息 SchBaseTaskconfig taskConfig = taskConfigService.getOne(new LambdaQueryWrapper() @@ -206,6 +208,20 @@ public class FJMKTask extends AbstractTask { if (isFull == null) { isFull = GeneralDefinition.YES; } + // update: 新增钢托盘对应的数量和批次和钢托盘号 + // hint: 获取各自组盘信息。这里可能被解绑了，所以，未解绑的数据没拿到，就拿解绑的数据 + String qty1 = ObjectUtil.isNotEmpty(param.getString("qty1")) ? param.getString("qty1") : "-"; + String vehicleCode1 = ObjectUtil.isNotEmpty(param.getString("vehicle_code1")) + ? param.getString("vehicle_code1") : "-"; + String pcsn1 = vehiclematerialgroupService.getNowOrOldPcsnByVehicleCode(vehicleCode1, GeneralDefinition.STEEL_TRAY); + String qty2 = ObjectUtil.isNotEmpty(param.getString("qty2")) ? param.getString("qty2") : "-"; + String vehicleCode2 = ObjectUtil.isNotEmpty(param.getString("vehicle_code2")) + ? param.getString("vehicle_code2") : "-"; + String pcsn2 = vehiclematerialgroupService.getNowOrOldPcsnByVehicleCode(vehicleCode2, GeneralDefinition.STEEL_TRAY); + String qty3 = ObjectUtil.isNotEmpty(param.getString("qty3")) ? param.getString("qty3") : "-"; + String vehicleCode3 = ObjectUtil.isNotEmpty(param.getString("vehicle_code3")) + ? param.getString("vehicle_code3") : "-"; + String pcsn3 = vehiclematerialgroupService.getNowOrOldPcsnByVehicleCode(vehicleCode3, GeneralDefinition.STEEL_TRAY); // 砖块数量 Integer qty = param.getInteger("qty"); SchBasePoint basePoint = pointService.getById(deviceCode); @@ -246,6 +262,25 @@ public class FJMKTask extends AbstractTask { groupEntity.setIs_delete(false); groupEntity.setIs_full(isFull.equals(GeneralDefinition.YES)); vehiclematerialgroupService.saveOrUpdate(groupEntity); + // hint: 记录数据上报MES + MesSemiProDto mesSemiProDto = new MesSemiProDto(); + mesSemiProDto.setRECORD_ID(IdUtil.getSnowflake(1, 1).nextIdStr()); + mesSemiProDto.setWOOD_VEHICLE_CODE(vehicleCode); + mesSemiProDto.setWOOD_QTY(String.valueOf(qty)); + mesSemiProDto.setWOOD_PCSN(groupEntity.getPcsn()); + mesSemiProDto.setSTEEL_VEHICLE_CODE1(vehicleCode1); + mesSemiProDto.setSTEEL_VEHICLE_CODE2(vehicleCode2); + mesSemiProDto.setSTEEL_VEHICLE_CODE3(vehicleCode3); + mesSemiProDto.setSTEEL_PCSN1(pcsn1); + mesSemiProDto.setSTEEL_PCSN2(pcsn2); + mesSemiProDto.setSTEEL_PCSN3(pcsn3); + mesSemiProDto.setSTEEL_QTY1(qty1); + mesSemiProDto.setSTEEL_QTY2(qty2); + mesSemiProDto.setSTEEL_QTY3(qty3); + mesSemiProDto.setRECORD_TIME(DateUtil.now()); + mesSemiProDto.setCREATE_TM(DateUtil.now()); + mesSemiProDto.setOP_FLAG(GeneralDefinition.NO); + wmsToMesService.reportSemiProToMes(mesSemiProDto); // 返回组盘id记录任务中 return groupEntity.getGroup_id(); } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/gtx/HCSSXMLTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/gtx/HCSSXMLTask.java index 30e8332..a8881e2 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/gtx/HCSSXMLTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/gtx/HCSSXMLTask.java @@ -136,11 +136,7 @@ public class HCSSXMLTask extends AbstractTask { @Transactional(rollbackFor = Exception.class) public void finishTask(SchBaseTask taskObj, TaskFinishedTypeEnum taskFinishedType) { - String endPoint = taskObj.getPoint_code2(); - SchBasePoint endPointObj = pointService.selectByIdLock(endPoint); - if (ObjectUtil.isNotEmpty(endPointObj)) { - // update: 终点解锁 - 解锁由入窑口02上报有货修改 - } + // update: 终点解锁 - 解锁由入窑口02上报有货修改 // 任务完成 taskObj.setTask_status(TaskStatus.FINISHED.getCode()); taskObj.setRemark(GeneralDefinition.TASK_FINISH); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/hn/HNMLTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/hn/HNMLTask.java index 48af39d..f697233 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/hn/HNMLTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/hn/HNMLTask.java @@ -222,7 +222,6 @@ public class HNMLTask extends AbstractTask { String requestParam = taskObj.getRequest_param(); JSONObject responseObj = JSONObject.parseObject(responseParam); JSONObject requestObj = JSONObject.parseObject(requestParam); - String recordId = requestObj.getString("record_id"); // 要把数据存到组盘表。压制工单放进去， SchBaseVehiclematerialgroup groupEntity = vehiclematerialgroupService.getOne( new LambdaQueryWrapper() @@ -251,7 +250,8 @@ public class HNMLTask extends AbstractTask { PointUtils.setUpdateByType(yjDevice, taskFinishedType); yjDevice.setPoint_status(PointStatusEnum.FULL_POINT.getCode()); pointService.updateById(yjDevice); - PdmBdRequestMaterialRecord materialRecord = requestMaterialRecordService.getById(recordId); + PdmBdRequestMaterialRecord materialRecord = requestMaterialRecordService + .getById(requestObj.getString("record_id")); // 找压机工单 -> 根据压机要料表对应的工单 PdmBdWorkorder one = workorderService.getByCode(materialRecord.getWorkorder_id()); if (ObjectUtil.isNotEmpty(one)) { diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/util/CommonUtils.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/util/CommonUtils.java index 2a6ce6f..069c765 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/util/CommonUtils.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/util/CommonUtils.java @@ -7,6 +7,7 @@ import org.nl.wms.ext.acs.service.dto.to.acs.PutActionRequest; import org.nl.wms.sch.task_manage.enums.TagNameEnum; import org.slf4j.MDC; +import java.math.BigDecimal; import java.text.ParseException; import java.text.SimpleDateFormat; import java.time.Duration; @@ -123,4 +124,23 @@ public class CommonUtils { return list; } + public static BigDecimal dTOAMinutes(String data1, String data2) { + String dateFormat = "yyyy-MM-dd HH:mm:ss"; + SimpleDateFormat sdf = new SimpleDateFormat(dateFormat); + try { + // 解析第一个时间字符串 + Date date1 = sdf.parse(data1); + // 解析第二个时间字符串 + Date date2 = sdf.parse(data2); + // 计算分钟差 + long differenceInMilliseconds = date2.getTime() - date1.getTime(); + long differenceInMinutes = differenceInMilliseconds / (60 * 1000); + return BigDecimal.valueOf(differenceInMinutes); + } catch (ParseException e) { + log.error("计算时间差出错-参数：{} - 异常信息：{}", data1+"-"+data2, e.getMessage()); + e.printStackTrace(); + } + return BigDecimal.valueOf(0); + } + } 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 43a61b3..2214799 100644 --- a/lms/nladmin-system/nlsso-server/src/main/resources/ext.dic +++ b/lms/nladmin-system/nlsso-server/src/main/resources/ext.dic @@ -29,3 +29,5 @@ 自动下发混碾 下发混碾失败 看板【当月工单】日志 +分拣-上报MES分拣对应关系数据 +分拣插入MES分拣对应关系失败 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 4d56868..cf8dcc9 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 @@ -51,7 +51,7 @@ https://juejin.cn/post/6844903775631572999 - DEBUG + INFO ACCEPT DENY diff --git a/lms/nladmin-system/nlsso-server/src/test/java/org/nl/ext/TestDemo.java b/lms/nladmin-system/nlsso-server/src/test/java/org/nl/ext/TestDemo.java index 3e4cd90..0581317 100644 --- a/lms/nladmin-system/nlsso-server/src/test/java/org/nl/ext/TestDemo.java +++ b/lms/nladmin-system/nlsso-server/src/test/java/org/nl/ext/TestDemo.java @@ -13,6 +13,7 @@ import org.nl.common.utils.CodeUtil; import org.nl.wms.ext.acs.service.dto.to.wms.ApplyDeviceDto; import org.nl.wms.ext.mes.service.WmsToMesService; import org.nl.wms.ext.mes.service.dao.mapper.MesRequestMapper; +import org.nl.wms.sch.group.service.ISchBaseVehiclematerialgroupService; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; @@ -36,6 +37,8 @@ public class TestDemo { private MesRequestMapper mesRequestMapper; @Autowired private WmsToMesService wmsToMesService; + @Autowired + private ISchBaseVehiclematerialgroupService vehiclematerialgroupService; private static AtomicInteger countUp = new AtomicInteger(0); // 上层数量 private static AtomicInteger countLower = new AtomicInteger(0); // 下层数量 @Test @@ -184,4 +187,10 @@ public class TestDemo { } } + + @Test + void getVG() { + String pcsn = vehiclematerialgroupService.getNowOrOldPcsnByVehicleCode("1031", "GTP"); + System.out.println(pcsn); + } } diff --git a/lms/nladmin-ui/src/layout/components/Navbar.vue b/lms/nladmin-ui/src/layout/components/Navbar.vue index 011b261..e2a8a4c 100644 --- a/lms/nladmin-ui/src/layout/components/Navbar.vue +++ b/lms/nladmin-ui/src/layout/components/Navbar.vue @@ -129,7 +129,7 @@ export default { }, initWebSocket() { // const wsUri = (process.env.VUE_APP_WS_API === '/' ? '/' : (process.env.VUE_APP_WS_API + '/')) + 'messageInfo' - const wsUri = window.g.prod.VUE_APP_BASE_API.replace('http', 'ws') + '/webSocket/' + 'messageInfo' + const wsUri = process.env.VUE_APP_WS_API + '/webSocket/' + 'messageInfo' this.websock = new WebSocket(wsUri) this.websock.onerror = this.webSocketOnError this.websock.onmessage = this.webSocketOnMessage diff --git a/lms/nladmin-ui/src/views/system/menu/index.vue b/lms/nladmin-ui/src/views/system/menu/index.vue index c7b5c58..3c30e46 100644 --- a/lms/nladmin-ui/src/views/system/menu/index.vue +++ b/lms/nladmin-ui/src/views/system/menu/index.vue @@ -241,7 +241,7 @@ export default { name: 'Menu', components: { Treeselect, IconSelect, crudOperation, rrOperation, udOperation, DateRangePicker }, cruds() { - return CRUD({ title: '菜单', idField: 'menu_id', url: 'api/sysMenu', crudMethod: { ...crudMenu }}) + return CRUD({ title: '菜单', idField: 'menu_id', crudMethod: { ...crudMenu }}) }, mixins: [presenter(), header(), form(defaultForm), crud()], dicts: ['system_type'], diff --git a/lms/nladmin-ui/src/views/wms/pdm/vehiclebiding/index.vue b/lms/nladmin-ui/src/views/wms/pdm/vehiclebiding/index.vue index 7cf04f9..3558605 100644 --- a/lms/nladmin-ui/src/views/wms/pdm/vehiclebiding/index.vue +++ b/lms/nladmin-ui/src/views/wms/pdm/vehiclebiding/index.vue @@ -5,37 +5,31 @@ - - - - + + + + - - + + - - + + - - + + - - + + - - + + - - + + - - - - - - - - + +
@@ -46,20 +40,24 @@ - - - - - - - - - - + + + + + + + + + + + + + @@ -80,17 +78,24 @@ import udOperation from '@crud/UD.operation' import pagination from '@crud/Pagination' const defaultForm = { - associate_id: null, - origin_vehicle_code: null, - origin_vehicle_type: null, - target_vehicle_code: null, - target_vehicle_type: null, - origin_qty: null, - target_qty: null, - get_station: null, - put_station: null, - order_code: null, - record_time: null + record_ID: null, + wood_VEHICLE_CODE: null, + wood_QTY: null, + wood_PCSN: null, + steel_VEHICLE_CODE1: null, + steel_QTY1: null, + steel_PCSN1: null, + steel_VEHICLE_CODE2: null, + steel_QTY2: null, + steel_PCSN2: null, + steel_VEHICLE_CODE3: null, + steel_QTY3: null, + steel_PCSN3: null, + record_TIME: null, + create_TM: null, + op_FLAG: null, + op_TM: null, + op_REPLAY: null } export default { name: 'PdmBdVehicleBinding', @@ -100,8 +105,8 @@ export default { return CRUD({ title: '分拣载具关联记录', url: 'api/pdmBdVehicleBinding', - idField: 'associate_id', - sort: 'associate_id,desc', + idField: 'record_ID', + sort: 'record_id,desc', crudMethod: { ...crudPdmBdVehicleBinding } }) },