From 7ad79ee463adbdbc51e37c12ae025fb8598ab670 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期日, 07 四月 2024 14:25:36 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/entity/PlaLog.java | 2 +-
src/main/java/com/zy/asrs/controller/PlaQtyController.java | 2 +-
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 2 +-
src/main/java/com/zy/asrs/controller/OrderDetlController.java | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OrderDetlController.java b/src/main/java/com/zy/asrs/controller/OrderDetlController.java
index 7417ecb..4a2a9ac 100644
--- a/src/main/java/com/zy/asrs/controller/OrderDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderDetlController.java
@@ -128,7 +128,7 @@
wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
} else {
- wrapper.like(entry.getKey(), val);
+ wrapper.eq(entry.getKey(), val);
}
}
}
diff --git a/src/main/java/com/zy/asrs/controller/PlaQtyController.java b/src/main/java/com/zy/asrs/controller/PlaQtyController.java
index dee0d6c..8633d63 100644
--- a/src/main/java/com/zy/asrs/controller/PlaQtyController.java
+++ b/src/main/java/com/zy/asrs/controller/PlaQtyController.java
@@ -103,7 +103,7 @@
wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
} else {
- wrapper.like(entry.getKey(), val);
+ wrapper.eq(entry.getKey(), val);
}
}
}
diff --git a/src/main/java/com/zy/asrs/entity/PlaLog.java b/src/main/java/com/zy/asrs/entity/PlaLog.java
index f9b42ef..c6bc5a0 100644
--- a/src/main/java/com/zy/asrs/entity/PlaLog.java
+++ b/src/main/java/com/zy/asrs/entity/PlaLog.java
@@ -67,7 +67,7 @@
//鍖呰鍙�
@TableField("package_no")
@ExcelProperty(value = "鍖呰鍙�")
- private String packageNo;
+ private Integer packageNo;
//鍖呰鍙�
@ExcelProperty(value = "鐢熶骇鏃ユ湡")
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 b2c5a16..08112e5 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -1247,7 +1247,7 @@
if(isReplace){
replacePla(pla,manPakOut,plaQty);
}else {
- if((!Cools.eq(pla.getStatus(),GlobleParameter.PLA_STATUS_2) && !Cools.eq(pla.getStatus(),GlobleParameter.PLA_STATUS_3)) ||
+ if((!Cools.eq(pla.getStatus(),GlobleParameter.PLA_STATUS_2) && !Cools.eq(pla.getStatus(),GlobleParameter.PLA_STATUS_3) && !Cools.eq(pla.getStatus(),GlobleParameter.PLA_STATUS_1)) ||
!Cools.eq(pla.getBatch(),manPakOut.getBatch()) ||
!Cools.eq(pla.getPackageNo()+"",manPakOut.getBarcode()) ||
!Cools.eq(pla.getBrand(),manPakOut.getMaktx()) ){
--
Gitblit v1.9.1