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

2024-04-12 09:02:20 +08:00 · 2024-04-12 09:02:20 +08:00 · 12d22b9181
parent 3face37c91 6deb17db59
commit 12d22b9181
9 changed files with 142 additions and 105 deletions
--- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/BackReceiveController.java
+++ b/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)
--- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/TmTask.java
+++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/TmTask.java
@ -13,13 +13,14 @@ import java.util.Date;
 import java.util.List;

 /**
-* Description: 任务表tm_task
-* @Author 阮世耀
-* @Create 2023/12/13 15:14
-* @Version 1.0
-*/
+ * Description: 任务表tm_task
+ *
+ * @Author 阮世耀
+ * @Create 2023/12/13 15:14
+ * @Version 1.0
+ */

-@ApiModel(description="任务表tm_task")
+@ApiModel(description = "任务表tm_task")
@Data
 public class TmTask implements Serializable {

@ -28,221 +29,222 @@ public class TmTask implements Serializable {
    private String id;

    /**
-    * 任务ID
-    */
-    @ApiModelProperty(value="任务ID")
+     * 任务ID
+     */
+    @ApiModelProperty(value = "任务ID")
    private Long taskId;
    private Long parentId;
    private Integer outNum;

    /**
-    * 任务类型(定义数据字典)
-    */
-    @ApiModelProperty(value="任务类型(数据字典)")
+     * 任务类型(定义数据字典)
+     */
+    @ApiModelProperty(value = "任务类型(数据字典)")
    private Integer taskType;

    /**
-    * 任务状态(定义数据字典)
-    */
-    @ApiModelProperty(value="任务状态(数据字典)")
+     * 任务状态(定义数据字典)
+     */
+    @ApiModelProperty(value = "任务状态(数据字典)")
    private Integer taskStatus;

    private Integer flag;

    /**
-    * 预领料合计数
-    */
-    @ApiModelProperty(value="预领料合计数")
+     * 预领料合计数
+     */
+    @ApiModelProperty(value = "预领料合计数")
    private Integer preCountNum;
    /**
-    * 预领料合计数
-    */
-    @ApiModelProperty(value="已出库数量")
+     * 预领料合计数
+     */
+    @ApiModelProperty(value = "已出库数量")
    private Integer alNum;
    /**
-    * 库存
-    */
-    @ApiModelProperty(value="库存")
+     * 库存
+     */
+    @ApiModelProperty(value = "库存")
    private Integer num;

    /**
-    * 编号
-    */
-    @ApiModelProperty(value="编号")
-    @Excel(name = "领料单号",sort = 1)
+     * 编号
+     */
+    @ApiModelProperty(value = "编号")
+    @Excel(name = "领料单号", sort = 1)
    private String code;

    /**
-    * 创建者
-    */
-    @ApiModelProperty(value="创建者")
+     * 创建者
+     */
+    @ApiModelProperty(value = "创建者")
    private String createBy;

    /**
     * 申请人手机号码
     */
-    @ApiModelProperty(value="手机号")
+    @ApiModelProperty(value = "手机号")
    private String phoneNumber;

    /**
     * 部门名称 单位名称
     */
-    @ApiModelProperty(value="部门/单位名称")
+    @ApiModelProperty(value = "部门/单位名称")
    private String deptName;

    /**
     * 工程名称
     */
-    @ApiModelProperty(value="工程名称")
-    @Excel(name = "领料工程",sort = 3)
+    @ApiModelProperty(value = "工程名称")
+    @Excel(name = "领料工程", sort = 3)
    private String proName;

    /**
     * 工程id
     */
-    @ApiModelProperty(value="工程id")
+    @ApiModelProperty(value = "工程id")
    private Integer proId;

    /**
-    * 创建时间
-    */
-    @ApiModelProperty(value="创建时间")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+     * 创建时间
+     */
+    @ApiModelProperty(value = "创建时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date createTime;

    /**
-    * 更新者
-    */
-    @ApiModelProperty(value="更新者")
+     * 更新者
+     */
+    @ApiModelProperty(value = "更新者")
    private String updateBy;

    /**
-    * 更新时间
-    */
-    @ApiModelProperty(value="更新时间")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+     * 更新时间
+     */
+    @ApiModelProperty(value = "更新时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date updateTime;

    /**
-    * 备注
-    */
-    @ApiModelProperty(value="备注")
-    @Excel(name = "备注",sort = 11)
+     * 备注
+     */
+    @ApiModelProperty(value = "备注")
+    @Excel(name = "备注", sort = 11)
    private String remark;

    /**
-    * 数据所属组织
-    */
-    @ApiModelProperty(value="数据所属组织")
+     * 数据所属组织
+     */
+    @ApiModelProperty(value = "数据所属组织")
    private Integer companyId;

    /**
     * 领料任务实体
     */
-    @ApiModelProperty(value="领料任务实体")
+    @ApiModelProperty(value = "领料任务实体")
    private LeaseApplyInfo leaseApplyInfo;

    /**
     * 领料任务实体集合
     */
-    @ApiModelProperty(value="领料任务实体集合")
+    @ApiModelProperty(value = "领料任务实体集合")
    private List<LeaseApplyInfo> leaseApplyInfoList;

    /**
     * 领料任务详情集合
     */
-    @ApiModelProperty(value="领料任务详情集合")
-    private List<LeaseApplyDetails>  leaseApplyDetails;
+    @ApiModelProperty(value = "领料任务详情集合")
+    private List<LeaseApplyDetails> leaseApplyDetails;

-    @ApiModelProperty(value="协议id")
+    @ApiModelProperty(value = "协议id")
    private Integer agreementId;

-    @ApiModelProperty(value="退料人")
+    @ApiModelProperty(value = "退料人")
    private String backPerson;
-    @ApiModelProperty(value="退料人联系电话")
+    @ApiModelProperty(value = "退料人联系电话")
    private String phone;
-    @ApiModelProperty(value="退料申请时间")
+    @ApiModelProperty(value = "退料申请时间")
    private String backTime;
-    @ApiModelProperty(value="退料审核人 机具分公司审批人")
+    @ApiModelProperty(value = "退料审核人 机具分公司审批人")
    private String directAuditBy;
-    @ApiModelProperty(value="退料审核时间 机具分公司审批时间")
+    @ApiModelProperty(value = "退料审核时间 机具分公司审批时间")
    private String directAuditTime;
-    @ApiModelProperty(value="退料审核备注 机具分公司审批备注")
+    @ApiModelProperty(value = "退料审核备注 机具分公司审批备注")
    private String directAuditRemark;

-    @ApiModelProperty(value="往来单位id")
+    @ApiModelProperty(value = "往来单位id")
    private Long unitId;
-    @ApiModelProperty(value="往来单位")
-    @Excel(name = "领料单位",sort = 2)
+    @ApiModelProperty(value = "往来单位")
+    @Excel(name = "领料单位", sort = 2)
    private String unitName;

-    @ApiModelProperty(value="工程id")
+    @ApiModelProperty(value = "工程id")
    private Long projectId;
-    @ApiModelProperty(value="关键字")
+    @ApiModelProperty(value = "关键字")
    private String keyWord;
-    @ApiModelProperty(value="开始时间")
+    @ApiModelProperty(value = "开始时间")
    private String startTime;
-    @ApiModelProperty(value="结束时间")
+    @ApiModelProperty(value = "结束时间")
    private String endTime;
-    @ApiModelProperty(value="类型")
+    @ApiModelProperty(value = "类型")
    private Integer types;


-    @ApiModelProperty(value="协议编号")
-    @Excel(name = "协议号",sort = 4)
+    @ApiModelProperty(value = "协议编号")
+    @Excel(name = "协议号", sort = 4)
    private String agreementCode;

-    @ApiModelProperty(value="领料人")
-    @Excel(name = "领料人",sort = 5)
+    @ApiModelProperty(value = "领料人")
+    @Excel(name = "领料人", sort = 5)
    private String leasePerson;

-    @ApiModelProperty(value="领料人手机号")
-    @Excel(name = "联系电话",sort = 6)
+    @ApiModelProperty(value = "领料人手机号")
+    @Excel(name = "联系电话", sort = 6)
    private String leasePhone;

-    @ApiModelProperty(value="申请人")
-    @Excel(name = "申请人",sort = 7)
+    @ApiModelProperty(value = "申请人")
+    @Excel(name = "申请人", sort = 7)
    private String applyFor;

-    @ApiModelProperty(value="任务状态")
-    @Excel(name = "任务状态",sort = 9)
+    @ApiModelProperty(value = "任务状态")
+    @Excel(name = "任务状态", sort = 9)
    private String taskName;

-    @ApiModelProperty(value="审批状态id")
+    @ApiModelProperty(value = "审批状态id")
    private String examineStatusId;

-    @ApiModelProperty(value="审批状态的备注")
-    @Excel(name = "审批结果",sort = 10)
+    @ApiModelProperty(value = "审批状态的备注")
+    @Excel(name = "审批结果", sort = 10)
    private String examineStatus;

-    @ApiModelProperty(value="创建时间")
-    @Excel(name = "申请时间",sort = 8)
+    @ApiModelProperty(value = "创建时间")
+    @Excel(name = "申请时间", sort = 8)
    private String createTimes;

-    @ApiModelProperty(value="更新时间")
+    @ApiModelProperty(value = "更新时间")
    private String updateTimes;

-    @ApiModelProperty(value="公司审批人")
+    @ApiModelProperty(value = "公司审批人")
    private String companyAuditBy;

-    @ApiModelProperty(value="公司审批时间")
+    @ApiModelProperty(value = "公司审批时间")
    private String companyAuditTime;

-    @ApiModelProperty(value="公司审批备注")
+    @ApiModelProperty(value = "公司审批备注")
    private String companyAuditRemark;

-    @ApiModelProperty(value="分管审批人")
+    @ApiModelProperty(value = "分管审批人")
    private String deptAuditBy;

-    @ApiModelProperty(value="分管审批时间")
+    @ApiModelProperty(value = "分管审批时间")
    private String deptAuditTime;

-    @ApiModelProperty(value="分管审批备注")
+    @ApiModelProperty(value = "分管审批备注")
    private String deptAuditRemark;

-    @ApiModelProperty(value="领用类型：0 短期租赁 1长期领用")
+    @ApiModelProperty(value = "领用类型：0 工程租赁 1长期领用")
+    @Excel(name = "领料类型", readConverterExp = "0=工程租赁,1=长期租赁")
    private String leaseType;

    private String userId;
@ -255,8 +257,8 @@ public class TmTask implements Serializable {
    private String maId;
    private String maStatus;
    private String typeId;
-    @ApiModelProperty(value="预计领料时间（重庆）")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "预计领料时间（重庆）")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date estimateLeaseTime;

--- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/TmTaskVo.java
+++ b/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;

    /**
--- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/BackApplyController.java
+++ b/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")
--- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/BackApplyMapper.java
+++ b/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);
 }
--- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/BackApplyService.java
+++ b/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);
 }
--- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/BackApplyServiceImpl.java
+++ b/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);
+    }
+
 }
--- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/BackApplyMapper.xml
+++ b/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>
--- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseMacodeInfoMapper.xml
+++ b/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
-            count(*)
-        FROM
-            purchase_check_details
-        WHERE
-            task_id =  #{taskId} and (status = 1 or status=6)
+        SELECT count(*)
+        FROM (SELECT CASE
+
+                         WHEN
+                             pmi.ma_code IS NOT NULL THEN
+                             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