Skip to content

D
data-acquisition
Commit 31f3daa3 authored by renchao's avatar renchao
Browse files
Options

生产工序业务修改

parent 893453a4
Hide whitespace changes
Inline Side-by-side
Showing with 95 additions and 84 deletions
acquisition-business/src/main/java/cn/wise/sc/acquisition/business/enumation/ProjectEnum.java
View file @ 31f3daa3
...@@ -16,7 +16,9 @@ public class ProjectEnum { ...@@ -16,7 +16,9 @@ public class ProjectEnum {
public enum TMaterialOut { public enum TMaterialOut {
CONSUME_DATE(1, "ConsumeDate","材料消耗日期"); CONSUME_DATE(1, "ConsumeDate","材料消耗日期"),
PROCESSES_NAME(2, "processesName","工序名称");
// 成员变量 // 成员变量
......
acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TMaterialOutServiceImpl.java
View file @ 31f3daa3
...@@ -15,6 +15,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; ...@@ -15,6 +15,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
...@@ -23,7 +24,7 @@ import javax.annotation.Resource; ...@@ -23,7 +24,7 @@ import javax.annotation.Resource;
/** /**
* <p> * <p>
* 服务实现类 * 服务实现类
* </p> * </p>
* *
* @author renchao * @author renchao
...@@ -34,93 +35,101 @@ import javax.annotation.Resource; ...@@ -34,93 +35,101 @@ import javax.annotation.Resource;
@Slf4j @Slf4j
public class TMaterialOutServiceImpl extends ServiceImpl<TMaterialOutMapper, TMaterialOut> implements ITMaterialOutService { public class TMaterialOutServiceImpl extends ServiceImpl<TMaterialOutMapper, TMaterialOut> implements ITMaterialOutService {
@Resource @Resource
private TMaterialOutMapper materialOutMapper; private TMaterialOutMapper materialOutMapper;
/** /**
* 分页列表 * 分页列表
* @param pageQuery *
* @return * @param pageQuery
*/ * @return
@Override */
public R<IPage<TMaterialOut>> getPage(PageQuery pageQuery) { @Override
QueryWrapper<TMaterialOut> qw = new QueryWrapper<>(); public R<IPage<TMaterialOut>> getPage(PageQuery pageQuery) {
qw.orderByDesc("Tag"); QueryWrapper<TMaterialOut> qw = new QueryWrapper<>();
IPage<TMaterialOut> page = new Page<>(pageQuery.getPageNo(), pageQuery.getPageSize()); qw.orderByDesc("Tag");
page = materialOutMapper.selectPage(page, qw); IPage<TMaterialOut> page = new Page<>(pageQuery.getPageNo(), pageQuery.getPageSize());
return R.ok(page); page = materialOutMapper.selectPage(page, qw);
} return R.ok(page);
}
/** /**
* 领用出库 * 领用出库
* @param query *
* @return * @param query
*/ * @return
@Override */
public R delivery(TMaterialOutQuery query) { @Override
Rcode.NOT_PARAM.assertNotNull(query); public R delivery(TMaterialOutQuery query) {
Rcode.NOT_PARAM.assertNotNull(query.getEquipmentID()); Rcode.NOT_PARAM.assertNotNull(query);
Rcode.NOT_PARAM.assertNotNull(query.getEquipmentName()); Rcode.NOT_PARAM.assertNotNull(query.getEquipmentID());
TMaterialOut out = new TMaterialOut(); Rcode.NOT_PARAM.assertNotNull(query.getEquipmentName());
BeanUtils.copyProperties(query, out); TMaterialOut out = new TMaterialOut();
materialOutMapper.insert(out); BeanUtils.copyProperties(query, out);
return R.ok(); materialOutMapper.insert(out);
} return R.ok();
}
/** /**
* 修改领用出库 * 修改领用出库
* @param query *
* @return * @param query
*/ * @return
@Override */
public R update(TMaterialOutQuery query) { @Override
Rcode.NOT_PARAM.assertNotNull(query); public R update(TMaterialOutQuery query) {
Rcode.NOT_PARAM.assertNotNull(query.getEquipmentID()); Rcode.NOT_PARAM.assertNotNull(query);
Rcode.NOT_PARAM.assertNotNull(query.getEquipmentName()); Rcode.NOT_PARAM.assertNotNull(query.getEquipmentID());
TMaterialOut out = materialOutMapper.selectById(query.getUid()); Rcode.NOT_PARAM.assertNotNull(query.getEquipmentName());
Rcode.NOT_FOUND.assertNotNull(out); TMaterialOut out = materialOutMapper.selectById(query.getUid());
BeanUtils.copyProperties(query, out); Rcode.NOT_FOUND.assertNotNull(out);
materialOutMapper.updateById(out); BeanUtils.copyProperties(query, out);
return R.ok(); materialOutMapper.updateById(out);
} return R.ok();
}
/** /**
* 领用出库详情 * 领用出库详情
* @param Uid *
* @return * @param Uid
*/ * @return
@Override */
public R<TMaterialOut> getDetail(String Uid) { @Override
Rcode.NOT_PARAM.assertNotNull(Uid); public R<TMaterialOut> getDetail(String Uid) {
TMaterialOut out = materialOutMapper.selectById(Uid); Rcode.NOT_PARAM.assertNotNull(Uid);
Rcode.NOT_FOUND.assertNotNull(out); TMaterialOut out = materialOutMapper.selectById(Uid);
return R.ok(out); Rcode.NOT_FOUND.assertNotNull(out);
} return R.ok(out);
}
/** /**
* 物资消耗列表查询 分页列表 * 物资消耗列表查询 分页列表
* @param tMaterialOutQuery *
* @return * @param tMaterialOutQuery
*/ * @return
@Override */
public R<IPage<TMaterialOut>> getConsumePage(TMaterialOutQuery tMaterialOutQuery,PageQuery query) { @Override
log.info(JSON.toJSONString(tMaterialOutQuery)); public R<IPage<TMaterialOut>> getConsumePage(TMaterialOutQuery tMaterialOutQuery, PageQuery query) {
//参数校验 log.info(JSON.toJSONString(tMaterialOutQuery));
//分页 //参数校验
Page<TMaterialOut> page = new Page<>(query.getPageNo(), query.getPageSize()); //分页
//条件封装 Page<TMaterialOut> page = new Page<>(query.getPageNo(), query.getPageSize());
QueryWrapper<TMaterialOut> queryWrapper = new QueryWrapper<>(); //条件封装
//如果设计时间不为空 条件查询 QueryWrapper<TMaterialOut> queryWrapper = new QueryWrapper<>();
if (tMaterialOutQuery.getConsumeDate() != null) { //如果设计时间不为空 条件查询
//前端传来的时间可能为2021-04-05 17:37:33.000, 需要查询 2021-04-05 00:00:00 到 2021-04-05 23:59:59 的数据 故作处理 if (tMaterialOutQuery.getConsumeDate() != null) {
queryWrapper //前端传来的时间可能为2021-04-05 17:37:33.000, 需要查询 2021-04-05 00:00:00 到 2021-04-05 23:59:59 的数据 故作处理
.ge(ProjectEnum.TMaterialOut.CONSUME_DATE.getLabel(), DateUtil.getBeginTimeStr(tMaterialOutQuery.getConsumeDate())) queryWrapper
.le(ProjectEnum.TMaterialOut.CONSUME_DATE.getLabel(), DateUtil.getEndTimeStr(tMaterialOutQuery.getConsumeDate())); .ge(ProjectEnum.TMaterialOut.CONSUME_DATE.getLabel(), DateUtil.getBeginTimeStr(tMaterialOutQuery.getConsumeDate()))
} .le(ProjectEnum.TMaterialOut.CONSUME_DATE.getLabel(), DateUtil.getEndTimeStr(tMaterialOutQuery.getConsumeDate()));
//查询 }
Page<TMaterialOut> tMaterialOutPage = baseMapper.selectPage(page, queryWrapper); queryWrapper.eq(StringUtils.isNotBlank(tMaterialOutQuery.getProcessesName()),
return R.ok(tMaterialOutPage); ProjectEnum.TMaterialOut.PROCESSES_NAME.getLabel(),
} tMaterialOutQuery.getConsumeType());
//查询
Page<TMaterialOut> tMaterialOutPage = baseMapper.selectPage(page, queryWrapper);
return R.ok(tMaterialOutPage);
}
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment