From 7e1420649451d5dc22ac49b3b31ba59df1edf19e Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期一, 22 十二月 2025 10:53:10 +0800
Subject: [PATCH] #getArmType$
---
src/main/java/com/zy/asrs/entity/WrkDetlLog.java | 17 ++++-
src/main/java/com/zy/asrs/entity/OrderDetlPakout.java | 17 ++++-
src/main/java/com/zy/asrs/entity/BasBoxType.java | 14 ++++
src/main/java/com/zy/asrs/entity/WaitPakinLog.java | 17 ++++-
src/main/java/com/zy/asrs/entity/OrderDetl.java | 17 ++++-
src/main/java/com/zy/asrs/entity/WaitPakin.java | 17 ++++-
src/main/java/com/zy/asrs/entity/LocDetl.java | 17 ++++-
src/main/java/com/zy/asrs/entity/WrkDetl.java | 17 ++++-
src/main/webapp/static/js/basBoxType/basBoxType.js | 1
src/main/webapp/views/basBoxType/basBoxType.html | 16 +++++
src/main/java/com/zy/asrs/entity/WrkDetlSingle.java | 17 ++++-
11 files changed, 126 insertions(+), 41 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/BasBoxType.java b/src/main/java/com/zy/asrs/entity/BasBoxType.java
index 7f885be..0284d78 100644
--- a/src/main/java/com/zy/asrs/entity/BasBoxType.java
+++ b/src/main/java/com/zy/asrs/entity/BasBoxType.java
@@ -50,7 +50,19 @@
this.boxType = boxType;
}
-// BasBoxType basBoxType = new BasBoxType(
+ public String getArmType$() {
+ if (Cools.isEmpty(armType)) return "璇烽�夋嫨缁撴灉";
+ switch (armType) {
+ case 1:
+ return "鍏佽";
+ case 999:
+ return "涓嶅厑璁�";
+ default:
+ return "璇烽�夋嫨缁撴灉";
+ }
+ }
+
+ // BasBoxType basBoxType = new BasBoxType(
// null, // 浠诲姟鍙穂闈炵┖]
// null // 鍫嗗灈鏈�
// );
diff --git a/src/main/java/com/zy/asrs/entity/LocDetl.java b/src/main/java/com/zy/asrs/entity/LocDetl.java
index 192a7bf..4de4778 100644
--- a/src/main/java/com/zy/asrs/entity/LocDetl.java
+++ b/src/main/java/com/zy/asrs/entity/LocDetl.java
@@ -248,12 +248,19 @@
}
public int getBrandArmType$(){
- BasBoxTypeService basBoxTypeService = SpringUtils.getBean(BasBoxTypeService.class);
- List<BasBoxType> basBoxTypes = basBoxTypeService.selectList(new EntityWrapper<BasBoxType>().eq("box_type", this.brand).orderBy("id", true));
- for (BasBoxType basBoxType:basBoxTypes){
- return basBoxType.getArmType();
+ try{
+ BasBoxTypeService basBoxTypeService = SpringUtils.getBean(BasBoxTypeService.class);
+ List<BasBoxType> basBoxTypes = basBoxTypeService.selectList(new EntityWrapper<BasBoxType>().eq("box_type", this.brand).orderBy("id", true));
+ for (BasBoxType basBoxType:basBoxTypes){
+ if (basBoxType.getArmType()!=1){
+ return 999;
+ }
+ return basBoxType.getArmType();
+ }
+ return 999;
+ } catch (Exception e){
+ return 999;
}
- return 999;
}
public String getModiTime$(){
diff --git a/src/main/java/com/zy/asrs/entity/OrderDetl.java b/src/main/java/com/zy/asrs/entity/OrderDetl.java
index b4cec8c..6c0f107 100644
--- a/src/main/java/com/zy/asrs/entity/OrderDetl.java
+++ b/src/main/java/com/zy/asrs/entity/OrderDetl.java
@@ -506,12 +506,19 @@
}
public int getBrandArmType$(){
- BasBoxTypeService basBoxTypeService = SpringUtils.getBean(BasBoxTypeService.class);
- List<BasBoxType> basBoxTypes = basBoxTypeService.selectList(new EntityWrapper<BasBoxType>().eq("box_type", this.brand).orderBy("id", true));
- for (BasBoxType basBoxType:basBoxTypes){
- return basBoxType.getArmType();
+ try{
+ BasBoxTypeService basBoxTypeService = SpringUtils.getBean(BasBoxTypeService.class);
+ List<BasBoxType> basBoxTypes = basBoxTypeService.selectList(new EntityWrapper<BasBoxType>().eq("box_type", this.brand).orderBy("id", true));
+ for (BasBoxType basBoxType:basBoxTypes){
+ if (basBoxType.getArmType()!=1){
+ return 999;
+ }
+ return basBoxType.getArmType();
+ }
+ return 999;
+ } catch (Exception e){
+ return 999;
}
- return 999;
}
}
\ No newline at end of file
diff --git a/src/main/java/com/zy/asrs/entity/OrderDetlPakout.java b/src/main/java/com/zy/asrs/entity/OrderDetlPakout.java
index 7f0bd73..b1d0f59 100644
--- a/src/main/java/com/zy/asrs/entity/OrderDetlPakout.java
+++ b/src/main/java/com/zy/asrs/entity/OrderDetlPakout.java
@@ -513,12 +513,19 @@
}
public int getBrandArmType$(){
- BasBoxTypeService basBoxTypeService = SpringUtils.getBean(BasBoxTypeService.class);
- List<BasBoxType> basBoxTypes = basBoxTypeService.selectList(new EntityWrapper<BasBoxType>().eq("box_type", this.brand).orderBy("id", true));
- for (BasBoxType basBoxType:basBoxTypes){
- return basBoxType.getArmType();
+ try{
+ BasBoxTypeService basBoxTypeService = SpringUtils.getBean(BasBoxTypeService.class);
+ List<BasBoxType> basBoxTypes = basBoxTypeService.selectList(new EntityWrapper<BasBoxType>().eq("box_type", this.brand).orderBy("id", true));
+ for (BasBoxType basBoxType:basBoxTypes){
+ if (basBoxType.getArmType()!=1){
+ return 999;
+ }
+ return basBoxType.getArmType();
+ }
+ return 999;
+ } catch (Exception e){
+ return 999;
}
- return 999;
}
}
\ No newline at end of file
diff --git a/src/main/java/com/zy/asrs/entity/WaitPakin.java b/src/main/java/com/zy/asrs/entity/WaitPakin.java
index 976ca55..9628be6 100644
--- a/src/main/java/com/zy/asrs/entity/WaitPakin.java
+++ b/src/main/java/com/zy/asrs/entity/WaitPakin.java
@@ -255,11 +255,18 @@
}
public int getBrandArmType$(){
- BasBoxTypeService basBoxTypeService = SpringUtils.getBean(BasBoxTypeService.class);
- List<BasBoxType> basBoxTypes = basBoxTypeService.selectList(new EntityWrapper<BasBoxType>().eq("box_type", this.brand).orderBy("id", true));
- for (BasBoxType basBoxType:basBoxTypes){
- return basBoxType.getArmType();
+ try{
+ BasBoxTypeService basBoxTypeService = SpringUtils.getBean(BasBoxTypeService.class);
+ List<BasBoxType> basBoxTypes = basBoxTypeService.selectList(new EntityWrapper<BasBoxType>().eq("box_type", this.brand).orderBy("id", true));
+ for (BasBoxType basBoxType:basBoxTypes){
+ if (basBoxType.getArmType()!=1){
+ return 999;
+ }
+ return basBoxType.getArmType();
+ }
+ return 999;
+ } catch (Exception e){
+ return 999;
}
- return 999;
}
}
diff --git a/src/main/java/com/zy/asrs/entity/WaitPakinLog.java b/src/main/java/com/zy/asrs/entity/WaitPakinLog.java
index a3769e7..bf7bd35 100644
--- a/src/main/java/com/zy/asrs/entity/WaitPakinLog.java
+++ b/src/main/java/com/zy/asrs/entity/WaitPakinLog.java
@@ -238,12 +238,19 @@
}
public int getBrandArmType$(){
- BasBoxTypeService basBoxTypeService = SpringUtils.getBean(BasBoxTypeService.class);
- List<BasBoxType> basBoxTypes = basBoxTypeService.selectList(new EntityWrapper<BasBoxType>().eq("box_type", this.brand).orderBy("id", true));
- for (BasBoxType basBoxType:basBoxTypes){
- return basBoxType.getArmType();
+ try{
+ BasBoxTypeService basBoxTypeService = SpringUtils.getBean(BasBoxTypeService.class);
+ List<BasBoxType> basBoxTypes = basBoxTypeService.selectList(new EntityWrapper<BasBoxType>().eq("box_type", this.brand).orderBy("id", true));
+ for (BasBoxType basBoxType:basBoxTypes){
+ if (basBoxType.getArmType()!=1){
+ return 999;
+ }
+ return basBoxType.getArmType();
+ }
+ return 999;
+ } catch (Exception e){
+ return 999;
}
- return 999;
}
}
diff --git a/src/main/java/com/zy/asrs/entity/WrkDetl.java b/src/main/java/com/zy/asrs/entity/WrkDetl.java
index 09c72bc..071dad7 100644
--- a/src/main/java/com/zy/asrs/entity/WrkDetl.java
+++ b/src/main/java/com/zy/asrs/entity/WrkDetl.java
@@ -405,12 +405,19 @@
}
public int getBrandArmType$(){
- BasBoxTypeService basBoxTypeService = SpringUtils.getBean(BasBoxTypeService.class);
- List<BasBoxType> basBoxTypes = basBoxTypeService.selectList(new EntityWrapper<BasBoxType>().eq("box_type", this.brand).orderBy("id", true));
- for (BasBoxType basBoxType:basBoxTypes){
- return basBoxType.getArmType();
+ try{
+ BasBoxTypeService basBoxTypeService = SpringUtils.getBean(BasBoxTypeService.class);
+ List<BasBoxType> basBoxTypes = basBoxTypeService.selectList(new EntityWrapper<BasBoxType>().eq("box_type", this.brand).orderBy("id", true));
+ for (BasBoxType basBoxType:basBoxTypes){
+ if (basBoxType.getArmType()!=1){
+ return 999;
+ }
+ return basBoxType.getArmType();
+ }
+ return 999;
+ } catch (Exception e){
+ return 999;
}
- return 999;
}
public void sync(Object source) {
diff --git a/src/main/java/com/zy/asrs/entity/WrkDetlLog.java b/src/main/java/com/zy/asrs/entity/WrkDetlLog.java
index 2332363..287012af 100644
--- a/src/main/java/com/zy/asrs/entity/WrkDetlLog.java
+++ b/src/main/java/com/zy/asrs/entity/WrkDetlLog.java
@@ -399,12 +399,19 @@
}
public int getBrandArmType$(){
- BasBoxTypeService basBoxTypeService = SpringUtils.getBean(BasBoxTypeService.class);
- List<BasBoxType> basBoxTypes = basBoxTypeService.selectList(new EntityWrapper<BasBoxType>().eq("box_type", this.brand).orderBy("id", true));
- for (BasBoxType basBoxType:basBoxTypes){
- return basBoxType.getArmType();
+ try{
+ BasBoxTypeService basBoxTypeService = SpringUtils.getBean(BasBoxTypeService.class);
+ List<BasBoxType> basBoxTypes = basBoxTypeService.selectList(new EntityWrapper<BasBoxType>().eq("box_type", this.brand).orderBy("id", true));
+ for (BasBoxType basBoxType:basBoxTypes){
+ if (basBoxType.getArmType()!=1){
+ return 999;
+ }
+ return basBoxType.getArmType();
+ }
+ return 999;
+ } catch (Exception e){
+ return 999;
}
- return 999;
}
diff --git a/src/main/java/com/zy/asrs/entity/WrkDetlSingle.java b/src/main/java/com/zy/asrs/entity/WrkDetlSingle.java
index 3911a08..22d5cc0 100644
--- a/src/main/java/com/zy/asrs/entity/WrkDetlSingle.java
+++ b/src/main/java/com/zy/asrs/entity/WrkDetlSingle.java
@@ -480,12 +480,19 @@
}
public int getBrandArmType$(){
- BasBoxTypeService basBoxTypeService = SpringUtils.getBean(BasBoxTypeService.class);
- List<BasBoxType> basBoxTypes = basBoxTypeService.selectList(new EntityWrapper<BasBoxType>().eq("box_type", this.brand).orderBy("id", true));
- for (BasBoxType basBoxType:basBoxTypes){
- return basBoxType.getArmType();
+ try{
+ BasBoxTypeService basBoxTypeService = SpringUtils.getBean(BasBoxTypeService.class);
+ List<BasBoxType> basBoxTypes = basBoxTypeService.selectList(new EntityWrapper<BasBoxType>().eq("box_type", this.brand).orderBy("id", true));
+ for (BasBoxType basBoxType:basBoxTypes){
+ if (basBoxType.getArmType()!=1){
+ return 999;
+ }
+ return basBoxType.getArmType();
+ }
+ return 999;
+ } catch (Exception e){
+ return 999;
}
- return 999;
}
diff --git a/src/main/webapp/static/js/basBoxType/basBoxType.js b/src/main/webapp/static/js/basBoxType/basBoxType.js
index 480c069..7371eea 100644
--- a/src/main/webapp/static/js/basBoxType/basBoxType.js
+++ b/src/main/webapp/static/js/basBoxType/basBoxType.js
@@ -25,6 +25,7 @@
{field: 'id', align: 'center',title: 'ID' ,hide : true},
{field: 'boxSpecs', align: 'center',title: '绠卞瀷',hide : false}
,{field: 'boxType', align: 'center',title: '绠卞瀷缂栧彿',hide : false}
+ ,{field: 'armType$', align: 'center',title: '鏄惁鍏佽鏈烘鑷傛墽琛�',hide : false}
,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:120}
]],
diff --git a/src/main/webapp/views/basBoxType/basBoxType.html b/src/main/webapp/views/basBoxType/basBoxType.html
index 3f55399..62c78ac 100644
--- a/src/main/webapp/views/basBoxType/basBoxType.html
+++ b/src/main/webapp/views/basBoxType/basBoxType.html
@@ -84,6 +84,22 @@
<input class="layui-input" name="boxType" placeholder="璇疯緭鍏ョ鍨嬬紪鍙�">
</div>
</div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">绠卞瀷缂栧彿锛堟鏋舵満姊拌噦鐢級: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="armType" placeholder="璇疯緭鍏ョ鍨嬬紪鍙�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">鏄惁鍏佽鏈烘鑷傛墽琛�: </label>
+ <div class="layui-input-block">
+ <select name="armType">
+ <option value="0">璇烽�夋嫨缁撴灉</option>
+ <option value="1">鍏佽</option>
+ <option value="999">涓嶅厑璁�</option>
+ </select>
+ </div>
+ </div>
</div>
</div>
--
Gitblit v1.9.1