From cbd78ba82aff357cd0937aeec353ea0f8d273f23 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Thu, 11 Jul 2024 14:57:53 +0800 Subject: [PATCH] =?UTF-8?q?oms=E8=B0=83=E7=94=A8=E7=B3=BB=E7=BB=9F?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E4=B8=8B=E6=A0=B9=E6=8D=AE=E7=BB=84=E7=BB=87?= =?UTF-8?q?=E5=85=A8=E8=B7=AF=E5=BE=84=E6=9F=A5=E8=AF=A2=E5=BD=93=E5=89=8D?= =?UTF-8?q?=E9=83=A8=E9=97=A8=E4=B8=8B=E7=9A=84=E6=89=80=E6=9C=89=E5=91=98?= =?UTF-8?q?=E5=B7=A5=E6=8E=A5=E5=8F=A3=E5=BC=80=E5=8F=91=20=E9=87=87?= =?UTF-8?q?=E8=B4=AD=E5=8D=95=E4=BF=9D=E5=AD=98=E5=90=8E=E6=8E=A8=E9=80=81?= =?UTF-8?q?=E9=A2=84=E6=9C=9F=E5=88=B0=E8=B4=A7=E9=80=9A=E7=9F=A5=E5=8D=95?= =?UTF-8?q?=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../apiadmin/aggregation/SysStaffOrgRest.java | 12 +++- .../purchasebill/PurchaseBillService.java | 58 ++++++++++++++++++- .../PurchaseBillAmount.java | 13 +++-- .../PurchaseBillAmountDetailsVo.java | 13 +++-- .../PurchaseBillAmountDto.java | 18 +++--- .../PurchaseBillDetailDto.java | 2 +- .../func/sysstafforg/SysStaffOrgByUserVo.java | 30 ++++++++++ .../func/sysstafforg/SysStaffOrgService.java | 6 ++ .../warehouseansbill/WarehouseAnsBillDto.java | 4 ++ .../portal/sysstafforg/SysStaffOrgFeign.java | 8 +++ 10 files changed, 143 insertions(+), 21 deletions(-) create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/sysstafforg/SysStaffOrgByUserVo.java diff --git a/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SysStaffOrgRest.java b/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SysStaffOrgRest.java index 8d299f4..2c9fc9c 100644 --- a/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SysStaffOrgRest.java +++ b/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SysStaffOrgRest.java @@ -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 getOrgSidByPath(@RequestParam("orgPath") String orgPath){ return sysStaffOrgService.getOrgSidByPath(orgPath); - }; + } + + @GetMapping("/selAllByOrgSidPath") + @ResponseBody + @ApiOperation("根据组织全路径查询当前部门下的所有员工") + public ResultBean> selAllByOrgSidPath(String orgSidPath) { + return sysStaffOrgService.selAllByOrgSidPath(orgSidPath); + } } 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 074ef59..61738ce 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,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> listPageVo(PagerQuery pq) { ResultBean rb = ResultBean.fireFail(); @@ -73,6 +80,7 @@ public class PurchaseBillService extends MybatisBaseService 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 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 wmsAnsBillDetailDtos = new ArrayList<>(); + List 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 fetchDetailsVoBySid(String sid) { diff --git a/oms/src/main/java/com/yxt/oms/biz/func/purchasebillamount/PurchaseBillAmount.java b/oms/src/main/java/com/yxt/oms/biz/func/purchasebillamount/PurchaseBillAmount.java index ff80eba..2fbcc77 100644 --- a/oms/src/main/java/com/yxt/oms/biz/func/purchasebillamount/PurchaseBillAmount.java +++ b/oms/src/main/java/com/yxt/oms/biz/func/purchasebillamount/PurchaseBillAmount.java @@ -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; // 币种 - } diff --git a/oms/src/main/java/com/yxt/oms/biz/func/purchasebillamount/PurchaseBillAmountDetailsVo.java b/oms/src/main/java/com/yxt/oms/biz/func/purchasebillamount/PurchaseBillAmountDetailsVo.java index c877cc1..3623b91 100644 --- a/oms/src/main/java/com/yxt/oms/biz/func/purchasebillamount/PurchaseBillAmountDetailsVo.java +++ b/oms/src/main/java/com/yxt/oms/biz/func/purchasebillamount/PurchaseBillAmountDetailsVo.java @@ -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; // 币种 - } \ No newline at end of file diff --git a/oms/src/main/java/com/yxt/oms/biz/func/purchasebillamount/PurchaseBillAmountDto.java b/oms/src/main/java/com/yxt/oms/biz/func/purchasebillamount/PurchaseBillAmountDto.java index 32c57c6..b620cdf 100644 --- a/oms/src/main/java/com/yxt/oms/biz/func/purchasebillamount/PurchaseBillAmountDto.java +++ b/oms/src/main/java/com/yxt/oms/biz/func/purchasebillamount/PurchaseBillAmountDto.java @@ -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; // 币种 - } \ No newline at end of file diff --git a/oms/src/main/java/com/yxt/oms/biz/func/purchasebilldetail/PurchaseBillDetailDto.java b/oms/src/main/java/com/yxt/oms/biz/func/purchasebilldetail/PurchaseBillDetailDto.java index 59e294d..663dab8 100644 --- a/oms/src/main/java/com/yxt/oms/biz/func/purchasebilldetail/PurchaseBillDetailDto.java +++ b/oms/src/main/java/com/yxt/oms/biz/func/purchasebilldetail/PurchaseBillDetailDto.java @@ -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("税额") diff --git a/oms/src/main/java/com/yxt/oms/biz/func/sysstafforg/SysStaffOrgByUserVo.java b/oms/src/main/java/com/yxt/oms/biz/func/sysstafforg/SysStaffOrgByUserVo.java new file mode 100644 index 0000000..397c4c7 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/sysstafforg/SysStaffOrgByUserVo.java @@ -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(门户建设)
+ * File: SysStaffOrgVo.java
+ * Class: com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgVo
+ * Description: 员工部门关联表 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:29
+ * + * @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; +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/sysstafforg/SysStaffOrgService.java b/oms/src/main/java/com/yxt/oms/biz/func/sysstafforg/SysStaffOrgService.java index 77409de..989ca5f 100644 --- a/oms/src/main/java/com/yxt/oms/biz/func/sysstafforg/SysStaffOrgService.java +++ b/oms/src/main/java/com/yxt/oms/biz/func/sysstafforg/SysStaffOrgService.java @@ -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 { @@ -17,4 +19,8 @@ public class SysStaffOrgService extends MybatisBaseService getOrgSidByPath(String orgPath) { return sysStaffOrgFeign.getOrgSidByPath(orgPath); } + + public ResultBean> selAllByOrgSidPath(String orgSidPath) { + return sysStaffOrgFeign.selAllByOrgSidPath(orgSidPath); + } } \ No newline at end of file diff --git a/oms/src/main/java/com/yxt/oms/biz/func/warehouseansbill/WarehouseAnsBillDto.java b/oms/src/main/java/com/yxt/oms/biz/func/warehouseansbill/WarehouseAnsBillDto.java index 991dcac..daa59e6 100644 --- a/oms/src/main/java/com/yxt/oms/biz/func/warehouseansbill/WarehouseAnsBillDto.java +++ b/oms/src/main/java/com/yxt/oms/biz/func/warehouseansbill/WarehouseAnsBillDto.java @@ -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（采购预约、调拨预约、其他预约）") 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 5dfd7ab..a274a80 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 @@ -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 getOrgSidByPath(@RequestParam("orgPath") String orgPath); + + @GetMapping("/selAllByOrgSidPath") + @ResponseBody + @ApiOperation("根据组织全路径查询当前部门下的所有员工") + public ResultBean> selAllByOrgSidPath(String orgSidPath); }