From 4093544cb5bc76ca6aa027c438892360335d7864 Mon Sep 17 00:00:00 2001
From: syruan <321359594@qq.com>
Date: Thu, 9 Jan 2025 11:13:03 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=86=E6=96=99=E5=8D=95=E7=94=B5=E5=AD=90?=
=?UTF-8?q?=E7=AD=BE=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../common/biz/domain/lease/LeaseApplyInfo.java | 6 ++++++
.../lease/controller/LeaseApplyInfoController.java | 14 ++++++++++++++
.../lease/mapper/LeaseApplyInfoMapper.java | 5 +++++
.../lease/service/ILeaseApplyInfoService.java | 6 ++++--
.../service/impl/LeaseApplyInfoServiceImpl.java | 10 ++++++++++
.../mapper/material/lease/LeaseApplyInfoMapper.xml | 13 ++++++++++++-
.../material/settlement/SltAgreementInfoMapper.xml | 4 ++--
7 files changed, 53 insertions(+), 5 deletions(-)
diff --git a/bonus-common-biz/src/main/java/com/bonus/common/biz/domain/lease/LeaseApplyInfo.java b/bonus-common-biz/src/main/java/com/bonus/common/biz/domain/lease/LeaseApplyInfo.java
index 4b6b91e6..1169b620 100644
--- a/bonus-common-biz/src/main/java/com/bonus/common/biz/domain/lease/LeaseApplyInfo.java
+++ b/bonus-common-biz/src/main/java/com/bonus/common/biz/domain/lease/LeaseApplyInfo.java
@@ -63,6 +63,12 @@ public class LeaseApplyInfo extends BaseEntity{
@ApiModelProperty(value = "领料工程id")
private Integer leaseProjectId;
+ @ApiModelProperty(value = "领料人签名URL")
+ private String leaseSignUrl;
+
+ @ApiModelProperty(value = "领料人签名类型")
+ private Byte leaseSignType;
+
/**
* 领料物资名称汇总
*/
diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/controller/LeaseApplyInfoController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/controller/LeaseApplyInfoController.java
index 10f64f92..ba06290d 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/controller/LeaseApplyInfoController.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/controller/LeaseApplyInfoController.java
@@ -137,6 +137,20 @@ public class LeaseApplyInfoController extends BaseController {
}
}
+ /**
+ * 修改领料任务
+ */
+ @ApiOperation(value = "领料任务电子签名")
+ @PreventRepeatSubmit
+ @SysLog(title = "领料任务电子签名", businessType = OperaType.UPDATE, logType = 1,module = "仓储管理->修改领料任务签字")
+ @PostMapping("/updateLeaseApplyInfoSign")
+ public AjaxResult updateLeaseApplyInfoSign(@RequestBody @NotNull LeaseApplyInfo leaseApplyInfo) {
+ try {
+ return toAjax(leaseApplyInfoService.updateLeaseApplyInfoSign(leaseApplyInfo));
+ } catch (Exception e) {
+ return error("系统错误, " + e.getMessage());
+ }
+ }
/**
* 领料任务发布
diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/mapper/LeaseApplyInfoMapper.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/mapper/LeaseApplyInfoMapper.java
index c77cc46f..19793ca2 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/mapper/LeaseApplyInfoMapper.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/mapper/LeaseApplyInfoMapper.java
@@ -42,6 +42,11 @@ public interface LeaseApplyInfoMapper {
*/
int updateLeaseApplyInfo(LeaseApplyInfo leaseApplyInfo);
+ /**
+ * 领料任务电子签名
+ */
+ int updateLeaseApplyInfoSign(LeaseApplyInfo leaseApplyInfo);
+
/**
* 删除领料任务
*
diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/ILeaseApplyInfoService.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/ILeaseApplyInfoService.java
index 86ef537e..0b221aa9 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/ILeaseApplyInfoService.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/ILeaseApplyInfoService.java
@@ -55,8 +55,10 @@ public interface ILeaseApplyInfoService {
*/
boolean updateLeaseApplyInfo(LeaseApplyRequestVo leaseApplyRequestVo);
-
-
+ /**
+ * 领料任务电子签名
+ */
+ int updateLeaseApplyInfoSign(LeaseApplyInfo leaseApplyInfo);
/**
* 领料：出库
diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseApplyInfoServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseApplyInfoServiceImpl.java
index bc8dabf1..c23de61a 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseApplyInfoServiceImpl.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseApplyInfoServiceImpl.java
@@ -269,6 +269,16 @@ public class LeaseApplyInfoServiceImpl implements ILeaseApplyInfoService {
}
}
+ /**
+ * 领料任务电子签名
+ *
+ * @param leaseApplyInfo
+ */
+ @Override
+ public int updateLeaseApplyInfoSign(LeaseApplyInfo leaseApplyInfo) {
+ return leaseApplyInfoMapper.updateLeaseApplyInfoSign(leaseApplyInfo);
+ }
+
/**
* 领料：出库
diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseApplyInfoMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseApplyInfoMapper.xml
index e43134bc..45d5d9f1 100644
--- a/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseApplyInfoMapper.xml
+++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseApplyInfoMapper.xml
@@ -34,6 +34,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+
+
@@ -42,7 +44,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
lai.company_audit_time, lai.company_audit_remark, lai.dept_audit_by, lai.dept_audit_time,
lai.dept_audit_remark, lai.direct_audit_by, lai.direct_audit_time, lai.direct_audit_remark,
lai.create_by, lai.create_time, lai.update_by, lai.update_time, lai.remark, lai.company_id,
- lai.direct_id, lai.lease_type, lai.estimate_lease_time, lai.cost_bearing_party,
+ lai.direct_id, lai.lease_type, lai.estimate_lease_time, lai.cost_bearing_party, lai.lease_sign_url, lai.lease_sign_type,
bai.unit_id,bai.project_id,bu.unit_name, bp.pro_name, bai.agreement_code, tt.task_status as taskStatus,
sda.dict_label as taskStatusName,
IFNULL(sum(lad.pre_num),0) as preCountNum,
@@ -221,4 +223,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
from lease_apply_info
where id = #{parentId}
+
+
+ update lease_apply_info
+
+ lease_sign_url = #{leaseSignUrl},
+ lease_sign_type = #{leaseSignType},
+
+ where id = #{id}
+
\ No newline at end of file
diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/settlement/SltAgreementInfoMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/settlement/SltAgreementInfoMapper.xml
index ec23db01..8742e2c5 100644
--- a/bonus-modules/bonus-material/src/main/resources/mapper/material/settlement/SltAgreementInfoMapper.xml
+++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/settlement/SltAgreementInfoMapper.xml
@@ -283,7 +283,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
LEFT JOIN bm_unit bui ON bui.unit_id = bai.unit_id
left join ma_type mt on rc.type_id = mt.type_id
left join ma_type mt1 on mt.parent_id = mt1.type_id
- where rc.status in ('3')
+ where rc.status in ('0','1')
and rc.task_id in
@@ -312,7 +312,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
LEFT JOIN bm_unit bui ON bui.unit_id = bai.unit_id
left join ma_type mt on sad.type_id = mt.type_id
left join ma_type mt1 on mt.parent_id = mt1.type_id
- where 1=1 and sad.status = '3'
+ where sad.status in ('0','1')
and sad.task_id in