diff --git a/nladmin-system/nlsso-server/pom.xml b/nladmin-system/nlsso-server/pom.xml index 92dfc2c..d6fe0db 100644 --- a/nladmin-system/nlsso-server/pom.xml +++ b/nladmin-system/nlsso-server/pom.xml @@ -205,6 +205,7 @@ mysql mysql-connector-java + 8.0.20 diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/common/logging/aspect/LogAspect.java b/nladmin-system/nlsso-server/src/main/java/org/nl/common/logging/aspect/LogAspect.java index 5253ed6..42fa350 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/common/logging/aspect/LogAspect.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/common/logging/aspect/LogAspect.java @@ -100,7 +100,7 @@ public class LogAspect { SysLog log = new SysLog("INFO", System.currentTimeMillis() - currentTime.get()); currentTime.remove(); - logService.save(getUsername(), StringUtils.getBrowser(request), StringUtils.getIp(request), joinPoint, log); +// logService.save(getUsername(), StringUtils.getBrowser(request), StringUtils.getIp(request), joinPoint, log); return result; } @@ -149,7 +149,7 @@ public class LogAspect { currentTime.remove(); log.setException_detail(ThrowableUtil.getStackTrace(e).getBytes()); HttpServletRequest request = RequestHolder.getHttpServletRequest(); - logService.save(getUsername(), StringUtils.getBrowser(request), StringUtils.getIp(request), (ProceedingJoinPoint) joinPoint, log); +// logService.save(getUsername(), StringUtils.getBrowser(request), StringUtils.getIp(request), (ProceedingJoinPoint) joinPoint, log); } public String getUsername() { diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/dict/SysDictController.java b/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/dict/SysDictController.java index a3e0432..6367cc6 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/dict/SysDictController.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/dict/SysDictController.java @@ -1,9 +1,11 @@ package org.nl.system.controller.dict; +import cn.dev33.satoken.annotation.SaIgnore; import com.alibaba.fastjson.JSONObject; import org.nl.common.base.TableDataInfo; import org.nl.common.domain.query.PageQuery; +import org.nl.common.exception.BadRequestException; import org.nl.common.logging.annotation.Log; import org.nl.system.service.dict.ISysDictService; import org.nl.system.service.dict.dao.Dict; @@ -36,12 +38,12 @@ public class SysDictController { @Log("查询字典") @GetMapping - + public ResponseEntity query(@RequestParam Map whereJson, PageQuery pageable){ return new ResponseEntity<>(TableDataInfo.build(dictService.queryAll(whereJson,pageable)), HttpStatus.OK); } - + @GetMapping(value = "/all") public ResponseEntity queryAll(){ return new ResponseEntity<>(dictService.queryAll(),HttpStatus.OK); @@ -74,7 +76,7 @@ public class SysDictController { return new ResponseEntity<>(TableDataInfo.build(dictService.queryAllDetail(dictQuery,pageable)),HttpStatus.OK); } - + @GetMapping(value = "/dictDetail/map") public ResponseEntity getDictDetailMaps(@RequestParam String dictName){ String[] names = dictName.split("[,，]"); @@ -106,5 +108,18 @@ public class SysDictController { return new ResponseEntity<>(HttpStatus.OK); } + @GetMapping("/getTableEnum") + @SaIgnore + public ResponseEntity getTableEnum(@RequestParam Map criteria) { + Object type = criteria.get("code"); + Object label = criteria.get("label"); + Object value = criteria.get("value"); + if (type == null||label == null||value == null){ + throw new BadRequestException("参数不能为空"); + } + List maps = dictService.dynamicTableEnum((String) type, (String) label, (String) value); + return new ResponseEntity<>(maps, HttpStatus.OK); + } + } diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dict/ISysDictService.java b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dict/ISysDictService.java index f56a0ba..c68e731 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dict/ISysDictService.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dict/ISysDictService.java @@ -85,4 +85,7 @@ public interface ISysDictService extends IService { * @return */ List queryAll(); + + List dynamicTableEnum(String table,String label,String value); + } diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dict/dao/mapper/SysDictMapper.java b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dict/dao/mapper/SysDictMapper.java index d83ff61..2ba3c32 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dict/dao/mapper/SysDictMapper.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dict/dao/mapper/SysDictMapper.java @@ -1,8 +1,12 @@ package org.nl.system.service.dict.dao.mapper; +import org.apache.ibatis.annotations.Param; import org.nl.system.service.dict.dao.Dict; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import java.util.List; +import java.util.Map; + /** *

* 字典表 Mapper 接口 @@ -12,5 +16,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * @since 2022-12-14 */ public interface SysDictMapper extends BaseMapper { + List dynamicTableEnum(@Param("table") String table, @Param("label")String label, @Param("value")String value); } diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dict/dao/mapper/SysDictMapper.xml b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dict/dao/mapper/SysDictMapper.xml index d4acd65..d694fe4 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dict/dao/mapper/SysDictMapper.xml +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dict/dao/mapper/SysDictMapper.xml @@ -2,4 +2,7 @@ + diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dict/impl/SysDictServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dict/impl/SysDictServiceImpl.java index 5bd1845..d48c001 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dict/impl/SysDictServiceImpl.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dict/impl/SysDictServiceImpl.java @@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.apache.commons.lang3.StringUtils; import org.nl.common.domain.query.PageQuery; import org.nl.common.exception.BadRequestException; import org.nl.common.utils.SecurityUtils; @@ -194,4 +195,12 @@ public class SysDictServiceImpl extends ServiceImpl impleme .groupBy(Dict::getCode, Dict::getName)); } + @Override + public List dynamicTableEnum(String table, String label, String value) { + if (StringUtils.isEmpty(table)||StringUtils.isEmpty(label)||StringUtils.isEmpty(value)){ + throw new BadRequestException("参数不能为空"); + } + return this.sysDictMapper.dynamicTableEnum(table,label,value); + } + } diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/master/vehicle/service/dao/Storagevehicleinfo.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/master/vehicle/service/dao/Storagevehicleinfo.java index 9b49fc2..367d4c1 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/master/vehicle/service/dao/Storagevehicleinfo.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/master/vehicle/service/dao/Storagevehicleinfo.java @@ -1,7 +1,6 @@ package org.nl.wms.basedata.master.vehicle.service.dao; import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; @@ -126,19 +125,5 @@ public class Storagevehicleinfo implements Serializable { */ private String ext_id; - @TableField(exist = false) - private String material_code; - - @TableField(exist = false) - private String material_name; - - @TableField(exist = false) - private String point_code; - - @TableField(exist = false) - private String point_name; - - @TableField(exist = false) - private String storagevehicle_type_name; } diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/master/vehicle/service/dao/mapper/StoragevehicleinfoMapper.xml b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/master/vehicle/service/dao/mapper/StoragevehicleinfoMapper.xml index 81818f3..f825f56 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/master/vehicle/service/dao/mapper/StoragevehicleinfoMapper.xml +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/master/vehicle/service/dao/mapper/StoragevehicleinfoMapper.xml @@ -5,18 +5,9 @@ + SELECT + late.*, + mater.material_code, + mater.material_name + FROM + md_pb_groupplate late + LEFT JOIN md_me_materialbase mater ON mater.material_code = late.material_code + + late.status = '01' + + AND + late.storagevehicle_code = #{param.storagevehicle_code} + + + + + + + + diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/dao/mapper/SchBaseVehiclematerialgroupMapper.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/dao/mapper/SchBaseVehiclematerialgroupMapper.java deleted file mode 100644 index 9579533..0000000 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/dao/mapper/SchBaseVehiclematerialgroupMapper.java +++ /dev/null @@ -1,36 +0,0 @@ -package org.nl.wms.sch.group.service.dao.mapper; - -import com.alibaba.fastjson.JSONObject; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import org.nl.wms.sch.group.service.dao.SchBaseVehiclematerialgroup; -import org.nl.wms.sch.group.service.dto.SchBaseVehiclematerialgroupQuery; - -/** -* @author lyd -* @date 2023-05-16 -**/ -public interface SchBaseVehiclematerialgroupMapper extends BaseMapper { - - /** - * 分页查询 - * @param pages 、 - * @param query 查询条件 - * @return IPage - */ - IPage selectPageLeftJoin(IPage pages, SchBaseVehiclematerialgroupQuery query); - - /** - * 获取组盘信息 - * @param entity 、 - * @return SchBaseVehiclematerialgroup 实体类 - */ - SchBaseVehiclematerialgroup getGroup(JSONObject entity); - - /** - * 获取物料嘻嘻 - * @param materialId 物料id - * @return int 数字 - */ - int getInventoryQtyByMaterialId(String materialId); -} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/dao/mapper/SchBaseVehiclematerialgroupMapper.xml b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/dao/mapper/SchBaseVehiclematerialgroupMapper.xml deleted file mode 100644 index ddcebf1..0000000 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/dao/mapper/SchBaseVehiclematerialgroupMapper.xml +++ /dev/null @@ -1,68 +0,0 @@ - - - - - - - - diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/dto/GroupPlateDto.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/dto/GroupPlateDto.java new file mode 100644 index 0000000..2743ea6 --- /dev/null +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/dto/GroupPlateDto.java @@ -0,0 +1,24 @@ +package org.nl.wms.sch.group.service.dto; + +import lombok.Data; +import org.nl.wms.sch.group.service.dao.GroupPlate; + +/** + * @author dsh + * 2025/5/20 + */ +@Data +public class GroupPlateDto extends GroupPlate{ + + /** + * 物料编码 + */ + private String material_spec; + + private String material_code; + + /** + * 物料名称 + */ + private String material_name; +} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/dto/SchBaseVehiclematerialgroupDto.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/dto/SchBaseVehiclematerialgroupDto.java deleted file mode 100644 index 7122789..0000000 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/dto/SchBaseVehiclematerialgroupDto.java +++ /dev/null @@ -1,131 +0,0 @@ -package org.nl.wms.sch.group.service.dto; - -import java.math.BigDecimal; - - -import lombok.Data; -import java.io.Serializable; - -/** -* @description / -* @author lyd -* @date 2023-05-16 -**/ -@Data -public class SchBaseVehiclematerialgroupDto implements Serializable { - - /** 组盘id */ - private String group_id; - - /** 载具编码 */ - private String vehicle_code; - - /** 物料标识 */ - private String material_id; - - /** 子载具编码 */ - private String child_vehicle_code; - - /** 来源载具编码 */ - private String source_vehicle_code; - - /** 点位编码 */ - private String point_code; - - /** 点位名称 */ - private String point_name; - - /** 是否满托 */ - private Boolean is_full; - - /** 是否已烧制 */ - private Boolean is_firing; - - /** 批次 */ - private String pcsn; - - /** 入库时间 */ - private String instorage_time; - - /** 静置时间(分钟) */ - private BigDecimal standing_time; - - /** 物料数量 */ - private BigDecimal material_qty; - - /** 物料重量 */ - private BigDecimal material_weight; - - /** 搬运工单编码 */ - private String workorder_code; - - /** 组盘次数 */ - private BigDecimal group_number; - - /** 任务编码 */ - private String task_code; - - /** 额外信息 */ - private String ext_data; - - /** 车间编码 */ - private String workshop_code; - - /** 组盘状态 */ - private String group_status; - - /** 业务表表名 */ - private String table_name; - - /** 业务表表名主键字段 */ - private String table_fk; - - /** 业务表表名主键值 */ - private String table_fk_id; - - /** 业务链路标识 */ - private String buss_move_id; - - /** 是否首个流程任务 */ - private Boolean is_first_flow_task; - - /** 流程编码 */ - private String flow_code; - - /** 流程顺序 */ - private BigDecimal flow_num; - - /** 上一任务编码 */ - private String before_task_code; - - /** 下一任务编码 */ - private String next_task_code; - - /** 备注 */ - private String remark; - - /** 是否删除 */ - private Boolean is_delete; - - /** 创建人 */ - private String create_id; - - /** 创建人 */ - private String create_name; - - /** 创建时间 */ - private String create_time; - - /** 修改人 */ - private String update_id; - - /** 修改人 */ - private String update_name; - - /** 修改时间 */ - private String update_time; - /** 出窑时间 */ - private String out_kiln_time; - /** 入窑时间 */ - private String into_kiln_time; -} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/dto/SchBaseVehiclematerialgroupQuery.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/dto/SchBaseVehiclematerialgroupQuery.java deleted file mode 100644 index 5d18e0f..0000000 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/dto/SchBaseVehiclematerialgroupQuery.java +++ /dev/null @@ -1,19 +0,0 @@ -package org.nl.wms.sch.group.service.dto; - -import lombok.Data; -import org.nl.common.domain.query.BaseQuery; -import org.nl.wms.sch.group.service.dao.SchBaseVehiclematerialgroup; - -import java.io.Serializable; - -/** -* @author lyd -* @date 2023-05-16 -**/ -@Data -public class SchBaseVehiclematerialgroupQuery implements Serializable { - private String vehicle_code; - private String workshop_code; - private String region_code; - private String group_status; -} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/enums/GroupStatus.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/enums/GroupStatus.java new file mode 100644 index 0000000..1fc6ef8 --- /dev/null +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/enums/GroupStatus.java @@ -0,0 +1,14 @@ +package org.nl.wms.sch.group.service.enums; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.Getter; + +@Getter +@AllArgsConstructor +public enum GroupStatus { + START("1","生成"); + private String code; + private String desc; + +} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/impl/MdPbGroupplateServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/impl/MdPbGroupplateServiceImpl.java new file mode 100644 index 0000000..1d40045 --- /dev/null +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/impl/MdPbGroupplateServiceImpl.java @@ -0,0 +1,43 @@ +package org.nl.wms.sch.group.service.impl; + +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.nl.common.domain.query.PageQuery; +import org.nl.wms.sch.group.service.IMdPbGroupplateService; +import org.nl.wms.sch.group.service.dao.GroupPlate; +import org.nl.wms.sch.group.service.dao.mapper.MdPbGroupplateMapper; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; +import java.util.Map; +import java.util.Set; + +/** + *

+ * 组盘记录表 服务实现类 + *

+ * + * @author Liuxy + * @since 2025-05-23 + */ +@Service +public class MdPbGroupplateServiceImpl extends ServiceImpl implements IMdPbGroupplateService { + + + @Override + public IPage queryAll(Map whereJson, PageQuery page) { + return this.baseMapper.queryAllByPage(new Page<>(page.getPage() + 1, page.getSize()), + whereJson); + } + + @Override + @Transactional + public void delete(Set ids) { + this.baseMapper.deleteBatchIds(ids); + } + + +} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/impl/SchBaseVehiclematerialgroupServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/impl/SchBaseVehiclematerialgroupServiceImpl.java deleted file mode 100644 index bda6cc0..0000000 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/impl/SchBaseVehiclematerialgroupServiceImpl.java +++ /dev/null @@ -1,151 +0,0 @@ -package org.nl.wms.sch.group.service.impl; - -import cn.hutool.core.date.DateUtil; -import cn.hutool.core.util.IdUtil; -import com.alibaba.fastjson.JSONObject; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import lombok.extern.slf4j.Slf4j; -import org.nl.common.domain.query.PageQuery; -import org.nl.common.utils.SecurityUtils; -import org.nl.wms.sch.group.service.ISchBaseVehiclematerialgroupService; -import org.nl.wms.sch.group.service.dao.SchBaseVehiclematerialgroup; -import org.nl.wms.sch.group.service.dao.mapper.SchBaseVehiclematerialgroupMapper; -import org.nl.wms.sch.group.service.dto.SchBaseVehiclematerialgroupQuery; -import org.nl.wms.sch.point.service.ISchBasePointService; -import org.nl.wms.sch.task_manage.enums.GroupBindMaterialStatusEnum; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.ArrayList; -import java.util.List; -import java.util.Set; - -/** - * @author lyd - * @description 服务实现 - * @date 2023-05-16 - **/ -@Slf4j -@Service -public class SchBaseVehiclematerialgroupServiceImpl extends ServiceImpl implements ISchBaseVehiclematerialgroupService { - - @Autowired - private SchBaseVehiclematerialgroupMapper vehiclematerialgroupMapper; - @Autowired - private ISchBasePointService pointService; - - @Override - public IPage queryAll(SchBaseVehiclematerialgroupQuery whereJson, PageQuery page) { - IPage pages = new Page<>(page.getPage() + 1, page.getSize()); - pages = vehiclematerialgroupMapper.selectPageLeftJoin(pages, whereJson); - return pages; - } - - @Override - public void create(SchBaseVehiclematerialgroup entity) { - String currentUserId = SecurityUtils.getCurrentUserId(); - String nickName = SecurityUtils.getCurrentNickName(); - String now = DateUtil.now(); - - entity.setGroup_id(IdUtil.getSnowflake(1, 1).nextIdStr()); - entity.setCreate_id(currentUserId); - entity.setCreate_name(nickName); - entity.setCreate_time(now); - entity.setUpdate_id(currentUserId); - entity.setUpdate_name(nickName); - entity.setUpdate_time(now); - vehiclematerialgroupMapper.insert(entity); - } - - @Override - public void update(SchBaseVehiclematerialgroup entity) { - String currentUserId = SecurityUtils.getCurrentUserId(); - String nickName = SecurityUtils.getCurrentNickName(); - String now = DateUtil.now(); - entity.setUpdate_id(currentUserId); - entity.setUpdate_name(nickName); - entity.setUpdate_time(now); - vehiclematerialgroupMapper.updateById(entity); - } - - @Override - public void deleteAll(Set ids) { - // 真删除 - vehiclematerialgroupMapper.deleteBatchIds(ids); - } - - @Override - public SchBaseVehiclematerialgroup getGroup(JSONObject entity) { - return vehiclematerialgroupMapper.getGroup(entity); - } - - @Override - public SchBaseVehiclematerialgroup getGroupInfo(String vehicleCode, String vehicleType, String value, String materialId) { - LambdaQueryWrapper lambda = new QueryWrapper().lambda(); - lambda.eq(SchBaseVehiclematerialgroup::getVehicle_code, vehicleCode) - .eq(SchBaseVehiclematerialgroup::getVehicle_type, vehicleType) - .eq(SchBaseVehiclematerialgroup::getGroup_status, value) - .eq(SchBaseVehiclematerialgroup::getMaterial_id, materialId) - .eq(SchBaseVehiclematerialgroup::getIs_delete, false); - List selectOne = vehiclematerialgroupMapper.selectList(lambda); - return selectOne.size() > 0 ? selectOne.get(0) : null; - } - - @Override - public SchBaseVehiclematerialgroup getGroupInfo(String vehicleCode, String vehicleType, String value) { - LambdaQueryWrapper lambda = new QueryWrapper().lambda(); - lambda.eq(SchBaseVehiclematerialgroup::getVehicle_code, vehicleCode) - .eq(SchBaseVehiclematerialgroup::getVehicle_type, vehicleType) - .eq(SchBaseVehiclematerialgroup::getGroup_status, value) - .eq(SchBaseVehiclematerialgroup::getIs_delete, false); - List selectOne = vehiclematerialgroupMapper.selectList(lambda); - return selectOne.size() > 0 ? selectOne.get(0) : null; - } - - @Override - public SchBaseVehiclematerialgroup getGroupInfo(String vehicleCode, String value) { - LambdaQueryWrapper lambda = new QueryWrapper().lambda(); - lambda.eq(SchBaseVehiclematerialgroup::getVehicle_code, vehicleCode) - .eq(SchBaseVehiclematerialgroup::getGroup_status, value) - .eq(SchBaseVehiclematerialgroup::getIs_delete, false); - List selectOne = vehiclematerialgroupMapper.selectList(lambda); - return selectOne.size() > 0 ? selectOne.get(0) : null; - } - - @Override - public int getInventoryQtyByMaterialId(String materialId) { - return vehiclematerialgroupMapper.getInventoryQtyByMaterialId(materialId); - } - - @Override - public void unBindingSameVehicleMaterial(String vehicleCode, String vehicleType) { - LambdaQueryWrapper lambda = new QueryWrapper().lambda(); - lambda.eq(SchBaseVehiclematerialgroup::getVehicle_code, vehicleCode) - .eq(SchBaseVehiclematerialgroup::getVehicle_type, vehicleType) - .ne(SchBaseVehiclematerialgroup::getGroup_status, GroupBindMaterialStatusEnum.UNBOUND.getValue()) - .eq(SchBaseVehiclematerialgroup::getIs_delete, false); - List list = vehiclematerialgroupMapper.selectList(lambda); - list.forEach(schBaseVehiclematerialgroup -> - schBaseVehiclematerialgroup.setGroup_status(GroupBindMaterialStatusEnum.UNBOUND.getValue())); - this.updateBatchById(list); - } - - @Override - public SchBaseVehiclematerialgroup getOneByVehicleCode(String vehicleCode, String value) { - List list = new ArrayList<>(); -// list.add(GeneralDefinition.STEEL_TRAY); -// list.add(GeneralDefinition.MATERIAL_CUP); - LambdaQueryWrapper lambda = new QueryWrapper().lambda(); - lambda.eq(SchBaseVehiclematerialgroup::getVehicle_code, vehicleCode) - .eq(SchBaseVehiclematerialgroup::getGroup_status, value) - .eq(SchBaseVehiclematerialgroup::getIs_delete, false) - .notIn(SchBaseVehiclematerialgroup::getVehicle_type, list); - List selectOne = vehiclematerialgroupMapper.selectList(lambda); - return selectOne.size() > 0 ? selectOne.get(0) : null; - } - -} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/ISchBasePointService.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/ISchBasePointService.java index 6030dc3..80390cd 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/ISchBasePointService.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/ISchBasePointService.java @@ -2,8 +2,11 @@ package org.nl.wms.sch.point.service; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.metadata.IPage; +import org.nl.common.base.TableDataInfo; import org.nl.common.domain.query.PageQuery; import com.baomidou.mybatisplus.extension.service.IService; +import org.nl.wms.pdm.structivt.service.dto.RegionStructIvtVo; +import org.nl.wms.pdm.structivt.service.dto.RegionStructQuery; import org.nl.wms.sch.point.service.dao.SchBasePoint; import org.nl.wms.sch.point.service.dto.SchBasePointQuery; @@ -69,4 +72,9 @@ public interface ISchBasePointService extends IService { * @param lock_ype 锁定类型 */ void lockPoint(List list, String lock_ype); + + /* + * 区域点位库存查看 + * */ + TableDataInfo queryStruct(RegionStructQuery query, PageQuery pageQuery); } diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/dao/SchBasePoint.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/dao/SchBasePoint.java index e5ad188..b5a7831 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/dao/SchBasePoint.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/dao/SchBasePoint.java @@ -55,7 +55,7 @@ public class SchBasePoint implements Serializable { private String vehicle_type; /** 载具编码 */ - private String vehicle_code; + private String storagevehicle_code; /** 载具数量 */ private Integer vehicle_qty; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/dao/mapper/SchBasePointMapper.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/dao/mapper/SchBasePointMapper.java index 6d719d1..cd900c2 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/dao/mapper/SchBasePointMapper.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/dao/mapper/SchBasePointMapper.java @@ -2,6 +2,10 @@ package org.nl.wms.sch.point.service.dao.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import org.apache.ibatis.annotations.Param; +import org.nl.common.domain.query.PageQuery; +import org.nl.wms.pdm.structivt.service.dto.RegionStructIvtVo; +import org.nl.wms.pdm.structivt.service.dto.RegionStructQuery; import org.nl.wms.sch.point.service.dao.SchBasePoint; import org.nl.wms.sch.point.service.dto.SchBasePointQuery; @@ -28,4 +32,6 @@ public interface SchBasePointMapper extends BaseMapper { * @return */ IPage selectPageLeftJoin(IPage pages, SchBasePointQuery whereJson); + + List queryStruct(@Param("query") RegionStructQuery query); } diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/dao/mapper/SchBasePointMapper.xml b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/dao/mapper/SchBasePointMapper.xml index cd23bb8..b06abb5 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/dao/mapper/SchBasePointMapper.xml +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/dao/mapper/SchBasePointMapper.xml @@ -59,4 +59,36 @@ ORDER BY p.region_code, p.point_code, p.point_type + diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/impl/SchBasePointServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/impl/SchBasePointServiceImpl.java index 08ecfc5..4d7ea51 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/impl/SchBasePointServiceImpl.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/impl/SchBasePointServiceImpl.java @@ -9,11 +9,15 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.github.pagehelper.PageHelper; import lombok.extern.slf4j.Slf4j; +import org.nl.common.base.TableDataInfo; import org.nl.common.domain.query.PageQuery; import org.nl.common.exception.BadRequestException; import org.nl.common.utils.SecurityUtils; import org.nl.config.language.LangProcess; +import org.nl.wms.pdm.structivt.service.dto.RegionStructIvtVo; +import org.nl.wms.pdm.structivt.service.dto.RegionStructQuery; import org.nl.wms.sch.point.service.ISchBasePointService; import org.nl.wms.sch.point.service.dao.SchBasePoint; import org.nl.wms.sch.point.service.dao.mapper.SchBasePointMapper; @@ -25,6 +29,7 @@ import org.nl.wms.util.PointUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.CollectionUtils; import java.util.Arrays; import java.util.List; @@ -129,7 +134,7 @@ public class SchBasePointServiceImpl extends ServiceImpl queryStruct(RegionStructQuery query, PageQuery pageQuery) { + com.github.pagehelper.Page page = PageHelper.startPage(pageQuery.getPage() + 1, pageQuery.getSize()); +// page.setOrderBy("point_code DESC"); + List ivtVo = this.baseMapper.queryStruct(query); + TableDataInfo build = TableDataInfo.build(ivtVo); + build.setTotalElements(page.getTotal()); + return build; + } } diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/util/PointUtils.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/util/PointUtils.java index 88b65e9..987340a 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/util/PointUtils.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/util/PointUtils.java @@ -48,7 +48,7 @@ public class PointUtils { SchBasePointServiceImpl pointService = SpringContextHolder.getBean(SchBasePointServiceImpl.class); point.setPoint_status(PointStatusEnum.EMPTY_POINT.getCode()); point.setVehicle_type(""); - point.setVehicle_code(""); + point.setStoragevehicle_code(""); point.setIng_task_code(""); point.setVehicle_qty(0); point.setUpdate_time(DateUtil.now()); @@ -70,7 +70,7 @@ public class PointUtils { String parentPointCode = point.getParent_point_code(); SchBasePoint basePoint = pointService.getById(parentPointCode); point.setVehicle_type(""); - point.setVehicle_code(""); + point.setStoragevehicle_code(""); point.setIng_task_code(""); point.setVehicle_qty(point.getVehicle_qty() == 5 ? point.getVehicle_qty() : point.getVehicle_qty() + 1); // 等到新的点执行第一托的时候，才判断另一个点满足5个托盘的时候就清空 diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/util/TaskUtils.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/util/TaskUtils.java index aceda60..0d7da64 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/util/TaskUtils.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/util/TaskUtils.java @@ -7,7 +7,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import lombok.extern.slf4j.Slf4j; import org.nl.common.utils.SecurityUtils; import org.nl.config.SpringContextHolder; -import org.nl.wms.sch.group.service.dao.SchBaseVehiclematerialgroup; import org.nl.wms.sch.task.service.ISchBaseTaskService; import org.nl.wms.sch.task.service.dao.SchBaseTask; import org.nl.wms.sch.task_manage.GeneralDefinition; @@ -71,30 +70,6 @@ public class TaskUtils { taskObj.setUpdate_time(DateUtil.now()); } - public static void setGroupUpdateByAcs(SchBaseVehiclematerialgroup groupEntity) { - groupEntity.setUpdate_id(GeneralDefinition.ACS_ID); - groupEntity.setUpdate_name(GeneralDefinition.ACS_NAME); - groupEntity.setUpdate_time(DateUtil.now()); - } - - public static void setGroupUpdateByPC(SchBaseVehiclematerialgroup groupEntity) { - groupEntity.setUpdate_id(SecurityUtils.getCurrentUserId()); - groupEntity.setUpdate_name(SecurityUtils.getCurrentNickName()); - groupEntity.setUpdate_time(DateUtil.now()); - } - - /** - * 根据类型去判断谁修改的 - * @param groupEntity - * @param taskFinishedType - */ - public static void setGroupUpdateByType(SchBaseVehiclematerialgroup groupEntity, TaskFinishedTypeEnum taskFinishedType) { - if (taskFinishedType.equals(TaskFinishedTypeEnum.AUTO_ACS)) { - setGroupUpdateByAcs(groupEntity); - } else { - setGroupUpdateByPC(groupEntity); - } - } public static void setUpdateAuto(SchBaseTask taskObj) { String currentUserId = ObjectUtil.isNotEmpty(SecurityUtils.getCurrentUserId()) diff --git a/nladmin-system/nlsso-server/src/main/resources/config/application-dev.yml b/nladmin-system/nlsso-server/src/main/resources/config/application-dev.yml index 5e418f1..173cdb2 100644 --- a/nladmin-system/nlsso-server/src/main/resources/config/application-dev.yml +++ b/nladmin-system/nlsso-server/src/main/resources/config/application-dev.yml @@ -4,11 +4,11 @@ server: nl: config: mysql: - ip: 127.0.0.1 + ip: 192.168.81.251 port: 3306 username: root - password: 12356 - database: nl-platform + password: P@ssw0rd. + database: lms_standardv1 redis: ip: 127.0.0.1 port: 6379 diff --git a/nladmin-ui/package.json b/nladmin-ui/package.json index 1912240..361f471 100644 --- a/nladmin-ui/package.json +++ b/nladmin-ui/package.json @@ -6,6 +6,7 @@ "license": "Apache-2.0", "scripts": { "dev": "vue-cli-service serve", + "dev_mac": "export NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve", "build:prod": "vue-cli-service build", "build:stage": "vue-cli-service build --mode staging", "preview": "node build/index.js --preview", diff --git a/nladmin-ui/src/components/TableEnum/TableEnum.js b/nladmin-ui/src/components/TableEnum/TableEnum.js new file mode 100644 index 0000000..c8ed90b --- /dev/null +++ b/nladmin-ui/src/components/TableEnum/TableEnum.js @@ -0,0 +1,34 @@ +import Vue from 'vue' +import { tableEnum as getEnumDetail } from '@/views/system/dict/enumDetail' + +// tableEnums: ['st_ivt_bsrealstorattr#stor_name#stor_code'], +export default class TableEnum { + constructor(tableEnum) { + this.tableEnum = tableEnum + } + + async init(names, completeCallback) { + if (names === undefined || name === null) { + throw new Error('need TableEnum names') + } + const ps = [] + names.forEach(n => { + const split = n.split('#') + const code = split[0] + const label = split[1] + const value = split[2] + Vue.set(this.tableEnum.tableEnum, code, {}) + Vue.set(this.tableEnum.label, code, {}) + Vue.set(this.tableEnum, code, []) + ps.push(getEnumDetail({ 'code': code, 'label': label, 'value': value }).then(data => { + this.tableEnum[code].splice(0, 0, ...data) + data.forEach(d => { + Vue.set(this.tableEnum.tableEnum[code], d.value, d) + Vue.set(this.tableEnum.label[code], d.value, d.label) + }) + })) + }) + await Promise.all(ps) + completeCallback() + } +} diff --git a/nladmin-ui/src/components/TableEnum/index.js b/nladmin-ui/src/components/TableEnum/index.js new file mode 100644 index 0000000..8e80c42 --- /dev/null +++ b/nladmin-ui/src/components/TableEnum/index.js @@ -0,0 +1,29 @@ +import TableEnum from './TableEnum' + +const install = function(Vue) { + Vue.mixin({ + data() { + if (this.$options.tableEnums instanceof Array) { + const tableEnum = { + tableEnum: {}, + label: {} + } + return { + tableEnum + } + } + return {} + }, + created() { + if (this.$options.tableEnums instanceof Array) { + new TableEnum(this.tableEnum).init(this.$options.tableEnums, () => { + this.$nextTick(() => { + this.$emit('dictReady') + }) + }) + } + } + }) +} + +export default { install } diff --git a/nladmin-ui/src/main.js b/nladmin-ui/src/main.js index 0131f01..0bc4fe0 100644 --- a/nladmin-ui/src/main.js +++ b/nladmin-ui/src/main.js @@ -11,6 +11,7 @@ import 'mavon-editor/dist/css/index.css' // 数据字典 import dict from './components/Dict' +import tableEnum from './components/TableEnum' import scroll from 'vue-seamless-scroll' // 权限指令 @@ -71,6 +72,7 @@ Vue.use(VueHighlightJS) Vue.use(mavonEditor) Vue.use(permission) Vue.use(dict) +Vue.use(tableEnum) Vue.use(VueBus) // 全局设置控件样式https://codeantenna.com/a/0IN5FMJk5h Element.Table.props.border = { type: Boolean, default: true } diff --git a/nladmin-ui/src/views/system/dict/enumDetail.js b/nladmin-ui/src/views/system/dict/enumDetail.js new file mode 100644 index 0000000..c552d85 --- /dev/null +++ b/nladmin-ui/src/views/system/dict/enumDetail.js @@ -0,0 +1,22 @@ +import request from '@/utils/request' + +export function get(code) { + const params = { + code + } + return request({ + url: 'api/dict/getStatusEnum', + method: 'get', + params + }) +} + +export function tableEnum(params) { + return request({ + url: 'api/dict/getTableEnum', + method: 'get', + params + }) +} + +export default { get, tableEnum } diff --git a/nladmin-ui/src/views/wms/basedata/master/vehicle/index.vue b/nladmin-ui/src/views/wms/basedata/master/vehicle/index.vue index 0444f69..17e10b4 100644 --- a/nladmin-ui/src/views/wms/basedata/master/vehicle/index.vue +++ b/nladmin-ui/src/views/wms/basedata/master/vehicle/index.vue @@ -19,28 +19,6 @@ :placeholder="$t('common.Please_select')" /> - - - - - - - @@ -65,32 +43,52 @@ :visible.sync="crud.status.cu > 0" width="450px" > - - - + + + + +
- - + + - - {{ $t('common.No') }} - {{ $t('common.Yes') }} + + + + + + + + + + + + + + + + + 否 + 是
- {{ $t('common.Cancel') }} - {{ $t('VehicleInfo.dialog.build') }} - {{ $t('VehicleInfo.dialog.build_print') }} + 取消 + 生成 + 生成并打印
@@ -103,11 +101,6 @@ @selection-change="crud.selectionChangeHandler" > - { - debugger const data = res this.buildTree(data) this.classes1 = data @@ -317,6 +309,16 @@ export default { }) }) }, + getVehicle(code) { + if (!code) { + this.crud.notify('请选择载具类型', CRUD.NOTIFICATION_TYPE.INFO) + this.form.vehicle_code = '' + return false + } + crudStoragevehicleinfo.getVehicle(code).then(res => { + this.form.vehicle_code = res.value + }) + }, print() { const _selectData = this.$refs.table.selection if (!_selectData || _selectData.length < 1) { diff --git a/nladmin-ui/src/views/wms/basedata/material/MaterialDialog.vue b/nladmin-ui/src/views/wms/basedata/material/MaterialDialog.vue new file mode 100644 index 0000000..e01adf7 --- /dev/null +++ b/nladmin-ui/src/views/wms/basedata/material/MaterialDialog.vue @@ -0,0 +1,153 @@ + + + + + diff --git a/nladmin-ui/src/views/wms/basedata/material/index.vue b/nladmin-ui/src/views/wms/basedata/material/index.vue index e5afe05..36c9dd9 100644 --- a/nladmin-ui/src/views/wms/basedata/material/index.vue +++ b/nladmin-ui/src/views/wms/basedata/material/index.vue @@ -85,21 +85,25 @@ - - - - - - - - - - - - - - - + + + + + + + + +
取消 @@ -206,6 +210,7 @@ export default { name: 'Materia', // 数据字典 dicts: ['is_used'], + tableEnums: ['md_pb_measureunit#unit_name#measure_unit_id'], components: { pagination, crudOperation, rrOperation, udOperation, UploadDialog }, mixins: [presenter(), header(), form(defaultForm), crud()], cruds() { diff --git a/nladmin-ui/src/views/wms/pdm/group/group.js b/nladmin-ui/src/views/wms/pdm/group/group.js new file mode 100644 index 0000000..e927e8f --- /dev/null +++ b/nladmin-ui/src/views/wms/pdm/group/group.js @@ -0,0 +1,27 @@ +import request from '@/utils/request' + +export function add(data) { + return request({ + url: 'api/group', + method: 'post', + data + }) +} + +export function del(ids) { + return request({ + url: 'api/group/', + method: 'delete', + data: ids + }) +} + +export function edit(data) { + return request({ + url: 'api/group', + method: 'put', + data + }) +} + +export default { add, edit, del } diff --git a/nladmin-ui/src/views/wms/pdm/group/index.vue b/nladmin-ui/src/views/wms/pdm/group/index.vue new file mode 100644 index 0000000..2709f7c --- /dev/null +++ b/nladmin-ui/src/views/wms/pdm/group/index.vue @@ -0,0 +1,269 @@ + + + + + diff --git a/nladmin-ui/src/views/wms/pdm/structivt/index.vue b/nladmin-ui/src/views/wms/pdm/structivt/index.vue new file mode 100644 index 0000000..c10883c --- /dev/null +++ b/nladmin-ui/src/views/wms/pdm/structivt/index.vue @@ -0,0 +1,177 @@ + + + + + diff --git a/nladmin-ui/src/views/wms/pdm/structivt/structivt.js b/nladmin-ui/src/views/wms/pdm/structivt/structivt.js new file mode 100644 index 0000000..52927a9 --- /dev/null +++ b/nladmin-ui/src/views/wms/pdm/structivt/structivt.js @@ -0,0 +1,65 @@ +import request from '@/utils/request' + +export function add(data) { + return request({ + url: 'api/structivt', + method: 'post', + data + }) +} + +export function del(ids) { + return request({ + url: 'api/structivt/', + method: 'delete', + data: ids + }) +} + +export function edit(data) { + return request({ + url: 'api/structivt', + method: 'put', + data + }) +} + +export function getStruct() { + return request({ + url: 'api/structivt/getStruct', + method: 'get' + }) +} + +export function getStructById(data) { + return request({ + url: 'api/structivt/getStructById', + method: 'post', + data + }) +} + +export function getUnits() { + return request({ + url: 'api/structivt/getUnits', + method: 'get' + }) +} + +export function save(data) { + return request({ + url: 'api/structivt/save', + method: 'post', + data: data + }) +} + +export function excelImport(data) { + return request({ + url: 'api/structivt/importExcel', + method: 'post', + data + }) +} + +export default { add, edit, del, getStruct, getStructById, getUnits, save, excelImport }