diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/MasterEnum.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/MasterEnum.java index a9d74d4c..7b26149e 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/MasterEnum.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/MasterEnum.java @@ -21,6 +21,8 @@ public enum MasterEnum { BILL_TYPE(MapOf.of("生产入库","1","退货入库","2")), //单据类型 BILL_STATUS(MapOf.of("创建","1","生成","2")), + // 箱状态 + BOX_STATUS(MapOf.of("生成","1","组盘","2","入库","3","出库","4")), ; private Map code; diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/dao/MdPbBucketrecord.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/dao/MdPbBucketrecord.java index 531d7963..a56b0198 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/dao/MdPbBucketrecord.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/dao/MdPbBucketrecord.java @@ -7,6 +7,7 @@ import java.io.Serializable; import lombok.Builder; import lombok.Data; import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; /** *

diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/IOSEnum.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/IOSEnum.java index 9df59192..6a4bbc2b 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/IOSEnum.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/IOSEnum.java @@ -24,6 +24,8 @@ public enum IOSEnum { BILL_STATUS(MapOf.of("生成", "10", "分配中", "20", "分配完", "30", "完成", "99")), //单据状态 WORK_STATUS(MapOf.of("未生成", "00", "生成", "10", "执行中", "20", "完成", "99")), + //锁定类型 + LOCK_TYPE(MapOf.of("未锁定", "0", "入库锁", "1", "出库锁", "2","盘点锁", "3")), ; private Map code; diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/IVTEnum.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/IVTEnum.java new file mode 100644 index 00000000..3a9c78df --- /dev/null +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/IVTEnum.java @@ -0,0 +1,41 @@ +package org.nl.wms.storage_manage; + +import lombok.AllArgsConstructor; +import lombok.Getter; +import org.apache.commons.lang3.StringUtils; +import org.nl.common.utils.MapOf; +import org.nl.modules.common.exception.BadRequestException; + +import java.util.Map; + +/* + * @author ZZQ + * @Date 2023/5/4 20:11 + */ +@AllArgsConstructor +@Getter +public enum IVTEnum { + //库存品质类型 + QUALITY_SCODE(MapOf.of("待检品", "00", "合格品", "01", "不良品", "02")), + //库存等级 + IVT_LEVEL(MapOf.of("一级", "1", "二级", "2", "三级", "3")), + ; + private Map code; + + public String code(String desc) { + String code = this.getCode().get(desc); + if (StringUtils.isNotEmpty(code)) { + return code; + } + throw new BadRequestException(this.name() + "对应类型" + desc + "未定义"); + } + + public String check(String code) { + for (Map.Entry entry : this.getCode().entrySet()) { + if (entry.getValue().equals("code")) { + return entry.getValue(); + } + } + throw new BadRequestException(this.name() + "对应类型" + code + "未定义"); + } +} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/impl/StIvtIostorinvCpOutServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/impl/StIvtIostorinvCpOutServiceImpl.java index 69262dc2..27231914 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/impl/StIvtIostorinvCpOutServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/impl/StIvtIostorinvCpOutServiceImpl.java @@ -18,9 +18,11 @@ import org.nl.common.utils.IdUtil; import org.nl.common.utils.SecurityUtils; import org.nl.modules.common.exception.BadRequestException; import org.nl.modules.system.util.CodeUtil; +import org.nl.wms.masterdata_manage.MasterEnum; import org.nl.wms.masterdata_manage.service.vehicle.IMdPbBucketrecordService; import org.nl.wms.masterdata_manage.service.vehicle.IMdPbStoragevehicleextService; import org.nl.wms.masterdata_manage.service.vehicle.IMdPbStoragevehicleinfoService; +import org.nl.wms.masterdata_manage.service.vehicle.dao.MdPbBucketrecord; import org.nl.wms.masterdata_manage.service.vehicle.dao.MdPbStoragevehicleext; import org.nl.wms.masterdata_manage.storage.service.storage.IStIvtBsrealstorattrService; import org.nl.wms.masterdata_manage.storage.service.storage.IStIvtStructattrService; @@ -217,7 +219,7 @@ public class StIvtIostorinvCpOutServiceImpl extends ServiceImpl().lambda() .eq(MdPbStoragevehicleext::getStoragevehicle_code,dao.getStoragevehicle_code()) ); + + // 5) 更新箱记录表为出库 + iMdPbBucketrecordService.update( + MdPbBucketrecord.builder() + .status(MasterEnum.BOX_STATUS.code("出库")) + .build(), + new QueryWrapper().lambda() + .eq(MdPbBucketrecord::getStoragevehicle_code, dao.getStoragevehicle_code()) + .eq(MdPbBucketrecord::getMaterial_id, dao.getMaterial_id()) + .eq(MdPbBucketrecord::getStatus, MasterEnum.BOX_STATUS.code("入库")) + ); } } @@ -573,7 +586,7 @@ public class StIvtIostorinvCpOutServiceImpl extends ServiceImpl and attr.stor_id = #{stor_id} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/util/impl/DivRuleCpServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/util/impl/DivRuleCpServiceImpl.java index a0fe0d73..3892844c 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/util/impl/DivRuleCpServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/util/impl/DivRuleCpServiceImpl.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import org.nl.modules.common.exception.BadRequestException; import org.nl.wms.masterdata_manage.storage.service.storage.IStIvtStructattrService; import org.nl.wms.masterdata_manage.storage.service.storage.dao.StIvtStructattr; +import org.nl.wms.storage_manage.IOSEnum; import org.nl.wms.storage_manage.productmanage.service.structIvt.IStIvtStructivtCpService; import org.nl.wms.storage_manage.productmanage.service.structIvt.dao.StIvtStructivtCp; import org.nl.wms.storage_manage.productmanage.util.DivRuleCpService; @@ -51,7 +52,7 @@ public class DivRuleCpServiceImpl implements DivRuleCpService { .eq(StIvtStructattr::getSect_id, sect_id) .isNull(StIvtStructattr::getStoragevehicle_code) .eq(StIvtStructattr::getIs_used, "1") //TODO 暂时写死 - .eq(StIvtStructattr::getLock_type, "1") //TODO 暂时写死 + .eq(StIvtStructattr::getLock_type, IOSEnum.LOCK_TYPE.code("未锁定")) .orderByAsc(StIvtStructattr::getStruct_code) ,false); break; diff --git a/mes/qd/src/views/wms/storage_manage/product/productIn/AddBox.vue b/mes/qd/src/views/wms/storage_manage/product/productIn/AddBox.vue index d4ba3ace..3fd28f02 100644 --- a/mes/qd/src/views/wms/storage_manage/product/productIn/AddBox.vue +++ b/mes/qd/src/views/wms/storage_manage/product/productIn/AddBox.vue @@ -142,6 +142,7 @@ export default { open() { this.query.material_id = this.addBoxParam.material_id this.query.pcsn = this.addBoxParam.pcsn + this.query.status = '1' this.crud.toQuery() }, clickChange(item) {