选择商品增加组织权限

采购审核通过推送入库预约记录
查询所有员工接口调整

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;
 }

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<PurchaseBillMapper,
             }
         }
         ResultBean<String> resultBean = purchaseBillFeign.save(dto);
-        if (resultBean.getSuccess()) {
+        if (!resultBean.getSuccess()) {
+            return rb.setMsg(resultBean.getMsg());
+        }
+        return rb.success().setData(resultBean.getData());
+    }
+
+    public ResultBean<PurchaseBillDetailsVo> fetchDetailsVoBySid(String sid) {
+        return purchaseBillFeign.fetchDetailsBySid(sid);
+    }
+
+    public ResultBean delAll(String[] sids) {
+        return purchaseBillFeign.delBySids(sids);
+    }
+
+    public ResultBean<PagerVo<GoodsSkuPurSelectList>> purGoodsListPage(PagerQuery<GoodsSkuPurSelectQuery> pq) {
+        return goodsSkuFeign.purGoodsListPage(pq);
+    }
+
+    public ResultBean submit(String[] sids) {
+        return purchaseBillFeign.submit(sids);
+    }
+
+    public ResultBean<PagerVo<PurchaseBillExVo>> exlistPage(PagerQuery<PurchaseBillQuery> 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<PurchaseBillMapper,
             wmsAnsBillDto.setUseOrgSid(dto.getUseOrgSid());
             wmsAnsBillDto.setCreateOrgSid(dto.getCreateOrgSid());
             List<WarehouseAnsBillDetailDto> wmsAnsBillDetailDtos = new ArrayList<>();
-            List<PurchaseBillDetailDto> purchaseBillDetailList = dto.getPurchaseBillDetailList();
-            for (PurchaseBillDetailDto purchaseBillDetailDto : purchaseBillDetailList) {
+            List<PurchaseBillDetailDetailsVo> 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<PurchaseBillMapper,
             }
             wmsAnsBillDto.setWmsAnsBillDetailList(wmsAnsBillDetailDtos);
             warehouseAnsBillFeign.saveBill(wmsAnsBillDto);
-        }else {
-            return rb.setMsg(resultBean.getMsg());
         }
-        return rb.success().setData(resultBean.getData());
-    }
-
-    public ResultBean<PurchaseBillDetailsVo> fetchDetailsVoBySid(String sid) {
-        return purchaseBillFeign.fetchDetailsBySid(sid);
-    }
-
-    public ResultBean delAll(String[] sids) {
-        return purchaseBillFeign.delBySids(sids);
-    }
-
-    public ResultBean<PagerVo<GoodsSkuPurSelectList>> purGoodsListPage(PagerQuery<GoodsSkuPurSelectQuery> pq) {
-        return goodsSkuFeign.purGoodsListPage(pq);
-    }
-
-    public ResultBean submit(String[] sids) {
-        return purchaseBillFeign.submit(sids);
-    }
-
-    public ResultBean<PagerVo<PurchaseBillExVo>> exlistPage(PagerQuery<PurchaseBillQuery> pq) {
-        return purchaseBillFeign.exlistPage(pq);
-    }
-
-    public ResultBean examine(String sid, String state, String remarks) {
-        return purchaseBillFeign.examine(sid,state,remarks);
+        return rb;
     }
 }

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<List<SysStaffOrgByUserVo>> selAllByOrgSidPath(String orgSidPath);
+    public ResultBean<List<SysStaffOrgByUserVo>> selAllByOrgSidPath(@RequestParam("orgSidPath") String orgSidPath);
 
     @GetMapping("/getOrgByStaffSid")
     @ResponseBody