From b0a0b73b57e54a4e5e8cd5b8a5fa4fbc2f996656 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期一, 30 十月 2023 08:30:30 +0800
Subject: [PATCH] 输送线调用agv接口不传fromlocationcode
---
src/main/java/com/zy/asrs/controller/AgvLocMastController.java | 2 +-
src/main/java/com/zy/asrs/entity/param/LocDetlAdjustParam.java | 8 ++++++--
src/main/webapp/static/js/agvPakStore/stockAdjust.js | 2 +-
src/main/webapp/views/mat/mat.html | 2 +-
src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java | 1 +
src/main/java/com/zy/asrs/service/impl/AgvLocMastServiceImpl.java | 24 ++++++++++++------------
src/main/java/com/zy/asrs/service/impl/AgvWrkMastServiceImp.java | 12 ++++++++++++
7 files changed, 34 insertions(+), 17 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/AgvLocMastController.java b/src/main/java/com/zy/asrs/controller/AgvLocMastController.java
index 58b89f5..f1ff9b3 100644
--- a/src/main/java/com/zy/asrs/controller/AgvLocMastController.java
+++ b/src/main/java/com/zy/asrs/controller/AgvLocMastController.java
@@ -101,7 +101,7 @@
@ManagerAuth(memo = "鍒濆鍖栧簱浣�")
public R init(LocMastInitParam param) {
//娓呯┖鍘熸湁搴撲綅
- agvLockMastService.clearLoc();
+ //agvLockMastService.clearLoc();
//鍒濆鍖栦竴妤肩珯鐐�
//agvLockMastService.initLocFloor1();
//鍒濆鍖栦笁妤肩珯鐐�
diff --git a/src/main/java/com/zy/asrs/entity/param/LocDetlAdjustParam.java b/src/main/java/com/zy/asrs/entity/param/LocDetlAdjustParam.java
index a00c9ed..2d3a845 100644
--- a/src/main/java/com/zy/asrs/entity/param/LocDetlAdjustParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/LocDetlAdjustParam.java
@@ -36,12 +36,16 @@
//閿�鍞鍗曡鍙�
private String deadTime;
- public LocDetlAdjust(String matnr, String batch, Double count, String threeCode, String deadTime) {
+ //鏂欑鐮�
+ private String suppCode;
+
+ public LocDetlAdjust(String matnr, String batch, Double count, String threeCode, String deadTime, String suppCode) {
this.matnr = matnr;
this.batch = batch;
this.count = count;
this.threeCode = threeCode;
this.deadTime = deadTime;
+ this.suppCode = suppCode;
}
}
@@ -60,7 +64,7 @@
}
}
if (!exit) {
- copyList.add(new LocDetlAdjustParam.LocDetlAdjust(adjust.getMatnr(), adjust.getBatch(), adjust.getCount(), adjust.getThreeCode(), adjust.getDeadTime()));
+ copyList.add(new LocDetlAdjustParam.LocDetlAdjust(adjust.getMatnr(), adjust.getBatch(), adjust.getCount(), adjust.getThreeCode(), adjust.getDeadTime(),adjust.getSuppCode()));
}
}
list = copyList;
diff --git a/src/main/java/com/zy/asrs/service/impl/AgvLocMastServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/AgvLocMastServiceImpl.java
index c2860f1..0385081 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvLocMastServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvLocMastServiceImpl.java
@@ -34,19 +34,19 @@
public void initLocFloor3() {
//3妤� 1-33鎺� 1-14鍒� 8灞� ------> 1-33鎺� 1-17鍒� 8灞�
- this.insertBatch(getLocMastList(1, 33, 1, 17, 1, 8, 3));
+// this.insertBatch(getLocMastList(1, 33, 1, 17, 1, 8, 3));
+//
+// //3妤� 1-27鎺� 15-34鍒� 8灞� ------> 1-26鎺� 18-25鍒� 8灞�
+// this.insertBatch(getLocMastList(1, 27, 18, 25, 1, 8, 3));
+//
+// //3妤� 1-25鎺� 35-46鍒� 8灞� ------> 1-25鎺� 26-35鍒� 8灞�
+// this.insertBatch(getLocMastList(1, 25, 26, 35, 1, 8, 3));
+//
+// //3妤� 3-25鎺� 47-60鍒� 8灞� ------> 1-23鎺� 36-70鍒� 8灞�
+// this.insertBatch(getLocMastList(1, 23, 36, 70, 1, 8, 3));
- //3妤� 1-27鎺� 15-34鍒� 8灞� ------> 1-26鎺� 18-25鍒� 8灞�
- this.insertBatch(getLocMastList(1, 27, 18, 25, 1, 8, 3));
-
- //3妤� 1-25鎺� 35-46鍒� 8灞� ------> 1-25鎺� 26-35鍒� 8灞�
- this.insertBatch(getLocMastList(1, 25, 26, 35, 1, 8, 3));
-
- //3妤� 3-25鎺� 47-60鍒� 8灞� ------> 1-23鎺� 36-70鍒� 8灞�
- this.insertBatch(getLocMastList(1, 23, 36, 70, 1, 8, 3));
-
- //3妤� 4-25鎺� 61-70鍒� 8灞�
- //this.insertBatch(getLocMastList(4, 25, 61, 70, 1, 8, 3));
+ //3妤� 3-23鎺� 71-72鍒� 8灞�
+ this.insertBatch(getLocMastList(3, 23, 71, 72, 1, 8, 3));
}
diff --git a/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java
index 0430850..1faa1fc 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java
@@ -402,6 +402,7 @@
locDetl.setAppeTime(now);
locDetl.setThreeCode(adjust.getThreeCode());
locDetl.setDeadTime(adjust.getDeadTime());
+ locDetl.setSuppCode(adjust.getSuppCode());
if (!agvLocDetlService.insert(locDetl)) {
throw new CoolException("娣诲姞" + locDetl.getLocNo() + "搴撲綅锛�" + locDetl.getMatnr() + "鍟嗗搧锛�" + locDetl.getBatch() + "搴忓垪鐮佸簱瀛樻槑缁嗗け璐�");
}
diff --git a/src/main/java/com/zy/asrs/service/impl/AgvWrkMastServiceImp.java b/src/main/java/com/zy/asrs/service/impl/AgvWrkMastServiceImp.java
index 2cf9450..734d847 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvWrkMastServiceImp.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvWrkMastServiceImp.java
@@ -162,6 +162,9 @@
agvTaskParam.setTaskPriority(agvWrkMast.getIoPri().intValue());
//AgvTaskkDescribeParam
+ if(agvWrkMast.getSourceLocNo().contains("C")){
+ agvTaskkDescribeParam.setFromLocationCode(agvWrkMast.getSourceLocNo());
+ }
agvTaskkDescribeParam.setFromLocationCode(agvWrkMast.getSourceLocNo());
agvTaskkDescribeParam.setToLocationCode(agvWrkMast.getLocNo());
agvTaskkDescribeParam.setContainerCode(agvWrkMast.getBarcode());
@@ -207,4 +210,13 @@
}
+ public static void main(String[] args) {
+ String locationCode = "301-1";
+ if(locationCode.contains("C")){
+ System.out.println(true);
+ }else {
+ System.out.println(false);
+ }
+ }
+
}
diff --git a/src/main/webapp/static/js/agvPakStore/stockAdjust.js b/src/main/webapp/static/js/agvPakStore/stockAdjust.js
index db7ed09..3a1a916 100644
--- a/src/main/webapp/static/js/agvPakStore/stockAdjust.js
+++ b/src/main/webapp/static/js/agvPakStore/stockAdjust.js
@@ -10,7 +10,7 @@
,{field: 'batch', align: 'center',title: '搴忓垪鐮�', edit: true, style: 'font-weight:bold'}
,{field: 'threeCode', align: 'center',title: '閿�鍞鍗曞彿', edit: true, style: 'font-weight:bold'}
,{field: 'deadTime', align: 'center',title: '閿�鍞鍗曡鍙�', edit: true, style: 'font-weight:bold'}
- ,{field: 'suppCode', align: 'center',title: '鏂欑鐮�', edit: false, style: 'font-weight:bold'}
+ ,{field: 'suppCode', align: 'center',title: '鏂欑鐮�', edit: true, style: 'font-weight:bold'}
];
arrRemove(detlCols, "field", "zpallet");
arrRemove(detlCols, "field", "anfme");
diff --git a/src/main/webapp/views/mat/mat.html b/src/main/webapp/views/mat/mat.html
index f5fba90..6f2e8ce 100644
--- a/src/main/webapp/views/mat/mat.html
+++ b/src/main/webapp/views/mat/mat.html
@@ -147,7 +147,7 @@
</script>
<script type="text/html" id="operate">
- <a class="layui-btn layui-btn-xs btn-edit layui-btn-primary" lay-event="edit">淇敼</a>
+ <a class="layui-btn layui-btn-xs btn-edit layui-btn-primary btn-modify" lay-event="edit" style="display: none">淇敼</a>
<button class="layui-btn layui-btn-xs btn-print" lay-event="btnPrint">鎵撳嵃</button>
</script>
--
Gitblit v1.9.1