|
|
@ -318,92 +318,92 @@ public class SmsSalesReturnService extends MybatisBaseService<SmsSalesReturnMapp |
|
|
|
|
|
|
|
|
public SmsSalesInsertVo returnBillInit(String sid) { |
|
|
public SmsSalesInsertVo returnBillInit(String sid) { |
|
|
SmsSalesInsertVo vo = new SmsSalesInsertVo(); |
|
|
SmsSalesInsertVo vo = new SmsSalesInsertVo(); |
|
|
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); |
|
|
// SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
|
|
|
SmsSalesBill smsSalesBill = smsSalesBillService.fetchBySid(sid); |
|
|
// SmsSalesBill smsSalesBill = smsSalesBillService.fetchBySid(sid);
|
|
|
if (null != smsSalesBill) { |
|
|
// if (null != smsSalesBill) {
|
|
|
vo.setBillSid(sid); |
|
|
// vo.setBillSid(sid);
|
|
|
vo.setSourceBillNo(smsSalesBill.getBillNo()); |
|
|
// vo.setSourceBillNo(smsSalesBill.getBillNo());
|
|
|
//客户名称
|
|
|
// //客户名称
|
|
|
if (StringUtils.isNotBlank(smsSalesBill.getCustomerName())) { |
|
|
// if (StringUtils.isNotBlank(smsSalesBill.getCustomerName())) {
|
|
|
vo.setCustomerName(smsSalesBill.getCustomerName()); |
|
|
// vo.setCustomerName(smsSalesBill.getCustomerName());
|
|
|
} |
|
|
// }
|
|
|
//车牌号
|
|
|
// //车牌号
|
|
|
if (StringUtils.isNotBlank(smsSalesBill.getVehMark())) { |
|
|
// if (StringUtils.isNotBlank(smsSalesBill.getVehMark())) {
|
|
|
vo.setVehMark(smsSalesBill.getVehMark()); |
|
|
// vo.setVehMark(smsSalesBill.getVehMark());
|
|
|
} |
|
|
// }
|
|
|
//客户单位
|
|
|
// //客户单位
|
|
|
if (StringUtils.isNotBlank(smsSalesBill.getCustomerOrg())) { |
|
|
// if (StringUtils.isNotBlank(smsSalesBill.getCustomerOrg())) {
|
|
|
vo.setCustomerOrg(smsSalesBill.getCustomerOrg()); |
|
|
// vo.setCustomerOrg(smsSalesBill.getCustomerOrg());
|
|
|
} |
|
|
// }
|
|
|
//科目
|
|
|
// //科目
|
|
|
if (StringUtils.isNotBlank(smsSalesBill.getSubject())) { |
|
|
// if (StringUtils.isNotBlank(smsSalesBill.getSubject())) {
|
|
|
vo.setSubject(smsSalesBill.getSubject()); |
|
|
// vo.setSubject(smsSalesBill.getSubject());
|
|
|
} |
|
|
// }
|
|
|
//原单商品列表
|
|
|
// //原单商品列表
|
|
|
List<SalesGoodsReturnVo> billGoods = new ArrayList<>(); |
|
|
// List<SalesGoodsReturnVo> billGoods = new ArrayList<>();
|
|
|
//材料费
|
|
|
// //材料费
|
|
|
BigDecimal materialCosts = new BigDecimal(0); |
|
|
// BigDecimal materialCosts = new BigDecimal(0);
|
|
|
//合计优惠
|
|
|
// //合计优惠
|
|
|
BigDecimal discount = new BigDecimal(0); |
|
|
// BigDecimal discount = new BigDecimal(0);
|
|
|
List<SmsSalesBillDetail> billDetailList = smsSalesBillDetailService.fetchByMainSid(sid); |
|
|
// List<SmsSalesBillDetail> billDetailList = smsSalesBillDetailService.fetchByMainSid(sid);
|
|
|
if (!billDetailList.isEmpty()) { |
|
|
// if (!billDetailList.isEmpty()) {
|
|
|
for (SmsSalesBillDetail salesBillDetail : billDetailList) { |
|
|
// for (SmsSalesBillDetail salesBillDetail : billDetailList) {
|
|
|
if (null != salesBillDetail.getPrice()) { |
|
|
// if (null != salesBillDetail.getPrice()) {
|
|
|
materialCosts = salesBillDetail.getPrice().add(materialCosts); |
|
|
// materialCosts = salesBillDetail.getPrice().add(materialCosts);
|
|
|
} |
|
|
|
|
|
if (null != salesBillDetail.getDiscountAmount()) { |
|
|
|
|
|
discount = salesBillDetail.getDiscountAmount().add(discount); |
|
|
|
|
|
} |
|
|
|
|
|
SalesGoodsReturnVo salesGoodsVo = new SalesGoodsReturnVo(); |
|
|
|
|
|
BeanUtil.copyProperties(salesBillDetail, salesGoodsVo); |
|
|
|
|
|
//查询对应销售单已退商品数量
|
|
|
|
|
|
// String count = baseMapper.selRetunGoodsNum(sid, salesBillDetail.getInventorySid());
|
|
|
|
|
|
// if (StringUtils.isNotBlank(count)) {
|
|
|
|
|
|
// salesGoodsVo.setReturnedCount(count);
|
|
|
|
|
|
// }
|
|
|
// }
|
|
|
billGoods.add(salesGoodsVo); |
|
|
// if (null != salesBillDetail.getDiscountAmount()) {
|
|
|
} |
|
|
// discount = salesBillDetail.getDiscountAmount().add(discount);
|
|
|
vo.setBillGoods(billGoods); |
|
|
// }
|
|
|
} |
|
|
// SalesGoodsReturnVo salesGoodsVo = new SalesGoodsReturnVo();
|
|
|
vo.setMaterialCosts(materialCosts.toString()); |
|
|
// BeanUtil.copyProperties(salesBillDetail, salesGoodsVo);
|
|
|
vo.setDiscount(discount.toString()); |
|
|
// //查询对应销售单已退商品数量
|
|
|
//税额
|
|
|
//// String count = baseMapper.selRetunGoodsNum(sid, salesBillDetail.getInventorySid());
|
|
|
BigDecimal maxAmount = new BigDecimal(0); |
|
|
//// if (StringUtils.isNotBlank(count)) {
|
|
|
SmsSalesBillInvoice invoice = smsSalesBillInvoiceService.fetchByMainSid(sid); |
|
|
//// salesGoodsVo.setReturnedCount(count);
|
|
|
if (null != invoice) { |
|
|
//// }
|
|
|
if (null != invoice.getTaxRate()) { |
|
|
// billGoods.add(salesGoodsVo);
|
|
|
maxAmount = materialCosts.multiply(invoice.getTaxRate()).multiply(new BigDecimal(0.01)).setScale(2, BigDecimal.ROUND_UP); |
|
|
// }
|
|
|
vo.setMaxAmount(maxAmount.toString()); |
|
|
// vo.setBillGoods(billGoods);
|
|
|
} |
|
|
// }
|
|
|
} |
|
|
// vo.setMaterialCosts(materialCosts.toString());
|
|
|
// 合计金额
|
|
|
// vo.setDiscount(discount.toString());
|
|
|
BigDecimal amountAll = new BigDecimal(0); |
|
|
// //税额
|
|
|
amountAll = maxAmount.add(materialCosts); |
|
|
// BigDecimal maxAmount = new BigDecimal(0);
|
|
|
vo.setAmountAll(amountAll.toString()); |
|
|
// SmsSalesBillInvoice invoice = smsSalesBillInvoiceService.fetchByMainSid(sid);
|
|
|
//已收金额
|
|
|
// if (null != invoice) {
|
|
|
BigDecimal receivedAmount = new BigDecimal(0); |
|
|
// if (null != invoice.getTaxRate()) {
|
|
|
//欠款
|
|
|
// maxAmount = materialCosts.multiply(invoice.getTaxRate()).multiply(new BigDecimal(0.01)).setScale(2, BigDecimal.ROUND_UP);
|
|
|
BigDecimal debts = new BigDecimal(0); |
|
|
// vo.setMaxAmount(maxAmount.toString());
|
|
|
// 应收金额
|
|
|
// }
|
|
|
BigDecimal receivableAmount = new BigDecimal(0); |
|
|
// }
|
|
|
//结算时间
|
|
|
// // 合计金额
|
|
|
SmsSalesBillSettle settle = smsSalesBillSettleService.fetchByMainSid(sid); |
|
|
// BigDecimal amountAll = new BigDecimal(0);
|
|
|
if (null != settle) { |
|
|
// amountAll = maxAmount.add(materialCosts);
|
|
|
vo.setSettleTime(sdf.format(settle.getSettleTime())); |
|
|
// vo.setAmountAll(amountAll.toString());
|
|
|
if (null != settle.getSettleAmount()) { |
|
|
// //已收金额
|
|
|
receivedAmount = settle.getSettleAmount(); |
|
|
// BigDecimal receivedAmount = new BigDecimal(0);
|
|
|
} |
|
|
// //欠款
|
|
|
if (null != settle.getDebts()) { |
|
|
// BigDecimal debts = new BigDecimal(0);
|
|
|
debts = settle.getDebts(); |
|
|
// // 应收金额
|
|
|
} |
|
|
// BigDecimal receivableAmount = new BigDecimal(0);
|
|
|
if (null != settle.getReceivableAmount()) { |
|
|
// //结算时间
|
|
|
receivableAmount = settle.getReceivableAmount(); |
|
|
// SmsSalesBillSettle settle = smsSalesBillSettleService.fetchByMainSid(sid);
|
|
|
} |
|
|
// if (null != settle) {
|
|
|
} |
|
|
// vo.setSettleTime(sdf.format(settle.getSettleTime()));
|
|
|
vo.setReceivedAmount(receivedAmount.toString()); |
|
|
// if (null != settle.getSettleAmount()) {
|
|
|
vo.setDebts(debts.toString()); |
|
|
// receivedAmount = settle.getSettleAmount();
|
|
|
vo.setReceivableAmount(receivableAmount.toString()); |
|
|
// }
|
|
|
} |
|
|
// if (null != settle.getDebts()) {
|
|
|
|
|
|
// debts = settle.getDebts();
|
|
|
|
|
|
// }
|
|
|
|
|
|
// if (null != settle.getReceivableAmount()) {
|
|
|
|
|
|
// receivableAmount = settle.getReceivableAmount();
|
|
|
|
|
|
// }
|
|
|
|
|
|
// }
|
|
|
|
|
|
// vo.setReceivedAmount(receivedAmount.toString());
|
|
|
|
|
|
// vo.setDebts(debts.toString());
|
|
|
|
|
|
// vo.setReceivableAmount(receivableAmount.toString());
|
|
|
|
|
|
// }
|
|
|
return vo; |
|
|
return vo; |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
@ -458,115 +458,136 @@ public class SmsSalesReturnService extends MybatisBaseService<SmsSalesReturnMapp |
|
|
|
|
|
|
|
|
public SmsSalesReturnNewDetailsVo returnGoodsBillInit(String sid, String type) { |
|
|
public SmsSalesReturnNewDetailsVo returnGoodsBillInit(String sid, String type) { |
|
|
SmsSalesReturnNewDetailsVo vo = new SmsSalesReturnNewDetailsVo(); |
|
|
SmsSalesReturnNewDetailsVo vo = new SmsSalesReturnNewDetailsVo(); |
|
|
vo.setType(type); |
|
|
List<SmsSitemVo> sitemVos = new ArrayList<>();// 维修项目
|
|
|
vo.setSourceBillSid(sid); |
|
|
vo.setRemarks("222"); |
|
|
if (type.equals("0")) { |
|
|
SmsSitemVo v = new SmsSitemVo(); |
|
|
//维修工单
|
|
|
v.setRemarks("saasg"); |
|
|
AsBusrepairBillDetailsVo data = asBusrepairBillFeign.fetchDetailsBySid(sid).getData(); |
|
|
sitemVos.add(v); |
|
|
if (null != data) { |
|
|
List<SmsGoodsDetailsVo> goodsDetailsVos = new ArrayList<>(); //商品信息
|
|
|
vo.setSourceBillNo(data.getBillNo()); |
|
|
SmsGoodsDetailsVo v2 = new SmsGoodsDetailsVo(); |
|
|
vo.setBillType(data.getBillType()); |
|
|
v2.setRemarks("saasg"); |
|
|
vo.setBillDate(data.getCreateDate()); |
|
|
goodsDetailsVos.add(v2); |
|
|
if (StringUtils.isNotBlank(data.getSubject())) { |
|
|
List<SalesGoodsReturnVo> returnGoods = new ArrayList<>(); //退货商品列表
|
|
|
vo.setSubject(data.getSubject()); |
|
|
SalesGoodsReturnVo v3 = new SalesGoodsReturnVo(); |
|
|
} |
|
|
v3.setGoodsID("saasg"); |
|
|
if (StringUtils.isNotBlank(data.getWaitorName())) { |
|
|
returnGoods.add(v3); |
|
|
vo.setWaitorName(data.getWaitorName()); |
|
|
List<SalesItemsReturnVo> returnSitemVos = new ArrayList<>(); //退货维修项目列表
|
|
|
} |
|
|
SalesItemsReturnVo v4 = new SalesItemsReturnVo(); |
|
|
if (StringUtils.isNotBlank(data.getCustomerName())) { |
|
|
v.setRemarks("saasg"); |
|
|
vo.setCustomerName(data.getCustomerName()); |
|
|
returnSitemVos.add(v4); |
|
|
} |
|
|
vo.setReturnGoods(returnGoods); |
|
|
if (StringUtils.isNotBlank(data.getMobile())) { |
|
|
vo.setReturnSitemVos(returnSitemVos); |
|
|
vo.setMobile(data.getMobile()); |
|
|
vo.setGoodsDetailsVos(goodsDetailsVos); |
|
|
} |
|
|
vo.setSitemVos(sitemVos); |
|
|
if (StringUtils.isNotBlank(data.getCustomerOrg())) { |
|
|
// vo.setType(type);
|
|
|
vo.setCustomerOrg(data.getCustomerOrg()); |
|
|
// vo.setSourceBillSid(sid);
|
|
|
} |
|
|
// if (type.equals("0")) {
|
|
|
if (StringUtils.isNotBlank(data.getVehMark())) { |
|
|
// //维修工单
|
|
|
vo.setVehMark(data.getVehMark()); |
|
|
// AsBusrepairBillDetailsVo data = asBusrepairBillFeign.fetchDetailsBySid(sid).getData();
|
|
|
} |
|
|
// if (null != data) {
|
|
|
if (StringUtils.isNotBlank(data.getVinNo())) { |
|
|
// vo.setSourceBillNo(data.getBillNo());
|
|
|
vo.setVinNo(data.getVinNo()); |
|
|
// vo.setBillType(data.getBillType());
|
|
|
} |
|
|
// vo.setBillDate(data.getCreateDate());
|
|
|
SettleVo settleVo = data.getSettleVo(); |
|
|
// if (StringUtils.isNotBlank(data.getSubject())) {
|
|
|
if (null != settleVo) { |
|
|
// vo.setSubject(data.getSubject());
|
|
|
vo.setSettleDate(settleVo.getSettleTime()); |
|
|
// }
|
|
|
} |
|
|
// if (StringUtils.isNotBlank(data.getWaitorName())) {
|
|
|
List<SitemVo> sitemVos = data.getSitemVos(); |
|
|
// vo.setWaitorName(data.getWaitorName());
|
|
|
List<SmsSitemVo> smsSitemVos = new ArrayList<>(); |
|
|
// }
|
|
|
if (!sitemVos.isEmpty()) { |
|
|
// if (StringUtils.isNotBlank(data.getCustomerName())) {
|
|
|
for (SitemVo smsSitemVo : sitemVos) { |
|
|
// vo.setCustomerName(data.getCustomerName());
|
|
|
SmsSitemVo sitemVo = new SmsSitemVo(); |
|
|
// }
|
|
|
BeanUtil.copyProperties(smsSitemVo, sitemVo); |
|
|
// if (StringUtils.isNotBlank(data.getMobile())) {
|
|
|
smsSitemVos.add(sitemVo); |
|
|
// vo.setMobile(data.getMobile());
|
|
|
} |
|
|
// }
|
|
|
vo.setSitemVos(smsSitemVos); |
|
|
// if (StringUtils.isNotBlank(data.getCustomerOrg())) {
|
|
|
} |
|
|
// vo.setCustomerOrg(data.getCustomerOrg());
|
|
|
List<GoodsDetailsVo> goodsDetailsVos = data.getGoodsDetailsVos(); |
|
|
// }
|
|
|
List<SmsGoodsDetailsVo> smsGoodsDetailsVos = new ArrayList<>(); |
|
|
// if (StringUtils.isNotBlank(data.getVehMark())) {
|
|
|
if (!goodsDetailsVos.isEmpty()) { |
|
|
// vo.setVehMark(data.getVehMark());
|
|
|
for (GoodsDetailsVo goodsDetailsVo : goodsDetailsVos) { |
|
|
// }
|
|
|
SmsGoodsDetailsVo smsGoodsDetailsVo = new SmsGoodsDetailsVo(); |
|
|
// if (StringUtils.isNotBlank(data.getVinNo())) {
|
|
|
BeanUtil.copyProperties(goodsDetailsVo, smsGoodsDetailsVo); |
|
|
// vo.setVinNo(data.getVinNo());
|
|
|
//查询已退数量
|
|
|
// }
|
|
|
String goodsID = goodsDetailsVo.getGoodsID(); |
|
|
// SettleVo settleVo = data.getSettleVo();
|
|
|
String sumBackCount = baseMapper.selBackCountByGoodsID(goodsID, sid); |
|
|
// if (null != settleVo) {
|
|
|
smsGoodsDetailsVo.setReturnedCount(sumBackCount); |
|
|
// vo.setSettleDate(settleVo.getSettleTime());
|
|
|
smsGoodsDetailsVos.add(smsGoodsDetailsVo); |
|
|
// }
|
|
|
} |
|
|
// List<SitemVo> sitemVos = data.getSitemVos();
|
|
|
vo.setGoodsDetailsVos(smsGoodsDetailsVos); |
|
|
// List<SmsSitemVo> smsSitemVos = new ArrayList<>();
|
|
|
} |
|
|
// if (!sitemVos.isEmpty()) {
|
|
|
} |
|
|
// for (SitemVo smsSitemVo : sitemVos) {
|
|
|
} else if (type.equals("1")) { |
|
|
// SmsSitemVo sitemVo = new SmsSitemVo();
|
|
|
//销售单
|
|
|
// BeanUtil.copyProperties(smsSitemVo, sitemVo);
|
|
|
SmsSalesBillDetailsVo data = smsSalesBillService.fetchDetailsVoBySid(sid); |
|
|
// smsSitemVos.add(sitemVo);
|
|
|
if (null != data) { |
|
|
// }
|
|
|
vo.setSourceBillNo(data.getBillNo()); |
|
|
// vo.setSitemVos(smsSitemVos);
|
|
|
vo.setBillType("销售单"); |
|
|
// }
|
|
|
vo.setBillDate(data.getCreateTime()); |
|
|
// List<GoodsDetailsVo> goodsDetailsVos = data.getGoodsDetailsVos();
|
|
|
if (StringUtils.isNotBlank(data.getSubject())) { |
|
|
// List<SmsGoodsDetailsVo> smsGoodsDetailsVos = new ArrayList<>();
|
|
|
vo.setSubject(data.getSubject()); |
|
|
// if (!goodsDetailsVos.isEmpty()) {
|
|
|
} |
|
|
// for (GoodsDetailsVo goodsDetailsVo : goodsDetailsVos) {
|
|
|
if (StringUtils.isNotBlank(data.getSalesName())) { |
|
|
// SmsGoodsDetailsVo smsGoodsDetailsVo = new SmsGoodsDetailsVo();
|
|
|
vo.setWaitorName(data.getSalesName()); |
|
|
// BeanUtil.copyProperties(goodsDetailsVo, smsGoodsDetailsVo);
|
|
|
} |
|
|
// //查询已退数量
|
|
|
if (StringUtils.isNotBlank(data.getCustomerName())) { |
|
|
// String goodsID = goodsDetailsVo.getGoodsID();
|
|
|
vo.setCustomerName(data.getCustomerName()); |
|
|
// String sumBackCount = baseMapper.selBackCountByGoodsID(goodsID, sid);
|
|
|
} |
|
|
// smsGoodsDetailsVo.setReturnedCount(sumBackCount);
|
|
|
if (StringUtils.isNotBlank(data.getMobile())) { |
|
|
// smsGoodsDetailsVos.add(smsGoodsDetailsVo);
|
|
|
vo.setMobile(data.getMobile()); |
|
|
// }
|
|
|
} |
|
|
// vo.setGoodsDetailsVos(smsGoodsDetailsVos);
|
|
|
if (StringUtils.isNotBlank(data.getCustomerOrg())) { |
|
|
// }
|
|
|
vo.setCustomerOrg(data.getCustomerOrg()); |
|
|
// }
|
|
|
} |
|
|
// } else if (type.equals("1")) {
|
|
|
if (StringUtils.isNotBlank(data.getVehMark())) { |
|
|
// //销售单
|
|
|
vo.setVehMark(data.getVehMark()); |
|
|
// SmsSalesBillDetailsVo data = smsSalesBillService.fetchDetailsVoBySid(sid);
|
|
|
} |
|
|
// if (null != data) {
|
|
|
if (StringUtils.isNotBlank(data.getVinNo())) { |
|
|
// vo.setSourceBillNo(data.getBillNo());
|
|
|
vo.setVinNo(data.getVinNo()); |
|
|
// vo.setBillType("销售单");
|
|
|
} |
|
|
// vo.setBillDate(data.getCreateTime());
|
|
|
SettlementVo settleVo = data.getSettlementVo(); |
|
|
// if (StringUtils.isNotBlank(data.getSubject())) {
|
|
|
if (null != settleVo) { |
|
|
// vo.setSubject(data.getSubject());
|
|
|
vo.setSettleDate(settleVo.getSettleTime()); |
|
|
// }
|
|
|
} |
|
|
// if (StringUtils.isNotBlank(data.getSalesName())) {
|
|
|
List<SalesGoodsVo> goodsDetailsVos = data.getGoodsVos(); |
|
|
// vo.setWaitorName(data.getSalesName());
|
|
|
List<SmsGoodsDetailsVo> smsGoodsDetailsVos = new ArrayList<>(); |
|
|
// }
|
|
|
if (!goodsDetailsVos.isEmpty()) { |
|
|
// if (StringUtils.isNotBlank(data.getCustomerName())) {
|
|
|
for (SalesGoodsVo goodsDetailsVo : goodsDetailsVos) { |
|
|
// vo.setCustomerName(data.getCustomerName());
|
|
|
SmsGoodsDetailsVo smsGoodsDetailsVo = new SmsGoodsDetailsVo(); |
|
|
// }
|
|
|
BeanUtil.copyProperties(goodsDetailsVo, smsGoodsDetailsVo); |
|
|
// if (StringUtils.isNotBlank(data.getMobile())) {
|
|
|
//查询已退数量
|
|
|
// vo.setMobile(data.getMobile());
|
|
|
String goodsID = goodsDetailsVo.getGoodsID(); |
|
|
// }
|
|
|
String sumBackCount = baseMapper.selBackCountByGoodsID(goodsID, sid); |
|
|
// if (StringUtils.isNotBlank(data.getCustomerOrg())) {
|
|
|
smsGoodsDetailsVo.setReturnedCount(sumBackCount); |
|
|
// vo.setCustomerOrg(data.getCustomerOrg());
|
|
|
smsGoodsDetailsVos.add(smsGoodsDetailsVo); |
|
|
// }
|
|
|
smsGoodsDetailsVos.add(smsGoodsDetailsVo); |
|
|
// if (StringUtils.isNotBlank(data.getVehMark())) {
|
|
|
} |
|
|
// vo.setVehMark(data.getVehMark());
|
|
|
vo.setGoodsDetailsVos(smsGoodsDetailsVos); |
|
|
// }
|
|
|
} |
|
|
// if (StringUtils.isNotBlank(data.getVinNo())) {
|
|
|
} |
|
|
// vo.setVinNo(data.getVinNo());
|
|
|
|
|
|
// }
|
|
|
} |
|
|
// SettlementVo settleVo = data.getSettlementVo();
|
|
|
|
|
|
// if (null != settleVo) {
|
|
|
|
|
|
// vo.setSettleDate(settleVo.getSettleTime());
|
|
|
|
|
|
// }
|
|
|
|
|
|
// List<SalesGoodsVo> goodsDetailsVos = data.getGoodsVos();
|
|
|
|
|
|
// List<SmsGoodsDetailsVo> smsGoodsDetailsVos = new ArrayList<>();
|
|
|
|
|
|
// if (!goodsDetailsVos.isEmpty()) {
|
|
|
|
|
|
// for (SalesGoodsVo goodsDetailsVo : goodsDetailsVos) {
|
|
|
|
|
|
// SmsGoodsDetailsVo smsGoodsDetailsVo = new SmsGoodsDetailsVo();
|
|
|
|
|
|
// BeanUtil.copyProperties(goodsDetailsVo, smsGoodsDetailsVo);
|
|
|
|
|
|
// //查询已退数量
|
|
|
|
|
|
// String goodsID = goodsDetailsVo.getGoodsID();
|
|
|
|
|
|
// String sumBackCount = baseMapper.selBackCountByGoodsID(goodsID, sid);
|
|
|
|
|
|
// smsGoodsDetailsVo.setReturnedCount(sumBackCount);
|
|
|
|
|
|
// smsGoodsDetailsVos.add(smsGoodsDetailsVo);
|
|
|
|
|
|
// smsGoodsDetailsVos.add(smsGoodsDetailsVo);
|
|
|
|
|
|
// }
|
|
|
|
|
|
// vo.setGoodsDetailsVos(smsGoodsDetailsVos);
|
|
|
|
|
|
// }
|
|
|
|
|
|
// }
|
|
|
|
|
|
//
|
|
|
|
|
|
// }
|
|
|
return vo; |
|
|
return vo; |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
@ -636,7 +657,7 @@ public class SmsSalesReturnService extends MybatisBaseService<SmsSalesReturnMapp |
|
|
SmsSalesReturn smsSalesReturn = fetchBySid(sid); |
|
|
SmsSalesReturn smsSalesReturn = fetchBySid(sid); |
|
|
if (null != smsSalesReturn) { |
|
|
if (null != smsSalesReturn) { |
|
|
BeanUtil.copyProperties(smsSalesReturn, vo); |
|
|
BeanUtil.copyProperties(smsSalesReturn, vo); |
|
|
Integer type = smsSalesReturn.getType(); |
|
|
Integer type = smsSalesReturn.getBillType(); |
|
|
vo.setCreateTime(DateUtil.formatDate(smsSalesReturn.getCreateTime())); |
|
|
vo.setCreateTime(DateUtil.formatDate(smsSalesReturn.getCreateTime())); |
|
|
if (StringUtils.isNotBlank(smsSalesReturn.getProcInstId())) { |
|
|
if (StringUtils.isNotBlank(smsSalesReturn.getProcInstId())) { |
|
|
vo.setInstanceId(smsSalesReturn.getProcInstId()); |
|
|
vo.setInstanceId(smsSalesReturn.getProcInstId()); |
|
|
@ -660,9 +681,6 @@ public class SmsSalesReturnService extends MybatisBaseService<SmsSalesReturnMapp |
|
|
if (StringUtils.isNotBlank(data.getMobile())) { |
|
|
if (StringUtils.isNotBlank(data.getMobile())) { |
|
|
vo.setMobile(data.getMobile()); |
|
|
vo.setMobile(data.getMobile()); |
|
|
} |
|
|
} |
|
|
if (StringUtils.isNotBlank(data.getCustomerOrg())) { |
|
|
|
|
|
vo.setCustomerOrg(data.getCustomerOrg()); |
|
|
|
|
|
} |
|
|
|
|
|
if (StringUtils.isNotBlank(data.getVehMark())) { |
|
|
if (StringUtils.isNotBlank(data.getVehMark())) { |
|
|
vo.setVehMark(data.getVehMark()); |
|
|
vo.setVehMark(data.getVehMark()); |
|
|
} |
|
|
} |
|
|
@ -717,9 +735,6 @@ public class SmsSalesReturnService extends MybatisBaseService<SmsSalesReturnMapp |
|
|
if (StringUtils.isNotBlank(data.getMobile())) { |
|
|
if (StringUtils.isNotBlank(data.getMobile())) { |
|
|
vo.setMobile(data.getMobile()); |
|
|
vo.setMobile(data.getMobile()); |
|
|
} |
|
|
} |
|
|
if (StringUtils.isNotBlank(data.getCustomerOrg())) { |
|
|
|
|
|
vo.setCustomerOrg(data.getCustomerOrg()); |
|
|
|
|
|
} |
|
|
|
|
|
if (StringUtils.isNotBlank(data.getVehMark())) { |
|
|
if (StringUtils.isNotBlank(data.getVehMark())) { |
|
|
vo.setVehMark(data.getVehMark()); |
|
|
vo.setVehMark(data.getVehMark()); |
|
|
} |
|
|
} |
|
|
|
God
9 months ago