From 51da7fb82af136ddb931422b7427ac15119314a1 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期四, 21 八月 2025 15:02:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/czscwcs-version' into czscwcs-version
---
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 22 +++++++---------------
1 files changed, 7 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index f2d45cb..b0b3393 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -70,8 +70,8 @@
HashMap<String,Object> map=new HashMap<>();
TaskWrk taskWrk = taskWrkService.selectByTaskNo(param.getTaskNo());
if (taskWrk != null) {
- map.put("Code","0");
- map.put("Msg",param.getTaskNo()+"浠诲姟宸茬粡鐢熸垚锛�");
+ map.put("ReturnStatus",1);
+ map.put("ErrorMessage",param.getTaskNo()+"浠诲姟宸茬粡鐢熸垚锛�");
return map;
}
@@ -83,16 +83,8 @@
taskWrk.setWrkNo(workNo1);
taskWrk.setStatus(TaskStatusType.RECEIVE.id);//浠诲姟鐘舵�侊細鎺ユ敹
taskWrk.setCreateTime(now);
- try {
- if (param.getIoType() > 1) {
- if (Utils.locNoRowBoolean(locMast.getRow1())) {
- param.setTaskPriority(11);
- }
- }
- } catch (Exception e) {
- }
taskWrk.setIoType(param.getIoType());//浠诲姟绫诲瀷
- taskWrk.setIoPri(param.getTaskPriority());//浼樺厛绾�
+ taskWrk.setIoPri(param.getPriority());//浼樺厛绾�
taskWrk.setBarcode(param.getBarcode());//鏉＄爜
taskWrk.setCrnNo(locMast.getCrnNo());
if (param.getIoType() == 1) {
@@ -123,12 +115,12 @@
}
if (!taskWrkService.insert(taskWrk)) {
- map.put("Code","0");
- map.put("Msg",param.getTaskNo()+"鍒涘缓浠诲姟澶辫触锛�");
+ map.put("ReturnStatus",1);
+ map.put("ErrorMessage",param.getTaskNo()+"鍒涘缓浠诲姟澶辫触锛�");
return map;
}
- map.put("Code","1");
- map.put("Msg","ok");
+ map.put("ReturnStatus",0);
+ map.put("ErrorMessage","ok");
return map;
}
--
Gitblit v1.9.1