wms / wms4_hubeijili · Commits

Commit d70f645468177ba3794b02dbacb5e927ebcb7a1e

Authored by 肖超群
1 parent c680acbf

增加唯一号

Inline Side-by-side
Showing 4 changed files with 25 additions and 20 deletions
ant-design-vue-jeecg/src/views/system/shipment/ShipmentHeaderList.vue
  View file @d70f645
... ... @@ -107,16 +107,16 @@
107 107  
108 108 <!-- 操作按钮区域 -->
109 109 <div class="table-operator">
110   - <a-button @click="batchPrint()" type="primary">打印</a-button>
111 110 <a-button v-has="'shipmentHeader:add'" @click="handleAdd" type="primary" icon="plus">新增</a-button>
112 111 <a-button type="primary" icon="download" @click="handleExportXls('出库单')">导出</a-button>
113 112 <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl"
114 113 @change="handleImportExcel">
115   - <a-button type="primary" icon="import">导入</a-button>
  114 + <a-button type="primary" icon="import">导入</a-button>
  115 + <a-button v-has="'shipmentHeader:print'" @click="batchPrint()" type="primary">打印</a-button>
116 116 </a-upload>
117   - <!-- 高级查询区域 -->
118   - <j-super-query :fieldList="superFieldList" ref="superQueryModal"
119   - @handleSuperQuery="handleSuperQuery"></j-super-query>
  117 +<!-- &lt;!&ndash; 高级查询区域 &ndash;&gt;-->
  118 +<!-- <j-super-query :fieldList="superFieldList" ref="superQueryModal"-->
  119 +<!-- @handleSuperQuery="handleSuperQuery"></j-super-query>-->
120 120 </div>
121 121  
122 122 <!-- table区域-begin -->
... ...
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptContainerHeader/entity/ReceiptContainerDetail.java
  View file @d70f645
1 1 package org.jeecg.modules.wms.receipt.receiptContainerHeader.entity;
2 2  
3 3 import java.io.Serializable;
  4 +import java.util.Date;
  5 +
  6 +import org.jeecg.common.aspect.annotation.Dict;
  7 +import org.jeecgframework.poi.excel.annotation.Excel;
  8 +
4 9 import com.baomidou.mybatisplus.annotation.IdType;
5 10 import com.baomidou.mybatisplus.annotation.TableId;
6 11 import com.baomidou.mybatisplus.annotation.TableName;
7   -import org.jeecg.common.aspect.annotation.Dict;
8   -import lombok.Data;
9   -import com.fasterxml.jackson.annotation.JsonFormat;
10   -import org.springframework.format.annotation.DateTimeFormat;
11   -import org.jeecgframework.poi.excel.annotation.Excel;
12   -import java.util.Date;
  12 +
13 13 import io.swagger.annotations.ApiModel;
14 14 import io.swagger.annotations.ApiModelProperty;
15   -import java.io.UnsupportedEncodingException;
  15 +import lombok.Data;
16 16  
17 17 /**
18 18 * @Description: 入库组盘详情
... ... @@ -87,6 +87,8 @@ public class ReceiptContainerDetail implements Serializable {
87 87 @Excel(name = "项目号", width = 15)
88 88 @ApiModelProperty(value = "项目号")
89 89 private String project;
  90 + @ApiModelProperty(value = "唯一号")
  91 + private String uniqueCode;
90 92 /** 备用字段1 */
91 93 @Excel(name = "备用字段1", width = 15)
92 94 @ApiModelProperty(value = "备用字段1")
... ...
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/shipment/shipmentHeader/entity/ShipmentDetail.java
  View file @d70f645
... ... @@ -108,6 +108,8 @@ public class ShipmentDetail implements Serializable {
108 108 @Excel(name = "上游行号", width = 15)
109 109 @ApiModelProperty(value = "上游行号")
110 110 private String referLineNum;
  111 + @ApiModelProperty(value = "唯一号")
  112 + private String uniqueCode;
111 113 /** 备用字段1 */
112 114 @Excel(name = "备用字段1", width = 15)
113 115 @ApiModelProperty(value = "备用字段1")
... ...
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/task/taskHeader/entity/TaskDetail.java
  View file @d70f645
1 1 package org.jeecg.modules.wms.task.taskHeader.entity;
2 2  
3 3 import java.io.Serializable;
  4 +import java.math.BigDecimal;
  5 +import java.util.Date;
  6 +
  7 +import org.jeecg.common.aspect.annotation.Dict;
  8 +import org.jeecgframework.poi.excel.annotation.Excel;
  9 +
4 10 import com.baomidou.mybatisplus.annotation.IdType;
5 11 import com.baomidou.mybatisplus.annotation.TableId;
6 12 import com.baomidou.mybatisplus.annotation.TableName;
7   -import org.jeecg.common.aspect.annotation.Dict;
8   -import lombok.Data;
9   -import com.fasterxml.jackson.annotation.JsonFormat;
10   -import org.springframework.format.annotation.DateTimeFormat;
11   -import org.jeecgframework.poi.excel.annotation.Excel;
12 13  
13   -import java.math.BigDecimal;
14   -import java.util.Date;
15 14 import io.swagger.annotations.ApiModel;
16 15 import io.swagger.annotations.ApiModelProperty;
17   -import java.io.UnsupportedEncodingException;
  16 +import lombok.Data;
18 17  
19 18 /**
20 19 * @Description: 任务详情
... ... @@ -116,6 +115,8 @@ public class TaskDetail implements Serializable {
116 115 @Excel(name = "入库的库存详情id", width = 15)
117 116 @ApiModelProperty(value = "入库的库存详情id")
118 117 private Integer toInventoryDetailId;
  118 + @ApiModelProperty(value = "唯一号")
  119 + private String uniqueCode;
119 120 /** 备用字段1 */
120 121 @Excel(name = "备用字段1", width = 15)
121 122 @ApiModelProperty(value = "备用字段1")
... ...