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

fix: 部分修改

Browse Source
This commit is contained in:
liyongde
2023-05-19 15:06:08 +08:00
parent b1c7048486
commit 983d6a8de7
9 changed files with 88 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/service/dao/mapper/PdmBdWorkorderMapper.xml
View File

@@ -13,7 +13,7 @@
AND wo.workorder_code LIKE CONCAT('%', #{query.workorder_code}, '%')
</if>
<if test="query.point_code != null and query.point_code != ''">
AND wo.point_code LIKE CONCAT('%', #{query.point_code}, '%')
AND LOWER(wo.point_code) LIKE LOWER(CONCAT('%', #{query.point_code}, '%'))
</if>
</select>
</mapper>

2
nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/dao/SchBaseVehiclematerialgroup.java
View File

@@ -135,5 +135,7 @@ public class SchBaseVehiclematerialgroup implements Serializable {
private String material_code;
@TableField(exist = false)
private String material_spec;
@TableField(exist = false)
private String region_name;
}

2
nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/dao/mapper/SchBaseVehiclematerialgroupMapper.xml
View File

@@ -7,8 +7,10 @@
, ma.material_name
, ma.material_code
, ma.material_spec
, po.region_name
FROM sch_base_vehiclematerialgroup vg
LEFT JOIN md_base_material ma ON vg.material_id = ma.material_id
LEFT JOIN sch_base_point po ON po.point_code = vg.point_code
WHERE 1 = 1
<if test="query.vehicle_code != null">
AND vg.vehicle_code = #{query.vehicle_code}

20
nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/dao/SchBasePoint.java
View File

@@ -50,7 +50,7 @@ public class SchBasePoint implements Serializable {
private String can_vehicle_type;
@ApiModelProperty(value = "载具允许最大数量")
private BigDecimal vehicle_max_qty;
private Integer vehicle_max_qty;
@ApiModelProperty(value = "载具类型")
private String vehicle_type;
@@ -59,31 +59,31 @@ public class SchBasePoint implements Serializable {
private String vehicle_code;
@ApiModelProperty(value = "载具数量")
private BigDecimal vehicle_qty;
private Integer vehicle_qty;
@ApiModelProperty(value = "块")
private BigDecimal block_num;
private Integer block_num;
@ApiModelProperty(value = "排")
private BigDecimal row_num;
private Integer row_num;
@ApiModelProperty(value = "列")
private BigDecimal col_num;
private Integer col_num;
@ApiModelProperty(value = "层")
private BigDecimal layer_num;
private Integer layer_num;
@ApiModelProperty(value = "入库顺序")
private BigDecimal in_order_seq;
private Integer in_order_seq;
@ApiModelProperty(value = "出库顺序")
private BigDecimal out_order_seq;
private Integer out_order_seq;
@ApiModelProperty(value = "入空载具顺序")
private BigDecimal in_empty_seq;
private Integer in_empty_seq;
@ApiModelProperty(value = "出空载具顺序")
private BigDecimal out_empty_seq;
private Integer out_empty_seq;
@ApiModelProperty(value = "父点位编码")
private String parent_point_code;

20
nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/dto/SchBasePointDto.java
View File

@@ -37,7 +37,7 @@ public class SchBasePointDto implements Serializable {
private String can_vehicle_type;
/** 载具允许最大数量 */
private BigDecimal vehicle_max_qty;
private Integer vehicle_max_qty;
/** 载具类型 */
private String vehicle_type;
@@ -46,31 +46,31 @@ public class SchBasePointDto implements Serializable {
private String vehicle_code;
/** 载具数量 */
private BigDecimal vehicle_qty;
private Integer vehicle_qty;
/** 块 */
private BigDecimal block_num;
private Integer block_num;
/** 排 */
private BigDecimal row_num;
private Integer row_num;
/** 列 */
private BigDecimal col_num;
private Integer col_num;
/** 层 */
private BigDecimal layer_num;
private Integer layer_num;
/** 入库顺序 */
private BigDecimal in_order_seq;
private Integer in_order_seq;
/** 出库顺序 */
private BigDecimal out_order_seq;
private Integer out_order_seq;
/** 入空载具顺序 */
private BigDecimal in_empty_seq;
private Integer in_empty_seq;
/** 出空载具顺序 */
private BigDecimal out_empty_seq;
private Integer out_empty_seq;
/** 父点位编码 */
private String parent_point_code;

2
nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/impl/SchBasePointServiceImpl.java
View File

@@ -129,7 +129,7 @@ public class SchBasePointServiceImpl extends ServiceImpl<SchBasePointMapper, Sch
if (ObjectUtil.isNotEmpty(pointStatus) && pointStatus.equals(PointStatusEnum.EMPTY_PLACE.getValue())) {
entity.setVehicle_type("");
entity.setVehicle_code("");
entity.setVehicle_qty(BigDecimal.valueOf(0));
entity.setVehicle_qty(0);
}
pointMapper.updateById(entity);
}

6
nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/impl/SchBaseTaskconfigServiceImpl.java
View File

@@ -1,28 +1,24 @@
package org.nl.wms.sch.task.service.impl;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.lang.Assert;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.ObjectUtil;
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 lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.nl.common.domain.query.PageQuery;
import org.nl.common.exception.BadRequestException;
import org.nl.common.utils.SecurityUtils;
import org.nl.wms.sch.task.service.ISchBaseTaskconfigService;
import org.nl.wms.sch.task.service.dao.mapper.SchBaseTaskconfigMapper;
import org.nl.wms.sch.task.service.dao.SchBaseTaskconfig;
import org.nl.wms.sch.task.service.dao.mapper.SchBaseTaskconfigMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.Arrays;
import java.util.Map;
import java.util.Set;
import java.util.function.Consumer;
/**
* @author lyd