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/param/CombParam.java |   32 ++++++++++++++++++++++++++------
 1 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/zy/asrs/entity/param/CombParam.java b/src/main/java/com/zy/asrs/entity/param/CombParam.java
index d1d5cfd..d2cf14d 100644
--- a/src/main/java/com/zy/asrs/entity/param/CombParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/CombParam.java
@@ -1,6 +1,5 @@
 package com.zy.asrs.entity.param;
 
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.util.List;
@@ -18,27 +17,48 @@
     private String barcode;
 
     // 搴撲綅缂栧彿
-    private String locno;
+    private String locNo;
 
     private List<CombMat> combMats;
 
     @Data
     public static class CombMat {
 
+        private String orderNo;
+
         // 鐗╂枡缂栧彿
-        private String matnr;
+        private String matnr = "";
 
         // 搴忓垪鐮�
-        private String batch;
+        private String batch = "";
+        private String brand = "";
+        private String standby1 = "1";
+        private String standby2 = "1";
+        private String standby3 = "1";
+
+        private String boxType1 = "1";
+        private String boxType2 = "1";
+        private String boxType3 = "1";
 
         // 鐗╂枡鏁伴噺
         private Double anfme;
 
         // 鍟嗗搧鍚嶇О
-        private String maktx;
+        private String maktx = "";
 
         // 瑙勬牸
-        private String specs;
+        private String specs = "";
+        private String supp = "";
+        //
+        private String suppCode = "";
+        // sku
+        private String sku = "";
+        //澶囨敞
+        private String memo = "";
+        //浠撳簱缂栫爜
+        private String manu = "";
+
+        private String supplier = "";
 
     }
 

--
Gitblit v1.9.1