From 1443d5a84a4df99d9a86ac04c904554e91ae8271 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期日, 12 四月 2026 15:35:06 +0800
Subject: [PATCH] 1.针对7.3接口文档,新增了几个字段需要加入到组托档中,不额外加字段 2.针对7.11接口文档,对outOrder方法进行重写,batchSeq在wrkMast表中新增一个字段放,entryWmsCode、outDoorNo这两个在wrkDetl中找两个字段存放 3.针对7.7接口文档,上报时加上orderId出库单号 4.针对7.9接口文档,wcs会先请求wms,只需要palletId托盘码,errorMsg错误信息;wms转发给加上orderId出库单号转发给ERP 5.针对7.10接口文档,ERP先按照这个文档发给wms,wms再发给wcs,发给wcs这块先不写

---
 src/main/java/com/zy/asrs/entity/BasArmMastSign.java |   23 +++++++++++++++++------
 1 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/zy/asrs/entity/BasArmMastSign.java b/src/main/java/com/zy/asrs/entity/BasArmMastSign.java
index bf5aa74..abbfff4 100644
--- a/src/main/java/com/zy/asrs/entity/BasArmMastSign.java
+++ b/src/main/java/com/zy/asrs/entity/BasArmMastSign.java
@@ -28,16 +28,16 @@
     @ApiModelProperty(value= "鐘舵��")
     private Integer status;
 
-    @ApiModelProperty(value= "")
+    @ApiModelProperty(value= "sku")
     private String matnr;
 
-    @ApiModelProperty(value= "")
+    @ApiModelProperty(value= "sku")
     private String sku;
 
-    @ApiModelProperty(value= "")
+    @ApiModelProperty(value= "po")
     private String po;
 
-    @ApiModelProperty(value= "")
+    @ApiModelProperty(value= "po")
     private String upc;
 
     /**
@@ -46,14 +46,14 @@
     @ApiModelProperty(value= "璐ф簮")
     private String supplier;
 
-    @ApiModelProperty(value= "")
+    @ApiModelProperty(value= "璁㈠崟鍙�")
     @TableField("order_no")
     private String orderNo;
 
     /**
      * 鍒嗘嫞鏍囪
      */
-    @ApiModelProperty(value= "鍒嗘嫞鏍囪")
+    @ApiModelProperty(value= "鍒嗘嫞缁戝畾鏍囪")
     @TableField("create_time")
     private Long createTime;
 
@@ -88,4 +88,15 @@
 //    );
 
 
+    public String getStatus$() {
+        if (Cools.isEmpty(status)) {return "鏈煡寮傚父";}
+        switch (status){
+            case 0:
+                return "0.鏈爣璁�";
+            case 1:
+                return "1.宸叉爣璁�";
+            default:
+                return "鏈煡寮傚父";
+        }
+    }
 }

--
Gitblit v1.9.1