diff --git a/wms-module-system/src/main/java/top/wms/admin/fullWorkOrder/model/query/FullWorkOrderQuery.java b/wms-module-system/src/main/java/top/wms/admin/fullWorkOrder/model/query/FullWorkOrderQuery.java index 35c1002..4b4b713 100644 --- a/wms-module-system/src/main/java/top/wms/admin/fullWorkOrder/model/query/FullWorkOrderQuery.java +++ b/wms-module-system/src/main/java/top/wms/admin/fullWorkOrder/model/query/FullWorkOrderQuery.java @@ -6,8 +6,6 @@ import lombok.Data; import io.swagger.v3.oas.annotations.media.Schema; import org.springframework.format.annotation.DateTimeFormat; -import top.continew.starter.data.core.annotation.Query; -import top.continew.starter.data.core.enums.QueryType; import java.io.Serial; import java.io.Serializable; diff --git a/wms-module-system/src/main/java/top/wms/admin/fullWorkOrder/model/req/FullWorkOrderReq.java b/wms-module-system/src/main/java/top/wms/admin/fullWorkOrder/model/req/FullWorkOrderReq.java index 1a7ebb6..dde32bc 100644 --- a/wms-module-system/src/main/java/top/wms/admin/fullWorkOrder/model/req/FullWorkOrderReq.java +++ b/wms-module-system/src/main/java/top/wms/admin/fullWorkOrder/model/req/FullWorkOrderReq.java @@ -60,7 +60,6 @@ public class FullWorkOrderReq implements Serializable { @NotBlank(message = "批次号不能为空") private String batch; - /** * 标记号 */ @@ -68,7 +67,6 @@ public class FullWorkOrderReq implements Serializable { @NotBlank(message = "标记号不能为空") private String mark; - /** * 数量 */ diff --git a/wms-module-system/src/main/java/top/wms/admin/fullWorkOrder/service/impl/FullWorkOrderServiceImpl.java b/wms-module-system/src/main/java/top/wms/admin/fullWorkOrder/service/impl/FullWorkOrderServiceImpl.java index b381868..7c65270 100644 --- a/wms-module-system/src/main/java/top/wms/admin/fullWorkOrder/service/impl/FullWorkOrderServiceImpl.java +++ b/wms-module-system/src/main/java/top/wms/admin/fullWorkOrder/service/impl/FullWorkOrderServiceImpl.java @@ -42,7 +42,6 @@ public class FullWorkOrderServiceImpl extends BaseServiceImpl page(FullWorkOrderQuery query, PageQuery pageQuery) { QueryWrapper queryWrapper = new QueryWrapper<>(); @@ -50,16 +49,16 @@ public class FullWorkOrderServiceImpl extends BaseServiceImpl page = baseMapper.selectFullWorkOrderPage(new Page<>(pageQuery.getPage(), pageQuery - .getSize()), queryWrapper); + .getSize()), queryWrapper); return PageResp.build(page); } - @Override public void beforeAdd(FullWorkOrderReq req) { String timestamp = DateUtil.format(new Date(), "yyyyMMddHHmmss"); 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 d41b3a0..6061518 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 @@ -86,17 +86,19 @@ public class MaterialInfoServiceImpl extends BaseServiceImpl().eq(MaterialInfoDO::getEncoding, materialInfoReq.getEncoding())); + MaterialInfoDO materialInfoDO = baseMapper.selectOne(new LambdaQueryWrapper() + .eq(MaterialInfoDO::getEncoding, materialInfoReq.getEncoding())); CheckUtils.throwIf(materialInfoDO != null, "物料编码已存在"); } @Override public void beforeUpdate(MaterialInfoReq materialInfoReq, Long id) { - MaterialInfoDO materialInfoDO = baseMapper.selectOne(new LambdaQueryWrapper().eq(MaterialInfoDO::getEncoding, materialInfoReq.getEncoding()).ne(MaterialInfoDO::getId, id)); + MaterialInfoDO materialInfoDO = baseMapper.selectOne(new LambdaQueryWrapper() + .eq(MaterialInfoDO::getEncoding, materialInfoReq.getEncoding()) + .ne(MaterialInfoDO::getId, id)); CheckUtils.throwIf(materialInfoDO != null, "物料编码已存在"); } - @Override public PageResp page(MaterialInfoQuery query, PageQuery pageQuery) { QueryWrapper queryWrapper = new QueryWrapper<>(); diff --git a/wms-webapi/src/main/java/top/wms/admin/controller/fullWorkOrder/FullWorkOrderController.java b/wms-webapi/src/main/java/top/wms/admin/controller/fullWorkOrder/FullWorkOrderController.java index fe1686d..eeed8de 100644 --- a/wms-webapi/src/main/java/top/wms/admin/controller/fullWorkOrder/FullWorkOrderController.java +++ b/wms-webapi/src/main/java/top/wms/admin/controller/fullWorkOrder/FullWorkOrderController.java @@ -1,6 +1,5 @@ package top.wms.admin.controller.fullWorkOrder; -import cn.dev33.satoken.annotation.SaCheckPermission; import top.continew.starter.extension.crud.enums.Api; import io.swagger.v3.oas.annotations.tags.Tag; @@ -17,7 +16,6 @@ import top.wms.admin.fullWorkOrder.model.req.FullWorkOrderInfoReq; import top.wms.admin.fullWorkOrder.model.req.FullWorkOrderReq; import top.wms.admin.fullWorkOrder.model.resp.FullWorkOrderResp; import top.wms.admin.fullWorkOrder.service.FullWorkOrderService; -import top.wms.admin.weighManage.model.resp.WorkOrderResp; import java.util.List; diff --git a/wms-webapi/src/main/java/top/wms/admin/controller/weighManage/ah/AHDZCConnect.java b/wms-webapi/src/main/java/top/wms/admin/controller/weighManage/ah/AHDZCConnect.java index 090c8f7..8f4e034 100644 --- a/wms-webapi/src/main/java/top/wms/admin/controller/weighManage/ah/AHDZCConnect.java +++ b/wms-webapi/src/main/java/top/wms/admin/controller/weighManage/ah/AHDZCConnect.java @@ -28,9 +28,9 @@ import java.util.regex.Pattern; public class AHDZCConnect { //老设备(只能跑jar包的) - private static final String PORT_NAME = "COM12"; + // private static final String PORT_NAME = "COM12"; //新设备(环境齐全的) - // private static final String PORT_NAME = "COM13"; + private static final String PORT_NAME = "COM13"; private static final int BAUD_RATE = 9600; private static final int DATA_BITS = 8; private static final int STOP_BITS = 1;