From 8376b10e8758f4d9121ac1253a405179c75f0913 Mon Sep 17 00:00:00 2001
From: zyh <zyh@123>
Date: 星期一, 30 三月 2026 12:35:40 +0800
Subject: [PATCH] 将物料保质期字段改为寿命，并显示出来 新增物料同步的时候判断有无库存，无则修改有则返回
---
src/main/java/com/zy/asrs/entity/param/CombParam.java | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 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..ac07e41 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,18 +17,28 @@
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 = "";
+ private String standby2 = "";
+ private String standby3 = "";
+
+ private String boxType1 = "1";
+ private String boxType2 = "1";
+ private String boxType3 = "1";
// 鐗╂枡鏁伴噺
private Double anfme;
--
Gitblit v1.9.1