From 1443d5a84a4df99d9a86ac04c904554e91ae8271 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期日, 12 四月 2026 15:35:06 +0800
Subject: [PATCH] 1.针对7.3接口文档，新增了几个字段需要加入到组托档中，不额外加字段 2.针对7.11接口文档，对outOrder方法进行重写，batchSeq在wrkMast表中新增一个字段放，entryWmsCode、outDoorNo这两个在wrkDetl中找两个字段存放 3.针对7.7接口文档，上报时加上orderId出库单号 4.针对7.9接口文档，wcs会先请求wms，只需要palletId托盘码，errorMsg错误信息；wms转发给加上orderId出库单号转发给ERP 5.针对7.10接口文档，ERP先按照这个文档发给wms，wms再发给wcs，发给wcs这块先不写
---
src/main/java/com/zy/asrs/entity/RowLastno.java | 27 +++++++++++++++++++++++++++
1 files changed, 27 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/RowLastno.java b/src/main/java/com/zy/asrs/entity/RowLastno.java
index d4897ed..8be0bc9 100644
--- a/src/main/java/com/zy/asrs/entity/RowLastno.java
+++ b/src/main/java/com/zy/asrs/entity/RowLastno.java
@@ -4,6 +4,8 @@
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.annotations.TableName;
import com.baomidou.mybatisplus.enums.IdType;
+import com.zy.asrs.service.BasWhsService;
+import com.zy.asrs.service.RowLastnoTypeService;
import com.zy.system.entity.User;
import com.zy.system.service.UserService;
import com.core.common.Cools;
@@ -40,6 +42,13 @@
@ApiModelProperty(value= "褰撳墠鎺掑彿")
@TableField("current_row")
private Integer currentRow;
+
+ /**
+ * 褰撳墠鍫嗗灈鏈哄彿
+ */
+ @ApiModelProperty(value= "褰撳墠鍫嗗灈鏈哄彿")
+ @TableField("current_crn_no")
+ private Integer currentCrnNo;
/**
* 璧峰鎺掑彿
@@ -224,6 +233,14 @@
this.currentRow = currentRow;
}
+ public Integer getCurrentCrnNo() {
+ return currentCrnNo;
+ }
+
+ public void setCurrentCrnNo(Integer currentCrnNo) {
+ this.currentCrnNo = currentCrnNo;
+ }
+
public Integer getsRow() {
return sRow;
}
@@ -378,6 +395,16 @@
public Integer getTypeId() {
return typeId;
}
+ public String getTypeId$() {
+ RowLastnoTypeService rowLastnoTypeService = SpringUtils.getBean(RowLastnoTypeService.class);
+ RowLastnoType rowLastnoType = rowLastnoTypeService.selectById(this.typeId.longValue());
+ BasWhsService basWhsService = SpringUtils.getBean(BasWhsService.class);
+ BasWhs basWhs = basWhsService.selectById(rowLastnoType.getType().longValue());
+ if (!Cools.isEmpty(rowLastnoType)){
+ return rowLastnoType.getTypeName()+"<==>"+rowLastnoType.getMemo()+"<==>"+basWhs.getWhsDesc();
+ }
+ return typeId.toString();
+ }
public void setTypeId(Integer typeId) {
this.typeId = typeId;
--
Gitblit v1.9.1