From efac58964167be8db7cc5e967051c104d741bac2 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期五, 20 九月 2024 09:23:41 +0800
Subject: [PATCH] Merge branch 'phyzwms2' into phyzasrs-erp
---
src/main/java/com/zy/common/web/WcsController.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index 90f1bb9..07864aa 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -578,7 +578,7 @@
String containerCode = param.getContainerCode();
if(Cools.isEmpty(containerCode)){
- throw new CoolException("鏂欑鐮佷负绌�");
+ throw new CoolException("璐ф灦鐮佷负绌�");
}
if(!Character.isDigit(containerCode.charAt(0))){
@@ -618,7 +618,7 @@
return R.ok();
}
- return R.error("娌℃湁鏌ヨ鍒拌鏂欑淇℃伅");
+ return R.error("娌℃湁鏌ヨ鍒拌璐ф灦淇℃伅");
}
@@ -633,7 +633,7 @@
String containerCode = param.getContainerCode().split(";")[0];
if(Cools.isEmpty(containerCode)){
- throw new CoolException("鏂欑鐮佷负绌�");
+ throw new CoolException("璐ф灦鐮佷负绌�");
}
if(!Character.isDigit(containerCode.charAt(0))){
@@ -651,6 +651,7 @@
if(!Cools.isEmpty(agvWrkMast) && agvWrkMast.getIoType() == 101){
//灏嗗伐浣滃厷鐘舵�佹敼涓鸿揣鏋剁鍦�
agvWrkMast.setWrkSts(206L);
+ agvWrkMast.setModiTime(new Date());
agvWrkMastService.updateById(agvWrkMast);
// //鍙戦�佽揣鏋剁珛鍦鸿姹傦紝瀹屾垚宸ヤ綔妗�
// List<AgvWrkMast> agvWrkMastList = new ArrayList<>();
--
Gitblit v1.9.1