diff --git a/ant-design-vue-jeecg/src/views/system/inventory/InventoryChildList.vue b/ant-design-vue-jeecg/src/views/system/inventory/InventoryChildList.vue
index f417a11..1f322ce 100644
--- a/ant-design-vue-jeecg/src/views/system/inventory/InventoryChildList.vue
+++ b/ant-design-vue-jeecg/src/views/system/inventory/InventoryChildList.vue
@@ -61,8 +61,8 @@
</a-form-item>
</a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24">
- <a-form-item label="唯一号">
- <a-input placeholder="请输入唯一号" v-model="queryParam.uniqueCode"></a-input>
+ <a-form-item label="序列号">
+ <a-input placeholder="请输入序列号" v-model="queryParam.sn"></a-input>
</a-form-item>
</a-col>
<a-col :xl="10" :lg="11" :md="12" :sm="24">
@@ -238,9 +238,9 @@
dataIndex: 'inventoryAge'
},
{
- title:'唯一号',
+ title:'序列号',
align:"center",
- dataIndex: 'uniqueCode'
+ dataIndex: 'sn'
},
{
title:'创建人',
@@ -307,7 +307,7 @@
fieldList.push({type:'string',value:'materialUnit',text:'物料单位',dictCode:''})
fieldList.push({type:'string',value:'inventoryStatus',text:'库存状态',dictCode:'inventory_status'})
fieldList.push({type:'int',value:'inventoryAge',text:'库龄（天）',dictCode:''})
- fieldList.push({type:'string',value:'uniqueCode',text:'唯一号',dictCode:''})
+ fieldList.push({type:'string',value:'sn',text:'序列号',dictCode:''})
fieldList.push({type:'string',value:'createBy',text:'创建人',dictCode:''})
fieldList.push({type:'datetime',value:'createTime',text:'创建日期'})
fieldList.push({type:'string',value:'updateBy',text:'更新人',dictCode:''})
diff --git a/ant-design-vue-jeecg/src/views/system/inventory/InventoryDetailList.vue b/ant-design-vue-jeecg/src/views/system/inventory/InventoryDetailList.vue
index 2328140..c3ba1df 100644
--- a/ant-design-vue-jeecg/src/views/system/inventory/InventoryDetailList.vue
+++ b/ant-design-vue-jeecg/src/views/system/inventory/InventoryDetailList.vue
@@ -211,9 +211,9 @@ export default {
dataIndex: 'batch'
},
// {
- // title: '唯一号',
+ // title: '序列号',
// align: "center",
- // dataIndex: 'uniqueCode'
+ // dataIndex: 'sn'
// },
{
title: '入库日期',
diff --git a/ant-design-vue-jeecg/src/views/system/inventory/SimpleInventoryDetailList.vue b/ant-design-vue-jeecg/src/views/system/inventory/SimpleInventoryDetailList.vue
index 45d572e..1273e3d 100644
--- a/ant-design-vue-jeecg/src/views/system/inventory/SimpleInventoryDetailList.vue
+++ b/ant-design-vue-jeecg/src/views/system/inventory/SimpleInventoryDetailList.vue
@@ -60,8 +60,8 @@
</a-form-item>
</a-col>
<!-- <a-col :xl="6" :lg="7" :md="8" :sm="24">
- <a-form-item label="唯一号">
- <a-input placeholder="请输入唯一号" v-model="queryParam.uniqueCode"></a-input>
+ <a-form-item label="序列号">
+ <a-input placeholder="请输入序列号" v-model="queryParam.sn"></a-input>
</a-form-item>
</a-col> -->
<a-col :xl="6" :lg="7" :md="8" :sm="24">
@@ -304,9 +304,9 @@ export default {
dataIndex: 'batch'
},
// {
- // title:'唯一号',
+ // title:'序列号',
// align:"center",
- // dataIndex: 'uniqueCode'
+ // dataIndex: 'sn'
// },
{
title: '入库日期',
@@ -427,7 +427,7 @@ export default {
fieldList.push({type: 'BigDecimal', value: 'taskQty', text: '任务锁定数量', dictCode: ''})
fieldList.push({type: 'string', value: 'inventoryStatus', text: '库存状态', dictCode: 'inventory_status'})
fieldList.push({type: 'string', value: 'batch', text: '批次', dictCode: ''})
- // fieldList.push({type:'string',value:'uniqueCode',text:'唯一号',dictCode:''})
+ // fieldList.push({type:'string',value:'sn',text:'序列号',dictCode:''})
fieldList.push({type: 'datetime', value: 'receiptDate', text: '入库日期'})
fieldList.push({type: 'int', value: 'inventoryAge', text: '库龄（天）', dictCode: ''})
fieldList.push({type: 'string', value: 'createBy', text: '创建人', dictCode: ''})
diff --git a/ant-design-vue-jeecg/src/views/system/inventory/modules/InventoryChildForm.vue b/ant-design-vue-jeecg/src/views/system/inventory/modules/InventoryChildForm.vue
index 511e158..688c790 100644
--- a/ant-design-vue-jeecg/src/views/system/inventory/modules/InventoryChildForm.vue
+++ b/ant-design-vue-jeecg/src/views/system/inventory/modules/InventoryChildForm.vue
@@ -59,8 +59,8 @@
</a-form-model-item>
</a-col>
<a-col :span="24">
- <a-form-model-item label="唯一号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="uniqueCode">
- <a-input v-model="model.uniqueCode" placeholder="请输入唯一号" ></a-input>
+ <a-form-model-item label="序列号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="sn">
+ <a-input v-model="model.sn" placeholder="请输入序列号" ></a-input>
</a-form-model-item>
</a-col>
</a-row>
@@ -106,8 +106,8 @@ validatorRules: {
materialName: [
{ required: true, message: '请输入物料名称!'},
],
- uniqueCode: [
- { required: true, message: '请输入唯一号!'},
+ sn: [
+ { required: true, message: '请输入序列号!'},
],
},
url: {
@@ -160,7 +160,7 @@ validatorRules: {
that.confirmLoading = false;
})
}
-
+
})
},
}
diff --git a/ant-design-vue-jeecg/src/views/system/inventory/subTables/InventoryDetailSubTable.vue b/ant-design-vue-jeecg/src/views/system/inventory/subTables/InventoryDetailSubTable.vue
index f4fbb51..faa97fb 100644
--- a/ant-design-vue-jeecg/src/views/system/inventory/subTables/InventoryDetailSubTable.vue
+++ b/ant-design-vue-jeecg/src/views/system/inventory/subTables/InventoryDetailSubTable.vue
@@ -195,9 +195,9 @@ export default {
dataIndex: 'batch'
},
{
- title: '唯一号',
+ title: '序列号',
align: "center",
- dataIndex: 'uniqueCode'
+ dataIndex: 'sn'
},
{
title: '入库日期',
diff --git a/ant-design-vue-jeecg/src/views/system/receipt/ReceiptContainerHeaderList.vue b/ant-design-vue-jeecg/src/views/system/receipt/ReceiptContainerHeaderList.vue
index 93142cf..3c25742 100644
--- a/ant-design-vue-jeecg/src/views/system/receipt/ReceiptContainerHeaderList.vue
+++ b/ant-design-vue-jeecg/src/views/system/receipt/ReceiptContainerHeaderList.vue
@@ -112,8 +112,8 @@
</a-button>
</template>
<span slot="action" slot-scope="text, record">
- <a v-if="record.status == 0 && record.taskType == 200" @click="selectFillPort(record)" v-has="'receiptContainerHeader:fill'"><a-button type="primary">生成任务</a-button> <a-divider type="vertical"/></a>
- <a v-else-if="record.status == 0" @click="selectContainerStatus(record)" v-has="'receiptContainerHeader:fill'"><a-button type="primary">生成任务</a-button> <a-divider type="vertical"/></a>
+ <a v-if="record.status == 0 && record.taskType == 200" @click="selectFillPort(record)" v-has="'receiptContainerHeader:createTask'"><a-button type="primary">生成任务</a-button> <a-divider type="vertical"/></a>
+ <a v-else-if="record.status == 0" @click="selectContainerStatus(record)" v-has="'receiptContainerHeader:createTask'"><a-button type="primary">生成任务</a-button> <a-divider type="vertical"/></a>
<!-- <a v-if="record.status == 0 && record.taskType == 200" @click="selectPort(record)" v-has="'receiptContainerHeader:createTask'">生成任务<a-divider type="vertical"/></a>-->
<!-- <a v-else-if="record.status == 0" @click="createTask(record)" v-has="'receiptContainerHeader:createTask'">生成任务<a-divider type="vertical"/></a>-->
<a-popconfirm v-if="record.status == 0" v-has="'receiptContainerHeader:delete'" title="确定取消配盘吗?" @confirm="() => handleDelete(record.id)">
diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/inventory/inventoryChild/entity/InventoryChild.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/inventory/inventoryChild/entity/InventoryChild.java
index 9c40ca1..f2a48e6 100644
--- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/inventory/inventoryChild/entity/InventoryChild.java
+++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/inventory/inventoryChild/entity/InventoryChild.java
@@ -1,108 +1,107 @@
package org.jeecg.modules.wms.inventory.inventoryChild.entity;
import java.io.Serializable;
-import java.io.UnsupportedEncodingException;
import java.util.Date;
-import java.math.BigDecimal;
+
+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 lombok.Data;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.springframework.format.annotation.DateTimeFormat;
-import org.jeecgframework.poi.excel.annotation.Excel;
-import org.jeecg.common.aspect.annotation.Dict;
+
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
/**
* @Description: 库存明细
- * @Author: jeecg-boot
- * @Date: 2023-03-24
- * @Version: V1.0
+ * @Author: jeecg-boot
+ * @Date: 2023-03-24
+ * @Version: V1.0
*/
@Data
@TableName("inventory_child")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
-@ApiModel(value="inventory_child对象", description="库存明细")
+@ApiModel(value = "inventory_child对象", description = "库存明细")
public class InventoryChild implements Serializable {
private static final long serialVersionUID = 1L;
- /**主键*/
- @TableId(type = IdType.ASSIGN_ID)
+ /** 主键 */
+ @TableId(type = IdType.ASSIGN_ID)
@ApiModelProperty(value = "主键")
private String id;
- /**库存头ID*/
- @Excel(name = "库存头ID", width = 15)
+ /** 库存头ID */
+ @Excel(name = "库存头ID", width = 15)
@ApiModelProperty(value = "库存头ID")
private Integer inventoryHeaderId;
- /**仓库编码*/
- @Excel(name = "仓库编码", width = 15)
+ /** 仓库编码 */
+ @Excel(name = "仓库编码", width = 15)
@ApiModelProperty(value = "仓库编码")
private String warehouseCode;
- /**货主*/
- @Excel(name = "货主", width = 15)
+ /** 货主 */
+ @Excel(name = "货主", width = 15)
@ApiModelProperty(value = "货主")
private String companyCode;
- /**库区*/
- @Excel(name = "库区", width = 15)
+ /** 库区 */
+ @Excel(name = "库区", width = 15)
@ApiModelProperty(value = "库区")
private String zoneCode;
- /**容器状态*/
- @Excel(name = "容器状态", width = 15, dicCode = "container_status")
- @Dict(dicCode = "container_status")
+ /** 容器状态 */
+ @Excel(name = "容器状态", width = 15, dicCode = "container_status")
+ @Dict(dicCode = "container_status")
@ApiModelProperty(value = "容器状态")
private String containerStatus;
- /**容器编码*/
- @Excel(name = "容器编码", width = 15)
+ /** 容器编码 */
+ @Excel(name = "容器编码", width = 15)
@ApiModelProperty(value = "容器编码")
private String containerCode;
- /**库位编码*/
- @Excel(name = "库位编码", width = 15)
+ /** 库位编码 */
+ @Excel(name = "库位编码", width = 15)
@ApiModelProperty(value = "库位编码")
private String locationCode;
- /**物料编码*/
- @Excel(name = "物料编码", width = 15)
+ /** 物料编码 */
+ @Excel(name = "物料编码", width = 15)
@ApiModelProperty(value = "物料编码")
private String materialCode;
- /**物料名称*/
- @Excel(name = "物料名称", width = 15)
+ /** 物料名称 */
+ @Excel(name = "物料名称", width = 15)
@ApiModelProperty(value = "物料名称")
private String materialName;
- /**物料规格*/
- @Excel(name = "物料规格", width = 15)
+ /** 物料规格 */
+ @Excel(name = "物料规格", width = 15)
@ApiModelProperty(value = "物料规格")
private String materialSpec;
- /**物料单位*/
- @Excel(name = "物料单位", width = 15)
+ /** 物料单位 */
+ @Excel(name = "物料单位", width = 15)
@ApiModelProperty(value = "物料单位")
private String materialUnit;
- /**库存状态*/
- @Excel(name = "库存状态", width = 15, dicCode = "inventory_status")
- @Dict(dicCode = "inventory_status")
+ /** 库存状态 */
+ @Excel(name = "库存状态", width = 15, dicCode = "inventory_status")
+ @Dict(dicCode = "inventory_status")
@ApiModelProperty(value = "库存状态")
private String inventoryStatus;
- /**库龄（天）*/
- @Excel(name = "库龄（天）", width = 15)
+ /** 库龄（天） */
+ @Excel(name = "库龄（天）", width = 15)
@ApiModelProperty(value = "库龄（天）")
private Integer inventoryAge;
- /**唯一号*/
- @Excel(name = "唯一号", width = 15)
- @ApiModelProperty(value = "唯一号")
- private String uniqueCode;
- /**创建人*/
+ /** 序列号 */
+ @Excel(name = "序列号", width = 15)
+ @ApiModelProperty(value = "序列号")
+ private String sn;
+ /** 创建人 */
@ApiModelProperty(value = "创建人")
private String createBy;
- /**创建日期*/
+ /** 创建日期 */
@ApiModelProperty(value = "创建日期")
private Date createTime;
- /**更新人*/
+ /** 更新人 */
@ApiModelProperty(value = "更新人")
private String updateBy;
- /**更新日期*/
+ /** 更新日期 */
@ApiModelProperty(value = "更新日期")
private Date updateTime;
}
diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/inventory/inventoryHeader/entity/InventoryDetail.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/inventory/inventoryHeader/entity/InventoryDetail.java
index 23a16a3..e7b8cbf 100644
--- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/inventory/inventoryHeader/entity/InventoryDetail.java
+++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/inventory/inventoryHeader/entity/InventoryDetail.java
@@ -106,14 +106,17 @@ public class InventoryDetail implements Serializable {
@Excel(name = "项目号", width = 15)
@ApiModelProperty(value = "项目号")
private String project;
- /** 唯一号 */
- @Excel(name = "唯一号", width = 15)
- @ApiModelProperty(value = "唯一号")
- private String uniqueCode;
+ /** 序列号 */
+ @Excel(name = "序列号", width = 15)
+ @ApiModelProperty(value = "序列号")
+ private String sn;
/** 箱码 */
@Excel(name = "箱码", width = 15)
@ApiModelProperty(value = "箱码")
private String boxCode;
+ @Excel(name = "收货日期", width = 15)
+ @ApiModelProperty(value = "收货日期")
+ private Date receiveTime;
/** 入库日期 */
@Excel(name = "入库日期", width = 15)
@ApiModelProperty(value = "入库日期")
diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/inventory/inventoryTransaction/entity/InventoryTransaction.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/inventory/inventoryTransaction/entity/InventoryTransaction.java
index 7ad6bbd..26c8bd6 100644
--- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/inventory/inventoryTransaction/entity/InventoryTransaction.java
+++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/inventory/inventoryTransaction/entity/InventoryTransaction.java
@@ -125,10 +125,10 @@ public class InventoryTransaction implements Serializable {
@Excel(name = "项目号", width = 15)
@ApiModelProperty(value = "项目号")
private String project;
- /** 唯一号 */
- @Excel(name = "唯一号", width = 15)
- @ApiModelProperty(value = "唯一号")
- private String uniqueCode;
+ /** 序列号 */
+ @Excel(name = "序列号", width = 15)
+ @ApiModelProperty(value = "序列号")
+ private String sn;
/** 备用字段1 */
@Excel(name = "备用字段1", width = 15)
@ApiModelProperty(value = "备用字段1")
diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/monitor/operation/service/impl/OperationLogServiceImpl.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/monitor/operation/service/impl/OperationLogServiceImpl.java
index c5920f4..6068583 100644
--- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/monitor/operation/service/impl/OperationLogServiceImpl.java
+++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/monitor/operation/service/impl/OperationLogServiceImpl.java
@@ -48,7 +48,7 @@ public class OperationLogServiceImpl extends ServiceImpl<OperationLogMapper, Ope
switch (logDTO.getTag()) {
case "入库组盘":
message = "容器编码：{}，物料编码：{}，数量：{}";
- operationLogList.addAll(createOperationLogs(logDTO, ReceiptContainerDetail.class, "getUniqueCode", message, "getReferCode",
+ operationLogList.addAll(createOperationLogs(logDTO, ReceiptContainerDetail.class, "getsn", message, "getReferCode",
"getReceiptCode", "getWarehouseCode", "getContainerCode", "getMaterialCode", "getQty"));
break;
}
diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptContainerHeader/controller/ReceiptContainerHeaderController.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptContainerHeader/controller/ReceiptContainerHeaderController.java
index 2ab373b..d7e743b 100644
--- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptContainerHeader/controller/ReceiptContainerHeaderController.java
+++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptContainerHeader/controller/ReceiptContainerHeaderController.java
@@ -2,6 +2,7 @@ package org.jeecg.modules.wms.receipt.receiptContainerHeader.controller;
import java.io.IOException;
import java.util.Arrays;
+import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
@@ -208,6 +209,7 @@ public class ReceiptContainerHeaderController extends JeecgController<ReceiptCon
@PostMapping(value = "/addReceiptContainerDetail")
@RequiresPermissions("receiptContainerDetail:add")
public Result<String> addReceiptContainerDetail(@RequestBody ReceiptContainerDetail receiptContainerDetail) {
+ receiptContainerDetail.setReceiveTime(new Date());
receiptContainerDetailService.save(receiptContainerDetail);
return Result.OK("添加成功！");
}
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 4579470..0d754b0 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
@@ -97,9 +97,12 @@ public class ReceiptContainerDetail implements Serializable {
@Excel(name = "项目号", width = 15)
@ApiModelProperty(value = "项目号")
private String project;
- @Excel(name = "唯一号", width = 15)
- @ApiModelProperty(value = "唯一号")
- private String uniqueCode;
+ @Excel(name = "序列号", width = 15)
+ @ApiModelProperty(value = "序列号")
+ private String sn;
+ @Excel(name = "收货日期", width = 15)
+ @ApiModelProperty(value = "收货日期")
+ private Date receiveTime;
/** 备用字段1 */
@Excel(name = "备用字段1", width = 15)
@ApiModelProperty(value = "备用字段1")
diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptContainerHeader/service/impl/ReceiptContainerHeaderServiceImpl.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptContainerHeader/service/impl/ReceiptContainerHeaderServiceImpl.java
index 4a1ff6e..be0f943 100644
--- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptContainerHeader/service/impl/ReceiptContainerHeaderServiceImpl.java
+++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptContainerHeader/service/impl/ReceiptContainerHeaderServiceImpl.java
@@ -179,6 +179,7 @@ public class ReceiptContainerHeaderServiceImpl extends ServiceImpl<ReceiptContai
taskDetail.setBatch(receiptContainerDetail.getBatch());
taskDetail.setLot(receiptContainerDetail.getLot());
taskDetail.setProject(receiptContainerDetail.getProject());
+ taskDetail.setReceiveTime(receiptContainerDetail.getReceiveTime());
taskDetailList.add(taskDetail);
ReceiptDetail receiptDetail = receiptDetailService.getById(receiptContainerDetail.getReceiptDetailId());
if (receiptDetail == null) {
diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiving/domain/Receive.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiving/domain/Receive.java
index d9f20df..4b7b423 100644
--- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiving/domain/Receive.java
+++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiving/domain/Receive.java
@@ -1,12 +1,12 @@
package org.jeecg.modules.wms.receipt.receiving.domain;
-import lombok.Data;
-
import java.io.Serializable;
import java.math.BigDecimal;
import org.jeecg.common.aspect.annotation.Dict;
+import lombok.Data;
+
@Data
public class Receive implements Serializable {
private static final long serialVersionUID = 1L;
@@ -15,7 +15,7 @@ public class Receive implements Serializable {
private String containerCode; // 托盘号
- private String uniqueCode;// 唯一号
+ private String sn;// 序列号
private String materialCode;
diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiving/service/impl/ReceiveServiceImpl.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiving/service/impl/ReceiveServiceImpl.java
index 36b9317..c40bea8 100644
--- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiving/service/impl/ReceiveServiceImpl.java
+++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiving/service/impl/ReceiveServiceImpl.java
@@ -2,6 +2,7 @@ package org.jeecg.modules.wms.receipt.receiving.service.impl;
import java.math.BigDecimal;
import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;
@@ -234,7 +235,7 @@ public class ReceiveServiceImpl extends ServiceImpl<ReceiveMapper, Receive> impl
receiptContainerDetail = new ReceiptContainerDetail();
receiptContainerDetail.setCompanyCode(receiptDetail.getCompanyCode());
receiptContainerDetail.setReferCode(receiptDetail.getReferCode());
- receiptContainerDetail.setUniqueCode(receive.getUniqueCode());
+ receiptContainerDetail.setSn(receive.getSn());
receiptContainerDetail.setContainerCode(receive.getContainerCode());
receiptContainerDetail.setReceiptDetailId(receiptDetail.getId());
receiptContainerDetail.setReceiptId(receiptDetail.getReceiptId());
@@ -250,6 +251,7 @@ public class ReceiveServiceImpl extends ServiceImpl<ReceiveMapper, Receive> impl
receiptContainerDetail.setLot(receiptDetail.getLot());
receiptContainerDetail.setProject(receiptDetail.getProject());
receiptContainerDetail.setInventoryStatus(receiptDetail.getInventoryStatus());
+ receiptContainerDetail.setReceiveTime(new Date());
receiptContainerDetailList.add(receiptContainerDetail);
}
}
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 f5cf5a4..c9ef1d5 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
@@ -145,9 +145,13 @@ public class TaskDetail implements Serializable {
@ApiModelProperty(value = "入库的库存详情id")
private Integer toInventoryDetailId;
- @Excel(name = "唯一号", width = 15)
- @ApiModelProperty(value = "唯一号")
- private String uniqueCode;
+ @Excel(name = "序列号", width = 15)
+ @ApiModelProperty(value = "序列号")
+ private String sn;
+
+ @Excel(name = "收货日期", width = 15)
+ @ApiModelProperty(value = "收货日期")
+ private Date receiveTime;
/** 备用字段1 */
@Excel(name = "备用字段1", width = 15)
diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/task/taskHeader/service/impl/TaskHeaderServiceImpl.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/task/taskHeader/service/impl/TaskHeaderServiceImpl.java
index af7cc6b..419d195 100644
--- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/task/taskHeader/service/impl/TaskHeaderServiceImpl.java
+++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/task/taskHeader/service/impl/TaskHeaderServiceImpl.java
@@ -1108,6 +1108,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea
inventoryDetail.setBatch(taskDetail.getBatch());
inventoryDetail.setLot(taskDetail.getLot());
inventoryDetail.setProject(taskDetail.getProject());
+ inventoryDetail.setReceiveTime(taskDetail.getReceiveTime());
inventoryDetail.setReceiptDate(new Date());
inventoryDetailList.add(inventoryDetail);