From 75e92e196c01e33de751544ad037dc631c5edf61 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期六, 20 十二月 2025 11:38:59 +0800
Subject: [PATCH] #1
---
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 4 ++--
src/main/java/com/zy/common/service/CommonService.java | 14 --------------
2 files changed, 2 insertions(+), 16 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
index 0915c9f..d590316 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -744,7 +744,7 @@
StartupDto dto = null;
try{
- commonService.getLocNo(1, 1, 1901, matnr,null,null, locTypeDto);
+ dto = commonService.getLocNo(1, 1, 1901, matnr,null,null, locTypeDto);
} catch (Exception e){
throw new CoolException(e.getMessage());
}
@@ -1364,7 +1364,7 @@
public List<Map<String, Object>> boxTypeComb() {
EntityWrapper<BasBoxType> wrapper = new EntityWrapper<>();
List<Map<String, Object>> result = new ArrayList<>();
- List<BasBoxType> basBoxTypes = basBoxTypeService.selectList(wrapper.orderBy("id",true));
+ List<BasBoxType> basBoxTypes = basBoxTypeService.selectList(wrapper.orderBy("id",true).eq("arm_type",1));
for (BasBoxType basBoxType : basBoxTypes){
Map<String, Object> map = new HashMap<>();
map.put("boxType", basBoxType.getBoxType());
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index 532025f..fdd88dd 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -52,8 +52,6 @@
private LocDetlService locDetlService;
@Autowired
private SlaveProperties slaveProperties;
- @Autowired
- private WaitPakinService waitPakinService;
/**
* 鐢熸垚宸ヤ綔鍙�
@@ -163,12 +161,6 @@
throw new CoolException("鏁版嵁寮傚父锛岃鑱旂郴绠＄悊鍛�");
}
// ===============>>>> 寮�濮嬫墽琛�
- if (staDescId == 1){
- WaitPakin waitPakin = waitPakinService.selectOne(new EntityWrapper<WaitPakin>().eq("batch", batch));
- if (Cools.isEmpty(waitPakin) || waitPakin.getBrandArmType$() == 999) {
- sign999 = true;
- }
- }
if (sign999 || sourceStaNo == 118 || sourceStaNo == 122 || sourceStaNo == 1901 || sourceStaNo == 1908){
curRow = rowLastno.getCurrentRow1();
} else if (sourceStaNo == 120 || sourceStaNo == 121 || sourceStaNo == 123 || sourceStaNo == 171){
@@ -483,12 +475,6 @@
grade = "";
}
boolean sign999 = false;
- if (staDescId == 1){
- WaitPakin waitPakin = waitPakinService.selectOne(new EntityWrapper<WaitPakin>().eq("batch", batch));
- if (Cools.isEmpty(waitPakin) || waitPakin.getBrandArmType$() == 999) {
- sign999 = true;
- }
- }
// 鍒濆鍖栧弬鏁�
int crnNo = 0; //鍫嗗灈鏈哄彿
int nearRow = 0; //鏈�娴呭簱浣嶆帓
--
Gitblit v1.9.1