From a27f1b573fc5cf9a3b78e2eacb56e44310f83456 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期三, 27 八月 2025 12:17:01 +0800
Subject: [PATCH] art: 添加入库逻辑,SAP订单同步参数动态配置

---
 src/main/java/org/jeecg/modules/lsw/entity/LswMaterialInventory.java |   22 +++++++++++++++++++++-
 1 files changed, 21 insertions(+), 1 deletions(-)

diff --git a/src/main/java/org/jeecg/modules/lsw/entity/LswMaterialInventory.java b/src/main/java/org/jeecg/modules/lsw/entity/LswMaterialInventory.java
index ff35baa..73d6730 100644
--- a/src/main/java/org/jeecg/modules/lsw/entity/LswMaterialInventory.java
+++ b/src/main/java/org/jeecg/modules/lsw/entity/LswMaterialInventory.java
@@ -1,16 +1,21 @@
 package org.jeecg.modules.lsw.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.jeecg.common.aspect.annotation.Dict;
+import org.jeecg.modules.lsw.enums.MaterialInventoryStatusEnum;
 import org.jeecgframework.poi.excel.annotation.Excel;
 import org.springframework.format.annotation.DateTimeFormat;
 
+import javax.persistence.Table;
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.util.Date;
 
 /**
@@ -59,13 +64,28 @@
 	/**鏁伴噺*/
 	@Excel(name = "鏁伴噺", width = 15)
     @ApiModelProperty(value = "鏁伴噺")
-    private String quantity;
+    private BigDecimal quantity;
 	/**搴撳瓨鍦癐D*/
 	@Excel(name = "搴撳瓨鍦癐D", width = 15)
+    @Dict(dictTable = "base_line_side_warehouse", dicCode = "id", dicText = "warehouse_name")
     @ApiModelProperty(value = "搴撳瓨鍦癐D")
     private String warehouseId;
+    @TableField(exist = false)
+    @ApiModelProperty(value = "搴撳瓨鍦�")
+    private String warehouseName;
 	/**搴撳瓨鐘舵��*/
 	@Excel(name = "搴撳瓨鐘舵��", width = 15)
     @ApiModelProperty(value = "搴撳瓨鐘舵��")
     private String inventoryStatus;
+
+    public LswMaterialInventory(){}
+
+    public LswMaterialInventory(LswMaterialInbound inbound, String materialId, String inventoryCategory) {
+        this.warehouseId = inbound.getWarehouseId();
+        this.quantity = inbound.getQuantity();
+        this.batchNumber = inbound.getBatchNumber();
+        this.inventoryStatus = MaterialInventoryStatusEnum.NORMAL.name();
+        this.inventoryCategory = inventoryCategory;
+        this.materialId = materialId;
+    }
 }

--
Gitblit v1.9.3