diff --git a/oms/src/main/java/com/yxt/oms/biz/func/crmfile/CrmFileService.java b/oms/src/main/java/com/yxt/oms/biz/func/crmfile/CrmFileService.java index b3f20b3..65b7432 100644 --- a/oms/src/main/java/com/yxt/oms/biz/func/crmfile/CrmFileService.java +++ b/oms/src/main/java/com/yxt/oms/biz/func/crmfile/CrmFileService.java @@ -74,6 +74,6 @@ public class CrmFileService { datum.setFilePath(fileUploadComponent.getUrlPrefix() + datum.getFilePath()); } } - return crmFileFeign.getPcAppendix(query); + return rb.success().setData(data); } } diff --git a/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseBillService.java b/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseBillService.java index eb83bca..9ae0e25 100644 --- a/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseBillService.java +++ b/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseBillService.java @@ -41,6 +41,7 @@ import com.yxt.oms.biz.func.purchasebilldetail.PurchaseBillDetailDto; import com.yxt.oms.biz.func.sysorganization.SysOrganizationVo; import com.yxt.oms.biz.func.warehouseansbill.WarehouseAnsBillDto; import com.yxt.oms.biz.func.warehouseansbilldetail.WarehouseAnsBillDetailDto; +import com.yxt.oms.biz.func.warehouseansbilldetail.WarehouseAnsBillNum; import com.yxt.oms.feign.goods.basebrandinfo.BaseBrandInfoFeign; import com.yxt.oms.feign.goods.basegoodssku.BaseGoodsSkuFeign; import com.yxt.oms.feign.goods.basegoodsspu.BaseGoodsSpuFeign; @@ -89,6 +90,11 @@ public class PurchaseBillService { pq.getParams().setOrgLevelKey(dataRule.getDataRuleId()); pq.getParams().setIndex(dataRule.getIndex()); PagerVo p = purchaseBillFeign.listPage(pq).getData(); + for (PurchaseBillVo record : p.getRecords()) { + WarehouseAnsBillNum data = warehouseAnsBillFeign.selByExternalNo(record.getBillNo()).getData(); + record.setEnterWareCount(data.getActualInCount()); + record.setEnterWareAmount(data.getActualInCount().multiply(data.getPrice())); + } return rb.success().setData(p); } diff --git a/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/ReviewDetailsVo.java b/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/ReviewDetailsVo.java index 41570ce..814ce3d 100644 --- a/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/ReviewDetailsVo.java +++ b/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/ReviewDetailsVo.java @@ -19,4 +19,5 @@ public class ReviewDetailsVo { private ReviewInvoice invoice = new ReviewInvoice(); //发票信息 private List discounts; //优惠详情 private List records; //操作记录 + private String useOrgSid; } diff --git a/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/SmsSalesBillService.java b/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/SmsSalesBillService.java index 90d6d62..1c59274 100644 --- a/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/SmsSalesBillService.java +++ b/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/SmsSalesBillService.java @@ -178,7 +178,7 @@ public class SmsSalesBillService extends MybatisBaseService details(@RequestParam("sid") String sid); + + @GetMapping("selByExternalNo") + @ApiOperation("根据外部单号查询实际入库数量及单价") + ResultBean selByExternalNo(@RequestParam("billNo") String billNo); } \ No newline at end of file diff --git a/oms/src/main/java/com/yxt/oms/feign/warehouse/warehouseansbill/WarehouseAnsBillFeignFallback.java b/oms/src/main/java/com/yxt/oms/feign/warehouse/warehouseansbill/WarehouseAnsBillFeignFallback.java index 9182ddf..4ea4895 100644 --- a/oms/src/main/java/com/yxt/oms/feign/warehouse/warehouseansbill/WarehouseAnsBillFeignFallback.java +++ b/oms/src/main/java/com/yxt/oms/feign/warehouse/warehouseansbill/WarehouseAnsBillFeignFallback.java @@ -7,6 +7,7 @@ import com.yxt.oms.biz.func.warehouseansbill.WarehouseAnsBillDto; import com.yxt.oms.biz.func.warehouseansbill.WarehouseAnsBillQuery; import com.yxt.oms.biz.func.warehouseansbill.WarehouseAnsBillVo; import com.yxt.oms.biz.func.warehouseansbill.WarehouseAnsDetailsVo; +import com.yxt.oms.biz.func.warehouseansbilldetail.WarehouseAnsBillNum; import org.springframework.stereotype.Component; /** @@ -45,4 +46,9 @@ public class WarehouseAnsBillFeignFallback implements WarehouseAnsBillFeign { public ResultBean details(String sid) { return null; } + + @Override + public ResultBean selByExternalNo(String billNo) { + return null; + } } \ No newline at end of file