yxt_group
/
supervise
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

原料接口修改

master
wangpengfei 2 years ago
parent
b9300ed41f
commit
a1924b0ab2
2 changed files with 50 additions and 21 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/procurementdetails/ProcurementDetailsQuery.java
  2. 66
      yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/procurementdetails/ProcurementDetailsService.java

1
yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/procurementdetails/ProcurementDetailsQuery.java
View File

@ -42,4 +42,5 @@ public class ProcurementDetailsQuery implements Query {
private String state;
//区分1原油 2包装物 3原料
private String type;
private String supplierName;
}

66
yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/procurementdetails/ProcurementDetailsService.java
View File

@ -4,11 +4,13 @@ import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.date.DateUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.api.R;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.PagerUtil;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import com.yxt.supervise.cyf.api.approvalrecord.ApprovalRecordDto;
import com.yxt.supervise.cyf.api.crudeoiltypeinformation.CrudeOilTypeInformationDto;
import com.yxt.supervise.cyf.api.crudeoiltypeinformation.CrudeOilTypeInformationVo;
import com.yxt.supervise.cyf.api.materialinventory.MaterialInventory;
@ -18,6 +20,8 @@ import com.yxt.supervise.cyf.api.procurementdetails.ProcurementDetails;
import com.yxt.supervise.cyf.api.procurementdetails.ProcurementDetailsDto;
import com.yxt.supervise.cyf.api.procurementdetails.ProcurementDetailsQuery;
import com.yxt.supervise.cyf.api.procurementdetails.ProcurementDetailsVo;
import com.yxt.supervise.cyf.biz.approvalrecord.ApprovalRecordMapper;
import com.yxt.supervise.cyf.biz.approvalrecord.ApprovalRecordService;
import com.yxt.supervise.cyf.biz.crudeoiltypeinformation.CrudeOilTypeInformationMapper;
import com.yxt.supervise.cyf.biz.crudeoiltypeinformation.CrudeOilTypeInformationService;
import com.yxt.supervise.cyf.biz.materialinventory.MaterialInventoryMapper;
@ -39,15 +43,15 @@ public class ProcurementDetailsService extends MybatisBaseService<ProcurementDet
@Autowired
MaterialInventoryMapper rawMaterialInventoryMapper;
@Autowired
CrudeOilTypeInformationMapper crudeOilTypeInformationMapper;
ApprovalRecordService approvalRecordService;
public PagerVo<ProcurementDetailsVo> listPageVo(PagerQuery<ProcurementDetailsQuery> pq) {
ProcurementDetailsQuery query = pq.getParams();
QueryWrapper<ProcurementDetails> qw = new QueryWrapper<>();
// if (StringUtils.isNotBlank(query.getDate())) {
// qw.eq("STR_TO_DATE(o.deliveryDate,'%Y-%m-%d')", query.getDate());
// }
if (StringUtils.isNotBlank(query.getType())) {
qw.eq("d.type", query.getType());
if (StringUtils.isNotBlank(query.getSupplierName())) {
qw.eq("s.supplierNumber", query.getSupplierName());
}
if (StringUtils.isNotBlank(query.getState())) {
qw.eq("d.state", query.getState());
@ -65,10 +69,24 @@ public class ProcurementDetailsService extends MybatisBaseService<ProcurementDet
public ResultBean save(ProcurementDetailsDto dto){
ResultBean rb=new ResultBean();
Date curDate = new Date();
String dfmt = DateUtil.format(curDate, "yyyy-MM-dd");
ProcurementDetails entity=new ProcurementDetails();
if(null==dto.getSid() || ""==dto.getSid()){
BeanUtil.copyProperties(dto, entity, "id","sid");
// ApprovalRecordDto recordDto=new ApprovalRecordDto();
// recordDto.setProSid(entity.getSid());
// recordDto.setApprover("");
// recordDto.getApprovalOpinions();
// recordDto.setApprovalDate(dfmt);
// approvalRecordService.save(recordDto);
}else{
BeanUtil.copyProperties(dto, entity, "id");
}
// BeanUtil.copyProperties(dto, entity, "id","sid");
//多个商品
if(dto.getCommodityList().size()>1){
BeanUtil.copyProperties(dto, entity, "sid");
//BeanUtil.copyProperties(dto, entity, "sid");
for(CrudeOilTypeInformationDto pro:dto.getCommodityList()){
entity.setTypeSid(pro.getSid());
entity.setState(1);
@ -79,8 +97,7 @@ public class ProcurementDetailsService extends MybatisBaseService<ProcurementDet
}
return rb.success().setMsg("新增成功");
}
Date curDate = new Date();
String dfmt = DateUtil.format(curDate, "yyyy-MM-dd");
for(CrudeOilTypeInformationDto pro:dto.getCommodityList()){
entity.setTypeSid(pro.getSid());
entity.setState(1);
@ -93,27 +110,35 @@ public class ProcurementDetailsService extends MybatisBaseService<ProcurementDet
}
public ResultBean submit(ProcurementDetailsDto dto){
ResultBean rb=new ResultBean();
String sid =dto.getCommodityList().get(1).getSid();
//不存在提交
Date curDate = new Date();
String dfmt = DateUtil.format(curDate, "yyyy-MM-dd");
String sid =dto.getSid();
List<ProcurementDetails> procurementDetails=baseMapper.selectList(new QueryWrapper<ProcurementDetails>().eq("sid",sid));
//不存在保存加提交
if(sid.equals("")||sid.equals(null)){
ProcurementDetails entity=new ProcurementDetails();
if(dto.getCommodityList().size()>1){
BeanUtil.copyProperties(dto, entity, "sid");
for(CrudeOilTypeInformationDto pro:dto.getCommodityList()){
entity.setTypeSid(pro.getSid());
entity.setState(1);
entity.setState(procurementDetails.get(1).getState()+1);
entity.setType("1");
entity.setWeight(pro.getWeight());
entity.setPrice(pro.getPrice());
baseMapper.insert(entity);
}
//提交记录
// ApprovalRecordDto recordDto=new ApprovalRecordDto();
// recordDto.setProSid(entity.getSid());
// recordDto.setApprover("");
// recordDto.getApprovalOpinions();
// recordDto.setApprovalDate(dfmt);
// approvalRecordService.save(recordDto);
return rb.success().setMsg("新增成功");
}
Date curDate = new Date();
String dfmt = DateUtil.format(curDate, "yyyy-MM-dd");
for(CrudeOilTypeInformationDto pro:dto.getCommodityList()){
entity.setTypeSid(pro.getSid());
entity.setState(1);
entity.setState(procurementDetails.get(1).getState()+1);
entity.setType("1");
entity.setWeight(pro.getWeight());
entity.setPrice(pro.getPrice());
@ -122,13 +147,16 @@ public class ProcurementDetailsService extends MybatisBaseService<ProcurementDet
}else{
//存在该状态
List<ProcurementDetails> list =baseMapper.selectList(new QueryWrapper<ProcurementDetails>().eq("sid",sid));
if(list.size()>1){
for(ProcurementDetails pro:list){
BeanUtil.copyProperties(dto, pro, "id", "sid");
pro.setState(2);
pro.setState(procurementDetails.get(1).getState()+1);
baseMapper.updateById(pro);
}
}
// ApprovalRecordDto recordDto=new ApprovalRecordDto();
// recordDto.setProSid(list.get(1).getSid());
// recordDto.setApprover("");
// recordDto.getApprovalOpinions();
// recordDto.setApprovalDate(dfmt);
// approvalRecordService.save(recordDto);
}
return rb.success().setMsg("提交成功");
}
@ -136,9 +164,9 @@ public class ProcurementDetailsService extends MybatisBaseService<ProcurementDet
public ResultBean update (ProcurementDetailsDto dto){
ResultBean rb=new ResultBean();
String dtoSid = dto.getSid();
ProcurementDetails entity=fetchBySid(dtoSid);
BeanUtil.copyProperties(dto, entity, "id", "sid");
baseMapper.updateById(entity);
baseMapper.delete(new QueryWrapper<ProcurementDetails>().eq("sid",dtoSid));
dto.setSid(dtoSid);
save(dto);
return rb.success().setMsg("修改成功");
}
public ResultBean getProcurementBySid(String sid){

Write Preview
Loading…
Cancel
Save