From d70f645468177ba3794b02dbacb5e927ebcb7a1e Mon Sep 17 00:00:00 2001
From: youjie <272855983@qq.com>
Date: Tue, 21 Feb 2023 15:31:41 +0800
Subject: [PATCH] 增加唯一号
---
ant-design-vue-jeecg/src/views/system/shipment/ShipmentHeaderList.vue | 10 +++++-----
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptContainerHeader/entity/ReceiptContainerDetail.java | 16 +++++++++-------
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/shipment/shipmentHeader/entity/ShipmentDetail.java | 2 ++
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/task/taskHeader/entity/TaskDetail.java | 17 +++++++++--------
4 files changed, 25 insertions(+), 20 deletions(-)
diff --git a/ant-design-vue-jeecg/src/views/system/shipment/ShipmentHeaderList.vue b/ant-design-vue-jeecg/src/views/system/shipment/ShipmentHeaderList.vue
index afd2266..32645b3 100644
--- a/ant-design-vue-jeecg/src/views/system/shipment/ShipmentHeaderList.vue
+++ b/ant-design-vue-jeecg/src/views/system/shipment/ShipmentHeaderList.vue
@@ -107,16 +107,16 @@
<!-- 操作按钮区域 -->
<div class="table-operator">
- <a-button @click="batchPrint()" type="primary">打印</a-button>
<a-button v-has="'shipmentHeader:add'" @click="handleAdd" type="primary" icon="plus">新增</a-button>
<a-button type="primary" icon="download" @click="handleExportXls('出库单')">导出</a-button>
<a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl"
@change="handleImportExcel">
- <a-button type="primary" icon="import">导入</a-button>
+ <a-button type="primary" icon="import">导入</a-button>
+ <a-button v-has="'shipmentHeader:print'" @click="batchPrint()" type="primary">打印</a-button>
</a-upload>
- <!-- 高级查询区域 -->
- <j-super-query :fieldList="superFieldList" ref="superQueryModal"
- @handleSuperQuery="handleSuperQuery"></j-super-query>
+<!-- <!– 高级查询区域 –>-->
+<!-- <j-super-query :fieldList="superFieldList" ref="superQueryModal"-->
+<!-- @handleSuperQuery="handleSuperQuery"></j-super-query>-->
</div>
<!-- table区域-begin -->
diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptContainerHeader/entity/ReceiptContainerDetail.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptContainerHeader/entity/ReceiptContainerDetail.java
index 77bad17..51696a2 100644
--- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptContainerHeader/entity/ReceiptContainerDetail.java
+++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptContainerHeader/entity/ReceiptContainerDetail.java
@@ -1,18 +1,18 @@
package org.jeecg.modules.wms.receipt.receiptContainerHeader.entity;
import java.io.Serializable;
+import java.util.Date;
+
+import org.jeecg.common.aspect.annotation.Dict;
+import org.jeecgframework.poi.excel.annotation.Excel;
+
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
-import org.jeecg.common.aspect.annotation.Dict;
-import lombok.Data;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.springframework.format.annotation.DateTimeFormat;
-import org.jeecgframework.poi.excel.annotation.Excel;
-import java.util.Date;
+
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
-import java.io.UnsupportedEncodingException;
+import lombok.Data;
/**
* @Description: 入库组盘详情
@@ -87,6 +87,8 @@ public class ReceiptContainerDetail implements Serializable {
@Excel(name = "项目号", width = 15)
@ApiModelProperty(value = "项目号")
private String project;
+ @ApiModelProperty(value = "唯一号")
+ private String uniqueCode;
/** 备用字段1 */
@Excel(name = "备用字段1", width = 15)
@ApiModelProperty(value = "备用字段1")
diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/shipment/shipmentHeader/entity/ShipmentDetail.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/shipment/shipmentHeader/entity/ShipmentDetail.java
index e388a5b..f767b19 100644
--- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/shipment/shipmentHeader/entity/ShipmentDetail.java
+++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/shipment/shipmentHeader/entity/ShipmentDetail.java
@@ -108,6 +108,8 @@ public class ShipmentDetail implements Serializable {
@Excel(name = "上游行号", width = 15)
@ApiModelProperty(value = "上游行号")
private String referLineNum;
+ @ApiModelProperty(value = "唯一号")
+ private String uniqueCode;
/** 备用字段1 */
@Excel(name = "备用字段1", width = 15)
@ApiModelProperty(value = "备用字段1")
diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/task/taskHeader/entity/TaskDetail.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/task/taskHeader/entity/TaskDetail.java
index 7f7614d..d1d72a0 100644
--- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/task/taskHeader/entity/TaskDetail.java
+++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/task/taskHeader/entity/TaskDetail.java
@@ -1,20 +1,19 @@
package org.jeecg.modules.wms.task.taskHeader.entity;
import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+import org.jeecg.common.aspect.annotation.Dict;
+import org.jeecgframework.poi.excel.annotation.Excel;
+
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
-import org.jeecg.common.aspect.annotation.Dict;
-import lombok.Data;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.springframework.format.annotation.DateTimeFormat;
-import org.jeecgframework.poi.excel.annotation.Excel;
-import java.math.BigDecimal;
-import java.util.Date;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
-import java.io.UnsupportedEncodingException;
+import lombok.Data;
/**
* @Description: 任务详情
@@ -116,6 +115,8 @@ public class TaskDetail implements Serializable {
@Excel(name = "入库的库存详情id", width = 15)
@ApiModelProperty(value = "入库的库存详情id")
private Integer toInventoryDetailId;
+ @ApiModelProperty(value = "唯一号")
+ private String uniqueCode;
/** 备用字段1 */
@Excel(name = "备用字段1", width = 15)
@ApiModelProperty(value = "备用字段1")
--
libgit2 0.22.2