17 changed files with 713 additions and 44 deletions
@ -1,9 +1,67 @@ |
|||||
package com.yxt.supervise.cyf.api.packagingprocurementdetails; |
package com.yxt.supervise.cyf.api.packagingprocurementdetails; |
||||
|
|
||||
|
import com.yxt.supervise.cyf.api.packaginginventory.PackagingInventoryVo; |
||||
|
import lombok.Data; |
||||
|
|
||||
|
import java.util.List; |
||||
|
|
||||
/** |
/** |
||||
* @author wangpengfei |
* @author wangpengfei |
||||
* @date 2023/6/29 15:37 |
* @date 2023/6/29 15:37 |
||||
*/ |
*/ |
||||
public class PackagingProcurementDetailsVo |
@Data |
||||
{ |
public class PackagingProcurementDetailsVo { |
||||
|
private String id; |
||||
|
private String sid; |
||||
|
|
||||
|
//供应商
|
||||
|
private String supplierSid; |
||||
|
//合同签订日期
|
||||
|
private String contractSigningDate; |
||||
|
//原油类型
|
||||
|
private String inventorySid; |
||||
|
//单价
|
||||
|
private double price; |
||||
|
//重量
|
||||
|
private double weight=0; |
||||
|
//付款日期
|
||||
|
private String paymentDate; |
||||
|
//付款金额
|
||||
|
private double payment=0; |
||||
|
//付款单位
|
||||
|
private String payer; |
||||
|
//付款单位开户行
|
||||
|
private String payerBank; |
||||
|
//收款单位
|
||||
|
private String payee; |
||||
|
//收款单位开户行
|
||||
|
private String payeeBank; |
||||
|
//摘要
|
||||
|
private String paymentSummary; |
||||
|
//订单状态
|
||||
|
private String state; |
||||
|
//供应商名称
|
||||
|
private String supplierName; |
||||
|
//供应商编码
|
||||
|
private String supplierNumber; |
||||
|
//类型名称
|
||||
|
private String typeName; |
||||
|
//类型编码
|
||||
|
private String typeNumber; |
||||
|
//商品名称
|
||||
|
private String tradeName; |
||||
|
//商品编码
|
||||
|
private String productCode; |
||||
|
//订单编号
|
||||
|
private String orderNumber; |
||||
|
//状态value
|
||||
|
private String stateValue; |
||||
|
//种类数量
|
||||
|
private Integer amount; |
||||
|
//预计到货日期
|
||||
|
private String arrivalDate; |
||||
|
//总价值
|
||||
|
private double totalValue=0; |
||||
|
|
||||
|
private List<PackagingInventoryVo> commodityList; |
||||
} |
} |
||||
|
|||||
@ -0,0 +1,85 @@ |
|||||
|
package com.yxt.supervise.cyf.biz.packagingprocurementdetails; |
||||
|
|
||||
|
import com.baomidou.mybatisplus.core.conditions.Wrapper; |
||||
|
import com.baomidou.mybatisplus.core.mapper.BaseMapper; |
||||
|
import com.baomidou.mybatisplus.core.metadata.IPage; |
||||
|
import com.baomidou.mybatisplus.core.toolkit.Constants; |
||||
|
import com.yxt.supervise.cyf.api.packaginginventory.PackagingInventoryVo; |
||||
|
import com.yxt.supervise.cyf.api.packagingprocurementdetails.PackagingProcurementDetails; |
||||
|
import com.yxt.supervise.cyf.api.packagingprocurementdetails.PackagingProcurementDetailsVo; |
||||
|
import com.yxt.supervise.cyf.api.procurementdetails.ProcurementDetailsVo; |
||||
|
import org.apache.ibatis.annotations.Mapper; |
||||
|
import org.apache.ibatis.annotations.Param; |
||||
|
import org.apache.ibatis.annotations.Select; |
||||
|
|
||||
|
import java.util.List; |
||||
|
|
||||
|
/** |
||||
|
* @author wangpengfei |
||||
|
* @date 2023/6/30 8:40 |
||||
|
*/ |
||||
|
@Mapper |
||||
|
public interface PackagingProcurementDetailsMapper extends BaseMapper<PackagingProcurementDetails> { |
||||
|
IPage<PackagingProcurementDetailsVo> selectPageVo(IPage<PackagingProcurementDetails> page, @Param(Constants.WRAPPER) Wrapper<PackagingProcurementDetails> qw); |
||||
|
@Select("\t SELECT\n" + |
||||
|
"\n" + |
||||
|
" d.*,\n" + |
||||
|
" case d.state\n" + |
||||
|
" when 1 then '待提交'\n" + |
||||
|
" when 2 then '经理审批'\n" + |
||||
|
" when 3 then '监管审批'\n" + |
||||
|
" when 4 then '银行审批'\n" + |
||||
|
" when 5 then '财务审批'\n" + |
||||
|
" when 6 then '在途'\n" + |
||||
|
" when 7 then '已入库'\n" + |
||||
|
" end as stateValue\n" + |
||||
|
" FROM\n" + |
||||
|
" packaging_procurement_details d\n" + |
||||
|
" where d.sid=#{sid}\n" + |
||||
|
"\t\t\t\torder by d.state asc LIMIT 1") |
||||
|
PackagingProcurementDetailsVo getProcurementByState(@Param("sid") String sid); |
||||
|
@Select("select * from packaging_procurement_details where sid=#{sid}") |
||||
|
List<PackagingProcurementDetailsVo> getPackagingBySid(@Param("sid")String sid); |
||||
|
|
||||
|
@Select("SELECT\n" + |
||||
|
"\td.*,\n" + |
||||
|
"\ts.supplierNumber AS supplierNumber,\n" + |
||||
|
"\ts.supplierName AS supplierName,\n" + |
||||
|
"CASE\n" + |
||||
|
"\t\td.state \n" + |
||||
|
"\t\tWHEN 1 THEN\n" + |
||||
|
"\t\t'待提交' \n" + |
||||
|
"\t\tWHEN 2 THEN\n" + |
||||
|
"\t\t'经理审批' \n" + |
||||
|
"\t\tWHEN 3 THEN\n" + |
||||
|
"\t\t'监管审批' \n" + |
||||
|
"\t\tWHEN 4 THEN\n" + |
||||
|
"\t\t'银行审批' \n" + |
||||
|
"\t\tWHEN 5 THEN\n" + |
||||
|
"\t\t'财务审批' \n" + |
||||
|
"\t\tWHEN 6 THEN\n" + |
||||
|
"\t\t'在途' \n" + |
||||
|
"\t\tWHEN 7 THEN\n" + |
||||
|
"\t\t'已入库' \n" + |
||||
|
"\tEND AS stateValue ,count(1) as amount,\n" + |
||||
|
"\tsum(d.price * d.weight) as totalValue\n" + |
||||
|
"FROM\n" + |
||||
|
"\tpackaging_procurement_details d\n" + |
||||
|
"\tleft JOIN supplier_information s on d.supplierSid =s.sid\n" + |
||||
|
"\tleft join packaging_inventory c on c.sid =d.inventorySid \n" + |
||||
|
"\tleft join packaging_type m on m.sid =c.typeSid \n" + |
||||
|
"WHERE\n" + |
||||
|
"\td.sid=#{sid} \n" + |
||||
|
"GROUP BY\n" + |
||||
|
"\td.sid ") |
||||
|
PackagingProcurementDetailsVo getProBySid(@Param("sid")String sid); |
||||
|
|
||||
|
@Select("select * from packaging_inventory where sid=#{sid}") |
||||
|
PackagingInventoryVo getPackaging1BySid(@Param("sid")String sid); |
||||
|
@Select("select * from packaging_procurement_details where state=#{state} group by sid") |
||||
|
List<ProcurementDetailsVo> getProByState(@Param("state")String state); |
||||
|
@Select("select * from packaging_procurement_details where sid = #{sid}") |
||||
|
List<PackagingProcurementDetails> selectList(@Param("sid") String sid); |
||||
|
@Select("select * from packaging_procurement_details where state =#{state} group by sid") |
||||
|
List<ProcurementDetailsVo> listByState(String state); |
||||
|
} |
||||
@ -0,0 +1,16 @@ |
|||||
|
<?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="com.yxt.supervise.cyf.biz.packagingprocurementdetails.PackagingProcurementDetailsMapper"> |
||||
|
<select id="selectPageVo" resultType="com.yxt.supervise.cyf.api.packagingprocurementdetails.PackagingProcurementDetailsVo"> |
||||
|
SELECT d.*, s.supplierNumber AS supplierNumber, s.supplierName AS supplierName, c.name AS tradeName, c.number AS productCode, c.name AS typeName, c.number AS typeNumber, |
||||
|
CASE d.state WHEN 1 THEN '待提交' WHEN 2 THEN '经理审批' WHEN 3 THEN '监管审批' WHEN 4 THEN '银行审批' WHEN 5 THEN '财务审批' WHEN 6 THEN '在途' WHEN 7 THEN '已入库' END AS stateValue, count(1) AS amount, sum(d.price * d.weight) AS totalValue |
||||
|
FROM packaging_procurement_details d |
||||
|
left JOIN supplier_information s on d.supplierSid =s.sid |
||||
|
left join packaging_inventory c on c.sid =d.inventorySid |
||||
|
left join packaging_type m on m.sid =c.typeSid |
||||
|
<where> |
||||
|
${ew.sqlSegment} |
||||
|
</where> |
||||
|
GROUP BY d.sid |
||||
|
</select> |
||||
|
</mapper> |
||||
@ -0,0 +1,85 @@ |
|||||
|
package com.yxt.supervise.cyf.biz.packagingprocurementdetails; |
||||
|
|
||||
|
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.packagingprocurementdetails.PackagingProcurementDetailsDto; |
||||
|
import com.yxt.supervise.cyf.api.packagingprocurementdetails.PackagingProcurementDetailsQuery; |
||||
|
import com.yxt.supervise.cyf.api.packagingprocurementdetails.PackagingProcurementDetailsVo; |
||||
|
import com.yxt.supervise.cyf.api.procurementdetails.ProcurementDetailsVo; |
||||
|
import io.swagger.annotations.Api; |
||||
|
import io.swagger.annotations.ApiOperation; |
||||
|
import org.springframework.beans.factory.annotation.Autowired; |
||||
|
import org.springframework.web.bind.annotation.*; |
||||
|
|
||||
|
import java.util.List; |
||||
|
|
||||
|
/** |
||||
|
* @author wangpengfei |
||||
|
* @date 2023/6/30 8:40 |
||||
|
*/ |
||||
|
@Api(tags = "包装物采购信息") |
||||
|
@RestController |
||||
|
@RequestMapping("cyf/packagingprocurement") |
||||
|
public class PackagingProcurementDetailsRest { |
||||
|
@Autowired |
||||
|
private PackagingProcurementDetailsService PackagingProcurementDetailsService; |
||||
|
|
||||
|
@ApiOperation("根据条件分页查询数据的列表") |
||||
|
@PostMapping("/listPage") |
||||
|
public ResultBean<PagerVo<PackagingProcurementDetailsVo>> listPage(@RequestBody PagerQuery<PackagingProcurementDetailsQuery> pq) { |
||||
|
ResultBean rb = ResultBean.fireFail(); |
||||
|
PagerVo<PackagingProcurementDetailsVo> pv = PackagingProcurementDetailsService.listPageVo(pq); |
||||
|
return rb.success().setData(pv); |
||||
|
} |
||||
|
@ApiOperation("数据的列表") |
||||
|
@PostMapping("/list") |
||||
|
public ResultBean<List<ProcurementDetailsVo>> list() { |
||||
|
ResultBean rb = ResultBean.fireFail(); |
||||
|
List<ProcurementDetailsVo> pv = PackagingProcurementDetailsService.lists(); |
||||
|
return rb.success().setData(pv); |
||||
|
} |
||||
|
@ApiOperation("添加") |
||||
|
@PostMapping("/save") |
||||
|
public ResultBean save(@RequestBody PackagingProcurementDetailsDto dto){ |
||||
|
return PackagingProcurementDetailsService.save(dto); |
||||
|
} |
||||
|
|
||||
|
@ApiOperation("提交") |
||||
|
@PostMapping("/submit") |
||||
|
public ResultBean submit(@RequestBody PackagingProcurementDetailsDto dto){ |
||||
|
return PackagingProcurementDetailsService.submit(dto); |
||||
|
} |
||||
|
|
||||
|
@ApiOperation("修改") |
||||
|
@PostMapping("/update") |
||||
|
public ResultBean update(@RequestBody PackagingProcurementDetailsDto dto){ |
||||
|
return PackagingProcurementDetailsService.update(dto); |
||||
|
} |
||||
|
@ApiOperation("修改") |
||||
|
@PostMapping("/updateByState") |
||||
|
public ResultBean updateByState (@RequestBody PackagingProcurementDetailsDto dto){ |
||||
|
return PackagingProcurementDetailsService.updateByState(dto); |
||||
|
} |
||||
|
@ApiOperation("删除") |
||||
|
@DeleteMapping("/delete/{sid}") |
||||
|
public ResultBean delete(@PathVariable String sid ){ |
||||
|
return PackagingProcurementDetailsService.del(sid); |
||||
|
} |
||||
|
|
||||
|
@ApiOperation("根据sid查询") |
||||
|
@GetMapping("/getPackagingProcurementBySid/{sid}") |
||||
|
public ResultBean getPackagingProcurementBySid(@PathVariable String sid){ |
||||
|
return PackagingProcurementDetailsService.getPackagingProcurementBySid(sid); |
||||
|
} |
||||
|
/** |
||||
|
* 查询在途订单 |
||||
|
* @param state |
||||
|
* @return |
||||
|
*/ |
||||
|
@ApiOperation("查询在途订单") |
||||
|
@GetMapping("/getProcByState/{state}") |
||||
|
public ResultBean getProcByState(@PathVariable String state){ |
||||
|
return PackagingProcurementDetailsService.getProcByState(state); |
||||
|
} |
||||
|
} |
||||
@ -0,0 +1,293 @@ |
|||||
|
package com.yxt.supervise.cyf.biz.packagingprocurementdetails; |
||||
|
|
||||
|
import cn.dev33.satoken.stp.StpUtil; |
||||
|
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.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.packaginginventory.PackagingInventoryDto; |
||||
|
import com.yxt.supervise.cyf.api.packaginginventory.PackagingInventoryVo; |
||||
|
import com.yxt.supervise.cyf.api.packagingprocurementdetails.PackagingProcurementDetails; |
||||
|
import com.yxt.supervise.cyf.api.packagingprocurementdetails.PackagingProcurementDetailsDto; |
||||
|
import com.yxt.supervise.cyf.api.packagingprocurementdetails.PackagingProcurementDetailsQuery; |
||||
|
import com.yxt.supervise.cyf.api.packagingprocurementdetails.PackagingProcurementDetailsVo; |
||||
|
import com.yxt.supervise.cyf.api.procurementdetails.ProcurementDetailsVo; |
||||
|
import com.yxt.supervise.cyf.api.sysuser.SysUser; |
||||
|
import com.yxt.supervise.cyf.biz.approvalrecord.ApprovalRecordService; |
||||
|
import com.yxt.supervise.cyf.biz.sysuser.CyfSysUserMapper; |
||||
|
import org.apache.commons.lang3.StringUtils; |
||||
|
import org.springframework.beans.factory.annotation.Autowired; |
||||
|
import org.springframework.stereotype.Service; |
||||
|
|
||||
|
import java.util.ArrayList; |
||||
|
import java.util.Date; |
||||
|
import java.util.List; |
||||
|
|
||||
|
/** |
||||
|
* @author wangpengfei |
||||
|
* @date 2023/6/30 8:40 |
||||
|
*/ |
||||
|
@Service |
||||
|
public class PackagingProcurementDetailsService extends MybatisBaseService<PackagingProcurementDetailsMapper, PackagingProcurementDetails> { |
||||
|
@Autowired |
||||
|
ApprovalRecordService approvalRecordService; |
||||
|
@Autowired |
||||
|
CyfSysUserMapper sysUserMapper; |
||||
|
public PagerVo<PackagingProcurementDetailsVo> listPageVo(PagerQuery<PackagingProcurementDetailsQuery> pq) { |
||||
|
PackagingProcurementDetailsQuery query = pq.getParams(); |
||||
|
QueryWrapper<PackagingProcurementDetails> qw = new QueryWrapper<>(); |
||||
|
// if (StringUtils.isNotBlank(query.getType())) {
|
||||
|
// qw.eq("d.supplierNumber", query.getType());
|
||||
|
// }
|
||||
|
if (StringUtils.isNotBlank(query.getState())) { |
||||
|
qw.eq("d.state", query.getState()); |
||||
|
} |
||||
|
IPage<PackagingProcurementDetails> page = PagerUtil.queryToPage(pq); |
||||
|
IPage<PackagingProcurementDetailsVo> pagging = baseMapper.selectPageVo(page, qw); |
||||
|
for(PackagingProcurementDetailsVo v:pagging.getRecords()){ |
||||
|
PackagingProcurementDetailsVo c=baseMapper.getProcurementByState(v.getSid()); |
||||
|
v.setStateValue(c.getStateValue()); |
||||
|
} |
||||
|
PagerVo<PackagingProcurementDetailsVo> p = PagerUtil.pageToVo(pagging, null); |
||||
|
return p; |
||||
|
} |
||||
|
public List<ProcurementDetailsVo> lists() { |
||||
|
String state="6"; |
||||
|
List<ProcurementDetailsVo> pagging = baseMapper.listByState(state); |
||||
|
return pagging; |
||||
|
} |
||||
|
|
||||
|
public ResultBean save(PackagingProcurementDetailsDto dto){ |
||||
|
ResultBean rb = ResultBean.fireFail(); |
||||
|
Date curDate = new Date(); |
||||
|
String dfmt = DateUtil.format(curDate, "yyyy-MM-dd"); |
||||
|
PackagingProcurementDetails entity = new PackagingProcurementDetails(); |
||||
|
BeanUtil.copyProperties(dto, entity, "sid"); |
||||
|
SysUser sysUser=sysUserMapper.selectOne(new QueryWrapper<SysUser>().eq("id", StpUtil.getLoginIdAsString())); |
||||
|
if(null==dto.getSid() || ""==dto.getSid()){ |
||||
|
BeanUtil.copyProperties(dto, entity, "id","sid"); |
||||
|
ApprovalRecordDto recordDto=new ApprovalRecordDto(); |
||||
|
recordDto.setProSid(entity.getSid()); |
||||
|
recordDto.setApprover(sysUser.getSid()); |
||||
|
recordDto.setApprovalOpinions(dto.getApprovalOpinions()==null?"订单创建":dto.getApprovalOpinions()); |
||||
|
recordDto.setOperate("1"); |
||||
|
recordDto.setApprovalDate(dfmt); |
||||
|
approvalRecordService.save(recordDto); |
||||
|
}else{ |
||||
|
BeanUtil.copyProperties(dto, entity, "id"); |
||||
|
} |
||||
|
if (dto.getCommodityList().size() > 0){ |
||||
|
for(PackagingInventoryDto pro : dto.getCommodityList()){ |
||||
|
entity.setInventorySid(pro.getSid()); |
||||
|
entity.setState(1); |
||||
|
entity.setType("3"); |
||||
|
entity.setWeight(pro.getWeight()); |
||||
|
entity.setPrice(pro.getPrice()); |
||||
|
baseMapper.insert(entity); |
||||
|
} |
||||
|
}else if(dto.getCommodityList().size()==0){ |
||||
|
baseMapper.insert(entity); |
||||
|
} |
||||
|
// else{
|
||||
|
// for(PackagingInventoryDto pro : dto.getCommodityList()){
|
||||
|
// entity.setInventorySid(pro.getSid());
|
||||
|
// entity.setState(1);
|
||||
|
// entity.setType("3");
|
||||
|
// entity.setWeight(pro.getWeight());
|
||||
|
// entity.setPrice(pro.getPrice());
|
||||
|
// baseMapper.insert(entity);
|
||||
|
// }
|
||||
|
// }
|
||||
|
return rb.success().setMsg("新增成功"); |
||||
|
// //附件上传
|
||||
|
// String [] file=dto.getCrudeOilStorageFile();
|
||||
|
// if(file!=null){
|
||||
|
// List<Map<String,String>> maps=new ArrayList<>();
|
||||
|
// for(String s:file){
|
||||
|
// Map<String,String>m=new HashMap<>();
|
||||
|
// m.put("mainSid",entity.getSid());
|
||||
|
// m.put("url",s);
|
||||
|
// m.put("sid", UUID.randomUUID().toString());
|
||||
|
// maps.add(m);
|
||||
|
// }
|
||||
|
// if(maps.size()>0){
|
||||
|
// baseMapper.insertCrudeOilFiles(maps);
|
||||
|
// }
|
||||
|
// }
|
||||
|
} |
||||
|
|
||||
|
public ResultBean submit(PackagingProcurementDetailsDto dto){ |
||||
|
ResultBean rb = new ResultBean(); |
||||
|
Date curDate = new Date(); |
||||
|
String dfmt = DateUtil.format(curDate, "yyyy-MM-dd"); |
||||
|
String sid =dto.getSid(); |
||||
|
List<PackagingProcurementDetails> PackagingProcurementDetails = baseMapper.selectList(sid); |
||||
|
SysUser sysUser=sysUserMapper.selectOne(new QueryWrapper<SysUser>().eq("id",StpUtil.getLoginIdAsString())); |
||||
|
//不存在保存加提交
|
||||
|
if(dto.getSid().equals("")||dto.getSid().equals(null)){ |
||||
|
PackagingProcurementDetails entity = new PackagingProcurementDetails(); |
||||
|
//提交记录
|
||||
|
ApprovalRecordDto recordDto=new ApprovalRecordDto(); |
||||
|
recordDto.setProSid(entity.getSid()); |
||||
|
recordDto.setApprover(sysUser.getSid()); |
||||
|
recordDto.setApprovalOpinions(dto.getApprovalOpinions()==null?"订单创建":dto.getOperate()); |
||||
|
recordDto.setOperate("1"); |
||||
|
recordDto.setApprovalDate(dfmt); |
||||
|
approvalRecordService.save(recordDto); |
||||
|
//发起采购申请记录
|
||||
|
recordDto.setOperate("2"); |
||||
|
recordDto.setApprovalOpinions(dto.getApprovalOpinions()==null?"订单发起":dto.getOperate()); |
||||
|
approvalRecordService.save(recordDto); |
||||
|
if(dto.getCommodityList().size()>1){ |
||||
|
for(PackagingInventoryDto pro:dto.getCommodityList()){ |
||||
|
BeanUtil.copyProperties(dto, entity, "sid"); |
||||
|
entity.setInventorySid(pro.getSid()); |
||||
|
entity.setState(2); |
||||
|
entity.setType("3"); |
||||
|
entity.setWeight(pro.getWeight()); |
||||
|
entity.setPrice(pro.getPrice()); |
||||
|
baseMapper.insert(entity); |
||||
|
} |
||||
|
// //附件上传
|
||||
|
// String [] file=dto.getCrudeOilStorageFile();
|
||||
|
// if(file!=null){
|
||||
|
// List<Map<String,String>> maps=new ArrayList<>();
|
||||
|
// for(String s:file){
|
||||
|
// Map<String,String>m=new HashMap<>();
|
||||
|
// m.put("mainSid",entity.getSid());
|
||||
|
// m.put("url",s);
|
||||
|
// m.put("sid", UUID.randomUUID().toString());
|
||||
|
// maps.add(m);
|
||||
|
// }
|
||||
|
// if(maps.size()>0){
|
||||
|
// baseMapper.insertCrudeOilFiles(maps);
|
||||
|
// }
|
||||
|
// }
|
||||
|
return rb.success().setMsg("新增成功"); |
||||
|
} |
||||
|
for(PackagingInventoryDto pro : dto.getCommodityList()){ |
||||
|
BeanUtil.copyProperties(dto, entity, "sid"); |
||||
|
entity.setInventorySid(pro.getSid()); |
||||
|
entity.setState(2); |
||||
|
entity.setType("3"); |
||||
|
entity.setWeight(pro.getWeight()); |
||||
|
entity.setPrice(pro.getPrice()); |
||||
|
baseMapper.insert(entity); |
||||
|
} |
||||
|
|
||||
|
}else{ |
||||
|
//存在该状态
|
||||
|
for(PackagingProcurementDetails pro : PackagingProcurementDetails){ |
||||
|
pro.setState(pro.getState()+1); |
||||
|
baseMapper.updateById(pro); |
||||
|
} |
||||
|
ApprovalRecordDto recordDto=new ApprovalRecordDto(); |
||||
|
recordDto.setProSid(PackagingProcurementDetails.get(0).getSid()); |
||||
|
recordDto.setApprover(sysUser.getSid()); |
||||
|
recordDto.setApprovalOpinions(dto.getApprovalOpinions()==null?"订单发起":dto.getApprovalOpinions()); |
||||
|
recordDto.setOperate(dto.getOperate()==null?"2":dto.getOperate()); |
||||
|
recordDto.setApprovalDate(dfmt); |
||||
|
approvalRecordService.save(recordDto); |
||||
|
} |
||||
|
return rb.success().setMsg("提交成功"); |
||||
|
} |
||||
|
|
||||
|
public ResultBean update (PackagingProcurementDetailsDto dto){ |
||||
|
ResultBean rb = new ResultBean(); |
||||
|
String dtoSid = dto.getSid(); |
||||
|
baseMapper.delete(new QueryWrapper<PackagingProcurementDetails>().eq("sid",dtoSid)); |
||||
|
dto.setSid(dtoSid); |
||||
|
save(dto); |
||||
|
return rb.success().setMsg("修改成功"); |
||||
|
} |
||||
|
public ResultBean updateByState (PackagingProcurementDetailsDto dto){ |
||||
|
ResultBean rb=new ResultBean(); |
||||
|
SysUser sysUser=sysUserMapper.selectOne(new QueryWrapper<SysUser>().eq("id",StpUtil.getLoginIdAsString())); |
||||
|
String dtoSid = dto.getSid(); |
||||
|
ApprovalRecordDto recordDto=new ApprovalRecordDto(); |
||||
|
List<PackagingProcurementDetails> list=baseMapper.selectList(dtoSid); |
||||
|
Date curDate = new Date(); |
||||
|
String dfmt = DateUtil.format(curDate, "yyyy-MM-dd"); |
||||
|
if(dto.getOperate().equals("3")){ |
||||
|
//审核通过
|
||||
|
for(PackagingProcurementDetails procurementDetails:list){ |
||||
|
procurementDetails.setPaymentDate(dfmt); |
||||
|
procurementDetails.setPayment(dto.getPayment()==0?0:dto.getPayment()); |
||||
|
procurementDetails.setPayer(dto.getPayer()==null?"":dto.getPayer()); |
||||
|
procurementDetails.setPayerBank(dto.getPayerBank()==null?"":dto.getPayerBank()); |
||||
|
procurementDetails.setPayee(dto.getPayee()==null?"":dto.getPayee()); |
||||
|
procurementDetails.setPayeeBank(dto.getPayeeBank()==null?"":dto.getPayeeBank()); |
||||
|
procurementDetails.setPaymentSummary(dto.getPaymentSummary()==null?"":dto.getPaymentSummary()); |
||||
|
procurementDetails.setState(procurementDetails.getState()+1); |
||||
|
baseMapper.updateById(procurementDetails); |
||||
|
} |
||||
|
recordDto.setOperate(dto.getOperate()); |
||||
|
}else if(dto.getOperate().equals("4")){ |
||||
|
//审核不通过
|
||||
|
for(PackagingProcurementDetails procurementDetails:list){ |
||||
|
procurementDetails.setState(8); |
||||
|
baseMapper.updateById(procurementDetails); |
||||
|
} |
||||
|
recordDto.setOperate(dto.getOperate()); |
||||
|
} |
||||
|
recordDto.setProSid(dtoSid); |
||||
|
recordDto.setApprover(sysUser.getSid()); |
||||
|
recordDto.setApprovalOpinions(dto.getApprovalOpinions()); |
||||
|
recordDto.setApprovalDate(dfmt); |
||||
|
approvalRecordService.save(recordDto); |
||||
|
return rb.success().setMsg("修改成功"); |
||||
|
} |
||||
|
public ResultBean del(String sid){ |
||||
|
ResultBean rb=new ResultBean(); |
||||
|
baseMapper.delete(new QueryWrapper<PackagingProcurementDetails>().eq("sid",sid)); |
||||
|
return rb.success().setMsg("删除成功"); |
||||
|
} |
||||
|
|
||||
|
public ResultBean getPackagingProcurementBySid(String sid){ |
||||
|
ResultBean rb=new ResultBean(); |
||||
|
List<PackagingProcurementDetailsVo> RawProcurementDetails = baseMapper.getPackagingBySid(sid); |
||||
|
PackagingProcurementDetailsVo PackagingProcurementDetailsVo = baseMapper.getProBySid(sid); |
||||
|
List<PackagingInventoryVo> list =new ArrayList<>(); |
||||
|
for (PackagingProcurementDetailsVo pro : RawProcurementDetails){ |
||||
|
if(null!=pro.getInventorySid() && !pro.getInventorySid().equals("")){ |
||||
|
PackagingInventoryVo PackagingInventoryVo = baseMapper.getPackaging1BySid(pro.getInventorySid()); |
||||
|
PackagingInventoryVo.setWeight(pro.getWeight()); |
||||
|
PackagingInventoryVo.setPrice(pro.getPrice()); |
||||
|
list.add(PackagingInventoryVo); |
||||
|
} |
||||
|
} |
||||
|
PackagingProcurementDetailsVo.setCommodityList(list); |
||||
|
return rb.success().setData(PackagingProcurementDetailsVo); |
||||
|
} |
||||
|
public ResultBean getProcByState(String state){ |
||||
|
ResultBean rb=new ResultBean(); |
||||
|
List<ProcurementDetailsVo>list=baseMapper.getProByState(state); |
||||
|
for(ProcurementDetailsVo procurementDetailsVo:list){ |
||||
|
List<PackagingProcurementDetails> details=baseMapper.selectList(procurementDetailsVo.getSid()); |
||||
|
//订单总价值
|
||||
|
double i=0; |
||||
|
//入库总价值
|
||||
|
double j=0; |
||||
|
for(PackagingProcurementDetails procurementDetails:details){ |
||||
|
i=i+(procurementDetails.getWeight()*procurementDetails.getPrice()); |
||||
|
//CrudeOilStorageVo vo= crudeOilStorageMapper.getCrudeByCrudeSid(procurementDetails.getTypeSid(),procurementDetails.getSid());
|
||||
|
double weight=0; |
||||
|
// if(null!=vo){
|
||||
|
// weight=vo.getTotal();
|
||||
|
// }
|
||||
|
j=j+(weight*procurementDetails.getPrice()); |
||||
|
} |
||||
|
procurementDetailsVo.setTotalInbound(j); |
||||
|
procurementDetailsVo.setTotalValue(i); |
||||
|
procurementDetailsVo.setTotalValueTransit(procurementDetailsVo.getTotalValue()-procurementDetailsVo.getTotalInbound()); |
||||
|
} |
||||
|
return rb.success().setData(list); |
||||
|
} |
||||
|
|
||||
|
} |
||||
Loading…
Reference in new issue