From af11584bd5f4934c6fe23f37d62e68e1c9d29d36 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B8=B8=E7=86=9F=E5=90=B4=E5=BD=A6=E7=A5=96?=
 <qi.ruan@xujiesoft.com>
Date: Tue, 14 Oct 2025 15:14:10 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=88=E6=9D=BF=E5=88=9D=E5=A7=8B=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../automatedWarehouse/entity/AgvStation.java | 151 +++---------------
 .../entity/PalletDetailData.java              |   1 +
 .../impl/WcsIntegrationServiceImpl.java       |   7 +-
 .../controller/NewIssureController.java       |   2 +-
 .../modules/warehouse/entity/Location.java    | 100 ++++++++++--
 .../WcsIntegrationMapper.xml                  |   2 +-
 6 files changed, 113 insertions(+), 150 deletions(-)

diff --git a/src/main/java/com/gaotao/modules/automatedWarehouse/entity/AgvStation.java b/src/main/java/com/gaotao/modules/automatedWarehouse/entity/AgvStation.java
index 0e0f9e1..e5fac78 100644
--- a/src/main/java/com/gaotao/modules/automatedWarehouse/entity/AgvStation.java
+++ b/src/main/java/com/gaotao/modules/automatedWarehouse/entity/AgvStation.java
@@ -1,9 +1,14 @@
 package com.gaotao.modules.automatedWarehouse.entity;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
 import java.math.BigDecimal;
 
 /**
- * AGV站点信息实体类
+ * AGV站点信息基础实体类 - 直接映射数据库表 - rqrq
  * 
  * <p><b>核心字段说明：</b></p>
  * <ul>
@@ -29,10 +34,13 @@ import java.math.BigDecimal;
  * 4. 如果相同则允许扫进，否则报错
  * </pre>
  */
+@Data
+@TableName("agv_station")
 public class AgvStation {
     /**
      * 主键，自增ID
      */
+    @TableId(type = IdType.AUTO)
     private Long id;
 
     /**
@@ -49,7 +57,7 @@ public class AgvStation {
     private String stationName;
 
     /**
-     * 站点类型：
+     * 站点类型
      */
     private String areaType;
 
@@ -111,140 +119,17 @@ public class AgvStation {
     private String status;
 
     /**
-     * 站点ID（新增字段）
+     * 站点ID
      */
     private String stationId;
 
     /**
-     * 站点类型（新增字段）
+     * 站点类型
      */
     private String stationType;
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public String getStationCode() {
-        return stationCode;
-    }
-
-    public void setStationCode(String stationCode) {
-        this.stationCode = stationCode;
-    }
-
-    public String getStationName() {
-        return stationName;
-    }
-
-    public void setStationName(String stationName) {
-        this.stationName = stationName;
-    }
-
-    public String getAreaType() {
-        return areaType;
-    }
-
-    public void setAreaType(String areaType) {
-        this.areaType = areaType;
-    }
-
-    public String getWarehouseCode() {
-        return warehouseCode;
-    }
-
-    public void setWarehouseCode(String warehouseCode) {
-        this.warehouseCode = warehouseCode;
-    }
-
-    public BigDecimal getLocationX() {
-        return locationX;
-    }
-
-    public void setLocationX(BigDecimal locationX) {
-        this.locationX = locationX;
-    }
-
-    public BigDecimal getLocationY() {
-        return locationY;
-    }
-
-    public void setLocationY(BigDecimal locationY) {
-        this.locationY = locationY;
-    }
-
-    public BigDecimal getLocationZ() {
-        return locationZ;
-    }
-
-    public void setLocationZ(BigDecimal locationZ) {
-        this.locationZ = locationZ;
-    }
-
-    public String getActive() {
-        return active;
-    }
-
-    public void setActive(String active) {
-        this.active = active;
-    }
-
-    public String getLocationCode() {
-        return locationCode;
-    }
-
-    public void setLocationCode(String locationCode) {
-        this.locationCode = locationCode;
-    }
-
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-
-    public String getStationArea() {
-        return stationArea;
-    }
-
-    public void setStationArea(String stationArea) {
-        this.stationArea = stationArea;
-    }
-
-    public Integer getStatusDb() {
-        return statusDb;
-    }
-
-    public void setStatusDb(Integer statusDb) {
-        this.statusDb = statusDb;
-    }
-
-    public String getStatus() {
-        return status;
-    }
-
-    public void setStatus(String status) {
-        this.status = status;
-    }
-
-    public String getStationId() {
-        return stationId;
-    }
-
-    public void setStationId(String stationId) {
-        this.stationId = stationId;
-    }
-
-    public String getStationType() {
-        return stationType;
-    }
-
-    public void setStationType(String stationType) {
-        this.stationType = stationType;
-    }
-}
\ No newline at end of file
+    
+    /**
+     * 自动续盘  Y: 站点为空闲时自动调用空托盘过来   N：不续盘
+     */
+    private String autoCallBlankPallet;
+}
diff --git a/src/main/java/com/gaotao/modules/automatedWarehouse/entity/PalletDetailData.java b/src/main/java/com/gaotao/modules/automatedWarehouse/entity/PalletDetailData.java
index 384137d..f2fca1e 100644
--- a/src/main/java/com/gaotao/modules/automatedWarehouse/entity/PalletDetailData.java
+++ b/src/main/java/com/gaotao/modules/automatedWarehouse/entity/PalletDetailData.java
@@ -23,4 +23,5 @@ public class PalletDetailData extends PalletDetail{
     private String isCommonlyUsed;
     private String umId;
     private String manufactureDateStr;
+    private BigDecimal realHeight;
 }
diff --git a/src/main/java/com/gaotao/modules/automatedWarehouse/service/impl/WcsIntegrationServiceImpl.java b/src/main/java/com/gaotao/modules/automatedWarehouse/service/impl/WcsIntegrationServiceImpl.java
index cb5aea0..deb9cea 100644
--- a/src/main/java/com/gaotao/modules/automatedWarehouse/service/impl/WcsIntegrationServiceImpl.java
+++ b/src/main/java/com/gaotao/modules/automatedWarehouse/service/impl/WcsIntegrationServiceImpl.java
@@ -1198,9 +1198,10 @@ public class WcsIntegrationServiceImpl implements WcsIntegrationService {
                 PalletStationDetailVo saveVo=new PalletStationDetailVo();
                 saveVo.setSku(groupHUs.get(i).getPartNo());
                 saveVo.setMaterialName(groupHUs.get(i).getPartDesc()!=null?groupHUs.get(i).getPartDesc():"无");
-                saveVo.setLength(groupHUs.get(i).getLength()!=null?groupHUs.get(i).getLength():new BigDecimal(0));
-                saveVo.setWidth(groupHUs.get(i).getWidth()!=null?groupHUs.get(i).getWidth():new BigDecimal(0));
-                saveVo.setHeight(groupHUs.get(i).getHeight()!=null?groupHUs.get(i).getHeight():new BigDecimal(0));
+                //物料的长宽不一定是卷材横截面的长宽 所以直接不传
+                saveVo.setLength(new BigDecimal(0));
+                saveVo.setWidth(new BigDecimal(0));
+                saveVo.setHeight(groupHUs.get(i).getRealHeight()!=null?groupHUs.get(i).getRealHeight():groupHUs.get(i).getHeight()!=null?groupHUs.get(i).getHeight():new BigDecimal(0));
                 saveVo.setWeight(groupHUs.get(i).getWeight()!=null?groupHUs.get(i).getWeight():new BigDecimal(0));
                 saveVo.setSerialNo(groupHUs.get(i).getSerialNo()!=null?groupHUs.get(i).getSerialNo():"无");
                 saveVo.setVolume(new BigDecimal(0));
diff --git a/src/main/java/com/gaotao/modules/notify/controller/NewIssureController.java b/src/main/java/com/gaotao/modules/notify/controller/NewIssureController.java
index 751faeb..7be9618 100644
--- a/src/main/java/com/gaotao/modules/notify/controller/NewIssureController.java
+++ b/src/main/java/com/gaotao/modules/notify/controller/NewIssureController.java
@@ -224,7 +224,7 @@ public class NewIssureController {
      * @date 2024/12/19
      */
     @PostMapping(value="/pushInventoryToWcs")
-    public R pushInventoryToWcs(@RequestBody SOIssueNotifyHeaderData data) throws Exception {
+    public R pushInventoryToWcs(@RequestBody SOIssueNotifyHeaderData data) {
         newIssureService.pushInventoryToWcs(data);
         return R.ok();
     }
diff --git a/src/main/java/com/gaotao/modules/warehouse/entity/Location.java b/src/main/java/com/gaotao/modules/warehouse/entity/Location.java
index 1cd59d0..4295c73 100644
--- a/src/main/java/com/gaotao/modules/warehouse/entity/Location.java
+++ b/src/main/java/com/gaotao/modules/warehouse/entity/Location.java
@@ -2,32 +2,108 @@ package com.gaotao.modules.warehouse.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.*;
+import com.gaotao.common.utils.QueryPage;
+import lombok.Data;
+import org.apache.ibatis.type.Alias;
 
+/**
+ * @Description 库位信息基础实体类 - 直接映射数据库表 - rqrq
+ * @Author rqrq
+ * @Date 2025/10/14
+ */
 @Data
 @TableName("location")
+@Alias("Location")
 public class Location {
+    
+    /**
+     * 业务主键ID（非数据库字段，用于前端表单区分新增/编辑操作）
+     * 0=新增，1=编辑
+     */
+    @TableField(exist = false)
+    private Long id;
+    
+    /**
+     * 库位ID（数据库复合主键之一）
+     */
     private String locationId;
+    
+    /**
+     * 工厂编码（数据库复合主键之一）
+     */
     private String site;
+    
+    /**
+     * 库位名称
+     */
     private String locationName;
+    
+    /**
+     * 仓库ID（注意：数据库字段为WareHouseID，Java字段为warehouseId）
+     */
+    @TableField("WareHouseID")
     private String warehouseId;
-    @TableField(exist = false)
-    private String warehouseName;
+    
+    /**
+     * 管理人
+     */
     private String keeper;
+    
+    /**
+     * 是否启用
+     */
     private String active;
-    private String locationGroupId;
-    private String locationGroupDesc;
-    private String locationType;
+    
+    /**
+     * 保留字段
+     */
     private String hold;
+    
+    /**
+     * 行
+     */
     private String row;
+    
+    /**
+     * 层
+     */
     private String storey;
+    
+    /**
+     * 箱
+     */
     private String box;
+    
+    /**
+     * 是否隐藏
+     */
     private String hide;
-    /** 分页 */
-    private int page;
-    private int size;
-    /** 判断新增或者删除 */
+    
+    /**
+     * 库位组ID
+     */
+    private String locationGroupId;
+    
+    /**
+     * 库位组描述（非数据库字段，用于前端显示）
+     */
     @TableField(exist = false)
-    private Integer id;
+    private String locationGroupDesc;
+    
+    /**
+     * 库位类型
+     */
+    private String locationType;
+    
+    /**
+     * 分页参数 - 当前页码（非数据库字段）
+     */
+    @TableField(exist = false)
+    private Integer page = 1;
+    
+    /**
+     * 分页参数 - 每页数量（非数据库字段）
+     */
+    @TableField(exist = false)
+    private Integer size = 20;
 }
-
diff --git a/src/main/resources/mapper/automatedWarehouse/WcsIntegrationMapper.xml b/src/main/resources/mapper/automatedWarehouse/WcsIntegrationMapper.xml
index c3d30dc..84154dd 100644
--- a/src/main/resources/mapper/automatedWarehouse/WcsIntegrationMapper.xml
+++ b/src/main/resources/mapper/automatedWarehouse/WcsIntegrationMapper.xml
@@ -471,7 +471,7 @@
 
     <select id="getPalletDetailsNewDetail"  resultType="PalletDetailData">
         select a.site,a.pallet_id,a.[position],a.layer,a.serial_no,a.part_no,a.create_date,a.create_by,a.wcs_flag,
-        b.part_desc,b.qty,b.batch_no,b.wdr,c.weight,b.length,b.width,c.height,c.is_robot_pick,um_id
+        b.part_desc,b.qty,b.batch_no,b.wdr,c.weight,b.length,b.width,c.height,c.is_robot_pick,um_id,b.height as realHeight
             ,c.is_commonly_used, CONVERT(varchar(10),isnull( isnull(b.manufacture_date,b.receive_date),getdate()), 23) manufactureDateStr
         from pallet_detail a
         left join handling_unit b on a.site=b.site and a.serial_no=b.unit_id