修改token与key验证

src/main/java/com/dreamchaser/depository_manage/controller/PageController.java

@@ -540,11 +540,7 @@ public class PageController {
     @GetMapping("/selectPlaceByDepository")
     // 库位树形菜单
     public ModelAndView selectPlaceByDepository(Integer depositoryId, Integer mid, String placeCode, String unit) {
-
-
         ModelAndView mv = new ModelAndView();
-
-
         MaterialAndPlace placeAndMaterialByMidAndPid = null;
         if ("0000".equals(placeCode)) {
             // 如果要改变默认库位
@@ -565,7 +561,7 @@ public class PageController {
             mv.addObject("placeId", place.getId());
         }
         Inventory inventoryById = materialService.findInventoryById(mid);
-        if ("-1".equals(unit)) {
+        if (inventoryById.getUnit().equals(unit)) {
             // 如果转移的基础单位
             mv.addObject("quantity", placeAndMaterialByMidAndPid.getQuantity());
         } else {

src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java

@@ -4448,7 +4448,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
         int newNumber = ObjectFormatUtil.toInteger(orderNumber) + 1;
         redisTemplate.boundValueOps(key).set(String.valueOf(newNumber), DateUtil.getSecondsNextEarlyMorning(), TimeUnit.SECONDS);
         lock.unlock();
-        orderNumber = String.format("%09d", ObjectFormatUtil.toInteger(orderNumber));
+        orderNumber = String.format("%04d", ObjectFormatUtil.toInteger(orderNumber));
         if ("in".equals(type)) {
             code = code + depositoryName + nowTime + orderNumber;
         } else if ("out".equals(type)) {

src/main/java/com/dreamchaser/depository_manage/service/impl/MaterialServiceImpl.java

@@ -1458,12 +1458,10 @@ public class MaterialServiceImpl implements MaterialService {
 
         // 获取当前转移的计量单位
         String unit = (String) map.get("unit");
-
-
         // 获取转移之前的库存转移的数量
         int beforeQuantity = pidAndMidForBefore.getQuantity() - quantity;
 
-        if ("-1".equals(unit)) {
+        if (inventoryByMid.getUnit().equals(unit)) {
             // 如果是基础单位
 
             // 判断转移到的库位是否超出库存

src/main/resources/templates/pages/depository/table-stock.html

@@ -380,12 +380,9 @@
                 let showQuantity = data.showQuantity;
                 let btn = $("#btn_" + data.id);
                 let clickNum = Number(btn.attr("click_num"));
-
                 // 获取当前showQuantity 的长度
                 let length = Object.getOwnPropertyNames(showQuantity).length;
                 if (length > 0) {
-
-
                     if (clickNum < length) {
 
                         let keys = Object.keys(showQuantity);
@@ -422,10 +419,9 @@
             var depositoryId = obj.value;
             var placeCode = obj.innerText;
             var mid = obj.id;
-
             // 当前点击行中的计量单位按钮
             let unitBtn = obj.parentNode.parentNode.parentNode.childNodes[5].childNodes[0].childNodes[1];
-            let unit = unitBtn.value;
+            let unit = unitBtn.innerText;
             var index = layer.open({
                 title: '选择库位',
                 type: 2,

src/main/resources/templates/pages/user/userRoleForIn.html

@@ -45,7 +45,7 @@
                     "data": res.data //解析数据列表
                 };
             },
-            height: 'full-255',//固定高度-即固定表头固定第一行首行
+            // height: 'full-255',//固定高度-即固定表头固定第一行首行
             request: {
                 pageName: 'page', //页码的参数名称，默认：page
                 limitName: 'pagesize' //每页数据量的参数名，默认：limit

target/classes/templates/pages/depository/table-stock.html

@@ -380,12 +380,9 @@
                 let showQuantity = data.showQuantity;
                 let btn = $("#btn_" + data.id);
                 let clickNum = Number(btn.attr("click_num"));
-
                 // 获取当前showQuantity 的长度
                 let length = Object.getOwnPropertyNames(showQuantity).length;
                 if (length > 0) {
-
-
                     if (clickNum < length) {
 
                         let keys = Object.keys(showQuantity);
@@ -422,10 +419,9 @@
             var depositoryId = obj.value;
             var placeCode = obj.innerText;
             var mid = obj.id;
-
             // 当前点击行中的计量单位按钮
             let unitBtn = obj.parentNode.parentNode.parentNode.childNodes[5].childNodes[0].childNodes[1];
-            let unit = unitBtn.value;
+            let unit = unitBtn.innerText;
             var index = layer.open({
                 title: '选择库位',
                 type: 2,