From 2200d72978f02afdaef01327b731befa11579cd2 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 19 六月 2020 16:06:21 +0800
Subject: [PATCH] #
---
src/main/webapp/views/locMast/locMast.html | 3 +++
src/main/java/com/zy/asrs/controller/LocMastController.java | 4 ++++
src/main/webapp/static/js/locMast/locMast.js | 1 -
3 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/LocMastController.java b/src/main/java/com/zy/asrs/controller/LocMastController.java
index 7244906..fd8bade 100644
--- a/src/main/java/com/zy/asrs/controller/LocMastController.java
+++ b/src/main/java/com/zy/asrs/controller/LocMastController.java
@@ -12,6 +12,7 @@
import com.core.common.R;
import com.zy.asrs.entity.LocMast;
import com.zy.asrs.entity.param.LocMastInitParam;
+import com.zy.asrs.service.LocDetlService;
import com.zy.asrs.service.LocMastService;
import com.zy.common.entity.Parameter;
import com.zy.common.model.Shelves;
@@ -26,6 +27,8 @@
@Autowired
private LocMastService locMastService;
+ @Autowired
+ private LocDetlService locDetlService;
@RequestMapping(value = "/locMast/init/pwd")
public R locMastInitPwd(@RequestParam(required = false) String pwd) {
@@ -178,6 +181,7 @@
}
}
locMastService.delete(new EntityWrapper<>());
+ locDetlService.delete(new EntityWrapper<>());
locMastService.insertBatch(list);
return R.ok("鍒濆鍖栨垚鍔�");
}
diff --git a/src/main/webapp/static/js/locMast/locMast.js b/src/main/webapp/static/js/locMast/locMast.js
index d0f4dc5..83ea416 100644
--- a/src/main/webapp/static/js/locMast/locMast.js
+++ b/src/main/webapp/static/js/locMast/locMast.js
@@ -222,7 +222,6 @@
}
layer.close(idx);
})
-
});
break;
}
diff --git a/src/main/webapp/views/locMast/locMast.html b/src/main/webapp/views/locMast/locMast.html
index 3b5c724..3727917 100644
--- a/src/main/webapp/views/locMast/locMast.html
+++ b/src/main/webapp/views/locMast/locMast.html
@@ -145,6 +145,9 @@
</select>
</div>
</div>
+ <div id="prompt" style="text-indent: 10px;">
+ <span class="not-null">鍒濆鍖栦細娓呴櫎搴撲綅鎵�鏈夋暟鎹紝璇疯皑鎱庢搷浣滐紒</span>
+ </div>
<!-- 鎸夐挳 -->
<div style="text-align: center; margin-top: 20px">
<button class="layui-btn layui-btn-radius layui-btn-normal" id="initDo" lay-submit lay-filter="initDo">纭畾</button>
--
Gitblit v1.9.1