|
|
|
@ -1,4 +1,4 @@ |
|
|
|
package com.yxt.storage.biz.wmsreceiptbill; |
|
|
|
package com.yxt.storage.biz.storagereceiptbill; |
|
|
|
|
|
|
|
import cn.hutool.core.bean.BeanUtil; |
|
|
|
import cn.hutool.core.date.DateUtil; |
|
|
|
@ -11,17 +11,17 @@ import com.yxt.common.base.utils.StringUtils; |
|
|
|
import com.yxt.common.core.query.PagerQuery; |
|
|
|
import com.yxt.common.core.result.ResultBean; |
|
|
|
import com.yxt.common.core.vo.PagerVo; |
|
|
|
import com.yxt.storage.biz.wmsansbill.WmsAnsBill; |
|
|
|
import com.yxt.storage.biz.wmsansbill.WmsAnsBillService; |
|
|
|
import com.yxt.storage.biz.wmsansbilldetail.WmsAnsBillDetailService; |
|
|
|
import com.yxt.storage.biz.wmsansbilldetail.WmsAnsListDetailsVo; |
|
|
|
import com.yxt.storage.biz.wmsreceiptbilldetail.WmsReceiptBillDetailDto2; |
|
|
|
import com.yxt.storage.biz.wmsreceiptbilldetail.WmsReceiptBillDetailMapper; |
|
|
|
import com.yxt.storage.biz.wmsreceiptbilldetail.WmsReceiptBillDetailService; |
|
|
|
import com.yxt.storage.biz.wmsreceiptbilldetail.WmsReceiptBillDetailVo; |
|
|
|
import com.yxt.storage.biz.wmsreceiptbilldetailbatch.WmsReceiptBillDetailBatchDto2; |
|
|
|
import com.yxt.storage.biz.wmsreceiptbilldetailbatch.WmsReceiptBillDetailBatchMapper; |
|
|
|
import com.yxt.storage.biz.wmsreceiptbilldetailbatch.WmsReceiptBillDetailBatchService; |
|
|
|
import com.yxt.storage.biz.storageansbill.StorageAnsBill; |
|
|
|
import com.yxt.storage.biz.storageansbill.StorageAnsBillService; |
|
|
|
import com.yxt.storage.biz.storageansbilldetail.StorageAnsBillDetailService; |
|
|
|
import com.yxt.storage.biz.storageansbilldetail.StorageAnsListDetailsVo; |
|
|
|
import com.yxt.storage.biz.storagereceiptbilldetail.StorageReceiptBillDetailDto2; |
|
|
|
import com.yxt.storage.biz.storagereceiptbilldetail.StorageReceiptBillDetailMapper; |
|
|
|
import com.yxt.storage.biz.storagereceiptbilldetail.StorageReceiptBillDetailService; |
|
|
|
import com.yxt.storage.biz.storagereceiptbilldetail.StorageReceiptBillDetailVo; |
|
|
|
import com.yxt.storage.biz.storagereceiptbilldetailbatch.StorageReceiptBillDetailBatchDto2; |
|
|
|
import com.yxt.storage.biz.storagereceiptbilldetailbatch.StorageReceiptBillDetailBatchMapper; |
|
|
|
import com.yxt.storage.biz.storagereceiptbilldetailbatch.StorageReceiptBillDetailBatchService; |
|
|
|
import org.springframework.beans.factory.annotation.Autowired; |
|
|
|
import org.springframework.stereotype.Service; |
|
|
|
|
|
|
|
@ -34,24 +34,24 @@ import java.util.stream.Collectors; |
|
|
|
* @date: 2024/4/3 |
|
|
|
**/ |
|
|
|
@Service |
|
|
|
public class WmsReceiptBillService extends MybatisBaseService<WmsReceiptBillMapper, WmsReceiptBill> { |
|
|
|
public class StorageReceiptBillService extends MybatisBaseService<StorageReceiptBillMapper, StorageReceiptBill> { |
|
|
|
|
|
|
|
@Autowired |
|
|
|
private WmsReceiptBillDetailService wmsReceiptBillDetailService; |
|
|
|
private StorageReceiptBillDetailService wmsReceiptBillDetailService; |
|
|
|
@Autowired |
|
|
|
private WmsAnsBillService wmsAnsBillService; |
|
|
|
private StorageAnsBillService wmsAnsBillService; |
|
|
|
@Autowired |
|
|
|
private WmsAnsBillDetailService wmsAnsBillDetailService; |
|
|
|
private StorageAnsBillDetailService wmsAnsBillDetailService; |
|
|
|
@Autowired |
|
|
|
private WmsReceiptBillDetailBatchService wmsReceiptBillDetailBatchService; |
|
|
|
private StorageReceiptBillDetailBatchService wmsReceiptBillDetailBatchService; |
|
|
|
@Autowired |
|
|
|
private WmsReceiptBillDetailMapper wmsReceiptBillDetailMapper; |
|
|
|
private StorageReceiptBillDetailMapper wmsReceiptBillDetailMapper; |
|
|
|
@Autowired |
|
|
|
private WmsReceiptBillDetailBatchMapper wmsReceiptBillDetailBatchMapper; |
|
|
|
private StorageReceiptBillDetailBatchMapper wmsReceiptBillDetailBatchMapper; |
|
|
|
|
|
|
|
public PagerVo<WmsReceiptBillPageVo> listPage(PagerQuery<WmsReceiptBillQuery> pq) { |
|
|
|
WmsReceiptBillQuery query = pq.getParams(); |
|
|
|
QueryWrapper<WmsReceiptBill> qw = new QueryWrapper<>(); |
|
|
|
public PagerVo<StorageReceiptBillPageVo> listPage(PagerQuery<StorageReceiptBillQuery> pq) { |
|
|
|
StorageReceiptBillQuery query = pq.getParams(); |
|
|
|
QueryWrapper<StorageReceiptBill> qw = new QueryWrapper<>(); |
|
|
|
//ToDo:添加查询条件
|
|
|
|
if (StringUtils.isNotBlank(query.getBillNo())) { |
|
|
|
qw.like("wrb.billNo", query.getBillNo()); |
|
|
|
@ -72,22 +72,22 @@ public class WmsReceiptBillService extends MybatisBaseService<WmsReceiptBillMapp |
|
|
|
if (StringUtils.isNotBlank(query.getSourceBillNo())) { |
|
|
|
qw.like("wrb.sourceBillNo", query.getSourceBillNo()); |
|
|
|
} |
|
|
|
IPage<WmsReceiptBill> page = PagerUtil.queryToPage(pq); |
|
|
|
IPage<WmsReceiptBillPageVo> pagging = baseMapper.listPage(page, qw); |
|
|
|
PagerVo<WmsReceiptBillPageVo> p = PagerUtil.pageToVo(pagging, null); |
|
|
|
IPage<StorageReceiptBill> page = PagerUtil.queryToPage(pq); |
|
|
|
IPage<StorageReceiptBillPageVo> pagging = baseMapper.listPage(page, qw); |
|
|
|
PagerVo<StorageReceiptBillPageVo> p = PagerUtil.pageToVo(pagging, null); |
|
|
|
return p; |
|
|
|
} |
|
|
|
|
|
|
|
public ResultBean<String> saveOrUpdateBill2(WmsReceiptBillDto2 dto) { |
|
|
|
public ResultBean<String> saveOrUpdateBill2(StorageReceiptBillDto2 dto) { |
|
|
|
ResultBean<String> rb = ResultBean.fireFail(); |
|
|
|
String sid = dto.getSid(); |
|
|
|
if (StringUtils.isBlank(sid)) { |
|
|
|
WmsReceiptBill wmsReceiptBill = new WmsReceiptBill(); |
|
|
|
StorageReceiptBill wmsReceiptBill = new StorageReceiptBill(); |
|
|
|
sid = wmsReceiptBill.getSid(); |
|
|
|
BeanUtil.copyProperties(dto, wmsReceiptBill, "sid"); |
|
|
|
List<WmsReceiptBillDetailDto2> list = dto.getList(); |
|
|
|
List<StorageReceiptBillDetailDto2> list = dto.getList(); |
|
|
|
list.removeAll(Collections.singleton(null)); |
|
|
|
List<WmsReceiptBillDetailBatchDto2> pcList = dto.getPcList(); |
|
|
|
List<StorageReceiptBillDetailBatchDto2> pcList = dto.getPcList(); |
|
|
|
pcList.removeAll(Collections.singleton(null)); |
|
|
|
if (!list.isEmpty()) { |
|
|
|
wmsReceiptBillDetailService.saveOrUpdateDetailsList2(sid, list, pcList); |
|
|
|
@ -95,14 +95,14 @@ public class WmsReceiptBillService extends MybatisBaseService<WmsReceiptBillMapp |
|
|
|
baseMapper.insert(wmsReceiptBill); |
|
|
|
|
|
|
|
} else { |
|
|
|
WmsReceiptBill wmsReceiptBill = fetchBySid(sid); |
|
|
|
StorageReceiptBill wmsReceiptBill = fetchBySid(sid); |
|
|
|
if (wmsReceiptBill == null) { |
|
|
|
return rb.setMsg("该单据不存在"); |
|
|
|
} |
|
|
|
BeanUtil.copyProperties(dto, wmsReceiptBill, "sid"); |
|
|
|
List<WmsReceiptBillDetailDto2> list = dto.getList(); |
|
|
|
List<StorageReceiptBillDetailDto2> list = dto.getList(); |
|
|
|
list.removeAll(Collections.singleton(null)); |
|
|
|
List<WmsReceiptBillDetailBatchDto2> pcList = dto.getPcList(); |
|
|
|
List<StorageReceiptBillDetailBatchDto2> pcList = dto.getPcList(); |
|
|
|
pcList.removeAll(Collections.singleton(null)); |
|
|
|
if (!list.isEmpty()) { |
|
|
|
wmsReceiptBillDetailService.saveOrUpdateDetailsList2(sid, list, pcList); |
|
|
|
@ -112,41 +112,41 @@ public class WmsReceiptBillService extends MybatisBaseService<WmsReceiptBillMapp |
|
|
|
return rb.success().setData(sid); |
|
|
|
} |
|
|
|
|
|
|
|
public ResultBean<WmsReceiptBillVo> getInitDetails(String sourceSid) { |
|
|
|
ResultBean<WmsReceiptBillVo> rb = ResultBean.fireFail(); |
|
|
|
WmsReceiptBillVo wmsReceiptBillVo = new WmsReceiptBillVo(); |
|
|
|
WmsAnsBill wmsAnsBill = wmsAnsBillService.fetchBySid(sourceSid); |
|
|
|
public ResultBean<StorageReceiptBillVo> getInitDetails(String sourceSid) { |
|
|
|
ResultBean<StorageReceiptBillVo> rb = ResultBean.fireFail(); |
|
|
|
StorageReceiptBillVo wmsReceiptBillVo = new StorageReceiptBillVo(); |
|
|
|
StorageAnsBill wmsAnsBill = wmsAnsBillService.fetchBySid(sourceSid); |
|
|
|
BeanUtil.copyProperties(wmsAnsBill, wmsReceiptBillVo, "sid"); |
|
|
|
wmsReceiptBillVo.setSourceBillNo(wmsAnsBill.getBillNo()); |
|
|
|
wmsReceiptBillVo.setSourceBillSid(wmsAnsBill.getSid()); |
|
|
|
wmsReceiptBillVo.setCreateTime(DateUtil.today()); |
|
|
|
List<WmsAnsListDetailsVo> list = wmsAnsBillDetailService.selectByBillSid(sourceSid); |
|
|
|
List<StorageAnsListDetailsVo> list = wmsAnsBillDetailService.selectByBillSid(sourceSid); |
|
|
|
list.removeAll(Collections.singleton(null)); |
|
|
|
if (!list.isEmpty()) { |
|
|
|
List<WmsReceiptBillDetailVo> lists = Optional.ofNullable(list).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), WmsReceiptBillDetailVo.class)).collect(Collectors.toList()); |
|
|
|
List<StorageReceiptBillDetailVo> lists = Optional.ofNullable(list).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), StorageReceiptBillDetailVo.class)).collect(Collectors.toList()); |
|
|
|
wmsReceiptBillVo.setList(lists); |
|
|
|
} |
|
|
|
|
|
|
|
return rb.success().setData(wmsReceiptBillVo); |
|
|
|
} |
|
|
|
|
|
|
|
public ResultBean<WmsReceiptBillInitVo> getDetailsInit(String sid) { |
|
|
|
ResultBean<WmsReceiptBillInitVo> rb = ResultBean.fireFail(); |
|
|
|
WmsReceiptBillInitVo wmsReceiptBillInitVo = baseMapper.getDetailsInit(sid); |
|
|
|
List<WmsReceiptBillDetailBatchDto2> pcList = new ArrayList<>(); |
|
|
|
public ResultBean<StorageReceiptBillInitVo> getDetailsInit(String sid) { |
|
|
|
ResultBean<StorageReceiptBillInitVo> rb = ResultBean.fireFail(); |
|
|
|
StorageReceiptBillInitVo wmsReceiptBillInitVo = baseMapper.getDetailsInit(sid); |
|
|
|
List<StorageReceiptBillDetailBatchDto2> pcList = new ArrayList<>(); |
|
|
|
if (wmsReceiptBillInitVo != null) { |
|
|
|
List<WmsReceiptBillDetailDto2> list = wmsReceiptBillDetailService.getDetailsInit(sid); |
|
|
|
List<StorageReceiptBillDetailDto2> list = wmsReceiptBillDetailService.getDetailsInit(sid); |
|
|
|
list.removeAll(Collections.singleton(null)); |
|
|
|
if (!list.isEmpty()) { |
|
|
|
for (int i = 0; i < list.size(); i++) { |
|
|
|
WmsReceiptBillDetailDto2 wmsReceiptBillDetailDto2 = list.get(i); |
|
|
|
StorageReceiptBillDetailDto2 wmsReceiptBillDetailDto2 = list.get(i); |
|
|
|
int a = i + 1; |
|
|
|
wmsReceiptBillDetailDto2.setXh(String.valueOf(a)); |
|
|
|
List<WmsReceiptBillDetailBatchDto2> pcList2 = wmsReceiptBillDetailBatchService.getDetailsInit(sid, wmsReceiptBillDetailDto2.getDetailsSid()); |
|
|
|
List<StorageReceiptBillDetailBatchDto2> pcList2 = wmsReceiptBillDetailBatchService.getDetailsInit(sid, wmsReceiptBillDetailDto2.getDetailsSid()); |
|
|
|
pcList2.removeAll(Collections.singleton(null)); |
|
|
|
if (!pcList2.isEmpty()) { |
|
|
|
for (int j = 0; j < pcList2.size(); j++) { |
|
|
|
WmsReceiptBillDetailBatchDto2 wmsReceiptBillDetailBatchDto2 = pcList2.get(j); |
|
|
|
StorageReceiptBillDetailBatchDto2 wmsReceiptBillDetailBatchDto2 = pcList2.get(j); |
|
|
|
wmsReceiptBillDetailBatchDto2.setXh(String.valueOf(a)); |
|
|
|
} |
|
|
|
pcList.addAll(pcList2); |
|
|
|
@ -161,14 +161,14 @@ public class WmsReceiptBillService extends MybatisBaseService<WmsReceiptBillMapp |
|
|
|
return rb.success().setData(wmsReceiptBillInitVo); |
|
|
|
} |
|
|
|
|
|
|
|
public ResultBean<String> confirm(WmsReceiptBillDto2 dto) { |
|
|
|
public ResultBean<String> confirm(StorageReceiptBillDto2 dto) { |
|
|
|
ResultBean<String> rb = ResultBean.fireFail(); |
|
|
|
dto.setBillState("1"); |
|
|
|
List<WmsReceiptBillDetailDto2> list = dto.getList(); |
|
|
|
List<StorageReceiptBillDetailDto2> list = dto.getList(); |
|
|
|
list.removeAll(Collections.singleton(null)); |
|
|
|
if (!list.isEmpty()) { |
|
|
|
for (int i = 0; i < list.size(); i++) { |
|
|
|
WmsReceiptBillDetailDto2 wmsReceiptBillDetailDto2 = list.get(i); |
|
|
|
StorageReceiptBillDetailDto2 wmsReceiptBillDetailDto2 = list.get(i); |
|
|
|
wmsReceiptBillDetailDto2.setState(1); |
|
|
|
} |
|
|
|
} |
dimengzhe
1 year ago