From 4ee63669f1739b80adadc191310e91c5105ea6d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Thu, 31 Jan 2019 22:17:43 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=8D=95=E6=8D=AE=E7=BC=96?=
 =?UTF-8?q?=E5=8F=B7=E8=A7=84=E5=88=99=EF=BC=8C=E9=98=B2=E6=AD=A2=E5=B9=B6?=
 =?UTF-8?q?=E5=8F=91=E6=8F=90=E4=BA=A4=E6=97=B6=EF=BC=8C=E5=8D=95=E6=8D=AE?=
 =?UTF-8?q?=E7=BC=96=E5=8F=B7=E9=87=8D=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../erp/service/depotHead/DepotHeadService.java   | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java b/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java
index d282c4bb..bfb6f0e3 100644
--- a/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java
+++ b/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java
@@ -19,6 +19,7 @@ import com.jsh.erp.service.serialNumber.SerialNumberService;
 import com.jsh.erp.service.supplier.SupplierService;
 import com.jsh.erp.service.user.UserService;
 import com.jsh.erp.utils.StringUtil;
+import com.jsh.erp.utils.Tools;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.dao.DataAccessException;
@@ -293,6 +294,20 @@ public class DepotHeadService {
         //判断用户是否已经登录过，登录过不再处理
         User userInfo=userService.getCurrentUser();
         depotHead.setOperpersonname(userInfo==null?null:userInfo.getUsername());
+        //构造新的编号
+        String dNumber = depotHead.getDefaultnumber();
+        String number = dNumber.substring(0, 12); //截取前缀
+        String beginTime = Tools.getNow() + " 00:00:00";
+        String endTime = Tools.getNow() + " 23:59:59";
+        String newNumber = buildNumber(depotHead.getType(), depotHead.getSubtype(), beginTime, endTime);  //从数据库查询最新的编号+1,这样能防止重复
+        String allNewNumber = number + newNumber;
+        String frontNumber = depotHead.getNumber();
+        if(frontNumber.indexOf(number) > -1) {
+            depotHead.setNumber(allNewNumber); //从后台取值
+        } else {
+            depotHead.setNumber(frontNumber); //从前端文本框里面获取
+        }
+        depotHead.setDefaultnumber(allNewNumber); //初始编号，一直都从后台取值
         depotHead.setCreatetime(new Timestamp(System.currentTimeMillis()));
         depotHead.setStatus(false);
         depotHeadMapperEx.adddepotHead(depotHead);