From b97fe6683ecba03ae69585a11d7a1faf09084222 Mon Sep 17 00:00:00 2001 From: liuxy Date: Tue, 30 May 2023 16:40:06 +0800 Subject: [PATCH] =?UTF-8?q?rev:=20=E6=88=90=E5=93=81=E6=8D=9F=E7=9B=8A?= =?UTF-8?q?=E5=BC=BA=E5=88=B6=E7=A1=AE=E8=AE=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../vehicle/IMdPbBucketrecordService.java | 3 + .../service/vehicle/dao/MdPbBucketrecord.java | 5 +- .../vehicle/dao/MdPbStoragevehicleext.java | 3 + .../impl/MdPbBucketrecordServiceImpl.java | 45 +++++ .../org/nl/wms/storage_manage/IOSEnum.java | 2 +- .../impl/StIvtIostorinvCpOutServiceImpl.java | 5 +- .../impl/StIvtIostorinvCpServiceImpl.java | 1 + .../impl/StIvtIostorinvdisCpServiceImpl.java | 2 + .../dao/mapper/StIvtMoreorlessmstCpMapper.xml | 2 + .../impl/StIvtMoreorlessdtlCpServiceImpl.java | 2 +- .../impl/StIvtMoreorlessmstCpServiceImpl.java | 173 ++++++++++++++++++ .../dao/mapper/StIvtStructivtCpMapper.java | 2 + .../dao/mapper/StIvtStructivtCpMapper.xml | 41 +++++ .../impl/StIvtStructivtCpServiceImpl.java | 24 ++- .../product/productMoreOrless/AddDialog.vue | 9 +- 15 files changed, 312 insertions(+), 7 deletions(-) diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/IMdPbBucketrecordService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/IMdPbBucketrecordService.java index 8d394c3a..e73d8b30 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/IMdPbBucketrecordService.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/IMdPbBucketrecordService.java @@ -1,5 +1,6 @@ package org.nl.wms.masterdata_manage.service.vehicle; +import com.alibaba.fastjson.JSONObject; import org.nl.common.domain.query.PageQuery; import org.nl.wms.masterdata_manage.service.vehicle.dao.MdPbBucketrecord; import com.baomidou.mybatisplus.extension.service.IService; @@ -24,4 +25,6 @@ public interface IMdPbBucketrecordService extends IService { * @return Object / */ Object queryAll(Map whereJson, PageQuery page); + + void createBucke(MdPbBucketrecord dao); } 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 a56b0198..366d7cb6 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 @@ -1,6 +1,8 @@ package org.nl.wms.masterdata_manage.service.vehicle.dao; import java.math.BigDecimal; + +import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import java.io.Serializable; @@ -28,6 +30,7 @@ public class MdPbBucketrecord implements Serializable { /** * 桶记录标识 */ + @TableId private Long bucket_record_id; /** @@ -43,7 +46,7 @@ public class MdPbBucketrecord implements Serializable { /** * 物料标识 */ - private Long material_id; + private String material_id; /** * 批次 diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/dao/MdPbStoragevehicleext.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/dao/MdPbStoragevehicleext.java index a5b05c90..3cd90ee2 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/dao/MdPbStoragevehicleext.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/dao/MdPbStoragevehicleext.java @@ -1,6 +1,8 @@ package org.nl.wms.masterdata_manage.service.vehicle.dao; import java.math.BigDecimal; + +import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import java.util.Date; import java.io.Serializable; @@ -27,6 +29,7 @@ public class MdPbStoragevehicleext implements Serializable { /** * 载具扩展标识 */ + @TableId private String storagevehicleext_id; /** diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/impl/MdPbBucketrecordServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/impl/MdPbBucketrecordServiceImpl.java index de740b17..f930d511 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/impl/MdPbBucketrecordServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/impl/MdPbBucketrecordServiceImpl.java @@ -1,16 +1,29 @@ package org.nl.wms.masterdata_manage.service.vehicle.impl; +import cn.hutool.core.date.DateUtil; +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.Page; import com.github.pagehelper.PageHelper; import org.nl.common.TableDataInfo; import org.nl.common.domain.query.PageQuery; +import org.nl.common.utils.IdUtil; +import org.nl.common.utils.SecurityUtils; +import org.nl.wms.masterdata_manage.MasterEnum; +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.service.vehicle.dao.MdPbStoragevehicleinfo; import org.nl.wms.masterdata_manage.service.vehicle.dao.mapper.MdPbBucketrecordMapper; import org.nl.wms.masterdata_manage.service.vehicle.IMdPbBucketrecordService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.nl.wms.storage_manage.IOSEnum; +import org.nl.wms.storage_manage.IVTEnum; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.math.BigDecimal; import java.util.List; import java.util.Map; @@ -25,6 +38,10 @@ import java.util.Map; @Service public class MdPbBucketrecordServiceImpl extends ServiceImpl implements IMdPbBucketrecordService { + + @Autowired + protected IMdPbStoragevehicleinfoService iMdPbStoragevehicleinfoService; // 载具服务 + @Override public Object queryAll(Map whereJson, PageQuery pageQuery) { Page page = PageHelper.startPage(pageQuery.getPage()+1, pageQuery.getSize()); @@ -33,4 +50,32 @@ public class MdPbBucketrecordServiceImpl extends ServiceImpl().lambda() + .eq(MdPbStoragevehicleinfo::getStoragevehicle_code, dao.getStoragevehicle_code()) + ); + + dao.setBucket_record_id(IdUtil.getLongId()); + dao.setStoragevehicle_type("1"); // TODO 暂时写死 + dao.setIvt_level(IVTEnum.IVT_LEVEL.code("一级")); + dao.setIs_active("1"); + dao.setQuality_scode(IVTEnum.QUALITY_SCODE.code("待检品")); + dao.setPrint_times(BigDecimal.valueOf(0)); + dao.setCreate_id(Long.valueOf(SecurityUtils.getCurrentUserId())); + dao.setCreate_name(SecurityUtils.getCurrentNickName()); + dao.setCreate_time(DateUtil.now()); + dao.setStoragevehicle_id(Long.valueOf(vehicleDao.getStoragevehicle_id())); + dao.setStoragevehicle_code(vehicleDao.getStoragevehicle_code()); + dao.setMakeup_optid(Long.valueOf(SecurityUtils.getCurrentUserId())); + dao.setMakeup_optname(SecurityUtils.getCurrentNickName()); + dao.setMakeup_time(DateUtil.now()); + dao.setInstor_optid(Long.valueOf(SecurityUtils.getCurrentUserId())); + dao.setInstor_optname(SecurityUtils.getCurrentNickName()); + dao.setInstor_time(DateUtil.now()); + this.save(dao); + + } } 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 22e6758d..a55a0a33 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 @@ -25,7 +25,7 @@ public enum IOSEnum { //单据状态 WORK_STATUS(MapOf.of("未生成", "00", "生成", "10", "执行中", "20", "完成", "99")), //锁定类型 - LOCK_TYPE(MapOf.of("未锁定", "0", "入库锁", "1", "出库锁", "2","盘点锁", "3")), + LOCK_TYPE(MapOf.of("未锁定", "0", "入库锁", "1", "出库锁", "2","盘点锁", "3","损溢锁", "4")), ; private Map 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 c00e555f..b5413d10 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 @@ -455,7 +455,8 @@ public class StIvtIostorinvCpOutServiceImpl extends ServiceImpl().lambda() .eq(MdPbStoragevehicleext::getStoragevehicle_code,dao.getStoragevehicle_code()) ); @@ -477,7 +478,7 @@ public class StIvtIostorinvCpOutServiceImpl extends ServiceImpl + order by mst.mol_code DESC + diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/moreOrLess/impl/StIvtMoreorlessdtlCpServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/moreOrLess/impl/StIvtMoreorlessdtlCpServiceImpl.java index 6776b3d1..4ea55f07 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/moreOrLess/impl/StIvtMoreorlessdtlCpServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/moreOrLess/impl/StIvtMoreorlessdtlCpServiceImpl.java @@ -107,7 +107,7 @@ public class StIvtMoreorlessdtlCpServiceImpl extends ServiceImpl() - .set("lock_type", IOSEnum.LOCK_TYPE.code("盘点锁")) + .set("lock_type", IOSEnum.LOCK_TYPE.code("损溢锁")) .set("inv_code",mst.getMol_code()) .eq("struct_id", row.getStruct_id())); } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/moreOrLess/impl/StIvtMoreorlessmstCpServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/moreOrLess/impl/StIvtMoreorlessmstCpServiceImpl.java index dfe48f1c..c47ee096 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/moreOrLess/impl/StIvtMoreorlessmstCpServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/moreOrLess/impl/StIvtMoreorlessmstCpServiceImpl.java @@ -19,11 +19,17 @@ 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.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; import org.nl.wms.masterdata_manage.storage.service.storage.dao.StIvtBsrealstorattr; import org.nl.wms.masterdata_manage.storage.service.storage.dao.StIvtStructattr; import org.nl.wms.storage_manage.CHECKEnum; +import org.nl.wms.storage_manage.IOSEnum; import org.nl.wms.storage_manage.productmanage.service.moreOrLess.IStIvtMoreorlessdtlCpService; import org.nl.wms.storage_manage.productmanage.service.moreOrLess.IStIvtMoreorlessmstCpService; import org.nl.wms.storage_manage.productmanage.service.moreOrLess.dao.StIvtMoreorlessdtlCp; @@ -38,6 +44,7 @@ import org.nl.wms.storage_manage.rawmanage.service.structIvt.dao.StIvtStructivtY import org.nl.wms.storage_manage.semimanage.MLEnum; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import java.math.BigDecimal; import java.util.List; @@ -66,6 +73,12 @@ public class StIvtMoreorlessmstCpServiceImpl extends ServiceImpl page = PageHelper.startPage(pageQuery.getPage() + 1, pageQuery.getSize()); @@ -117,10 +130,28 @@ public class StIvtMoreorlessmstCpServiceImpl extends ServiceImpl().eq("mol_id", id)); dao.setIs_delete(true); this.updateById(dao); + + // 解锁货位 + StIvtMoreorlessdtlCp dtlDao = iStIvtMoreorlessdtlCpService.getOne( + new QueryWrapper().lambda() + .eq(StIvtMoreorlessdtlCp::getMol_id, id), + false + ); + + structattrService.update( + new StIvtStructattr() + .setInv_code("") + .setInv_type("") + .setInv_id("") + .setLock_type(IOSEnum.LOCK_TYPE.code("未锁定")), + new QueryWrapper().lambda() + .eq(StIvtStructattr::getStruct_id, dtlDao.getStruct_id()) + ); } } @Override + @Transactional(rollbackFor = Exception.class) public void confirm(JSONObject whereJson) { String mol_id = (String) whereJson.get("mol_id"); @@ -146,9 +177,64 @@ public class StIvtMoreorlessmstCpServiceImpl extends ServiceImpl().lambda() + .eq(MdPbStoragevehicleext::getStoragevehicle_code, dtl.getStoragevehicle_code()) + ); + if (ObjectUtil.isNotEmpty(vehicleDao)) { + vehicleDao.setStorage_qty(NumberUtil.sub(vehicleDao.getStorage_qty(),mol_qty)); + iMdPbStoragevehicleextService.updateById(vehicleDao); + } + + // 判断是否有箱 + MdPbBucketrecord buckDao = iMdPbBucketrecordService.getOne( + new QueryWrapper().lambda() + .eq(MdPbBucketrecord::getBucketunique, dtl.getBucketunique()) + .eq(MdPbBucketrecord::getMaterial_id, dtl.getMaterial_id()) + ); + + if (ObjectUtil.isNotEmpty(buckDao)) { + // 更新箱重量 + buckDao.setStorage_qty(NumberUtil.sub(buckDao.getStorage_qty(), mol_qty)); + iMdPbBucketrecordService.updateById(buckDao); + } + //如果库存变为0则删除记录 if (canuse_qty.compareTo(mol_qty) == 0 && canuse_qty.compareTo(ivt_qty) == 0) { iStIvtStructivtCpService.removeById(ivt.getStockrecord_id()); + + // 更新箱记录表状态为出库 + iMdPbBucketrecordService.update( + MdPbBucketrecord.builder() + .status(MasterEnum.BOX_STATUS.code("出库")) + .build(), + new QueryWrapper().lambda() + .eq(MdPbBucketrecord::getBucketunique, dtl.getBucketunique()) + .eq(MdPbBucketrecord::getMaterial_id, dtl.getMaterial_id()) + ); + + // 更新载具扩展属性 - 释放载具对应物料关系 清空数量 + iMdPbStoragevehicleextService.update( + new MdPbStoragevehicleext() + .setMaterial_id("") + .setStorage_qty(BigDecimal.valueOf(0)), + new QueryWrapper().lambda() + .eq(MdPbStoragevehicleext::getStoragevehicle_code,dtl.getStoragevehicle_code()) + ); + + // 更新货位 -- 清除载具号 + structattrService.update( + new StIvtStructattr() + .setStoragevehicle_code("") + .setInv_id("") + .setInv_type("") + .setInv_code(""), + new QueryWrapper().lambda() + .eq(StIvtStructattr::getStruct_id, ivt.getStruct_id()) + ); + } else { iStIvtStructivtCpService.updateById(ivt); } @@ -177,12 +263,99 @@ public class StIvtMoreorlessmstCpServiceImpl extends ServiceImpl().lambda() + .eq(MdPbStoragevehicleext::getStoragevehicle_code, dtl.getStoragevehicle_code()) + ); + if (ObjectUtil.isNotEmpty(vehicleDao)) { + vehicleDao.setStorage_qty(mol_qty); + vehicleDao.setMaterial_id(dtl.getMaterial_id()); + iMdPbStoragevehicleextService.updateById(vehicleDao); + } + + // 判断是否有箱 + if (ObjectUtil.isNotEmpty(dtl.getBucketunique())) { + MdPbBucketrecord buckDao = iMdPbBucketrecordService.getOne( + new QueryWrapper().lambda() + .eq(MdPbBucketrecord::getBucketunique, dtl.getBucketunique()) + .eq(MdPbBucketrecord::getMaterial_id, dtl.getMaterial_id()) + ); + + if (ObjectUtil.isEmpty(buckDao)) { + // 新增一条箱记录 + MdPbBucketrecord param = MdPbBucketrecord.builder() + .bucketunique(dtl.getBucketunique()) + .material_id(dtl.getMaterial_id()) + .pcsn(dtl.getPcsn()) + .qty_unit_id(Long.valueOf(dtl.getQty_unit_id())) + .qty_unit_name(dtl.getQty_unit_name()) + .storage_qty(dtl.getMol_qty()) + .status(MasterEnum.BOX_STATUS.code("入库")) + .storagevehicle_code(dtl.getStoragevehicle_code()) + .build(); + + iMdPbBucketrecordService.createBucke(param); + } else { + buckDao.setStorage_qty(dtl.getMol_qty()); + buckDao.setStatus(MasterEnum.BOX_STATUS.code("入库")); + iMdPbBucketrecordService.updateById(buckDao); + } + } + } else { + BigDecimal canuse_qty = ivt.getCanuse_qty(); BigDecimal ivt_qty = ivt.getIvt_qty(); + + // 更新库存 ivt.setCanuse_qty(NumberUtil.add(canuse_qty, mol_qty)); ivt.setIvt_qty(NumberUtil.add(ivt_qty, mol_qty)); iStIvtStructivtCpService.updateById(ivt); + + // 判断是否有箱 + if (ObjectUtil.isNotEmpty(dtl.getBucketunique())) { + MdPbBucketrecord buckDao = iMdPbBucketrecordService.getOne( + new QueryWrapper().lambda() + .eq(MdPbBucketrecord::getBucketunique, dtl.getBucketunique()) + .eq(MdPbBucketrecord::getMaterial_id, dtl.getMaterial_id()) + ); + + if (ObjectUtil.isEmpty(buckDao)) { + // 新增一条箱记录 + MdPbBucketrecord param = MdPbBucketrecord.builder() + .bucketunique(dtl.getBucketunique()) + .material_id(dtl.getMaterial_id()) + .pcsn(dtl.getPcsn()) + .qty_unit_id(Long.valueOf(dtl.getQty_unit_id())) + .qty_unit_name(dtl.getQty_unit_name()) + .storage_qty(dtl.getMol_qty()) + .status(MasterEnum.BOX_STATUS.code("入库")) + .storagevehicle_code(dtl.getStoragevehicle_code()) + .build(); + + iMdPbBucketrecordService.createBucke(param); + } else { + buckDao.setStorage_qty(NumberUtil.add(buckDao.getStorage_qty(), dtl.getMol_qty())); + buckDao.setStatus(MasterEnum.BOX_STATUS.code("入库")); + iMdPbBucketrecordService.updateById(buckDao); + } + } + + // 更新载具扩展属性 - 数量 + MdPbStoragevehicleext vehicleDao = iMdPbStoragevehicleextService.getOne( + new QueryWrapper().lambda() + .eq(MdPbStoragevehicleext::getStoragevehicle_code, dtl.getStoragevehicle_code()) + ); + if (ObjectUtil.isNotEmpty(vehicleDao)) { + vehicleDao.setStorage_qty(NumberUtil.add(vehicleDao.getStorage_qty(), dtl.getMol_qty())); + iMdPbStoragevehicleextService.updateById(vehicleDao); + } } //更新明细状态 diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/structIvt/dao/mapper/StIvtStructivtCpMapper.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/structIvt/dao/mapper/StIvtStructivtCpMapper.java index 8dea72fd..8f4dc19a 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/structIvt/dao/mapper/StIvtStructivtCpMapper.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/structIvt/dao/mapper/StIvtStructivtCpMapper.java @@ -25,4 +25,6 @@ public interface StIvtStructivtCpMapper extends BaseMapper { List getStructIvtMore(@Param("query") StructIvtYLQuery query); + List getStructIvtMoreBox(JSONObject json); + } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/structIvt/dao/mapper/StIvtStructivtCpMapper.xml b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/structIvt/dao/mapper/StIvtStructivtCpMapper.xml index 144559fa..4c9bf7f5 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/structIvt/dao/mapper/StIvtStructivtCpMapper.xml +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/structIvt/dao/mapper/StIvtStructivtCpMapper.xml @@ -74,6 +74,7 @@ sa.struct_id, sa.struct_code, sa.struct_name, + sa.storagevehicle_code, class.class_name FROM ST_IVT_StructIvt_CP ivt @@ -97,4 +98,44 @@ + + diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/structIvt/impl/StIvtStructivtCpServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/structIvt/impl/StIvtStructivtCpServiceImpl.java index 48111148..78a2a1ba 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/structIvt/impl/StIvtStructivtCpServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/structIvt/impl/StIvtStructivtCpServiceImpl.java @@ -10,6 +10,8 @@ import org.nl.common.utils.IdUtil; import org.nl.modules.common.exception.BadRequestException; import org.nl.wms.masterdata_manage.service.material.IMdMeMaterialbaseService; import org.nl.wms.masterdata_manage.service.material.dao.MdMeMaterialbase; +import org.nl.wms.masterdata_manage.service.vehicle.IMdPbBucketrecordService; +import org.nl.wms.masterdata_manage.service.vehicle.dao.MdPbBucketrecord; 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.productmanage.service.structIvt.IStIvtStructivtCpService; @@ -43,6 +45,9 @@ public class StIvtStructivtCpServiceImpl extends ServiceImpl getStructIvtMore(StructIvtYLQuery whereJson) { - return this.baseMapper.getStructIvtMore(whereJson); + // 判断货位是否有箱 + List structIvtList = this.baseMapper.getStructIvtMore(whereJson); + + if (ObjectUtil.isNotEmpty(structIvtList)) { + MdPbBucketrecord buckDao = iMdPbBucketrecordService.getOne( + new QueryWrapper().lambda() + .eq(MdPbBucketrecord::getStoragevehicle_code, structIvtList.get(0).get("storagevehicle_code")), + false + ); + + if (ObjectUtil.isNotEmpty(buckDao)) { + JSONObject param = new JSONObject(); + param.put("storagevehicle_code",structIvtList.get(0).get("storagevehicle_code")); + param.put("struct_code",structIvtList.get(0).get("struct_code")); + structIvtList = this.baseMapper.getStructIvtMoreBox(param); + } + } + return structIvtList; } /* diff --git a/mes/qd/src/views/wms/storage_manage/product/productMoreOrless/AddDialog.vue b/mes/qd/src/views/wms/storage_manage/product/productMoreOrless/AddDialog.vue index e72550c1..c1062b1f 100644 --- a/mes/qd/src/views/wms/storage_manage/product/productMoreOrless/AddDialog.vue +++ b/mes/qd/src/views/wms/storage_manage/product/productMoreOrless/AddDialog.vue @@ -391,9 +391,11 @@ export default { this.form.sect_name = row.sect_name this.form.struct_name = row.struct_name crudMoreOrless.getStructIvt({'struct_id': row.struct_id}).then(res => { + debugger this.form.tableData = res for (let i = 0; i < this.form.tableData.length; i++) { const row = this.form.tableData[i] + row.material_id = row.material_id.toString() this.$set(row, 'edit', false) this.form.tableData.splice(i, 1, row) } @@ -407,7 +409,7 @@ export default { this.nowrow = row }, async queryStruct() { - if (!this.form.mol_type) { + if (!this.form.mol_type) {structShow this.crud.notify('请先选择损溢类型！', CRUD.NOTIFICATION_TYPE.INFO) return } @@ -450,6 +452,7 @@ export default { this.form.struct_name = '' }, handleEdit(index, row) { + row.material_id = row.material_id.toString() if (!row.edit) { if (typeof (row.mol_qty) === 'undefined' | (parseFloat(row.mol_qty) <= 0)) { this.crud.notify('不允许损溢数量为0！', CRUD.NOTIFICATION_TYPE.INFO) @@ -459,6 +462,10 @@ export default { this.crud.notify('物料不可为空！', CRUD.NOTIFICATION_TYPE.INFO) return false } + if (!row.storagevehicle_code) { + this.crud.notify('载具号不可为空！', CRUD.NOTIFICATION_TYPE.INFO) + return false + } if (this.form.mol_type === '0' && (parseFloat(row.ivt_qty) < parseFloat(row.mol_qty))) { this.crud.notify('不允许损数量大于库存数量！', CRUD.NOTIFICATION_TYPE.INFO) return false