Merge remote-tracking branch 'origin/master'

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;

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);

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());
         }

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收费）
      */

sgzb-modules/sgzb-material/src/main/resources/mapper/app/LeaseOutDetailsMapper.xml

@@ -311,7 +311,8 @@
     <update id="updSltInfo">
         update slt_agreement_info
         set num = #{num},
-            update_time = now()
+            update_time = now(),
+            ck_remark = #{ckRemark}
         where id = #{id}
     </update>
     <update id="updateMaTypeStockNumCt">
@@ -385,8 +386,8 @@
         </trim>
     </insert>
     <insert id="insSltInfo">
-        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)
+        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());
+        values (#{agreementId},#{record.typeId},#{record.maId},#{record.outNum},now(),0,#{record.parentId},#{ma.finalPrice},#{ma.buyPrice},'0',#{record.companyId},#{record.leaseType},now(),#{record.remark});
     </insert>
 
     <select id="leaseOutRecordList" resultType="com.bonus.sgzb.base.api.domain.LeaseOutDetails">

sgzb-modules/sgzb-material/src/main/resources/mapper/material/SltAgreementInfoMapper.xml

@@ -336,6 +336,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                lai.remark,
                bb.remark as outRemark,
                sai.is_slt as isSlt,
+               sai.ck_remark as ckRemark,
                sai.trim_day as trimDay,
                DATE(sai.start_time) as startTime,
                DATE(sai.end_time) as endTime,
@@ -367,6 +368,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                lai.remark,
                bb.remark as outRemark,
                sai.is_slt as isSlt,
+               sai.ck_remark as ckRemark,
             DATE(sai.start_time) as startTime,
             DATE(sai.end_time) as endTime,
             DATEDIFF(IF(sai.end_time is null,CURDATE(),sai.end_time), sai.start_time) + 1 as leaseDays