From 57f9a55581343a805cd589bbdc00e4d28a28aa97 Mon Sep 17 00:00:00 2001 From: zwl <1051256694@qq.com> Date: 星期一, 28 七月 2025 13:26:42 +0800 Subject: [PATCH] erp对接 --- src/main/java/com/zy/asrs/entity/param/MatSyncParam.java | 129 ++++++++++++++++++++++++++++++++++++++---- 1 files changed, 116 insertions(+), 13 deletions(-) diff --git a/src/main/java/com/zy/asrs/entity/param/MatSyncParam.java b/src/main/java/com/zy/asrs/entity/param/MatSyncParam.java index ff2f451..d9b16b4 100644 --- a/src/main/java/com/zy/asrs/entity/param/MatSyncParam.java +++ b/src/main/java/com/zy/asrs/entity/param/MatSyncParam.java @@ -1,7 +1,11 @@ package com.zy.asrs.entity.param; +import com.baomidou.mybatisplus.annotations.TableField; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; +import java.util.Date; import java.util.List; /** @@ -12,33 +16,118 @@ public class MatSyncParam { /** - * 鍒涘缓鏃堕棿 + * orderNo璁㈠崟缂栧彿 */ - public String createTime; + public String orderNo; - public List<MatParam> matDetails; + public List<MatParam> data; @Data - public class MatParam{ + public static class MatParam{ /** - * 鍟嗗搧缂栧彿 + * 瀛樿揣缂栫爜 */ private String matnr; /** - * 鍟嗗搧鍚嶇О + * 瀛樿揣鍚嶇О */ private String maktx; +// /** +// * 鍟嗗搧鍒嗙被 +// */ +// private String groupCode; +// +// /** +// * 鍒嗙被鍚嶇О +// */ +// private String groupName; /** - * 鍟嗗搧鍒嗙被 + * 瀛樿揣澶х被缂栫爜 */ - private String groupCode; + private Long tagId; /** - * 鍒嗙被鍚嶇О + * 瀛樿揣澶х被鍚嶇О */ - private String groupName; + private String tagIdName; + + /** + * 瀛樿揣妫�楠屽憳 + */ + private String inspectName; + + /** + * 璁¢噺鍗曚綅缁勭紪鐮� + */ + private String groupUnitId; + + /** + * 涓昏閲忓崟浣嶇紪鐮� + */ + private String unitId; + + /** + * 鏄庣粏缂栫爜 + */ + private String detailId; + + /** + * 璐у搧鐗瑰緛 + */ + private String batch; + + /** + * 閿�鍞粯璁よ閲忓崟浣嶇紪鐮� + */ + private String saleUnitId; + + /** + * 閿�鍞粯璁よ閲忓崟浣嶅悕绉� + */ + private String saleUnit; + + /** + * 閲囪喘榛樿璁¢噺鍗曚綅鍚嶇О + */ + private String procureUnit; + + /** + * 閲囪喘榛樿璁¢噺鍗曚綅缂栫爜 + */ + private String procureUnitId; + + /** + * 搴撳瓨榛樿璁¢噺鍗曚綅缂栫爜 + */ + private String inventoryUnitId; + + /** + * 搴撳瓨榛樿璁¢噺鍗曚綅鍚嶇О + */ + private String inventoryUnit; + + /** + * 鐢熶骇璁¢噺鍗曚綅缂栫爜 + */ + private String produceUnitId; + + /** + * 鐢熶骇璁¢噺鍗曚綅鍚嶇О + */ + private String produceUnit; + + /** + * 榛樿浠撳簱缂栫爜 + */ + private String warehouse; + + /** + * 榛樿浠撳簱鍚嶇О + */ + private String warehouseName; + /** * 鍒悕 @@ -61,12 +150,12 @@ private String color; /** - * 鍝佺墝 + * 閫氱敤 */ private String brand; /** - * 鍗曚綅 + * 涓昏閲忓崟浣嶅悕绉� */ private String unit; @@ -166,7 +255,7 @@ private Integer source; /** - * 瑕佹眰妫�楠� 1: 鏄� 0: 鍚� + * 鏄惁鍚敤 1: 鏄� 0: 鍚� */ private Integer inspect; @@ -194,6 +283,20 @@ * 澶囨敞 */ private String memo; + + /** + * 鏁伴噺 + */ + private Double anfme; + + /** + * 鍚敤鏃堕棿 + */ + @ApiModelProperty(value= "鍚敤鏃堕棿") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + private Date suspensionDate; + + } } -- Gitblit v1.9.1