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

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

@@ -123,6 +123,7 @@ public class BackReceiveController extends BaseController {
      * 编码退料--管理方式为0的
      *
      * @param record 查询条件
+     *
      * @return AjaxResult对象
      */
     @Log(title = "退料接收-编码退料", businessType = BusinessType.INSERT)

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

@@ -14,6 +14,7 @@ import java.util.List;
 
 /**
  * Description: 任务表tm_task
+ *
  * @Author 阮世耀
  * @Create 2023/12/13 15:14
  * @Version 1.0
@@ -242,7 +243,8 @@ public class TmTask implements Serializable {
     @ApiModelProperty(value = "分管审批备注")
     private String deptAuditRemark;
 
-    @ApiModelProperty(value="领用类型：0 短期租赁 1长期领用")
+    @ApiModelProperty(value = "领用类型：0 工程租赁 1长期领用")
+    @Excel(name = "领料类型", readConverterExp = "0=工程租赁,1=长期租赁")
     private String leaseType;
 
     private String userId;

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

@@ -73,7 +73,7 @@ public class TmTaskVo implements Serializable {
      * 领用类型
      */
     @ApiModelProperty(value = "领料类型")
-    @Excel(name = "领料类型", sort = 12, readConverterExp = "0=短期租赁,1=长期租赁")
+    @Excel(name = "领料类型", sort = 12, readConverterExp = "0=工程租赁,1=长期租赁")
     private String leaseType;
 
     /**

sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/BackApplyController.java

@@ -58,6 +58,11 @@ public class BackApplyController extends BaseController {
         return AjaxResult.success(ListPagingUtil.paging(pageIndex, pageSize, list));
     }
 
+    @ApiOperation(value = "退料申请获取当前类型在用量")
+    @GetMapping("/getUseNumByTypeId")
+    public AjaxResult getUseNumByTypeId(String typeId) {
+        return AjaxResult.success(backApplyService.getUseNumByTypeId(typeId));
+    }
 
     @ApiOperation(value = "在用设备类型树")
     @PostMapping("/getUseTypeTree")

sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/BackApplyMapper.java

@@ -131,4 +131,6 @@ public interface BackApplyMapper {
     int delApply(BackApplyInfo bean);
 
     List<BackApplyInfo> selectIdByTaskId(Integer taskId);
+
+    int getUseNumByTypeId(String typeId);
 }

sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/BackApplyService.java

@@ -119,4 +119,6 @@ public interface BackApplyService {
     int delApply(BackApplyInfo bean);
 
     List<BackApplyInfo> selectIdByTaskId(Integer taskId);
+
+    int getUseNumByTypeId(String typeId);
 }

sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/BackApplyServiceImpl.java

@@ -373,4 +373,9 @@ public class BackApplyServiceImpl implements BackApplyService {
         return backApplyMapper.selectIdByTaskId(taskId);
     }
 
+    @Override
+    public int getUseNumByTypeId(String typeId) {
+        return backApplyMapper.getUseNumByTypeId(typeId);
+    }
+
 }

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

@@ -811,5 +811,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectIdByTaskId" resultType="com.bonus.sgzb.material.domain.BackApplyInfo">
         select * from back_apply_info where  task_id = #{taskId}
     </select>
+    <select id="getUseNumByTypeId" resultType="java.lang.Integer">
+        select count(*) as useNum from ma_machine where type_id = #{typeId} and ma_status in (16,84)
+    </select>
 
 </mapper>

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

@@ -486,12 +486,29 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         order by status
     </select>
     <select id="isOperateAll" resultType="java.lang.Integer">
-        SELECT
+        SELECT count(*)
-            count(*)
+        FROM (SELECT CASE
-        FROM
+
-            purchase_check_details
+                         WHEN
-        WHERE
+                             pmi.ma_code IS NOT NULL THEN
-            task_id =  #{taskId} and (status = 1 or status=6)
+                             CASE
+
+                                 WHEN pmi.STATUS = 0 THEN
+                                     1
+                                 WHEN pmi.STATUS = 1 THEN
+                                     4
+                                 WHEN pmi.STATUS = 2 THEN
+                                     5
+                                 ELSE 1
+                                 END
+                         ELSE pcd.STATUS
+                         END AS STATUS
+              FROM purchase_check_details pcd
+                       LEFT JOIN purchase_macode_info pmi ON pmi.task_id = pcd.task_id
+                  AND pmi.type_id = pcd.type_id
+                       LEFT JOIN ma_machine mm ON pmi.ma_code = mm.ma_code
+              WHERE pcd.task_id = #{taskId}) aa
+        WHERE (STATUS = 1 OR STATUS = 6)
     </select>
     <select id="selectPurchaseCheckDetailsStatus" resultType="java.lang.Integer">
         SELECT