Browse Source

Merge remote-tracking branch 'origin/master'

master
wangpengfei 6 months ago
parent
commit
e94ce1a051
  1. 1
      src/main/java/com/yxt/sales/biz/smssalesbill/ReviewDetailsVo.java
  2. 1
      src/main/java/com/yxt/sales/biz/smssalesbill/SmsSalesBillService.java

1
src/main/java/com/yxt/sales/biz/smssalesbill/ReviewDetailsVo.java

@ -19,4 +19,5 @@ public class ReviewDetailsVo {
private ReviewInvoice invoice = new ReviewInvoice(); //发票信息
private List<ReviewDiscount> discounts; //优惠详情
private List<ReviewRecord> records; //操作记录
private String useOrgSid;
}

1
src/main/java/com/yxt/sales/biz/smssalesbill/SmsSalesBillService.java

@ -512,6 +512,7 @@ public class SmsSalesBillService extends MybatisBaseService<SmsSalesBillMapper,
ReviewDetailsVo vo = new ReviewDetailsVo();
vo.setSid(sid);
SmsSalesBill smsSalesBill = fetchBySid(sid);
vo.setUseOrgSid(smsSalesBill.getUseOrgSid());
List<SmsSalesBillDetail> goods = smsSalesBillDetailService.selByBillSid(sid);
if (!goods.isEmpty()) {
List<ReviewGoods> reviewGoods = new ArrayList<>();

Loading…
Cancel
Save