|
|
|
@ -56,6 +56,9 @@ import com.yxt.pms.feign.message.MessageFlowableQuery; |
|
|
|
import com.yxt.pms.feign.portal.sysorganization.SysOrganizationFeign; |
|
|
|
import com.yxt.pms.feign.portal.sysorganization.SysOrganizationVo; |
|
|
|
import com.yxt.pms.feign.portal.sysstafforg.SysStaffOrgFeign; |
|
|
|
import com.yxt.pms.feign.wms.wmsansbill.WmsAnsBillDetailDto; |
|
|
|
import com.yxt.pms.feign.wms.wmsansbill.WmsAnsBillDto; |
|
|
|
import com.yxt.pms.feign.wms.wmsansbill.WmsAnsBillFeign; |
|
|
|
import org.apache.commons.lang3.StringUtils; |
|
|
|
import com.yxt.common.base.service.MybatisBaseService; |
|
|
|
import com.yxt.common.base.utils.PagerUtil; |
|
|
|
@ -105,6 +108,8 @@ public class PmsPurchaseBillService extends MybatisBaseService<PmsPurchaseBillMa |
|
|
|
private FlowFeign flowFeign; |
|
|
|
@Autowired |
|
|
|
private MessageFeign messageFeign; |
|
|
|
@Autowired |
|
|
|
private WmsAnsBillFeign wmsAnsBillFeign; |
|
|
|
|
|
|
|
public PagerVo<PmsPurchaseBillVo> listPageVo(PagerQuery<PmsPurchaseBillQuery> pq) { |
|
|
|
PmsPurchaseBillQuery query = pq.getParams(); |
|
|
|
@ -156,12 +161,11 @@ public class PmsPurchaseBillService extends MybatisBaseService<PmsPurchaseBillMa |
|
|
|
return p; |
|
|
|
} |
|
|
|
|
|
|
|
public PagerVo<PmsPurchaseChoiceBillVo> choiceBillListPage(PagerQuery<PmsPurchaseBillQuery> pq) { |
|
|
|
PmsPurchaseBillQuery query = pq.getParams(); |
|
|
|
public PagerVo<PmsPurchaseChoiceBillVo> choiceBillListPage(PagerQuery<PmsPurchaseChoiceBillQuery> pq) { |
|
|
|
PmsPurchaseChoiceBillQuery query = pq.getParams(); |
|
|
|
QueryWrapper<PmsPurchaseBill> qw = new QueryWrapper<>(); |
|
|
|
String orgPath = query.getOrgPath(); |
|
|
|
String createOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData(); |
|
|
|
qw.eq("ppb.createOrgSid", createOrgSid); |
|
|
|
qw.eq("ppb.createOrgSid", query.getCreateOrgSid()); |
|
|
|
qw.eq("ppb.nodeState", "已办结"); |
|
|
|
if (StringUtils.isNotBlank(query.getCreateOrgName())) { |
|
|
|
qw.like("ppb.createOrgName", query.getCreateOrgName()); |
|
|
|
} |
|
|
|
@ -204,7 +208,7 @@ public class PmsPurchaseBillService extends MybatisBaseService<PmsPurchaseBillMa |
|
|
|
IPage<PmsPurchaseChoiceBillVo> pagging = baseMapper.choiceBillListPage(page, qw); |
|
|
|
for (PmsPurchaseChoiceBillVo record : pagging.getRecords()) { |
|
|
|
BigDecimal money = pmsPurchasebackBillService.checkPayableAmountBySourceBillSid(record.getSid()); |
|
|
|
if (money != null){ |
|
|
|
if (money != null) { |
|
|
|
record.setPayableAmount(money); |
|
|
|
} |
|
|
|
List<PmsPurchaseBillDetailDetailsVo> pmsPurchaseBillDetailDetailsVos = pmsPurchaseBillDetailService.selByMainSid(record.getSid()); |
|
|
|
@ -423,7 +427,44 @@ public class PmsPurchaseBillService extends MybatisBaseService<PmsPurchaseBillMa |
|
|
|
UpdateFlowFieldVo ufVo = resultBean.getData(); |
|
|
|
updateFlowFiled(BeanUtil.beanToMap(resultBean.getData())); |
|
|
|
if ("Event_end".equals(resultBean.getData().getTaskDefKey())) { |
|
|
|
|
|
|
|
WmsAnsBillDto wmsAnsBillDto = new WmsAnsBillDto(); |
|
|
|
wmsAnsBillDto.setCreateBySid(pmsPurchaseBill.getCreateBySid()); |
|
|
|
wmsAnsBillDto.setSourceBillNo(pmsPurchaseBill.getBillNo()); |
|
|
|
wmsAnsBillDto.setBusTypeKey("01"); |
|
|
|
wmsAnsBillDto.setBusTypeValue("采购预约"); |
|
|
|
wmsAnsBillDto.setCreateByName(pmsPurchaseBill.getCreateByName()); |
|
|
|
wmsAnsBillDto.setBillState(0); |
|
|
|
wmsAnsBillDto.setReviewStatus(""); |
|
|
|
wmsAnsBillDto.setRefuseReason(""); |
|
|
|
wmsAnsBillDto.setContact(""); |
|
|
|
wmsAnsBillDto.setMobile(""); |
|
|
|
wmsAnsBillDto.setSupplierSid(pmsPurchaseBill.getSupplierSid()); |
|
|
|
wmsAnsBillDto.setSupplierName(pmsPurchaseBill.getSupplierName()); |
|
|
|
wmsAnsBillDto.setGoodsOwnerSid(""); |
|
|
|
wmsAnsBillDto.setGoodsOwner(""); |
|
|
|
wmsAnsBillDto.setDeliveryDate(pmsPurchaseBill.getDeliveryDate()); |
|
|
|
wmsAnsBillDto.setUseOrgSid(pmsPurchaseBill.getUseOrgSid()); |
|
|
|
wmsAnsBillDto.setCreateOrgSid(pmsPurchaseBill.getCreateOrgSid()); |
|
|
|
List<WmsAnsBillDetailDto> wmsAnsBillDetailDtos = new ArrayList<>(); |
|
|
|
List<PmsPurchaseBillDetailDetailsVo> pmsPurchaseBillDetailDetailsVos = pmsPurchaseBillDetailService.selByMainSid(businessSid); |
|
|
|
for (PmsPurchaseBillDetailDetailsVo pmsPurchaseBillDetailDetailsVo : pmsPurchaseBillDetailDetailsVos) { |
|
|
|
WmsAnsBillDetailDto wmsAnsBillDetailDto = new WmsAnsBillDetailDto(); |
|
|
|
wmsAnsBillDetailDto.setGoodSpuSid(pmsPurchaseBillDetailDetailsVo.getGoodSpuSid()); |
|
|
|
wmsAnsBillDetailDto.setGoodsSpuName(pmsPurchaseBillDetailDetailsVo.getGoodsSpuName()); |
|
|
|
wmsAnsBillDetailDto.setGoodsSkuSid(pmsPurchaseBillDetailDetailsVo.getGoodsSkuSid()); |
|
|
|
wmsAnsBillDetailDto.setGoodsSkuTitle(pmsPurchaseBillDetailDetailsVo.getGoodsSkuTitle()); |
|
|
|
wmsAnsBillDetailDto.setGoodsSkuCode(pmsPurchaseBillDetailDetailsVo.getGoodsSkuCode()); |
|
|
|
wmsAnsBillDetailDto.setGoodsSkuOwnSpec(pmsPurchaseBillDetailDetailsVo.getGoodsSkuOwnSpec()); |
|
|
|
wmsAnsBillDetailDto.setUnit(pmsPurchaseBillDetailDetailsVo.getUnit()); |
|
|
|
wmsAnsBillDetailDto.setCost(pmsPurchaseBillDetailDetailsVo.getCost().toString()); |
|
|
|
wmsAnsBillDetailDto.setOrderCount(pmsPurchaseBillDetailDetailsVo.getCount().toString()); |
|
|
|
wmsAnsBillDetailDto.setTaxAmount(pmsPurchaseBillDetailDetailsVo.getTaxAmount().toString()); |
|
|
|
wmsAnsBillDetailDto.setTaxPrice(pmsPurchaseBillDetailDetailsVo.getTaxPrice().toString()); |
|
|
|
wmsAnsBillDetailDto.setAmount(pmsPurchaseBillDetailDetailsVo.getAmount().toString()); |
|
|
|
wmsAnsBillDetailDtos.add(wmsAnsBillDetailDto); |
|
|
|
} |
|
|
|
wmsAnsBillDto.setWmsAnsBillDetailList(wmsAnsBillDetailDtos); |
|
|
|
wmsAnsBillFeign.saveOrUpdate(wmsAnsBillDto); |
|
|
|
} else { |
|
|
|
//极光推送
|
|
|
|
pmsPurchaseBill = fetchBySid(businessSid); |
|
|
|
|
God
1 year ago