diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/PurchaseCheckInfo.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/PurchaseCheckInfo.java
index 76f72edf..03c11e76 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/PurchaseCheckInfo.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/PurchaseCheckInfo.java
@@ -57,6 +57,16 @@ public class PurchaseCheckInfo extends BaseEntity {
@ApiModelProperty(value = "采购员")
private Long purchaser;
+ /** 物资厂家id */
+ @Excel(name = "物资厂家id")
+ @ApiModelProperty(value = "物资厂家id")
+ private Long supplierId;
+
+ /** 物资厂家名称 */
+ @Excel(name = "物资厂家名称")
+ @ApiModelProperty(value = "物资厂家名称")
+ private Long supplierName;
+
/** 数据所属组织 */
@Excel(name = "数据所属组织")
@ApiModelProperty(value = "数据所属组织")
diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseCheckInfoServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseCheckInfoServiceImpl.java
index 4e9c7c34..64848926 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseCheckInfoServiceImpl.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseCheckInfoServiceImpl.java
@@ -167,7 +167,9 @@ public class PurchaseCheckInfoServiceImpl implements IPurchaseCheckInfoService {
public AjaxResult insertPurchaseCheckInfo(PurchaseCheckDto purchaseCheckInfo) {
// 赋值创建时间
purchaseCheckInfo.getPurchaseCheckInfo().setCreateTime(DateUtils.getNowDate());
- purchaseCheckInfo.getPurchaseCheckInfo().setCreateBy(SecurityUtils.getLoginUser().getUsername());
+ purchaseCheckInfo.getPurchaseCheckInfo().setUpdateTime(DateUtils.getNowDate());
+ purchaseCheckInfo.getPurchaseCheckInfo().setCreateBy(SecurityUtils.getUsername());
+ purchaseCheckInfo.getPurchaseCheckInfo().setUpdateBy(SecurityUtils.getUsername());
try {
// 查询新购任务当月最大单号
Integer thisMonthMaxOrder = tmTaskMapper.getMonthMaxOrderByDate(DateUtils.getCurrentYear(), DateUtils.getCurrentMonth(), Long.valueOf(PurchaseTaskEnum.PURCHASE_TASK_STATUS_WAIT_NOTICE.getTaskTypeId()));
diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseCheckInfoMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseCheckInfoMapper.xml
index 98771f7f..2965a1bb 100644
--- a/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseCheckInfoMapper.xml
+++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseCheckInfoMapper.xml
@@ -10,6 +10,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+
@@ -29,7 +30,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
select
- id, task_id, purchase_time, arrival_time, purchaser, tax_rate, create_by,
+ id, task_id, purchase_time, arrival_time, purchaser, supplier_id, tax_rate, create_by,
create_time, update_by, update_time, remark, company_id
from
purchase_check_info
@@ -37,7 +38,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
select
- pci.id, pci.task_id, pci.purchase_time, pci.arrival_time, pci.purchaser, pci.tax_rate, pci.create_by,
+ pci.id, pci.task_id, pci.purchase_time, pci.arrival_time, pci.purchaser, pci.supplier_id, pci.tax_rate, pci.create_by,
pci.create_time, pci.update_by, pci.update_time, pci.remark, pci.company_id,
t.task_status, t.task_type, t.code, su.user_name as create_user_name
from
@@ -53,6 +54,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and purchase_time = #{purchaseTime}
and arrival_time = #{arrivalTime}
and purchaser = #{purchaser}
+ and supplier_id = #{supplierId}
and tax_rate = #{taxRate}
and company_id = #{companyId}
@@ -70,6 +72,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
purchase_time,
arrival_time,
purchaser,
+ supplier_id,
tax_rate,
create_by,
create_time,
@@ -83,6 +86,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{purchaseTime},
#{arrivalTime},
#{purchaser},
+ #{supplierId},
#{taxRate},
#{createBy},
#{createTime},
@@ -100,6 +104,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
purchase_time = #{purchaseTime},
arrival_time = #{arrivalTime},
purchaser = #{purchaser},
+ supplier_id = #{supplierId},
tax_rate = #{taxRate},
create_by = #{createBy},
create_time = #{createTime},
@@ -129,6 +134,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and pci.purchase_time = #{purchaseTime}
and pci.arrival_time = #{arrivalTime}
and pci.purchaser = #{purchaser}
+ and pci.supplier_id = #{supplierId}
and pci.tax_rate = #{taxRate}