From 861687da5e04136d7bc2b786de260ceea7f6283b Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Mon, 29 Jul 2024 15:14:59 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=89=E6=8B=A9=E5=95=86=E5=93=81=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E7=BB=84=E7=BB=87=E6=9D=83=E9=99=90=20=E9=87=87?= =?UTF-8?q?=E8=B4=AD=E5=AE=A1=E6=A0=B8=E9=80=9A=E8=BF=87=E6=8E=A8=E9=80=81?= =?UTF-8?q?=E5=85=A5=E5=BA=93=E9=A2=84=E7=BA=A6=E8=AE=B0=E5=BD=95=20?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=89=80=E6=9C=89=E5=91=98=E5=B7=A5=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purchasebill/GoodsSkuPurSelectQuery.java | 2 + .../purchasebill/PurchaseBillService.java | 66 ++++++++++--------- .../portal/sysstafforg/SysStaffOrgFeign.java | 2 +- 3 files changed, 37 insertions(+), 33 deletions(-) diff --git a/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/GoodsSkuPurSelectQuery.java b/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/GoodsSkuPurSelectQuery.java index 0042a1f..3684cf8 100644 --- a/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/GoodsSkuPurSelectQuery.java +++ b/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/GoodsSkuPurSelectQuery.java @@ -19,4 +19,6 @@ public class GoodsSkuPurSelectQuery implements Query { private String barCode; //规格名称 private String goodsSkuOwnSpec; + + private String orgPath; } 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 d049e34..8469dcf 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 @@ -26,12 +26,11 @@ package com.yxt.oms.biz.func.purchasebill; import cn.hutool.core.date.DateUtil; -import com.baomidou.mybatisplus.extension.api.R; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; -import com.yxt.oms.biz.func.purchasebilldetail.PurchaseBillDetailDto; +import com.yxt.oms.biz.func.purchasebilldetail.PurchaseBillDetailDetailsVo; import com.yxt.oms.biz.func.sysorganization.SysOrganizationVo; import com.yxt.oms.biz.func.warehouseansbill.WarehouseAnsBillDto; import com.yxt.oms.biz.func.warehouseansbilldetail.WarehouseAnsBillDetailDto; @@ -121,7 +120,36 @@ public class PurchaseBillService extends MybatisBaseService resultBean = purchaseBillFeign.save(dto); - if (resultBean.getSuccess()) { + if (!resultBean.getSuccess()) { + return rb.setMsg(resultBean.getMsg()); + } + return rb.success().setData(resultBean.getData()); + } + + public ResultBean fetchDetailsVoBySid(String sid) { + return purchaseBillFeign.fetchDetailsBySid(sid); + } + + public ResultBean delAll(String[] sids) { + return purchaseBillFeign.delBySids(sids); + } + + public ResultBean> purGoodsListPage(PagerQuery pq) { + return goodsSkuFeign.purGoodsListPage(pq); + } + + public ResultBean submit(String[] sids) { + return purchaseBillFeign.submit(sids); + } + + public ResultBean> exlistPage(PagerQuery pq) { + return purchaseBillFeign.exlistPage(pq); + } + + public ResultBean examine(String sid, String state, String remarks) { + ResultBean rb = purchaseBillFeign.examine(sid, state, remarks); + PurchaseBillDetailsVo dto = purchaseBillFeign.fetchDetailsBySid(sid).getData(); + if ("2".equals(state)){ WarehouseAnsBillDto wmsAnsBillDto = new WarehouseAnsBillDto(); wmsAnsBillDto.setDeptName(dto.getDeptName()); wmsAnsBillDto.setDeptSid(dto.getDeptSid()); @@ -141,8 +169,8 @@ public class PurchaseBillService extends MybatisBaseService wmsAnsBillDetailDtos = new ArrayList<>(); - List purchaseBillDetailList = dto.getPurchaseBillDetailList(); - for (PurchaseBillDetailDto purchaseBillDetailDto : purchaseBillDetailList) { + List purchaseBillDetailList = dto.getPurchaseBillDetailList(); + for (PurchaseBillDetailDetailsVo purchaseBillDetailDto : purchaseBillDetailList) { WarehouseAnsBillDetailDto wmsAnsBillDetailDto = new WarehouseAnsBillDetailDto(); wmsAnsBillDetailDto.setGoodSpuSid(purchaseBillDetailDto.getGoodsSpuSid()); wmsAnsBillDetailDto.setGoodsSpuName(purchaseBillDetailDto.getGoodsSpuName()); @@ -163,33 +191,7 @@ public class PurchaseBillService extends MybatisBaseService fetchDetailsVoBySid(String sid) { - return purchaseBillFeign.fetchDetailsBySid(sid); - } - - public ResultBean delAll(String[] sids) { - return purchaseBillFeign.delBySids(sids); - } - - public ResultBean> purGoodsListPage(PagerQuery pq) { - return goodsSkuFeign.purGoodsListPage(pq); - } - - public ResultBean submit(String[] sids) { - return purchaseBillFeign.submit(sids); - } - - public ResultBean> exlistPage(PagerQuery pq) { - return purchaseBillFeign.exlistPage(pq); - } - - public ResultBean examine(String sid, String state, String remarks) { - return purchaseBillFeign.examine(sid,state,remarks); + return rb; } } diff --git a/oms/src/main/java/com/yxt/oms/feign/portal/sysstafforg/SysStaffOrgFeign.java b/oms/src/main/java/com/yxt/oms/feign/portal/sysstafforg/SysStaffOrgFeign.java index 1343a40..835f357 100644 --- a/oms/src/main/java/com/yxt/oms/feign/portal/sysstafforg/SysStaffOrgFeign.java +++ b/oms/src/main/java/com/yxt/oms/feign/portal/sysstafforg/SysStaffOrgFeign.java @@ -32,7 +32,7 @@ public interface SysStaffOrgFeign { @GetMapping("/selAllByOrgSidPath") @ResponseBody @ApiOperation("根据组织全路径查询当前部门下的所有员工") - public ResultBean> selAllByOrgSidPath(String orgSidPath); + public ResultBean> selAllByOrgSidPath(@RequestParam("orgSidPath") String orgSidPath); @GetMapping("/getOrgByStaffSid") @ResponseBody