From 07fc18f77a9764bd47857e30d65abc03cc1e439c Mon Sep 17 00:00:00 2001
From: zhangchao <zc857179121@qq.com>
Date: 星期五, 08 十一月 2024 16:21:56 +0800
Subject: [PATCH] Merge branch 'phyzwms2' into phyzasrs-erp
---
src/main/java/com/zy/asrs/controller/MobileController.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index 08b1789..f26bbf8 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -168,7 +168,7 @@
}
/**
- * 鍑哄簱纭 - 鎵墭鐩樼爜
+ * 鍑哄簱纭 - 鎵揣鏋剁爜
* 1.鍏ㄦ澘 杩斿洖 101
* 2.鎷ｆ枡 杩斿洖 103
*/
@@ -428,7 +428,7 @@
}
@RequestMapping("/check/waitPakin/auth")
- @ManagerAuth(memo = "鏌ヨ鎵樼洏鏄惁缁勬墭")
+ @ManagerAuth(memo = "鏌ヨ璐ф灦鏄惁缁勬墭")
public R waitPakins(@RequestBody String barcode){
return R.ok().add(waitPakinService.selectList(new EntityWrapper<WaitPakin>().eq("zpallet", barcode)));
}
@@ -450,7 +450,7 @@
public R checkWrkDetl(@RequestBody String barcode){
WrkMast wrkMast = wrkMastService.selectByBarcode(barcode);
if(Cools.isEmpty(wrkMast)){
- return R.error("璇ユ墭鐩樻病鏈夊伐浣滄。");
+ return R.error("璇ヨ揣鏋舵病鏈夊伐浣滄。");
}
List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
return R.ok().add(wrkDetls);
--
Gitblit v1.9.1