diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/enums/WorkerOrderEnum.java b/mes/hd/nladmin-system/src/main/java/org/nl/common/enums/WorkerOrderEnum.java similarity index 96% rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/enums/WorkerOrderEnum.java rename to mes/hd/nladmin-system/src/main/java/org/nl/common/enums/WorkerOrderEnum.java index 9b98253e..6af9d1b3 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/enums/WorkerOrderEnum.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/common/enums/WorkerOrderEnum.java @@ -1,4 +1,4 @@ -package org.nl.wms.enums; +package org.nl.common.enums; /** * @Author: lyd diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/mdcs.xls b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/mdcs.xls index ee2c60d4..d9cfc9e6 100644 Binary files a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/mdcs.xls and b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/mdcs.xls differ diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/mdpb.xls b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/mdpb.xls index 55c259ac..61f387c9 100644 Binary files a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/mdpb.xls and b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/mdpb.xls differ diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/stivt.xls b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/stivt.xls index 0f5d9333..322c3c56 100644 Binary files a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/stivt.xls and b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/stivt.xls differ diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/enums/PointEnum.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/enums/PointEnum.java deleted file mode 100644 index c60294f2..00000000 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/enums/PointEnum.java +++ /dev/null @@ -1,27 +0,0 @@ -package org.nl.wms.enums; - -/** - * @Author: lyd - * @Description: 点位枚举 - * @Date: 2023/3/20 - */ -public enum PointEnum { - LOCK_TYPE_OFF("未锁定", "0"), - LOCK_TYPE_ON("锁定", "1"); - - private final String name; - private final String code; - - PointEnum(String name, String code) { - this.name = name; - this.code = code; - } - - public String getName() { - return name; - } - - public String getCode() { - return code; - } -} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps/service/impl/ProduceWorkorderServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps/service/impl/ProduceWorkorderServiceImpl.java index cbf36be1..c66093ae 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps/service/impl/ProduceWorkorderServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps/service/impl/ProduceWorkorderServiceImpl.java @@ -25,7 +25,7 @@ import org.nl.modules.wql.util.WqlUtil; import org.nl.system.service.user.ISysUserService; import org.nl.system.service.user.dao.SysUser; import org.nl.wms.basedata.master.service.ClassstandardService; -import org.nl.wms.enums.WorkerOrderEnum; +import org.nl.common.enums.WorkerOrderEnum; import org.nl.wms.ext.acs.service.WmsToAcsService; import org.nl.wms.mps.service.ProduceWorkorderService; import org.nl.wms.mps.service.WorkOrderImportEnum; diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/wql/pdm.xls b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/wql/pdm.xls index a55cf93d..d3f24c68 100644 Binary files a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/wql/pdm.xls and b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/wql/pdm.xls differ diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/PointServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/PointServiceImpl.java index 85e0da95..205ff642 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/PointServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/PointServiceImpl.java @@ -8,16 +8,14 @@ import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; -import com.mchange.lang.DoubleUtils; - import lombok.RequiredArgsConstructor; -import org.nl.common.anno.Log; +import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.nl.common.enums.StatusEnum; import org.nl.modules.common.exception.BadRequestException; import org.nl.common.utils.SecurityUtils; import org.nl.modules.wql.WQL; import org.nl.modules.wql.core.bean.WQLObject; import org.nl.modules.wql.util.WqlUtil; -import org.nl.wms.enums.PointEnum; import org.nl.wms.sch.service.PointService; import org.nl.wms.sch.service.RegionService; import org.nl.wms.sch.service.dto.PointDto; @@ -27,8 +25,6 @@ import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.math.BigDecimal; -import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -316,8 +312,8 @@ public class PointServiceImpl implements PointService { String lock = jsonObject.getString("lock_type"); for ( int i = 0; i < data.size(); i++ ) { JSONObject object = data.getJSONObject(i); - if (lock.equals(PointEnum.LOCK_TYPE_OFF.getCode())) object.put("lock_type", PointEnum.LOCK_TYPE_OFF.getCode()); - else object.put("lock_type", PointEnum.LOCK_TYPE_ON.getCode()); + if (lock.equals(StatusEnum.LOCK_OFF.getCode())) object.put("lock_type", StatusEnum.LOCK_OFF.getCode()); + else object.put("lock_type", StatusEnum.LOCK_ON.getCode()); wo.update(object); } } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/wql/sch.xls b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/wql/sch.xls index f39438d2..f4d14c9a 100644 Binary files a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/wql/sch.xls and b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/wql/sch.xls differ