Merge branch 'dev-nx' of http://192.168.0.56:3000/bonus/devicesmgt into dev-nx

sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/LeaseOutDetails.java

@@ -67,6 +67,11 @@ public class LeaseOutDetails implements Serializable {
      */
     @ApiModelProperty(value = "规格名称")
     private String typeName;
+    /**
+     * 规格名称
+     */
+    @ApiModelProperty(value = "规格型号")
+    private String typeModelName;
 
     /**
      * maId
@@ -79,6 +84,16 @@ public class LeaseOutDetails implements Serializable {
      */
     @ApiModelProperty(value = "机具编号")
     private String maCode;
+    /**
+     * 出库人
+     */
+    @ApiModelProperty(value = "出库人")
+    private String outPerson;
+    /**
+     * 领料人
+     */
+    @ApiModelProperty(value = "领料人")
+    private String leasePerson;
 
     /**
      * 协议ID

sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/LeaseOutDetailsController.java

@@ -133,6 +133,18 @@ public class LeaseOutDetailsController extends BaseController {
     public AjaxResult submitOut(@RequestBody LeaseOutDetails record) {
         return leaseOutDetailsService.submitOut(record);
     }
+    /**
+     * 领料出库，出库单查询
+     *
+     * @param parentId
+     */
+    @Log(title = "出库单查询", businessType = BusinessType.MATERIAL)
+    @GetMapping("/getOutboundOrder")
+    public AjaxResult getOutboundOrder(String parentId) {
+        startPage();
+        List<LeaseOutDetails> outboundOrder = leaseOutDetailsService.getOutboundOrder(parentId);
+        return AjaxResult.success(getDataTable(outboundOrder));
+    }
 
     /**
      * @param recordList

sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/TmTaskController.java

@@ -271,7 +271,7 @@ public class TmTaskController extends BaseController {
             } else {
                 return AjaxResult.error("创建任务失败");
             }
-            UrgentProcessingUser urgentProcessingUser = new UrgentProcessingUser();
+            /*UrgentProcessingUser urgentProcessingUser = new UrgentProcessingUser();
             urgentProcessingUser.setCompanyId(Long.valueOf(task.getCompanyId()));
             urgentProcessingUser.setTaskTypeId(task.getTaskType());
             urgentProcessingUser.setDeptId(SecurityUtils.getLoginUser().getSysUser().getDeptId());
@@ -300,7 +300,7 @@ public class TmTaskController extends BaseController {
                         }
                     }
                 }
-            }
+            }*/
             return AjaxResult.success("任务创建成功");
         } catch (Exception e) {
             return AjaxResult.error("创建任务失败," + e.getCause().toString() + "," + e.getMessage());
@@ -541,7 +541,7 @@ public class TmTaskController extends BaseController {
     @PostMapping("/outboundCompleted")
     public AjaxResult outboundCompleted(@RequestBody TmTask task) {
         int i = tmTaskService.updateLeaseAuditListByOne(task);
-        if (i == 0) {
+        if (i > 0) {
             return AjaxResult.success();
         } else {
             return AjaxResult.error();

sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/LeaseApplyDetails.java

@@ -52,6 +52,12 @@ public class LeaseApplyDetails implements Serializable {
     @ApiModelProperty(value = "领料出库状态")
     private String statusName;
 
+    /**
+     * 车牌号
+     */
+    @ApiModelProperty(value = "领料出库状态")
+    private String carCode;
+
     /**
      * 规格型号
      */

sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/LeaseOutDetailsMapper.java

@@ -107,4 +107,6 @@ public interface LeaseOutDetailsMapper {
     LeaseApplyDetails getLeaseApplyDetails(@Param("record") LeaseOutDetails record);
 
     int updateLeaseApplyDetails(@Param("record") LeaseOutDetails record);
+
+    List<LeaseOutDetails> getOutboundOrder(String parentId);
 }

sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/LeaseOutDetailsService.java

@@ -40,6 +40,7 @@ public interface LeaseOutDetailsService {
      * @return 结果
      */
     AjaxResult submitOut(LeaseOutDetails record);
+    List<LeaseOutDetails> getOutboundOrder(String parentId);
     /**
      * 根据code编码查询设备信息
      * @param maCode 机具编码

sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/LeaseOutDetailsServiceImpl.java

@@ -198,6 +198,11 @@ public class LeaseOutDetailsServiceImpl implements LeaseOutDetailsService {
         return AjaxResult.success("出库成功");
     }
 
+    @Override
+    public List<LeaseOutDetails> getOutboundOrder(String parentId) {
+        return leaseOutDetailsMapper.getOutboundOrder(parentId);
+    }
+
     private int insertRecords(LeaseOutDetails record) {
         int res = 0;
         // 首先更新领料任务详情表的领料数及状态（lease_apply_details）

sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java

@@ -7,10 +7,12 @@ import com.bonus.sgzb.app.domain.MachinePart;
 import com.bonus.sgzb.app.domain.TmTask;
 import com.bonus.sgzb.app.mapper.LeaseApplyDetailsMapper;
 import com.bonus.sgzb.app.mapper.LeaseApplyInfoMapper;
+import com.bonus.sgzb.app.mapper.LeaseOutDetailsMapper;
 import com.bonus.sgzb.app.mapper.TmTaskMapper;
 import com.bonus.sgzb.app.service.*;
 import com.bonus.sgzb.base.api.domain.BmFlowRecord;
 import com.bonus.sgzb.base.api.domain.BmFlowRelation;
+import com.bonus.sgzb.base.api.domain.LeaseOutDetails;
 import com.bonus.sgzb.common.core.constant.Constants;
 import com.bonus.sgzb.common.core.domain.R;
 import com.bonus.sgzb.common.core.enums.TaskStatusEnum;
@@ -69,6 +71,8 @@ public class TmTaskServiceImpl implements TmTaskService {
 
     @Resource
     private LeaseUserBookService leaseUserBookService;
+    @Resource
+    private LeaseOutDetailsMapper leaseOutDetailsMapper;
 
     @Resource
     private BmFlowRecordService bmFlowRecordService;
@@ -195,7 +199,7 @@ public class TmTaskServiceImpl implements TmTaskService {
                         }
                     }
                 }
-                sendMessageToLeader(record);
+                //sendMessageToLeader(record);
             } else {
                 // 先审核任务表
                 result += tmTaskMapper.updateTmTaskAuditStatus(record);
@@ -219,7 +223,7 @@ public class TmTaskServiceImpl implements TmTaskService {
                         }
                     }
                 }
-                sendMessageToLeader(record);
+                //sendMessageToLeader(record);
             }
         } else {
             return 0;
@@ -665,6 +669,7 @@ public class TmTaskServiceImpl implements TmTaskService {
     @Override
     public int updateLeaseAuditListByOne(TmTask task) {
         int i = tmTaskMapper.updateLeaseAuditListByOne(task);
+        int res = 0;
         if (i > 0) {
             int num = 0;
             List<LeaseApplyDetails> leaseApplyDetails = tmTaskMapper.getleaseDetailsStatus(task);
@@ -680,9 +685,17 @@ public class TmTaskServiceImpl implements TmTaskService {
                     tmTaskMapper.updateTmTaskAuditStatus(task);
                 }
             }
-            return 0;
+            LeaseOutDetails leaseOutDetails = new LeaseOutDetails();
+            leaseOutDetails.setParentId(Integer.valueOf(task.getId()));
+            leaseOutDetails.setTypeId(Integer.valueOf(task.getTypeId()));
+            leaseOutDetails.setCreateBy(task.getCreateBy());
+            leaseOutDetails.setCreateTime(new Date());
+            leaseOutDetails.setUpdateTime(new Date());
+            leaseOutDetails.setOutNum(0.0);
+            res =  leaseOutDetailsMapper.insertSelective(leaseOutDetails);
+            return res;
         } else {
-            return 1;
+            return res;
         }
     }
 

sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackReceiveMapper.xml

@@ -1075,7 +1075,6 @@
     mt.type_id AS typeId,
     mm.ma_code AS maCode,
     mm.ma_id AS maId,
-    bad.remark AS remark,
     sd.NAME AS maStatus
     FROM
     ma_type mt

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

@@ -450,4 +450,29 @@
             parennt_id = #{record.parentId}
         AND type_id = #{record.typeId}
     </select>
+    <select id="getOutboundOrder" resultType="com.bonus.sgzb.base.api.domain.LeaseOutDetails">
+        SELECT
+            mt.type_name typeModelName,
+            mt2.type_name typeName,
+            lod.out_num outNum,
+            lod.create_time,
+            lad.pre_num,
+            su.nick_name leasePerson,
+            su2.nick_name outPerson,
+            mm.ma_code,
+            lod.car_code
+        FROM
+            lease_out_details lod
+                LEFT JOIN lease_apply_details lad ON lod.parent_id = lad.parennt_id
+                AND lod.type_id = lad.type_id
+                LEFT JOIN lease_apply_info lai ON lai.id = lod.parent_id
+                LEFT JOIN ma_machine mm on mm.ma_id = lod.ma_id
+                LEFT JOIN sys_user su on su.user_id = lai.create_by
+                LEFT JOIN sys_user su2 on su2.user_id = lod.create_by
+                LEFT JOIN ma_type mt ON mt.type_id = lod.type_id
+                LEFT JOIN ma_type mt2 ON mt.parent_id = mt2.type_id
+        WHERE
+            lod.parent_id = #{parentId}
+    </select>
+
 </mapper>

sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml

@@ -1039,7 +1039,7 @@
     bui.unit_name AS unitName,
     lai.lease_person AS leasePerson,
     lai.phone AS leasePhone,
-    tt.create_by AS applyFor,
+    su.nick_name AS applyFor,
     d.`name` AS taskName,
     lai.lease_type AS leaseType,
     d.id AS examineStatusId,
@@ -1051,6 +1051,7 @@
     from
     lease_apply_info lai
     LEFT JOIN tm_task tt on lai.task_id = tt.task_id
+    LEFT JOIN sys_user su on lai.create_by = su.user_id
     LEFT JOIN sys_dic d ON d.id = tt.task_status
     LEFT JOIN tm_task_agreement tta ON lai.task_id = tta.task_id
     LEFT JOIN bm_agreement_info bai ON bai.agreement_id = tta.agreement_id
@@ -1197,7 +1198,7 @@
     bui.unit_name AS unitName,
     lai.lease_person AS leasePerson,
     lai.phone AS leasePhone,
-    tt.create_by AS applyFor,
+    su.nick_name AS applyFor,
     d.`name` AS taskName,
     lai.lease_type AS leaseType,
     d.id AS examineStatusId,
@@ -1209,6 +1210,7 @@
     from
     lease_apply_info lai
     LEFT JOIN tm_task tt on lai.task_id = tt.task_id
+    LEFT JOIN sys_user su on lai.create_by = su.user_id
     LEFT JOIN sys_dic d ON d.id = tt.task_status
     LEFT JOIN tm_task_agreement tta ON lai.task_id = tta.task_id
     LEFT JOIN bm_agreement_info bai ON bai.agreement_id = tta.agreement_id
@@ -1302,7 +1304,7 @@
     bui.unit_name AS unitName,
     lai.lease_person AS leasePerson,
     lai.phone AS leasePhone,
-    tt.create_by AS applyFor,
+    su.nick_name AS applyFor,
     d.`name` AS taskName,
     lai.lease_type AS leaseType,
     d.id AS examineStatusId,
@@ -1314,6 +1316,7 @@
     from
     lease_apply_info lai
     LEFT JOIN tm_task tt on lai.task_id = tt.task_id
+    LEFT JOIN sys_user su on lai.create_by = su.user_id
     LEFT JOIN sys_dic d ON d.id = tt.task_status
     LEFT JOIN tm_task_agreement tta ON lai.task_id = tta.task_id
     LEFT JOIN bm_agreement_info bai ON bai.agreement_id = tta.agreement_id
@@ -1346,7 +1349,7 @@
     bui.unit_name AS unitName,
     lai.lease_person AS leasePerson,
     lai.phone AS leasePhone,
-    tt.create_by AS applyFor,
+    su.nick_name AS applyFor,
     d.`name` AS taskName,
     lai.lease_type AS leaseType,
     d.id AS examineStatusId,
@@ -1358,6 +1361,7 @@
     from
     lease_apply_info lai
     LEFT JOIN tm_task tt on lai.task_id = tt.task_id
+    LEFT JOIN sys_user su on lai.create_by = su.user_id
     LEFT JOIN sys_dic d ON d.id = tt.task_status
     LEFT JOIN tm_task_agreement tta ON lai.task_id = tta.task_id
     LEFT JOIN bm_agreement_info bai ON bai.agreement_id = tta.agreement_id

sgzb-modules/sgzb-base/src/main/resources/mapper/largeScreen/LargeScreenMapper.xml

@@ -341,12 +341,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         mt2.type_name AS typeName,
         mt2.type_id AS typeId,
         mt.type_name AS typeModelName,
-        lod.out_num AS num,
+        SUM( lod.out_num ) AS num,
         lai.`code` AS materialCode,
         bui.unit_name AS unitName,
         bai.unit_id AS unitId,
         bpl.lot_id AS projectId,
-        su.user_name AS userName,
+        mt_full.userName AS userName,
         bpl.lot_name AS projectName,
         sd.dept_name AS companyName
         FROM
@@ -354,8 +354,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         LEFT JOIN ma_type mt ON lod.type_id = mt.type_id
         AND mt.`level` = '4'
         LEFT JOIN ma_type mt2 ON mt2.type_id = mt.parent_id
+        LEFT JOIN (
+        SELECT
+        mt.type_id,
+        mt.type_name,
+        GROUP_CONCAT( su.user_name ) AS userName
+        FROM
+        ma_type mt
         LEFT JOIN ma_type_keeper mtk ON mt.type_id = mtk.type_id
         LEFT JOIN sys_user su ON mtk.user_id = su.user_id
+        GROUP BY
+        mt.type_id,
+        mt.type_name
+        ) mt_full ON mt.type_id = mt_full.type_id
         LEFT JOIN sys_dept sd ON sd.dept_id = mt.company_id
         LEFT JOIN lease_apply_info lai ON lod.parent_id = lai.id
         LEFT JOIN tm_task_agreement tta ON lai.task_id = tta.task_id
@@ -379,6 +390,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="typeId!=null and typeId != ''">
             AND mt2.type_id = #{typeId}
         </if>
+        GROUP BY
+        mt.type_id,
+        mt.type_name,
+        lai.`code`
     </select>
     <select id="getMaterialReturnDetailData" resultType="com.bonus.sgzb.largeScreen.domain.MaterialDetailVo">
         SELECT
@@ -582,7 +597,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         LEFT JOIN purchase_check_info pci ON pci.task_id = pcd.task_id
         where
         1 = 1
-        <if test="type == 1 and startDate != null ">
+        <if test="startDate != '' and startDate != null ">
             AND DATE_FORMAT(pci.arrival_time, '%Y-%m') = #{startDate}
         </if>
         GROUP BY
@@ -599,7 +614,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         LEFT JOIN ma_type mt2 ON mt2.type_id = mt.parent_id
         where
         iad.input_type = '1'
-        <if test="type == 2 and startDate != null ">
+        <if test="startDate != '' and startDate != null ">
             AND DATE_FORMAT(iad.create_time, '%Y-%m') = #{startDate}
         </if>
         GROUP BY

sgzb-screen/src/components/home/inputStoreAnalysisDialog.vue

@@ -139,7 +139,7 @@ export default {
         maType: this.maType,
         typeId: this.formData.materialReqTypeValue,
         startDate: this.startDate,
-        type: this.type
+        // type: this.type
       }
       getAcceptanceStorage(params).then(({data}) => {
         this.tableData = data.rows