From 02c50bf159f9432ef7ee6ba3b3a64f4dd8b3186f Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期一, 10 三月 2025 17:06:28 +0800
Subject: [PATCH] #新增 1. PDA登录接口 2. PDA新增扫码收货接口 3. PDA新增确认收货接口
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Loc.java | 38 +++++++++++++++++++++++++++++---------
1 files changed, 29 insertions(+), 9 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Loc.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Loc.java
index 9253371..3bf2713 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Loc.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Loc.java
@@ -3,15 +3,12 @@
import com.baomidou.mybatisplus.annotation.TableLogic;
import java.text.SimpleDateFormat;
import java.util.Date;
+import com.vincent.rsf.server.manager.service.WarehouseAreasService;
+import com.vincent.rsf.server.manager.service.WarehouseService;
import org.springframework.format.annotation.DateTimeFormat;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import com.vincent.rsf.framework.common.Cools;
@@ -19,7 +16,6 @@
import com.vincent.rsf.server.system.service.UserService;
import com.vincent.rsf.server.system.entity.User;
import java.io.Serializable;
-import java.util.Date;
@Data
@TableName("man_loc")
@@ -34,6 +30,11 @@
@TableId(value = "id", type = IdType.AUTO)
private Long id;
+ /**
+ * 浠撳簱鏍囪瘑
+ */
+ @ApiModelProperty(value = "浠撳簱鏍囪瘑")
+ private Long warehouseId;
/**
* 搴撳尯鏍囪瘑
*/
@@ -92,7 +93,7 @@
* 鎺�
*/
@ApiModelProperty(value= "鎺�")
- private Integer row;
+ private Integer lrow;
/**
* 鍒�
@@ -189,7 +190,8 @@
public Loc() {}
- public Loc(Long areaId,String code,String type,String name,Short flagLogic,String fucAtrrs,String barcode,String unit,String size,Integer row,Integer col,Integer lev,Integer channel,Integer maxParts,Integer maxPack,Short flagLabelMange,String locAttrs,Integer status,Integer deleted,Integer tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
+ public Loc(Long areaId, Long warehouseId, String code,String type,String name,Short flagLogic,String fucAtrrs,String barcode,String unit,String size,Integer lrow,Integer col,Integer lev,Integer channel,Integer maxParts,Integer maxPack,Short flagLabelMange,String locAttrs,Integer status,Integer deleted,Integer tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
+ this.warehouseId = warehouseId;
this.areaId = areaId;
this.code = code;
this.type = type;
@@ -199,7 +201,7 @@
this.barcode = barcode;
this.unit = unit;
this.size = size;
- this.row = row;
+ this.lrow = lrow;
this.col = col;
this.lev = lev;
this.channel = channel;
@@ -245,6 +247,24 @@
// null // 澶囨敞
// );
+ public String getWarehouseId$() {
+ WarehouseService service = SpringUtils.getBean(WarehouseService.class);
+ Warehouse warehouse = service.getById(this.warehouseId);
+ if (!Cools.isEmpty(warehouse)) {
+ return String.valueOf(warehouse.getName());
+ }
+ return null;
+ }
+
+ public String gerAreaId$() {
+ WarehouseAreasService service = SpringUtils.getBean(WarehouseAreasService.class);
+ WarehouseAreas areas = service.getById(this.areaId);
+ if (!Cools.isEmpty(areas)) {
+ return String.valueOf(areas.getName());
+ }
+ return null;
+ }
+
public String getStatus$(){
if (null == this.status){ return null; }
switch (this.status){
--
Gitblit v1.9.1