yxt_product
/
oms-biz
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

oms调用系统管理下根据组织全路径查询当前部门下的所有员工接口开发 

采购单保存后推送预期到货通知单开发
master
God 11 months ago
parent
58d629c66b
commit
cbd78ba82a
10 changed files with 143 additions and 21 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 12
      oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SysStaffOrgRest.java
  2. 58
      oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseBillService.java
  3. 13
      oms/src/main/java/com/yxt/oms/biz/func/purchasebillamount/PurchaseBillAmount.java
  4. 13
      oms/src/main/java/com/yxt/oms/biz/func/purchasebillamount/PurchaseBillAmountDetailsVo.java
  5. 18
      oms/src/main/java/com/yxt/oms/biz/func/purchasebillamount/PurchaseBillAmountDto.java
  6. 2
      oms/src/main/java/com/yxt/oms/biz/func/purchasebilldetail/PurchaseBillDetailDto.java
  7. 30
      oms/src/main/java/com/yxt/oms/biz/func/sysstafforg/SysStaffOrgByUserVo.java
  8. 6
      oms/src/main/java/com/yxt/oms/biz/func/sysstafforg/SysStaffOrgService.java
  9. 4
      oms/src/main/java/com/yxt/oms/biz/func/warehouseansbill/WarehouseAnsBillDto.java
  10. 8
      oms/src/main/java/com/yxt/oms/feign/portal/sysstafforg/SysStaffOrgFeign.java

12
oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SysStaffOrgRest.java
View File

@ -1,11 +1,14 @@
package com.yxt.oms.apiadmin.aggregation;
import com.yxt.common.core.result.ResultBean;
import com.yxt.oms.biz.func.sysstafforg.SysStaffOrgByUserVo;
import com.yxt.oms.biz.func.sysstafforg.SysStaffOrgService;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.List;
@RestController
@RequestMapping("/apiadmin/sysstafforg")
public class SysStaffOrgRest {
@ -18,5 +21,12 @@ public class SysStaffOrgRest {
@ApiOperation("根据用户组织全路径获取用户的分公司sid")
ResultBean<String> getOrgSidByPath(@RequestParam("orgPath") String orgPath){
return sysStaffOrgService.getOrgSidByPath(orgPath);
};
}
@GetMapping("/selAllByOrgSidPath")
@ResponseBody
@ApiOperation("根据组织全路径查询当前部门下的所有员工")
public ResultBean<List<SysStaffOrgByUserVo>> selAllByOrgSidPath(String orgSidPath) {
return sysStaffOrgService.selAllByOrgSidPath(orgSidPath);
}
}

58
oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseBillService.java
View File

@ -26,17 +26,22 @@
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.sysorganization.SysOrganizationVo;
import com.yxt.oms.biz.func.warehouseansbill.WarehouseAnsBillDto;
import com.yxt.oms.biz.func.warehouseansbilldetail.WarehouseAnsBillDetailDto;
import com.yxt.oms.feign.goods.sku.GoodsSkuFeign;
import com.yxt.oms.feign.portal.privilege.PrivilegeQuery;
import com.yxt.oms.feign.portal.sysorganization.SysOrganizationFeign;
import com.yxt.oms.feign.portal.sysstafforg.SysStaffOrgFeign;
import com.yxt.oms.feign.portal.sysuser.SysUserFeign;
import com.yxt.oms.feign.purchase.purchasebill.PurchaseBillFeign;
import com.yxt.oms.feign.warehouse.warehouseansbill.WarehouseAnsBillFeign;
import com.yxt.oms.utils.Rule;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
@ -58,6 +63,8 @@ public class PurchaseBillService extends MybatisBaseService<PurchaseBillMapper,
private SysStaffOrgFeign sysStaffOrgFeign;
@Resource
private GoodsSkuFeign goodsSkuFeign;
@Resource
private WarehouseAnsBillFeign warehouseAnsBillFeign;
public ResultBean<PagerVo<PurchaseBillVo>> listPageVo(PagerQuery<PurchaseBillQuery> pq) {
ResultBean rb = ResultBean.fireFail();
@ -73,6 +80,7 @@ public class PurchaseBillService extends MybatisBaseService<PurchaseBillMapper,
}
public ResultBean<String> saveOrUpdateDto(PurchaseBillDto dto) {
ResultBean rb = ResultBean.fireFail();
String orgPath = dto.getOrgPath();
if (StringUtils.isBlank(dto.getSid())) {
String deptName = "";
@ -112,7 +120,55 @@ public class PurchaseBillService extends MybatisBaseService<PurchaseBillMapper,
}
}
}
return purchaseBillFeign.save(dto);
ResultBean<String> resultBean = purchaseBillFeign.save(dto);
if (resultBean.getSuccess()) {
WarehouseAnsBillDto wmsAnsBillDto = new WarehouseAnsBillDto();
wmsAnsBillDto.setDeptName(dto.getDeptName());
wmsAnsBillDto.setDeptSid(dto.getDeptSid());
wmsAnsBillDto.setCreateBySid(dto.getCreateBySid());
wmsAnsBillDto.setSourceBillNo(dto.getBillNo());
wmsAnsBillDto.setBusTypeKey("01");
wmsAnsBillDto.setBusTypeValue("采购预约");
wmsAnsBillDto.setCreateByName(dto.getCreateByName());
wmsAnsBillDto.setBillState(0);
wmsAnsBillDto.setReviewStatus("");
wmsAnsBillDto.setRefuseReason("");
wmsAnsBillDto.setMobile(dto.getSupplierPhone());
wmsAnsBillDto.setSupplierSid(dto.getSupplierSid());
wmsAnsBillDto.setSupplierName(dto.getSupplierName());
wmsAnsBillDto.setGoodsOwnerSid("");
wmsAnsBillDto.setGoodsOwner("");
wmsAnsBillDto.setDeliveryDate(dto.getDeliveryDate());
wmsAnsBillDto.setUseOrgSid(dto.getUseOrgSid());
wmsAnsBillDto.setCreateOrgSid(dto.getCreateOrgSid());
List<WarehouseAnsBillDetailDto> wmsAnsBillDetailDtos = new ArrayList<>();
List<PurchaseBillDetailDto> purchaseBillDetailList = dto.getPurchaseBillDetailList();
for (PurchaseBillDetailDto purchaseBillDetailDto : purchaseBillDetailList) {
WarehouseAnsBillDetailDto wmsAnsBillDetailDto = new WarehouseAnsBillDetailDto();
wmsAnsBillDetailDto.setGoodSpuSid(purchaseBillDetailDto.getGoodsSpuSid());
wmsAnsBillDetailDto.setGoodsSpuName(purchaseBillDetailDto.getGoodsSpuName());
wmsAnsBillDetailDto.setGoodsSkuSid(purchaseBillDetailDto.getGoodsSkuSid());
wmsAnsBillDetailDto.setGoodsSkuTitle(purchaseBillDetailDto.getGoodsSkuTitle());
wmsAnsBillDetailDto.setGoodsSkuCode(purchaseBillDetailDto.getGoodsSkuCode());
wmsAnsBillDetailDto.setGoodsSkuOwnSpec(purchaseBillDetailDto.getGoodsSkuOwnSpec());
wmsAnsBillDetailDto.setUnit(purchaseBillDetailDto.getUnit());
if (null != purchaseBillDetailDto.getCost()) {
wmsAnsBillDetailDto.setCost(purchaseBillDetailDto.getCost().doubleValue());
}
wmsAnsBillDetailDto.setOrderCount(purchaseBillDetailDto.getCount().doubleValue());
if (null != purchaseBillDetailDto.getTaxAmount()) {
wmsAnsBillDetailDto.setTaxAmount(purchaseBillDetailDto.getTaxAmount().doubleValue());
}
wmsAnsBillDetailDto.setTaxPrice(purchaseBillDetailDto.getTaxPrice().doubleValue());
wmsAnsBillDetailDto.setAmount(purchaseBillDetailDto.getAmount().doubleValue());
wmsAnsBillDetailDtos.add(wmsAnsBillDetailDto);
}
wmsAnsBillDto.setWmsAnsBillDetailList(wmsAnsBillDetailDtos);
warehouseAnsBillFeign.saveBill(wmsAnsBillDto);
}else {
return rb.setMsg(resultBean.getMsg());
}
return rb.success().setData(resultBean.getData());
}
public ResultBean<PurchaseBillDetailsVo> fetchDetailsVoBySid(String sid) {

13
oms/src/main/java/com/yxt/oms/biz/func/purchasebillamount/PurchaseBillAmount.java
View File

@ -63,8 +63,14 @@ public class PurchaseBillAmount extends BaseEntity {
private String otherShareTypeKey; // 其他费用分摊方式Key
@ApiModelProperty("其他费用分摊方式Value")
private String otherShareTypeValue; // 其他费用分摊方式Value
@ApiModelProperty("结算账户")
private String settleAccount; // 结算账户
@ApiModelProperty("结算账户key")
private String settleAccountKey;
@ApiModelProperty("结算账户value")
private String settleAccountValue;
@ApiModelProperty("币种")
private String currencyKey;
@ApiModelProperty("币种")
private String currencyValue;
@ApiModelProperty("预付金额")
private BigDecimal prepayment; // 预付金额
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
@ -76,7 +82,4 @@ public class PurchaseBillAmount extends BaseEntity {
private String bankAccountName; // 收款账户
@ApiModelProperty("收款银行账号")
private String bankAccount; // 收款银行账号
@ApiModelProperty("币种")
private String currency; // 币种
}

13
oms/src/main/java/com/yxt/oms/biz/func/purchasebillamount/PurchaseBillAmountDetailsVo.java
View File

@ -74,8 +74,14 @@ public class PurchaseBillAmountDetailsVo implements Vo {
private String otherShareTypeKey; // 其他费用分摊方式Key
@ApiModelProperty("其他费用分摊方式Value")
private String otherShareTypeValue; // 其他费用分摊方式Value
@ApiModelProperty("结算账户")
private String settleAccount; // 结算账户
@ApiModelProperty("结算账户key")
private String settleAccountKey;
@ApiModelProperty("结算账户value")
private String settleAccountValue;
@ApiModelProperty("币种")
private String currencyKey;
@ApiModelProperty("币种")
private String currencyValue;
@ApiModelProperty("预付金额")
private BigDecimal prepayment; // 预付金额
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
@ -88,7 +94,4 @@ public class PurchaseBillAmountDetailsVo implements Vo {
private String bankAccountName; // 收款账户
@ApiModelProperty("收款银行账号")
private String bankAccount; // 收款银行账号
@ApiModelProperty("币种")
private String currency; // 币种
}

18
oms/src/main/java/com/yxt/oms/biz/func/purchasebillamount/PurchaseBillAmountDto.java
View File

@ -74,21 +74,23 @@ public class PurchaseBillAmountDto implements Dto {
private String otherShareTypeKey; // 其他费用分摊方式Key
@ApiModelProperty("其他费用分摊方式Value")
private String otherShareTypeValue; // 其他费用分摊方式Value
@ApiModelProperty("结算账户")
private String settleAccount; // 结算账户
@ApiModelProperty("结算账户key")
private String settleAccountKey;
@ApiModelProperty("结算账户value")
private String settleAccountValue;
@ApiModelProperty("币种")
private String currencyKey;
@ApiModelProperty("币种")
private String currencyValue;
@ApiModelProperty("预付金额")
private BigDecimal prepayment; // 预付金额
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
@ApiModelProperty("付款期限")
private Date paymentTermStart; // 付款期限
private Date paymentTermEnd; // 付款期限
private Date paymentTerm; // 付款期限
@ApiModelProperty("收款开户行")
private String bankName; // 收款开户行
@ApiModelProperty("收款账户")
private String bankAccountName; // 收款账户
@ApiModelProperty("收款银行账号")
private String bankAccount; // 收款银行账号
@ApiModelProperty("币种")
private String currency; // 币种
}

2
oms/src/main/java/com/yxt/oms/biz/func/purchasebilldetail/PurchaseBillDetailDto.java
View File

@ -78,7 +78,7 @@ public class PurchaseBillDetailDto implements Dto {
private BigDecimal amount; // 采购金额
@ApiModelProperty("采购周期")
private Integer cycle; // 采购周期
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
@ApiModelProperty("预期到货日期")
private Date deliveryDate; // 预期到货日期
@ApiModelProperty("税额")

30
oms/src/main/java/com/yxt/oms/biz/func/sysstafforg/SysStaffOrgByUserVo.java
View File

@ -0,0 +1,30 @@
package com.yxt.oms.biz.func.sysstafforg;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* Project: anrui_portal(门户建设) <br/>
* File: SysStaffOrgVo.java <br/>
* Class: com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgVo <br/>
* Description: 员工部门关联表 视图数据对象. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2021-08-03 00:24:29 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@ApiModel(value = "员工部门关联表 视图数据对象", description = "员工部门关联表 视图数据对象")
@Data
public class SysStaffOrgByUserVo implements Vo {
@ApiModelProperty("sid")
private String sid;
@ApiModelProperty("员工姓名")
private String name;
}

6
oms/src/main/java/com/yxt/oms/biz/func/sysstafforg/SysStaffOrgService.java
View File

@ -8,6 +8,8 @@ import com.yxt.oms.feign.portal.sysstafforg.SysStaffOrgFeign;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
@Service
public class SysStaffOrgService extends MybatisBaseService<SysRoleAuthorizeMapper, SysRoleAuthorize> {
@ -17,4 +19,8 @@ public class SysStaffOrgService extends MybatisBaseService<SysRoleAuthorizeMappe
public ResultBean<String> getOrgSidByPath(String orgPath) {
return sysStaffOrgFeign.getOrgSidByPath(orgPath);
}
public ResultBean<List<SysStaffOrgByUserVo>> selAllByOrgSidPath(String orgSidPath) {
return sysStaffOrgFeign.selAllByOrgSidPath(orgSidPath);
}
}

4
oms/src/main/java/com/yxt/oms/biz/func/warehouseansbill/WarehouseAnsBillDto.java
View File

@ -19,6 +19,10 @@ public class WarehouseAnsBillDto {
private String sid;
private String createBySid;
@ApiModelProperty("申请部门sid")
private String deptSid;
@ApiModelProperty("申请部门")
private String deptName;
@ApiModelProperty("外部单号（业务单据编号）")
private String sourceBillNo;
@ApiModelProperty("业务类型key（采购预约、调拨预约、其他预约）")

8
oms/src/main/java/com/yxt/oms/feign/portal/sysstafforg/SysStaffOrgFeign.java
View File

@ -1,12 +1,15 @@
package com.yxt.oms.feign.portal.sysstafforg;
import com.yxt.common.core.result.ResultBean;
import com.yxt.oms.biz.func.sysstafforg.SysStaffOrgByUserVo;
import io.swagger.annotations.ApiOperation;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
import java.util.List;
/**
* @description: 人员与机构
* @author: dimengzhe
@ -22,4 +25,9 @@ public interface SysStaffOrgFeign {
@ResponseBody
@ApiOperation("根据用户组织全路径获取用户的分公司sid")
ResultBean<String> getOrgSidByPath(@RequestParam("orgPath") String orgPath);
@GetMapping("/selAllByOrgSidPath")
@ResponseBody
@ApiOperation("根据组织全路径查询当前部门下的所有员工")
public ResultBean<List<SysStaffOrgByUserVo>> selAllByOrgSidPath(String orgSidPath);
}

Write Preview
Loading…
Cancel
Save