From cf3eebcb4a10841ed37ce26a03aec703d4fd4fd7 Mon Sep 17 00:00:00 2001
From: God <10745413@qq.com>
Date: Wed, 31 Jul 2024 17:08:42 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=87=E8=B4=AD=E5=8D=95=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E7=94=9F=E6=88=90=E5=8D=95=E6=8D=AE=E7=BC=96=E5=8F=B7=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../func/purchasebill/PurchaseBillDto.java    |  2 ++
 .../func/purchasebill/PurchaseBillMapper.java | 35 -------------------
 .../func/purchasebill/PurchaseBillMapper.xml  | 13 -------
 .../purchasebill/PurchaseBillService.java     | 14 ++------
 4 files changed, 4 insertions(+), 60 deletions(-)
 delete mode 100644 oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseBillMapper.java
 delete mode 100644 oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseBillMapper.xml

diff --git a/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseBillDto.java b/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseBillDto.java
index e4ac57e..65b3d96 100644
--- a/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseBillDto.java
+++ b/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseBillDto.java
@@ -96,6 +96,8 @@ public class PurchaseBillDto implements Dto {
     private String deptName;
     @ApiModelProperty("组织全路径")
     private String orgPath;
+    @ApiModelProperty("组织编码")
+    private String orgCode;
 
     @ApiModelProperty("采购单费用/预付款")
     private PurchaseBillAmountDto purchaseBillAmount;
diff --git a/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseBillMapper.java b/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseBillMapper.java
deleted file mode 100644
index 455e6d3..0000000
--- a/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseBillMapper.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*********************************************************
- *********************************************************
- ********************                  *******************
- *************                                ************
- *******                  _oo0oo_                  *******
- ***                     o8888888o                     ***
- *                       88" . "88                       *
- *                       (| -_- |)                       *
- *                       0\  =  /0                       *
- *                     ___/`---'\___                     *
- *                   .' \\|     |// '.                   *
- *                  / \\|||  :  |||// \                  *
- *                 / _||||| -:- |||||- \                 *
- *                |   | \\\  -  /// |   |                *
- *                | \_|  ''\---/''  |_/ |                *
- *                \  .-\__  '-'  ___/-. /                *
- *              ___'. .'  /--.--\  `. .'___              *
- *           ."" '<  `.___\_<|>_/___.' >' "".            *
- *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
- *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
- *      =====`-.____`.___ \_____/___.-`___.-'=====       *
- *                        `=---='                        *
- *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
- *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
- *********************************************************/
-package com.yxt.oms.biz.func.purchasebill;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-
-@Mapper
-public interface PurchaseBillMapper extends BaseMapper<PurchaseBill> {
-
-    String selectNum(String billNo);
-}
\ No newline at end of file
diff --git a/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseBillMapper.xml b/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseBillMapper.xml
deleted file mode 100644
index 431fffd..0000000
--- a/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseBillMapper.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.yxt.oms.biz.func.purchasebill.PurchaseBillMapper">
-<!--    <where> ${ew.sqlSegment} </where>-->
-<!--    ${ew.customSqlSegment} -->
-	<select id="selectNum" resultType="java.lang.String">
-		select RIGHT (billNo, 4)
-		from purchase_bill
-		where billNo LIKE concat(#{billNo}, '%')
-		order by billNo desc
-				limit 1
-	</select>
-</mapper>
\ No newline at end of file
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 9b01e5b..d22329d 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
@@ -50,7 +50,7 @@ import javax.annotation.Resource;
 import java.util.*;
 
 @Service
-public class PurchaseBillService extends MybatisBaseService<PurchaseBillMapper, PurchaseBill> {
+public class PurchaseBillService {
 
     @Autowired
     private PurchaseBillFeign purchaseBillFeign;
@@ -105,17 +105,7 @@ public class PurchaseBillService extends MybatisBaseService<PurchaseBillMapper,
                 if (organizationResultBean.getData() != null) {
                     dto.setCreateOrgSid(createOrgSid);
                     dto.setUseOrgSid(createOrgSid);
-                    //生成单据编号
-                    String billNo = "";
-                    String date = DateUtil.format(DateUtil.date(), "yyyyMM");
-                    billNo = "CGD" + organizationResultBean.getData().getOrgCode() + date;
-                    String i = baseMapper.selectNum(billNo);
-                    if (StringUtils.isNotBlank(i)) {
-                        billNo = Rule.getBillNo(billNo, Integer.valueOf(i).intValue());
-                    } else {
-                        billNo = Rule.getBillNo(billNo, 0);
-                    }
-                    dto.setBillNo(billNo);
+                    dto.setOrgCode(organizationResultBean.getData().getOrgCode());
                 }
             }
         }