From efca64ae3ac8907ef15ee3b23e886e6a4c5940b3 Mon Sep 17 00:00:00 2001
From: erdanergou <p17686264821@163.com>
Date: Thu, 30 Mar 2023 10:55:41 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=89=A9=E6=96=99=E7=BC=96?=
 =?UTF-8?q?=E7=A0=81=E7=94=9F=E4=BA=A7=E8=A7=84=E5=88=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/MaterialServiceImpl.java         | 15 +++++++++------
 .../templates/pages/depository/table-stock.html   |  2 +-
 target/classes/templates/pages/user/login.html    |  2 +-
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/dreamchaser/depository_manage/service/impl/MaterialServiceImpl.java b/src/main/java/com/dreamchaser/depository_manage/service/impl/MaterialServiceImpl.java
index 2ba313e8..c1ae76c0 100644
--- a/src/main/java/com/dreamchaser/depository_manage/service/impl/MaterialServiceImpl.java
+++ b/src/main/java/com/dreamchaser/depository_manage/service/impl/MaterialServiceImpl.java
@@ -112,12 +112,15 @@ public class MaterialServiceImpl implements MaterialService {
             Integer typeId = ObjectFormatUtil.toInteger(map.get("typeId").toString());
             MaterialType materialTypeById = materialTypeMapper.findMaterialTypeById(typeId);
             map.put("materialTypeId", materialTypeById.getOldId());
-            String code = materialTypeById.getOldId().toString();
             List<Material> materialByType = materialMapper.findMaterialByType(materialTypeById.getOldId());
+            String newCode = "";
             if (materialByType == null) {
-                materialByType = new ArrayList<>();
+                newCode = String.format("%04d", 1);
+            } else {
+                newCode = String.format("%04d",Integer.parseInt(materialByType.get(materialByType.size() - 1).getCode()) + 1);
+
             }
-            map.put("code", code + String.format("%04d", materialByType.size() + 1));
+            map.put("code",newCode);
         }
         if (map.containsKey("barCode")) {
             materialMapper.addBarCodeAndMcode(map);
@@ -438,7 +441,7 @@ public class MaterialServiceImpl implements MaterialService {
     @Override
     public Material findMaterialById(int id) {
         Material material = materialMapper.findMaterialById(id);
-        if(material != null) {
+        if (material != null) {
             if (material.getMaterialTypeId() != null) {
                 MaterialType materialTypeByOldId = materialTypeMapper.findMaterialTypeByOldId(material.getMaterialTypeId());
                 material.setTypeName(materialTypeByOldId.getTname());
@@ -1720,8 +1723,8 @@ public class MaterialServiceImpl implements MaterialService {
                         }
                     } else {
                         // 如果不大于
-                        insertForSplitInventory.put("saveQuantity",(int)(quantity * 100));
-                        insertForSplitInventory.put("inQuantity",(int)(quantity * 100));
+                        insertForSplitInventory.put("saveQuantity", (int) (quantity * 100));
+                        insertForSplitInventory.put("inQuantity", (int) (quantity * 100));
                         splitUnitMapper.addSplitInventory(insertForSplitInventory);
                     }
                 }
diff --git a/target/classes/templates/pages/depository/table-stock.html b/target/classes/templates/pages/depository/table-stock.html
index 880fbbf4..e9a3f703 100644
--- a/target/classes/templates/pages/depository/table-stock.html
+++ b/target/classes/templates/pages/depository/table-stock.html
@@ -193,7 +193,7 @@
 
                     }
                     // 所处库位
-                    var placeCodeItem = $("[lay-id='currentTableId'] tr:eq(" + (i + 1) + ")").children()[9];
+                    var placeCodeItem = $("[lay-id='currentTableId'] tr:eq(" + (i + 1) + ")").children()[10];
                     //计量单位
                     // 用于库位的添加
                     var aItem = placeCodeItem.childNodes[0];
diff --git a/target/classes/templates/pages/user/login.html b/target/classes/templates/pages/user/login.html
index 2476e0e3..de13f12e 100644
--- a/target/classes/templates/pages/user/login.html
+++ b/target/classes/templates/pages/user/login.html
@@ -200,7 +200,7 @@
 <script src="static/lib/layui-v2.6.3/layui.js" charset="utf-8"></script>
 <script src="static/lib/jq-module/jquery.particleground.min.js" charset="utf-8"></script>
 <script src="https://wwcdn.weixin.qq.com/node/open/js/wecom-jssdk-1.3.1.js"></script>
-<script src="http://wwcdn.weixin.qq.com/node/wework/wwopen/js/wwLogin-1.2.4.js"></script>
+<script src="https://wwcdn.weixin.qq.com/node/wework/wwopen/js/wwLogin-1.2.4.js"></script>
 <script>
     layui.use(['layer', 'form'], function () {
         var form = layui.form,