From 4f76bfd16d95847d484580d3dfd3ff0d971fb2b9 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期一, 17 六月 2024 10:47:18 +0800
Subject: [PATCH] #
---
src/main/webapp/views/locMast/locMast.html | 39 +++++++++---
src/main/java/com/zy/asrs/controller/LocMastController.java | 99 ++++++++++++++++++--------------
src/main/webapp/static/js/locMast/locMast.js | 1
src/main/webapp/static/js/stoMan/stoQue.js | 1
4 files changed, 87 insertions(+), 53 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/LocMastController.java b/src/main/java/com/zy/asrs/controller/LocMastController.java
index f8ab79b..56cda69 100644
--- a/src/main/java/com/zy/asrs/controller/LocMastController.java
+++ b/src/main/java/com/zy/asrs/controller/LocMastController.java
@@ -180,55 +180,68 @@
@ManagerAuth(memo = "鍒濆鍖栧簱浣�")
// @Transactional
public R init(LocMastInitParam param) {
- List<LocMast> list = new ArrayList<>();
- BasWhs basWhs = basWhsService.selectByIdentifying(param.getIdentifying());
- if (Cools.isEmpty(basWhs)){
- return R.error("搴撳瀷涓嶅瓨鍦紒锛侊紒");
- }
- for (int r=param.getStartRow(); r<=param.getEndRow(); r++){
- for (int b=param.getStartBay(); b<=param.getEndBay(); b++) {
- for (int l=param.getStartLev(); l<=param.getEndLev(); l++) {
- // 鑾峰彇搴撲綅鍙�
- String locNo = String.format("%02d", r) + String.format("%03d", b) + String.format("%02d", l);
- // 鑾峰彇鍫嗗灈鏈哄彿
- int crnNo = 0;
- Shelves shelves = new Shelves(param.getEndRow() - param.getStartRow() + 1, param.getCrnAmount(),param.getStartRow());
- for (List<Integer> node : shelves.nodes){
+ try{
+ List<LocMast> list = new ArrayList<>();
+ BasWhs basWhs = basWhsService.selectByIdentifying(param.getIdentifying());
+ if (Cools.isEmpty(basWhs)){
+ return R.error("搴撳瀷涓嶅瓨鍦紒锛侊紒");
+ }
+ for (int r=param.getStartRow(); r<=param.getEndRow(); r++){
+ for (int b=param.getStartBay(); b<=param.getEndBay(); b++) {
+ for (int l=param.getStartLev(); l<=param.getEndLev(); l++) {
+ // 鑾峰彇搴撲綅鍙�
+ String locNo = String.format("%02d", r) + String.format("%03d", b) + String.format("%02d", l);
+ // 鑾峰彇鍫嗗灈鏈哄彿
+ int crnNo = 0;
+ if (basWhs.getIdentifying().equals("1") || basWhs.getIdentifying().equals("3")){
+ try{
+ Shelves shelves = new Shelves(param.getEndRow() - param.getStartRow() + 1, param.getCrnAmount(),param.getStartRow());
+ for (List<Integer> node : shelves.nodes){
- if (node.contains(r)) {
- if (!Cools.isEmpty(param.getStaCrn()) && param.getStaCrn() > 0){
- crnNo = shelves.nodes.indexOf(node) + param.getStaCrn();
- }else {
- crnNo = shelves.nodes.indexOf(node) + 1;
+ if (node.contains(r)) {
+ if (!Cools.isEmpty(param.getStaCrn()) && param.getStaCrn() > 0){
+ crnNo = shelves.nodes.indexOf(node) + param.getStaCrn();
+ }else {
+ crnNo = shelves.nodes.indexOf(node) + 1;
+ }
+
+ break;
+ }
+ }
+ }catch (Exception e){
+ throw new Exception("瑙ｆ瀽鍫嗗灈鏈哄彿澶辫触锛岃濉啓姝ｇ‘鐨勬暟鎹�!!!");
}
-
- break;
+ }else {
+ crnNo = param.getStaCrn();
}
+ Date now = new Date();
+ LocMast locMast = new LocMast();
+ locMast.setLocNo(locNo);
+ locMast.setLocSts("O");
+ locMast.setRow1(r); // 鎺�
+ locMast.setBay1(b); // 鍒�
+ locMast.setLev1(l); // 灞�
+ locMast.setGro1(0); // 缁�
+ locMast.setCrnNo(crnNo); // 鍫嗗灈鏈�
+ locMast.setLocType1(!Cools.isEmpty(param.getLocType1()) ? param.getLocType1() : 1);
+ locMast.setLocType2(param.getLocType2());
+ locMast.setLocType3(param.getLocType3());
+ locMast.setAppeUser(getUserId());
+ locMast.setAppeTime(now);
+ locMast.setModiUser(getUserId());
+ locMast.setModiTime(now);
+ locMast.setWhsType(basWhs.getId());
+ list.add(locMast);
}
- Date now = new Date();
- LocMast locMast = new LocMast();
- locMast.setLocNo(locNo);
- locMast.setLocSts("O");
- locMast.setRow1(r); // 鎺�
- locMast.setBay1(b); // 鍒�
- locMast.setLev1(l); // 灞�
- locMast.setCrnNo(crnNo); // 鍫嗗灈鏈�
- locMast.setLocType1(!Cools.isEmpty(param.getLocType1()) ? param.getLocType1() : 1);
- locMast.setLocType2(param.getLocType2());
- locMast.setLocType3(param.getLocType3());
- locMast.setAppeUser(getUserId());
- locMast.setAppeTime(now);
- locMast.setModiUser(getUserId());
- locMast.setModiTime(now);
- locMast.setWhsType(basWhs.getId());
- list.add(locMast);
}
}
+ if (!Cools.isEmpty(param.getEnable()) && param.getEnable() == 1){
+ locMastService.delete(new EntityWrapper<>());
+ }
+ locMastService.insertBatch(list);
+ return R.ok("鍒濆鍖栨垚鍔�");
+ }catch (Exception e){
+ return R.error("鍒濆鍖栧け璐�===>"+e.getMessage());
}
- if (!Cools.isEmpty(param.getEnable()) && param.getEnable() == 1){
- locMastService.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 a6d4eb7..6f25367 100644
--- a/src/main/webapp/static/js/locMast/locMast.js
+++ b/src/main/webapp/static/js/locMast/locMast.js
@@ -32,6 +32,7 @@
,{field: 'row1', align: 'center',title: '鎺�', sort:true, hide:false}
,{field: 'bay1', align: 'center',title: '鍒�', sort:true, hide:false}
,{field: 'lev1', align: 'center',title: '灞�', sort:true, hide:false}
+ ,{field: 'gro1', align: 'center',title: '缁�', sort:true, hide:false}
,{field: 'fullPlt', align: 'center',title: '婊℃澘', templet:function(row){
var html = "<input value='fullPlt' type='checkbox' lay-skin='primary' lay-filter='tableCheckbox' disabled table-index='"+row.LAY_TABLE_INDEX+"'";
if(row.fullPlt === 'Y'){html += " checked ";}
diff --git a/src/main/webapp/static/js/stoMan/stoQue.js b/src/main/webapp/static/js/stoMan/stoQue.js
index 0e3a266..0352dd9 100644
--- a/src/main/webapp/static/js/stoMan/stoQue.js
+++ b/src/main/webapp/static/js/stoMan/stoQue.js
@@ -33,6 +33,7 @@
,{field: 'row1', align: 'center',title: '鎺�', sort:true, hide:true}
,{field: 'bay1', align: 'center',title: '鍒�', sort:true, hide:true}
,{field: 'lev1', align: 'center',title: '灞�', sort:true, hide:true}
+ ,{field: 'gro1', align: 'center',title: '缁�', sort:true, hide:true}
,{field: 'fullPlt', align: 'center',title: '婊℃澘', templet:function(row){
var html = "<input value='fullPlt' type='checkbox' lay-skin='primary' lay-filter='tableCheckbox' table-index='"+row.LAY_TABLE_INDEX+"'";
if(row.fullPlt === 'Y'){html += " checked ";}
diff --git a/src/main/webapp/views/locMast/locMast.html b/src/main/webapp/views/locMast/locMast.html
index e3dcdca..e95ce3d 100644
--- a/src/main/webapp/views/locMast/locMast.html
+++ b/src/main/webapp/views/locMast/locMast.html
@@ -125,16 +125,35 @@
</div>
</div>
</div>
- <div class="layui-inline" style="width:80%">
- <label class="layui-form-label"><span class="not-null">*</span>搴撲綅绫诲瀷锛�</label>
- <div class="layui-input-inline cool-auto-complete">
- <input id="identifying" class="layui-input" type="text" style="display: none">
- <input id="identifying$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" onfocus=this.blur() disabled="disabled">
- <div class="cool-auto-complete-window">
- <input class="cool-auto-complete-window-input" data-key="basWhsQueryBywhsType" onkeyup="autoLoad(this.getAttribute('data-key'))">
- <select class="cool-auto-complete-window-select" data-key="basWhsQueryBywhsTypeSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
- </select>
- </div>
+<!-- <div class="layui-inline" style="width:80%">-->
+<!-- <label class="layui-form-label"><span class="not-null">*</span>搴撲綅绫诲瀷锛�</label>-->
+<!-- <div class="layui-input-inline cool-auto-complete">-->
+<!-- <input id="identifying" class="layui-input" type="text" style="display: none">-->
+<!-- <input id="identifying$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" onfocus=this.blur()>-->
+<!-- <div class="cool-auto-complete-window">-->
+<!-- <input class="cool-auto-complete-window-input" data-key="basWhsQueryBywhsType" onkeyup="autoLoad(this.getAttribute('data-key'))">-->
+<!-- <select class="cool-auto-complete-window-select" data-key="basWhsQueryBywhsTypeSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">-->
+<!-- </select>-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- </div>-->
+ <!--
+ /**
+ * 搴撳瀷 1: 鏍囧噯鍫嗗灈鏈哄簱 2: 骞冲簱 3: 绌挎鏉� 4: 鍥涘悜杞� 5: AGV 0: 鏈煡
+ */
+ -->
+ <div class="layui-form-item">
+ <label class="layui-form-label">搴撲綅绫诲瀷锛�</label>
+ <div class="layui-input-inline">
+ <select name="identifying">
+<!-- <option style="display: none"></option>-->
+<!-- <option value="0">鏈煡</option>-->
+ <option value="1" style="display: none">鏍囧噯鍫嗗灈鏈哄簱</option>
+ <option value="2">骞冲簱</option>
+ <option value="3">绌挎鏉�</option>
+ <option value="4">鍥涘悜杞�</option>
+ <option value="5">AGV</option>
+ </select>
</div>
</div>
<!-- 鎺� -->
--
Gitblit v1.9.1