From da87017291c1380fe5ad8ff82c5f6028bd94a484 Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Tue, 14 May 2024 16:22:01 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E6=9C=9F=E5=88=B0=E8=B4=A7=E9=80=9A?= =?UTF-8?q?=E7=9F=A5=E5=8D=95=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inventory/wmsansbill/WmsAnsBillDto.java | 5 ---- .../wmsansbill/WmsAnsBillMapper.java | 2 ++ .../inventory/wmsansbill/WmsAnsBillMapper.xml | 8 ++++++ .../wmsansbill/WmsAnsBillService.java | 25 +++++++++++++++++++ .../main/java/com/yxt/wms/utils/BillNo.java | 22 ++++++++++++++++ .../src/main/java/com/yxt/wms/utils/Rule.java | 15 +++++++++++ 6 files changed, 72 insertions(+), 5 deletions(-) create mode 100644 yxt-wms-biz/src/main/java/com/yxt/wms/utils/BillNo.java diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbill/WmsAnsBillDto.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbill/WmsAnsBillDto.java index b607bfd20b..ea85f5165b 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbill/WmsAnsBillDto.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbill/WmsAnsBillDto.java @@ -18,11 +18,6 @@ public class WmsAnsBillDto { private String sid; private String createBySid; - private String orgPath; - @ApiModelProperty("销售部门sid") - private String createDeptSid; - @ApiModelProperty("销售部门") - private String createDeptName; @ApiModelProperty("外部单号（业务单据编号）") private String sourceBillNo; diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbill/WmsAnsBillMapper.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbill/WmsAnsBillMapper.java index 0454caa6d1..4f2467eebe 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbill/WmsAnsBillMapper.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbill/WmsAnsBillMapper.java @@ -21,4 +21,6 @@ public interface WmsAnsBillMapper extends BaseMapper { IPage listPages(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); WmsAnsDetailsVo details(String sid); + + String selectNum(String bill); } diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbill/WmsAnsBillMapper.xml b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbill/WmsAnsBillMapper.xml index 851085adb9..436a8ab336 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbill/WmsAnsBillMapper.xml +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbill/WmsAnsBillMapper.xml @@ -45,4 +45,12 @@ from wms_ans_bill wab where sid = #{sid} + + \ No newline at end of file diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbill/WmsAnsBillService.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbill/WmsAnsBillService.java index e224813e93..bc279277e3 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbill/WmsAnsBillService.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbill/WmsAnsBillService.java @@ -13,6 +13,10 @@ import com.yxt.wms.biz.inventory.wmsansbilldetail.*; import com.yxt.wms.biz.inventory.wmsreceiptbill.WmsReceiptBill; import com.yxt.wms.biz.inventory.wmsreceiptbill.WmsReceiptBillQuery; import com.yxt.wms.biz.inventory.wmsreceiptbill.WmsReceiptBillVo; +import com.yxt.wms.feign.portal.sysorganization.SysOrganizationFeign; +import com.yxt.wms.feign.portal.sysorganization.SysOrganizationVo; +import com.yxt.wms.utils.BillNo; +import com.yxt.wms.utils.Rule; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -29,6 +33,8 @@ public class WmsAnsBillService extends MybatisBaseService saveOrUpdateBill(WmsAnsBillDto dto) { ResultBean rb = ResultBean.fireFail(); @@ -44,6 +50,8 @@ public class WmsAnsBillService extends MybatisBaseService resultBean1 = sysOrganizationFeign.fetchBySid(createOrgSid); + String orgCode = resultBean1.getData().getOrgCode(); + BillNo b = new BillNo(); + b.setOrgCode(orgCode); + b.setBillType("YGDHTZD"); + String bill = Rule.getBill(b); + String i = baseMapper.selectNum(bill); + String billNo = ""; + if (org.apache.commons.lang3.StringUtils.isNotBlank(i)) { + billNo = Rule.getBillNo(bill, Integer.valueOf(i).intValue()); + } else { + billNo = Rule.getBillNo(bill, 0); + } + return billNo; + } + public PagerVo listPage(PagerQuery pagerQuery) { WmsAnsBillDetailQuery query = pagerQuery.getParams(); QueryWrapper qw = new QueryWrapper<>(); diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/utils/BillNo.java b/yxt-wms-biz/src/main/java/com/yxt/wms/utils/BillNo.java new file mode 100644 index 0000000000..4ae2180086 --- /dev/null +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/utils/BillNo.java @@ -0,0 +1,22 @@ +package com.yxt.wms.utils; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + * @Author dimengzhe + * @Date 2022/7/1 9:46 + * @Description + */ +@Data +public class BillNo implements Serializable { + private static final long serialVersionUID = 1598887042562656350L; + + @ApiModelProperty(value = "单据名称首字母") + private String billType; + @ApiModelProperty(value = "分公司编码") + private String orgCode; + +} diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/utils/Rule.java b/yxt-wms-biz/src/main/java/com/yxt/wms/utils/Rule.java index 95fd973322..bd59eea9b2 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/utils/Rule.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/utils/Rule.java @@ -1,5 +1,8 @@ package com.yxt.wms.utils; +import cn.hutool.core.date.DateUtil; +import org.springframework.util.StringUtils; + /** * @description: * @author: dimengzhe @@ -12,4 +15,16 @@ public class Rule { String billNo = bill + num; return billNo; } + + public static String getBill(BillNo b) { + String billType = b.getBillType(); + String orgCode = b.getOrgCode(); + String date = DateUtil.format(DateUtil.date(), "yyyyMM"); + String bill = billType; + if (!StringUtils.isEmpty(orgCode)) { + bill = bill + orgCode; + } + bill = bill + date; + return bill; + } }