From 27272b02ddf69e6b82c8c9ae00799d0b54f2044c Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期四, 13 十一月 2025 17:13:59 +0800
Subject: [PATCH] *

---
 src/main/java/com/zy/asrs/entity/param/OrderMesXGHYParam.java |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/zy/asrs/entity/param/OrderMesXGHYParam.java b/src/main/java/com/zy/asrs/entity/param/OrderMesXGHYParam.java
index dcbc175..63d146f 100644
--- a/src/main/java/com/zy/asrs/entity/param/OrderMesXGHYParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/OrderMesXGHYParam.java
@@ -17,6 +17,7 @@
 public class OrderMesXGHYParam {
     private String barcode ;	//鎵樼洏鏉$爜锛堝緪宸ユ椂闂存埑锛�  = snowflakeIdWorker.nextId()  zpallet
     private int palletizingNo;	//鐮佸灈浣嶇紪鍙凤紙浣嶇疆锛�
+    private String warehouseType = "2";	//鐮佸灈浣嶇紪鍙凤紙浣嶇疆锛�
     private List<Box> matList;	//鏈ㄧ闆嗗悎
 
 
@@ -43,7 +44,7 @@
         private String wideInWidth;	// 4.5渭m脳588mm  matnr  涓殑  4.5
         private String thickness;	//4.5渭m脳588mm  matnr  涓殑  588
 
-        private String rollType = "绾歌酱";	//鏈ㄧ绫诲瀷  brand  brand$
+        private String rollType = "FRP";	//鏈ㄧ绫诲瀷  brand  brand$
 
         private List<Roll> rolls;	//鍗烽泦鍚�
 
@@ -140,10 +141,10 @@
                 // 鍏堟寜"渭m脳"鍒嗗壊锛屽啀鎸�"mm"鍒嗗壊
                 String[] firstSplit = matnr.split("渭m脳");
                 if (firstSplit.length == 2) {
-                    wideInWidth = firstSplit[0];  // 5.2
+                    thickness = firstSplit[0];  // 5.2
                     String[] secondSplit = firstSplit[1].split("mm");
                     if (secondSplit.length > 0) {
-                        thickness = secondSplit[0];  // 834.1
+                        wideInWidth = secondSplit[0];  // 834.1
                     }
                 }
                 boxPos = sampleWrkDetl.getOrigin();

--
Gitblit v1.9.1