From 19fe6936cbe4deef1f18186350a71acff4dff58e Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 14 一月 2025 17:06:18 +0800
Subject: [PATCH] # 24. PDA出库成功后,界面数据重置,避免重复操作  (已修复) 25. PDA接口请求,添加一个Loading遮档  (已修复) 27. 非平库单据,在平库可做入库操作  (已修复) 29. 平库入库后,订单明细没有添加(已修复) 30. 平库入库后,单据类型没有修改(已修复) 31. 没有绑定播种位,不能进行播种,前后端都需加判定(已修复) 33. 平库入库未修改入库已完成数量(已修复)

---
 zy-asrs-framework/src/main/java/com/zy/asrs/framework/common/R.java |  130 ++++++++++++++++++++++--------------------
 1 files changed, 68 insertions(+), 62 deletions(-)

diff --git a/zy-asrs-framework/src/main/java/com/zy/asrs/framework/common/R.java b/zy-asrs-framework/src/main/java/com/zy/asrs/framework/common/R.java
index 56f5807..3efe873 100644
--- a/zy-asrs-framework/src/main/java/com/zy/asrs/framework/common/R.java
+++ b/zy-asrs-framework/src/main/java/com/zy/asrs/framework/common/R.java
@@ -1,62 +1,68 @@
-package com.zy.asrs.framework.common;
-
-import java.util.HashMap;
-
-/**
- * Created by vincent on 2019-06-09
- */
-public class R extends HashMap<String, Object> {
-
-    private static final long serialVersionUID = 1L;
-
-    private static final String CODE = "code";
-    private static final String MSG = "msg";
-    private static final String DATA = "data";
-
-    public R(Integer code, String msg){
-        super.put(CODE, code);
-        super.put(MSG, msg);
-    }
-
-    public static R ok(){
-        return parse(BaseRes.OK);
-    }
-
-    public static R ok(String msg){
-        R r = ok();
-        r.put(MSG, msg);
-        return r;
-    }
-
-    public static R ok(Object obj){
-        return parse(BaseRes.OK).add(obj);
-    }
-
-    public static R error(){
-        return parse(BaseRes.ERROR);
-    }
-
-    public static R error(String msg){
-        R r = error();
-        r.put(MSG, msg);
-        return r;
-    }
-
-    public R add(Object obj){
-        this.put(DATA, obj);
-        return this;
-    }
-
-    public static R parse(String message){
-        if(Cools.isEmpty(message)){
-            return parse(BaseRes.ERROR);
-        }
-        String[] msg = message.split("-");
-        if(msg.length==2){
-            return new R(Integer.parseInt(msg[0]),msg[1]);
-        }else{
-            return parse("500-".concat(message));
-        }
-    }
-
-}
+package com.zy.asrs.framework.common;
+
+import java.util.HashMap;
+
+/**
+ * Created by vincent on 2019-06-09
+ */
+public class R extends HashMap<String, Object> {
+
+    private static final long serialVersionUID = 1L;
+
+    private static final String CODE = "code";
+    private static final String MSG = "msg";
+    private static final String DATA = "data";
+
+    public R(Integer code, String msg){
+        super.put(CODE, code);
+        super.put(MSG, msg);
+    }
+
+    public static R ok(){
+        return parse(BaseRes.OK);
+    }
+
+    public static R success(){return  success(BaseRes.SUCESS);}
+
+    public static R success(String msg){
+        return new R(0, msg);
+    }
+
+    public static R ok(String msg){
+        R r = ok();
+        r.put(MSG, msg);
+        return r;
+    }
+
+    public static R ok(Object obj){
+        return parse(BaseRes.OK).add(obj);
+    }
+
+    public static R error(){
+        return parse(BaseRes.ERROR);
+    }
+
+    public static R error(String msg){
+        R r = error();
+        r.put(MSG, msg);
+        return r;
+    }
+
+    public R add(Object obj){
+        this.put(DATA, obj);
+        return this;
+    }
+
+    public static R parse(String message){
+        if(Cools.isEmpty(message)){
+            return parse(BaseRes.ERROR);
+        }
+        String[] msg = message.split("-");
+        if(msg.length==2){
+            return new R(Integer.parseInt(msg[0]),msg[1]);
+        }else{
+            return parse("500-".concat(message));
+        }
+    }
+
+}

--
Gitblit v1.9.1