diff --git a/wms-module-system/src/main/java/top/wms/admin/material/model/resp/MaterialInfoResp.java b/wms-module-system/src/main/java/top/wms/admin/material/model/resp/MaterialInfoResp.java index a9ec2aa..c51a196 100644 --- a/wms-module-system/src/main/java/top/wms/admin/material/model/resp/MaterialInfoResp.java +++ b/wms-module-system/src/main/java/top/wms/admin/material/model/resp/MaterialInfoResp.java @@ -4,7 +4,6 @@ import com.alibaba.excel.annotation.ExcelIgnore; import com.alibaba.excel.annotation.ExcelProperty; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; -import top.wms.admin.common.enums.LightLevelEnumConverter; import top.wms.admin.common.model.resp.BaseDetailResp; import java.io.Serial; diff --git a/wms-module-system/src/main/java/top/wms/admin/material/service/impl/MaterialInfoServiceImpl.java b/wms-module-system/src/main/java/top/wms/admin/material/service/impl/MaterialInfoServiceImpl.java index 0c95b69..74c0808 100644 --- a/wms-module-system/src/main/java/top/wms/admin/material/service/impl/MaterialInfoServiceImpl.java +++ b/wms-module-system/src/main/java/top/wms/admin/material/service/impl/MaterialInfoServiceImpl.java @@ -39,7 +39,6 @@ import top.continew.starter.file.excel.util.ExcelUtils; import top.continew.starter.web.util.FileUploadUtils; import top.wms.admin.common.constant.CacheConstants; import top.wms.admin.common.context.UserContextHolder; -import top.wms.admin.common.enums.LightLevelEnum; import top.wms.admin.common.util.SecureUtils; import top.wms.admin.material.mapper.MaterialInfoMapper; import top.wms.admin.material.model.entity.MaterialInfoDO; @@ -232,7 +231,9 @@ public class MaterialInfoServiceImpl extends BaseServiceImplsystem ${project.basedir}/src/main/resources/lib/jna.jar + + net.java.dev.jna + jna + 5.13.0 + @@ -202,6 +207,9 @@ logback-spring.xml + + src/main/resources/lib + ${project.build.directory}/app/${config-path} diff --git a/wms-webapi/src/main/java/top/wms/admin/controller/vm/VmCommandController.java b/wms-webapi/src/main/java/top/wms/admin/controller/vm/VmCommandController.java index 04925e9..c41cd44 100644 --- a/wms-webapi/src/main/java/top/wms/admin/controller/vm/VmCommandController.java +++ b/wms-webapi/src/main/java/top/wms/admin/controller/vm/VmCommandController.java @@ -15,8 +15,6 @@ import top.wms.admin.controller.tcp.manager.ChannelManager; import top.wms.admin.controller.tcp.service.SaveBmpTaskService; import top.wms.admin.material.mapper.MaterialInfoMapper; import top.wms.admin.material.model.entity.MaterialInfoDO; -import top.wms.admin.material.model.resp.MaterialInfoResp; -import top.wms.admin.material.service.MaterialInfoService; @Slf4j @RestController @@ -39,7 +37,8 @@ public class VmCommandController { public String sendAndWait(@RequestBody JSONObject js) { String materialCode = js.getString("materialCode"); log.info("开始比对: {}", materialCode); - MaterialInfoDO materialInfoDO = materialInfoMapper.selectOne(new QueryWrapper().eq("encoding", materialCode)); + MaterialInfoDO materialInfoDO = materialInfoMapper.selectOne(new QueryWrapper() + .eq("encoding", materialCode)); CheckUtils.throwIf(ObjectUtil.isEmpty(materialInfoDO), "物料数据异常"); CheckUtils.throwIf(StrUtil.isBlank(materialInfoDO.getMaterialProcess()), "物料流程编码不能为空"); @@ -67,7 +66,7 @@ public class VmCommandController { if (!StrUtil.equals(split[1], materialInfoDO.getColor())) { throw new BusinessException("颜色不匹配"); } - + try { double measuredDiameter = Double.parseDouble(split[2]); double difference = Math.abs(measuredDiameter - materialInfoDO.getMaterialSpec()); diff --git a/wms-webapi/src/main/java/top/wms/admin/controller/ys/NetCommon.java b/wms-webapi/src/main/java/top/wms/admin/controller/ys/NetCommon.java index b85f933..0199985 100644 --- a/wms-webapi/src/main/java/top/wms/admin/controller/ys/NetCommon.java +++ b/wms-webapi/src/main/java/top/wms/admin/controller/ys/NetCommon.java @@ -87,7 +87,7 @@ public class NetCommon { // 设备信息 String strUserName = "admin"; String strPassword = "admin@123"; - String strIPAddr = "192.168.1.13"; + String strIPAddr = "192.168.2.11"; int dwPort = 80; int dwLoginProto = 1; // 私有协议 diff --git a/wms-webapi/src/main/java/top/wms/admin/controller/ys/lib/BaseFun.java b/wms-webapi/src/main/java/top/wms/admin/controller/ys/lib/BaseFun.java index a805a8f..3aa6307 100644 --- a/wms-webapi/src/main/java/top/wms/admin/controller/ys/lib/BaseFun.java +++ b/wms-webapi/src/main/java/top/wms/admin/controller/ys/lib/BaseFun.java @@ -46,12 +46,12 @@ class BaseFun { String OsArch = getOsArch(); if (OsArch.toLowerCase().startsWith("win32-x86")) { - loadLibrary = filePath + "\\wms-webapi\\src\\main\\resources\\lib\\win32\\"; + loadLibrary = filePath + "\\config\\lib\\win32\\"; } else if (OsArch.toLowerCase().startsWith("win32-amd64")) { - loadLibrary = filePath + "\\wms-webapi\\src\\main\\resources\\lib\\win64\\"; + loadLibrary = filePath + "\\config\\lib\\win64\\"; } String loadSDKLibrary = loadLibrary + "NetDEVSDK"; System.out.printf("[Load SDKLibrary Path : %s]\n", loadSDKLibrary); return loadSDKLibrary; } -} +} \ No newline at end of file