From f3ce4485cd37eb7c3bcf16fde86a7f149974c4b6 Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期五, 20 三月 2026 09:51:50 +0800
Subject: [PATCH] #检查导出功能： 1.商品档案无异常 2.库存明细管理（异常）已修复 3.库存明细统计无异常 4.工作档查询维护无异常 5.工作档明细查询无异常 6.工作历史档查询无异常 7.工作明细历史档查询无异常 8.入库通知历史档无异常 9.库存移动流水记录（异常）已修复 10.机台工位绑定无异常 11.库存调整记录无异常 12.工作档维护日志（异常）已修复 13.操作日志无异常
---
src/main/java/com/zy/asrs/entity/LocAroundBind.java | 73 +++++++++++++++++++++++++++++++-----
1 files changed, 63 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/LocAroundBind.java b/src/main/java/com/zy/asrs/entity/LocAroundBind.java
index 3fd519a..02f3873 100644
--- a/src/main/java/com/zy/asrs/entity/LocAroundBind.java
+++ b/src/main/java/com/zy/asrs/entity/LocAroundBind.java
@@ -1,7 +1,11 @@
package com.zy.asrs.entity;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.enums.IdType;
import com.core.common.Cools;import com.baomidou.mybatisplus.annotations.TableField;
+import com.core.common.SpringUtils;
+import com.zy.asrs.service.BasLocStsService;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import com.baomidou.mybatisplus.annotations.TableName;
@@ -13,20 +17,21 @@
private static final long serialVersionUID = 1L;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value= "ID")
+ @TableId(value = "id", type = IdType.AUTO)
private Long id;
/**
- * 鍙版満ID
+ * 鏈哄彴ID
*/
- @ApiModelProperty(value= "鍙版満ID")
+ @ApiModelProperty(value= "鏈哄彴ID")
@TableField("dev_id")
private Long devId;
/**
- * 鍙版満鍙�
+ * 鏈哄彴鍙�
*/
- @ApiModelProperty(value= "鍙版満鍙�")
+ @ApiModelProperty(value= "鏈哄彴鍙�")
@TableField("dev_no")
private String devNo;
@@ -42,23 +47,71 @@
*/
@ApiModelProperty(value= "搴撲綅鐮�")
@TableField("b_loc_no")
- private String bLocNo;
+ private String blocNo;
+
+ @ApiModelProperty("鏄惁榛樿")
+ @TableField("is_default")
+ private Integer isDefault;
+
+ @ApiModelProperty("宸ヤ綅鐘舵��")
+ @TableField("loc_type")
+ private String locType;
+
+ @ApiModelProperty("鏈哄彴鍚嶇О")
+ @TableField("dev_name")
+ private String devName;
+
+ @ApiModelProperty("鏈哄彴椤哄簭")
+ @TableField("order_no")
+ private Integer orderNo;
+
+ @ApiModelProperty("鏄惁鍐荤粨")
+ @TableField("freeze")
+ private Integer freeze;
public LocAroundBind() {}
- public LocAroundBind(Long devId,String devNo,Long bLocId,String bLocNo) {
+ public LocAroundBind(Long devId,String devNo,Long bLocId,String blocNo) {
this.devId = devId;
this.devNo = devNo;
this.bLocId = bLocId;
- this.bLocNo = bLocNo;
+ this.blocNo = blocNo;
+ }
+
+ public String getDef$() {
+ if (this.isDefault == 0) {
+ return "澶囩敤";
+ } else {
+ return "榛樿";
+ }
+ }
+
+ public String getLocType$() {
+ if (this.locType == null) {
+ return null;
+ }
+ BasLocStsService service = SpringUtils.getBean(BasLocStsService.class);
+ BasLocSts basLocSts = service.selectById(this.locType);
+ if (!Cools.isEmpty(basLocSts)){
+ return String.valueOf(basLocSts.getLocDesc());
+ }
+ return null;
+
}
// LocAroundBind locAroundBind = new LocAroundBind(
-// null, // 鍙版満ID[闈炵┖]
-// null, // 鍙版満鍙穂闈炵┖]
+// null, // 鏈哄彴ID[闈炵┖]
+// null, // 鏈哄彴鍙穂闈炵┖]
// null, // 搴撲綅ID[闈炵┖]
// null // 搴撲綅鐮乕闈炵┖]
// );
+ public LocAroundBind(Long devId, String devNo, String blocNo, String locType, int orderNo) {
+ this.devId = devId;
+ this.devNo = devNo;
+ this.blocNo = blocNo;
+ this.locType = locType;
+ this.orderNo = orderNo;
+ }
}
--
Gitblit v1.9.1