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

rev: 修改物料、组盘、工单

Browse Source
This commit is contained in:
liyongde
2023-05-17 16:13:56 +08:00
parent 9795450e50
commit 290ac6f9e1
11 changed files with 486 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/material/service/IMdBaseMaterialService.java
View File

@@ -1,6 +1,7 @@
package org.nl.wms.database.material.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.nl.common.domain.query.PageQuery;
import com.baomidou.mybatisplus.extension.service.IService;
import org.nl.wms.database.material.service.dao.MdBaseMaterial;

2
nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/material/service/impl/MdBaseMaterialServiceImpl.java
View File

@@ -37,10 +37,12 @@ public class MdBaseMaterialServiceImpl extends ServiceImpl<MdBaseMaterialMapper,
@Override
public IPage<MdBaseMaterial> queryAll(Map whereJson, PageQuery page){
String blurry = ObjectUtil.isNotEmpty(whereJson.get("blurry")) ? whereJson.get("blurry").toString() : null;
Boolean is_used = ObjectUtil.isNotEmpty(whereJson.get("is_used")) ? Boolean.valueOf(whereJson.get("is_used").toString()) : null;
String workshop_code = ObjectUtil.isNotEmpty(whereJson.get("workshop_code")) ? whereJson.get("workshop_code").toString() : null;
LambdaQueryWrapper<MdBaseMaterial> lam = new LambdaQueryWrapper<>();
lam.like(ObjectUtil.isNotEmpty(blurry), MdBaseMaterial::getMaterial_code, blurry)
.or(ObjectUtil.isNotEmpty(blurry), l -> l.like(ObjectUtil.isNotEmpty(blurry), MdBaseMaterial::getMaterial_name, blurry))
.eq(ObjectUtil.isNotEmpty(is_used), MdBaseMaterial::getIs_used, is_used)
.eq(ObjectUtil.isNotEmpty(workshop_code), MdBaseMaterial::getWorkshop_code, workshop_code);
IPage<MdBaseMaterial> pages = new Page<>(page.getPage() + 1, page.getSize());
mdBaseMaterialMapper.selectPage(pages, lam);

12
nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/service/dao/PdmBdWorkorder.java
View File

@@ -1,6 +1,7 @@
package org.nl.wms.pdm.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 io.swagger.annotations.ApiModelProperty;
@@ -29,8 +30,6 @@ public class PdmBdWorkorder implements Serializable {
@ApiModelProperty(value = "工单编号")
private String workorder_code;
@ApiModelProperty(value = "计划数量")
private BigDecimal plan_qty;
@@ -109,4 +108,13 @@ public class PdmBdWorkorder implements Serializable {
@ApiModelProperty(value = "修改时间")
private String update_time;
@TableField(exist = false)
private String material_name;
@TableField(exist = false)
private String material_code;
@TableField(exist = false)
private String material_spec;
}

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

@@ -1,6 +1,7 @@
package org.nl.wms.pdm.service.dao.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.nl.wms.pdm.service.dao.PdmBdWorkorder;
/**
@@ -9,4 +10,5 @@ import org.nl.wms.pdm.service.dao.PdmBdWorkorder;
**/
public interface PdmBdWorkorderMapper extends BaseMapper<PdmBdWorkorder> {
IPage<PdmBdWorkorder> selectPageLeftJoin(IPage<PdmBdWorkorder> pages, String workorderCode, String pointCode);
}

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

@@ -1,5 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.nl.wms.pdm.service.dao.mapper.PdmBdWorkorderMapper">
<select id="selectPageLeftJoin" resultType="org.nl.wms.pdm.service.dao.PdmBdWorkorder">
SELECT wo.*
,ma.material_name
,ma.material_code
,ma.material_spec
FROM pdm_bd_workorder wo
LEFT JOIN md_base_material ma ON ma.material_id = wo.material_id
WHERE 1 = 1
<if test="workorderCode != null">
AND wo.workorder_code like CONCAT('%', #{workorderCode}, '%')
</if>
<if test="pointCode != null">
AND wo.point_code like CONCAT('%', #{pointCode}, '%')
</if>
</select>
</mapper>

7
nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/service/impl/PdmBdWorkorderServiceImpl.java
View File

@@ -2,7 +2,9 @@ package org.nl.wms.pdm.service.impl;
import cn.hutool.core.date.DateUtil;
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.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;
@@ -33,9 +35,10 @@ public class PdmBdWorkorderServiceImpl extends ServiceImpl<PdmBdWorkorderMapper,
@Override
public IPage<PdmBdWorkorder> queryAll(Map whereJson, PageQuery page){
LambdaQueryWrapper<PdmBdWorkorder> lam = new LambdaQueryWrapper<>();
String workorder_code = ObjectUtil.isNotEmpty(whereJson.get("workorder_code")) ? whereJson.get("workorder_code").toString() : null;
String point_code = ObjectUtil.isNotEmpty(whereJson.get("point_code")) ? whereJson.get("point_code").toString() : null;
IPage<PdmBdWorkorder> pages = new Page<>(page.getPage() + 1, page.getSize());
pdmBdWorkorderMapper.selectPage(pages, lam);
pages = pdmBdWorkorderMapper.selectPageLeftJoin(pages, workorder_code, point_code);
return pages;
}

21
nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/impl/SchBaseVehiclematerialgroupServiceImpl.java
View File

@@ -1,12 +1,11 @@
package org.nl.wms.sch.group.service.impl;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.lang.Assert;
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;
@@ -30,35 +29,39 @@ import java.util.Set;
public class SchBaseVehiclematerialgroupServiceImpl extends ServiceImpl<SchBaseVehiclematerialgroupMapper, SchBaseVehiclematerialgroup> implements ISchBaseVehiclematerialgroupService {
@Autowired
private SchBaseVehiclematerialgroupMapper schBaseVehiclematerialgroupMapper;
private SchBaseVehiclematerialgroupMapper vehiclematerialgroupMapper;
@Override
public IPage<SchBaseVehiclematerialgroup> queryAll(Map whereJson, PageQuery page){
LambdaQueryWrapper<SchBaseVehiclematerialgroup> lam = new LambdaQueryWrapper<>();
IPage<SchBaseVehiclematerialgroup> pages = new Page<>(page.getPage() + 1, page.getSize());
schBaseVehiclematerialgroupMapper.selectPage(pages, lam);
vehiclematerialgroupMapper.selectPage(pages, lam);
return pages;
}
@Override
public void create(SchBaseVehiclematerialgroup entity) {
SchBaseVehiclematerialgroup schBaseVehiclematerialgroup = vehiclematerialgroupMapper.selectOne(new LambdaQueryWrapper<SchBaseVehiclematerialgroup>()
.eq(SchBaseVehiclematerialgroup::getVehicle_code, entity.getVehicle_code())
.eq(SchBaseVehiclematerialgroup::getIs_delete, false));
Assert.isNull(schBaseVehiclematerialgroup, "载具编码[" + entity.getVehicle_code() + "]已存在");
String currentUserId = SecurityUtils.getCurrentUserId();
String nickName = SecurityUtils.getCurrentNickName();
String now = DateUtil.now();
entity.setVehicle_code(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);
schBaseVehiclematerialgroupMapper.insert(entity);
vehiclematerialgroupMapper.insert(entity);
}
@Override
public void update(SchBaseVehiclematerialgroup entity) {
SchBaseVehiclematerialgroup dto = schBaseVehiclematerialgroupMapper.selectById(entity.getVehicle_code());
SchBaseVehiclematerialgroup dto = vehiclematerialgroupMapper.selectById(entity.getVehicle_code());
if (dto == null) throw new BadRequestException("被删除或无权限，操作失败!");
String currentUserId = SecurityUtils.getCurrentUserId();
@@ -68,13 +71,13 @@ public class SchBaseVehiclematerialgroupServiceImpl extends ServiceImpl<SchBaseV
entity.setUpdate_name(nickName);
entity.setUpdate_time(now);
schBaseVehiclematerialgroupMapper.updateById(entity);
vehiclematerialgroupMapper.updateById(entity);
}
@Override
public void deleteAll(Set<String> ids) {
// 真删除
schBaseVehiclematerialgroupMapper.deleteBatchIds(ids);
vehiclematerialgroupMapper.deleteBatchIds(ids);
}
}