root/hl_one
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
zhangzhiqiang
2023-05-30 19:55:57 +08:00
parent abb6df872d c02894484d
commit 85b5367584
33 changed files with 423 additions and 157 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/IMdPbBucketrecordService.java
View File

@@ -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<MdPbBucketrecord> {
* @return Object /
*/
Object queryAll(Map whereJson, PageQuery page);
void createBucke(MdPbBucketrecord dao);
}

5
mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/dao/MdPbBucketrecord.java
View File

@@ -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;
/**
* 批次

3
mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/dao/MdPbStoragevehicleext.java
View File

@@ -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;
/**

45
mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/impl/MdPbBucketrecordServiceImpl.java
View File

@@ -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<MdPbBucketrecordMapper, MdPbBucketrecord> implements IMdPbBucketrecordService {
@Autowired
protected IMdPbStoragevehicleinfoService iMdPbStoragevehicleinfoService; // 载具服务
@Override
public Object queryAll(Map whereJson, PageQuery pageQuery) {
Page<Object> page = PageHelper.startPage(pageQuery.getPage()+1, pageQuery.getSize());
@@ -33,4 +50,32 @@ public class MdPbBucketrecordServiceImpl extends ServiceImpl<MdPbBucketrecordMap
build.setTotalElements(page.getTotal());
return build;
}
@Override
public void createBucke(MdPbBucketrecord dao) {
MdPbStoragevehicleinfo vehicleDao = iMdPbStoragevehicleinfoService.getOne(
new QueryWrapper<MdPbStoragevehicleinfo>().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);
}
}

2
mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/IOSEnum.java
View File

@@ -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<String, String> code;

5
mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/impl/StIvtIostorinvCpOutServiceImpl.java
View File

@@ -455,7 +455,8 @@ public class StIvtIostorinvCpOutServiceImpl extends ServiceImpl<StIvtIostorinvCp
// 4) 更新载具扩展属性
iMdPbStoragevehicleextService.update(
new MdPbStoragevehicleext()
.setMaterial_id(""),
.setMaterial_id("")
.setStorage_qty(BigDecimal.valueOf(0)),
new QueryWrapper<MdPbStoragevehicleext>().lambda()
.eq(MdPbStoragevehicleext::getStoragevehicle_code,dao.getStoragevehicle_code())
);
@@ -477,7 +478,7 @@ public class StIvtIostorinvCpOutServiceImpl extends ServiceImpl<StIvtIostorinvCp
@Override
public List getStructIvt(JSONObject whereJson) {
JSONObject param = new JSONObject();
param.put("materia_id", whereJson.getString("materia_id"));
param.put("material_id", whereJson.getString("material_id"));
param.put("stor_id", whereJson.getString("stor_id"));
if (ObjectUtil.isNotEmpty(whereJson.getString("source_billdtl_id"))) param.put("sale_id", whereJson.getString("source_billdtl_id"));
if (ObjectUtil.isNotEmpty(whereJson.getString("search"))) param.put("remark", whereJson.getString("search"));

1
mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/impl/StIvtIostorinvCpServiceImpl.java
View File

@@ -271,6 +271,7 @@ public class StIvtIostorinvCpServiceImpl extends ServiceImpl<StIvtIostorinvCpMap
// 6.更新载具扩展属性表
MdPbStoragevehicleext vehicleDao = new MdPbStoragevehicleext();
vehicleDao.setMaterial_id(disDtlDao.getMaterial_id());
vehicleDao.setStorage_qty(qty);
vehicleDao.setUpdate_id(SecurityUtils.getCurrentUserId());
vehicleDao.setUpdate_name(SecurityUtils.getCurrentNickName());
vehicleDao.setUpdate_time(new Date());

2
mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/impl/StIvtIostorinvdisCpServiceImpl.java
View File

@@ -1,6 +1,7 @@
package org.nl.wms.storage_manage.productmanage.service.iostorInv.impl;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.NumberUtil;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -117,6 +118,7 @@ public class StIvtIostorinvdisCpServiceImpl extends ServiceImpl<StIvtIostorinvdi
// 更新载具扩展属性表
MdPbStoragevehicleext vehicleExtDao = new MdPbStoragevehicleext();
vehicleExtDao.setMaterial_id(item.getString("material_id"));
vehicleExtDao.setStorage_qty(NumberUtil.add(vehicleExtDao.getStorage_qty(),item.getBigDecimal("qty")));
vehicleExtDao.setUpdate_id(SecurityUtils.getCurrentUserId());
vehicleExtDao.setUpdate_name(SecurityUtils.getCurrentNickName());
vehicleExtDao.setUpdate_time(new Date());

2
mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/moreOrLess/dao/mapper/StIvtMoreorlessmstCpMapper.xml
View File

@@ -54,5 +54,7 @@
</if>
</where>
order by mst.mol_code DESC
</select>
</mapper>

2
mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/moreOrLess/impl/StIvtMoreorlessdtlCpServiceImpl.java
View File

@@ -107,7 +107,7 @@ public class StIvtMoreorlessdtlCpServiceImpl extends ServiceImpl<StIvtMoreorless
//锁定货位
structattrService.update(
new UpdateWrapper<StIvtStructattr>()
.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()));
}

173
mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/moreOrLess/impl/StIvtMoreorlessmstCpServiceImpl.java
View File

@@ -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<StIvtMoreorless
@Autowired
private IStIvtStructattrService structattrService; // 仓位属性服务
@Autowired
protected IMdPbBucketrecordService iMdPbBucketrecordService; // 包装箱记录表服务
@Autowired
protected IMdPbStoragevehicleextService iMdPbStoragevehicleextService; // 载具扩展属性信息表服务
@Override
public Object pageQuery(MoreOrlessQuery query, PageQuery pageQuery) {
Page<Object> page = PageHelper.startPage(pageQuery.getPage() + 1, pageQuery.getSize());
@@ -117,10 +130,28 @@ public class StIvtMoreorlessmstCpServiceImpl extends ServiceImpl<StIvtMoreorless
StIvtMoreorlessmstCp dao = this.getOne(new QueryWrapper<StIvtMoreorlessmstCp>().eq("mol_id", id));
dao.setIs_delete(true);
this.updateById(dao);
// 解锁货位
StIvtMoreorlessdtlCp dtlDao = iStIvtMoreorlessdtlCpService.getOne(
new QueryWrapper<StIvtMoreorlessdtlCp>().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<StIvtStructattr>().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<StIvtMoreorless
BigDecimal mol_qty = dtl.getMol_qty();
ivt.setCanuse_qty(NumberUtil.sub(canuse_qty, mol_qty));
ivt.setIvt_qty(NumberUtil.sub(ivt_qty, mol_qty));
// 更新载具扩展属性重量
MdPbStoragevehicleext vehicleDao = iMdPbStoragevehicleextService.getOne(
new QueryWrapper<MdPbStoragevehicleext>().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<MdPbBucketrecord>().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<MdPbBucketrecord>().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<MdPbStoragevehicleext>().lambda()
.eq(MdPbStoragevehicleext::getStoragevehicle_code,dtl.getStoragevehicle_code())
);
// 更新货位 -- 清除载具号
structattrService.update(
new StIvtStructattr()
.setStoragevehicle_code("")
.setInv_id("")
.setInv_type("")
.setInv_code(""),
new QueryWrapper<StIvtStructattr>().lambda()
.eq(StIvtStructattr::getStruct_id, ivt.getStruct_id())
);
} else {
iStIvtStructivtCpService.updateById(ivt);
}
@@ -177,12 +263,99 @@ public class StIvtMoreorlessmstCpServiceImpl extends ServiceImpl<StIvtMoreorless
.setInstorage_time(DateUtil.now())
.setStor_id(mst.getStor_id())
);
// 更新仓位 - 载具编码
struct_jo.setStoragevehicle_code(dtl.getStoragevehicle_code());
structattrService.updateById(struct_jo);
// 更新载具对应物料关系、数量
MdPbStoragevehicleext vehicleDao = iMdPbStoragevehicleextService.getOne(
new QueryWrapper<MdPbStoragevehicleext>().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<MdPbBucketrecord>().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<MdPbBucketrecord>().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<MdPbStoragevehicleext>().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);
}
}
//更新明细状态

2
mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/structIvt/dao/mapper/StIvtStructivtCpMapper.java
View File

@@ -25,4 +25,6 @@ public interface StIvtStructivtCpMapper extends BaseMapper<StIvtStructivtCp> {
List<Map> getStructIvtMore(@Param("query") StructIvtYLQuery query);
List<Map> getStructIvtMoreBox(JSONObject json);
}

41
mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/structIvt/dao/mapper/StIvtStructivtCpMapper.xml
View File

@@ -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 @@
</where>
</select>
<select id="getStructIvtMoreBox" resultType="java.util.Map">
SELECT
buck.storage_qty AS ivt_qty,
buck.qty_unit_id,
buck.qty_unit_name,
buck.quality_scode,
buck.ivt_level,
buck.pcsn,
buck.material_id,
buck.bucketunique,
mb.material_code,
mb.material_name,
sa.sect_id,
sa.sect_code,
sa.sect_name,
sa.struct_id,
sa.struct_code,
sa.struct_name,
sa.storagevehicle_code,
class.class_name
FROM
md_pb_bucketrecord buck
LEFT JOIN md_me_materialbase mb ON mb.material_id = buck.material_id
LEFT JOIN st_ivt_structattr sa ON sa.storagevehicle_code = buck.storagevehicle_code
LEFT JOIN md_pb_classstandard class ON class.class_id = mb.material_type_id
<where>
buck.storage_qty > 0
AND
sa.lock_type = '0'
AND
buck.status = '3'
<if test="storagevehicle_code!= null and storagevehicle_code != ''">
and sa.storagevehicle_code = #{storagevehicle_code}
</if>
<if test="struct_code!= null and struct_code != ''">
and sa.struct_code = #{struct_code}
</if>
</where>
</select>
</mapper>

24
mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/structIvt/impl/StIvtStructivtCpServiceImpl.java
View File

@@ -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<StIvtStructivtCpMap
@Autowired
protected IMdMeMaterialbaseService iMdMeMaterialbaseService; // 物料服务
@Autowired
protected IMdPbBucketrecordService iMdPbBucketrecordService; // 包装箱记录表服务
@Override
@Transactional(rollbackFor = Exception.class)
public void UpdateIvt(JSONObject json) {
@@ -95,7 +100,24 @@ public class StIvtStructivtCpServiceImpl extends ServiceImpl<StIvtStructivtCpMap
@Override
public List<Map> getStructIvtMore(StructIvtYLQuery whereJson) {
return this.baseMapper.getStructIvtMore(whereJson);
// 判断货位是否有箱
List<Map> structIvtList = this.baseMapper.getStructIvtMore(whereJson);
if (ObjectUtil.isNotEmpty(structIvtList)) {
MdPbBucketrecord buckDao = iMdPbBucketrecordService.getOne(
new QueryWrapper<MdPbBucketrecord>().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;
}
/*