From 25334526a574911047000afbb33830e38f48b924 Mon Sep 17 00:00:00 2001
From: bns_han <1604366271@qq.com>
Date: Mon, 22 Jan 2024 19:56:33 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../impl/PurchaseInputServiceImpl.java | 3 +
.../mapper/app/PurchaseInputMapper.xml | 2 +-
.../material/domain/PurchasePartDetails.java | 95 +++++++++++++++++--
.../impl/PurchaseMacodeInfoServiceImpl.java | 6 +-
.../material/PurchaseAccessoryMapper.xml | 25 +++++
.../material/PurchaseCheckDetailsMapper.xml | 2 +-
.../material/PurchaseCheckInfoMapper.xml | 15 ++-
7 files changed, 131 insertions(+), 17 deletions(-)
diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/PurchaseInputServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/PurchaseInputServiceImpl.java
index f8619277..300d9137 100644
--- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/PurchaseInputServiceImpl.java
+++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/PurchaseInputServiceImpl.java
@@ -5,6 +5,7 @@ import com.bonus.sgzb.app.mapper.PurchaseInputMapper;
import com.bonus.sgzb.app.service.PurchaseInputService;
import com.bonus.sgzb.base.api.domain.MaMachine;
import com.bonus.sgzb.base.api.domain.MaType;
+import com.bonus.sgzb.common.core.utils.DateUtils;
import com.bonus.sgzb.common.security.utils.SecurityUtils;
import org.springframework.stereotype.Service;
@@ -92,6 +93,8 @@ public class PurchaseInputServiceImpl implements PurchaseInputService {
TmTask task = new TmTask();
task.setTaskId(taskId);
task.setTaskStatus(28);
+ task.setUpdateBy(String.valueOf(SecurityUtils.getUserId()));
+ task.setUpdateTime(DateUtils.getNowDate());
purchaseInputMapper.updateTmTask(task);
}
return 1;
diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/PurchaseInputMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/PurchaseInputMapper.xml
index 0177cf3e..b5bf9372 100644
--- a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/PurchaseInputMapper.xml
+++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/PurchaseInputMapper.xml
@@ -86,7 +86,7 @@
update ma_type set num = #{num} where type_id = #{typeId}
- update purchase_check_details set check_num = #{inputNum},status = #{status} where task_id = #{taskId} and type_id = #{typeId}
+ update purchase_check_details set check_num = #{inputNum},status = #{status},input_num=#{inputNum},input_status='1',input_time=NOW() where task_id = #{taskId} and type_id = #{typeId}
update purchase_macode_info
diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/PurchasePartDetails.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/PurchasePartDetails.java
index 13792b89..80ea285a 100644
--- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/PurchasePartDetails.java
+++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/PurchasePartDetails.java
@@ -6,6 +6,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
+import org.springframework.format.annotation.DateTimeFormat;
import java.math.BigDecimal;
import java.util.Date;
@@ -38,6 +39,43 @@ public class PurchasePartDetails extends BaseEntity
@Excel(name = "采购单号")
private String code;
+ /** 采购日期 */
+ @ApiModelProperty(value = "采购日期")
+ @Excel(name = "采购日期")
+ private String purchaseTime;
+
+ /** 到货日期 */
+ @ApiModelProperty(value = "到货日期")
+ @Excel(name = "到货日期")
+ private String arrivalTime;
+
+ @ApiModelProperty(value = "机具类型名称")
+ @Excel(name = "配件类型")
+ private String machineTypeName;
+
+ /**
+ * 规格型号
+ */
+ @ApiModelProperty(value = "规格型号")
+ @Excel(name = "规格型号")
+ private String specificationType;
+
+ /** 采购员 */
+ @ApiModelProperty(value = "采购员")
+ @Excel(name = "采购员")
+ private String purchaserName;
+
+ /** 创建者 */
+ @Excel(name = "提交入库人员")
+ private String createBy;
+
+ /** 创建时间 */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "提交入库时间" , dateFormat = "yyyy-MM-dd HH:mm:ss")
+ private Date createTime;
+
+
/** 采购单价 */
@ApiModelProperty(value = "采购单价")
private String purchasePrice;
@@ -48,6 +86,7 @@ public class PurchasePartDetails extends BaseEntity
/** 验收数量 */
@ApiModelProperty(value = "验收数量")
+ @Excel(name = "数量")
private BigDecimal checkNum;
/** 绑定数量 */
@@ -72,6 +111,7 @@ public class PurchasePartDetails extends BaseEntity
/** 状态结果 */
@ApiModelProperty(value = "状态结果")
+ @Excel(name = "状态")
private String statusResult;
/** 出厂日期 */
@@ -111,28 +151,19 @@ public class PurchasePartDetails extends BaseEntity
@ApiModelProperty(value = "数据所属组织")
private Long companyId;
- /**
- * 规格型号
- */
- @ApiModelProperty(value = "规格型号")
- private String specificationType;
-
@ApiModelProperty(value = "规格型号")
private String typeName;
@ApiModelProperty(value = "单位")
private String unitName;
- @ApiModelProperty(value = "机具类型名称")
- private String machineTypeName;
-
@ApiModelProperty(value = "管理方式(0编号 1计数)")
private String manageType;
@ApiModelProperty(value = "关键字筛选")
private String keyWord;
- public void setTaskId(Long taskId)
+ public void setTaskId(Long taskId)
{
this.taskId = taskId;
}
@@ -372,6 +403,50 @@ public class PurchasePartDetails extends BaseEntity
this.inputBy = inputBy;
}
+ public String getPurchaseTime() {
+ return purchaseTime;
+ }
+
+ public void setPurchaseTime(String purchaseTime) {
+ this.purchaseTime = purchaseTime;
+ }
+
+ public String getArrivalTime() {
+ return arrivalTime;
+ }
+
+ public void setArrivalTime(String arrivalTime) {
+ this.arrivalTime = arrivalTime;
+ }
+
+ public String getPurchaserName() {
+ return purchaserName;
+ }
+
+ public void setPurchaserName(String purchaserName) {
+ this.purchaserName = purchaserName;
+ }
+
+ @Override
+ public String getCreateBy() {
+ return createBy;
+ }
+
+ @Override
+ public void setCreateBy(String createBy) {
+ this.createBy = createBy;
+ }
+
+ @Override
+ public Date getCreateTime() {
+ return createTime;
+ }
+
+ @Override
+ public void setCreateTime(Date createTime) {
+ this.createTime = createTime;
+ }
+
@Override
public String toString() {
return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseMacodeInfoServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseMacodeInfoServiceImpl.java
index 44b24c83..37fe11bd 100644
--- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseMacodeInfoServiceImpl.java
+++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseMacodeInfoServiceImpl.java
@@ -320,18 +320,16 @@ public class PurchaseMacodeInfoServiceImpl implements IPurchaseMacodeInfoService
purchaseMacodeInfoMapper.updateMacodeByType(purchaseMacodeInfo);
// 新增入库记录
purchaseMacodeInfoMapper.insertMaInputRecord(maInputRecord);
-
-
-
}
-
// 当全部为已入库的时候任务改为入库状态
Integer count = purchaseMacodeInfoMapper.selectMacodeInfoStatusByTaskId(taskId);
if (count <= 0) {
TmTask task = new TmTask();
task.setTaskId(taskId);
task.setTaskStatus(28);
+ task.setUpdateBy(String.valueOf(SecurityUtils.getUserId()));
+ task.setUpdateTime(DateUtils.getNowDate());
taskMapper.updateTmTask(task);
}
diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseAccessoryMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseAccessoryMapper.xml
index fca94da3..27cccf82 100644
--- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseAccessoryMapper.xml
+++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseAccessoryMapper.xml
@@ -393,5 +393,30 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
\ No newline at end of file
diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseCheckDetailsMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseCheckDetailsMapper.xml
index 2b358fdc..5cb9171e 100644
--- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseCheckDetailsMapper.xml
+++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseCheckDetailsMapper.xml
@@ -210,7 +210,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- update purchase_check_details set check_num = #{inputNum},status = #{status} where task_id = #{taskId} and type_id = #{typeId}
+ update purchase_check_details set check_num = #{inputNum},status = #{status},input_num=#{inputNum},input_status='1',input_time=NOW() where task_id = #{taskId} and type_id = #{typeId}
update purchase_check_details set status = '0' where task_id = #{taskId}
diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseCheckInfoMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseCheckInfoMapper.xml
index 5c379b7d..758162b6 100644
--- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseCheckInfoMapper.xml
+++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseCheckInfoMapper.xml
@@ -145,11 +145,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"