diff --git a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/SltAgreementInfo.java b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/SltAgreementInfo.java
index 8f16bda..a00b444 100644
--- a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/SltAgreementInfo.java
+++ b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/SltAgreementInfo.java
@@ -210,7 +210,11 @@ public class SltAgreementInfo {
* 委外维修费用
*/
private String outSourceCosts;
+ @ExcelProperty(index = 11, value = "领料备注")
private String remark;
+ @ExcelProperty(index = 12, value = "领料出库备注")
+ private String ckRemark;
+ @ExcelProperty(index = 13, value = "退料备注")
private String outRemark;
private String beginTime;
private String offTime;
diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/impl/LeaseOutDetailsServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/impl/LeaseOutDetailsServiceImpl.java
index 1a95a27..8558a30 100644
--- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/impl/LeaseOutDetailsServiceImpl.java
+++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/impl/LeaseOutDetailsServiceImpl.java
@@ -392,6 +392,7 @@ public class LeaseOutDetailsServiceImpl implements LeaseOutDetailsService {
Integer num = sltAgreementInfo.getNum();
Integer outNum = record.getOutNum();
sltAgreementInfo.setNum(num + outNum);
+ sltAgreementInfo.setCkRemark(record.getRemark());
res = leaseOutDetailsMapper.updSltInfo(sltAgreementInfo);
} else {
String agreementId = leaseOutDetailsMapper.getAgreementId(taskId);
diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/service/impl/RepairServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/service/impl/RepairServiceImpl.java
index 00df5d4..5832d74 100644
--- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/service/impl/RepairServiceImpl.java
+++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/service/impl/RepairServiceImpl.java
@@ -73,6 +73,9 @@ public class RepairServiceImpl implements RepairService {
String sfPart = "1";
String bsfPart = "0";
if (partList != null && partList.size() > 0) {
+ if (partList.get(0).getRepairNum() == null){
+ throw new ServiceException("请输入维修数量");
+ }
bean.setRepairNum(partList.get(0).getRepairNum());
bean.setRepairer(partList.get(0).getRepairer());
}
diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/LeaseInfo.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/LeaseInfo.java
index f09b7a2..7fd1105 100644
--- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/LeaseInfo.java
+++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/LeaseInfo.java
@@ -127,6 +127,12 @@ public class LeaseInfo {
*/
@Excel(name = "调整天数")
private String trimDay;
+ @Excel(name = "领料备注")
+ private String remark;
+ @Excel(name = "领料出库备注")
+ private String ckRemark;
+ @Excel(name = "退料备注")
+ private String outRemark;
/**
* 类型（0不收费，1收费）
*/
diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/app/LeaseOutDetailsMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/app/LeaseOutDetailsMapper.xml
index a821d4c..f1a04c7 100644
--- a/sgzb-modules/sgzb-material/src/main/resources/mapper/app/LeaseOutDetailsMapper.xml
+++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/app/LeaseOutDetailsMapper.xml
@@ -311,7 +311,8 @@
update slt_agreement_info
set num = #{num},
- update_time = now()
+ update_time = now(),
+ ck_remark = #{ckRemark}
where id = #{id}
@@ -385,8 +386,8 @@
- insert into slt_agreement_info (agreement_id,type_id,ma_id,num,start_time,status,lease_id,lease_price,buy_price,is_slt,company_id,lease_type,create_time)
- values (#{agreementId},#{record.typeId},#{record.maId},#{record.outNum},now(),0,#{record.parentId},#{ma.finalPrice},#{ma.buyPrice},'0',#{record.companyId},#{record.leaseType},now());
+ insert into slt_agreement_info (agreement_id,type_id,ma_id,num,start_time,status,lease_id,lease_price,buy_price,is_slt,company_id,lease_type,create_time,ck_remark)
+ values (#{agreementId},#{record.typeId},#{record.maId},#{record.outNum},now(),0,#{record.parentId},#{ma.finalPrice},#{ma.buyPrice},'0',#{record.companyId},#{record.leaseType},now(),#{record.remark});