bonus
/
devicesmgt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

工机具管理-库管员配置；维修班配置

This commit is contained in:
sliang 2023-12-18 13:08:34 +08:00
parent f9f603dfd9
commit 58fe071b38
11 changed files with 210 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/BackApplyController.java
View File

@ -10,12 +10,15 @@ import com.bonus.sgzb.app.service.TmTaskService;
import com.bonus.sgzb.base.api.domain.LeaseApplyDetails;
import com.bonus.sgzb.base.api.domain.LeaseApplyInfo;
import com.bonus.sgzb.base.api.domain.TmTask;
import com.bonus.sgzb.base.domain.WarehouseKeeper;
import com.bonus.sgzb.common.core.utils.DateUtils;
import com.bonus.sgzb.common.core.utils.StringUtils;
import com.bonus.sgzb.common.core.web.controller.BaseController;
import com.bonus.sgzb.common.core.web.domain.AjaxResult;
import com.bonus.sgzb.common.log.annotation.Log;
import com.bonus.sgzb.common.log.enums.BusinessType;
import io.swagger.annotations.ApiOperation;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@ -272,4 +275,13 @@ public class BackApplyController extends BaseController {
}
}
@ApiOperation("退料审核列表-审核")
@Log(title = "退料审核列表-审核", businessType = BusinessType.UPDATE)
@PostMapping("/audit")
public AjaxResult audit(String id)
{
return toAjax(backApplyService.audit(id));
}
}

2
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/BackApplyMapper.java
View File

@ -40,4 +40,6 @@ public interface BackApplyMapper {
List<BackApplyInfo> examineList(BackApplyInfo record);
List<BackApplyInfo> examineView(BackApplyInfo record);
int audit(String id);
}

2
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/BackApplyService.java
View File

@ -43,4 +43,6 @@ public interface BackApplyService {
List<BackApplyInfo> examineList(BackApplyInfo record);
List<BackApplyInfo> examineView(BackApplyInfo record);
int audit(String id);
}

5
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/BackApplyServiceImpl.java
View File

@ -81,4 +81,9 @@ public class BackApplyServiceImpl implements BackApplyService {
return backApplyMapper.examineView(record);
}
@Override
public int audit(String id) {
return backApplyMapper.audit(id);
}
}

5
sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackApplyMapper.xml
View File

@ -268,7 +268,10 @@
NOW()
)
</insert>
<delete id="del">
<update id="audit">
UPDATE tm_task SET task_status = 38 WHERE task_id = #{id}
</update>
<delete id="del">
DELETE FROM back_apply_info WHERE id = #{id}
</delete>

37
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/ReturnOfMaterialsInfoController.java Normal file
View File

@ -0,0 +1,37 @@
package com.bonus.sgzb.material.controller;
import com.bonus.sgzb.common.core.web.controller.BaseController;
import com.bonus.sgzb.common.core.web.page.TableDataInfo;
import com.bonus.sgzb.material.domain.ReturnOfMaterialsInfo;
import com.bonus.sgzb.material.service.ReturnOfMaterialsInfoService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.bonus.sgzb.material.domain.AgreementInfo;
import java.util.List;
/**
* @author lsun
*/
@Api(tags = " 退料入库")
@RestController
@RequestMapping("/returnOfMaterialsInfo")
public class ReturnOfMaterialsInfoController extends BaseController {
@Autowired
private ReturnOfMaterialsInfoService returnOfMaterialsInfoService;
/**
* 获取协议管理列表
*/
@ApiOperation(value = "获取协议管理列表")
@GetMapping("/getReturnOfMaterialsInfoAll")
public TableDataInfo getReturnOfMaterialsInfoAll(ReturnOfMaterialsInfo bean)
{
startPage();
List<ReturnOfMaterialsInfo> list = returnOfMaterialsInfoService.getReturnOfMaterialsInfoAll(bean);
return getDataTable(list);
}
}

64
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/ReturnOfMaterialsInfo.java Normal file
View File

@ -0,0 +1,64 @@
package com.bonus.sgzb.material.domain;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @author lsun
* 退料入库
*/
@Data
public class ReturnOfMaterialsInfo {
@ApiModelProperty(value = "id")
private Long id;
/** 退料单号 */
@ApiModelProperty(value = "退料单号")
private String code;
/** 退料单位 */
@ApiModelProperty(value = "退料单位")
private String unitName;
/** 退料工程 */
@ApiModelProperty(value = "退料工程")
private String lotName;
@ApiModelProperty(value = "机具id")
private Long kindId;
@ApiModelProperty(value = "机具名称")
private String kindName;
@ApiModelProperty(value = "类型id")
private Long typeId;
@ApiModelProperty(value = "类型ids")
private String typeIds;
@ApiModelProperty(value = "类型名称")
private String typeName;
@ApiModelProperty(value = "规格型号id")
private Long modelId;
@ApiModelProperty(value = "规格型号")
private String modelName;
@ApiModelProperty(value = "入库数量")
private String inputNum;
@ApiModelProperty(value = "编号")
private String maCode;
@ApiModelProperty(value = "退料时间")
private String returnTime;
@ApiModelProperty(value = "提交入库时间")
private String submitStorageTime;
@ApiModelProperty(value = "提交入库人员")
private String submitToStoragePersonnel;
@ApiModelProperty(value = "备注")
private String remark;
}

17
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/ReturnOfMaterialsInfoMapper.java Normal file
View File

@ -0,0 +1,17 @@
package com.bonus.sgzb.material.mapper;
import com.bonus.sgzb.material.domain.ReturnOfMaterialsInfo;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
/**
* @author lsun
*/
@Mapper
public interface ReturnOfMaterialsInfoMapper {
List<ReturnOfMaterialsInfo> getReturnOfMaterialsInfoAll(ReturnOfMaterialsInfo bean);
}

14
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/ReturnOfMaterialsInfoService.java Normal file
View File

@ -0,0 +1,14 @@
package com.bonus.sgzb.material.service;
import com.bonus.sgzb.material.domain.ReturnOfMaterialsInfo;
import java.util.List;
/**
* @author lsun
*/
public interface ReturnOfMaterialsInfoService {
List<ReturnOfMaterialsInfo> getReturnOfMaterialsInfoAll(ReturnOfMaterialsInfo bean);
}

24
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/ReturnOfMaterialsInfoServiceImpl.java Normal file
View File

@ -0,0 +1,24 @@
package com.bonus.sgzb.material.service.impl;
import com.bonus.sgzb.material.domain.ReturnOfMaterialsInfo;
import com.bonus.sgzb.material.mapper.ReturnOfMaterialsInfoMapper;
import com.bonus.sgzb.material.service.ReturnOfMaterialsInfoService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
/**
* @author lsun
*/
@Service
public class ReturnOfMaterialsInfoServiceImpl implements ReturnOfMaterialsInfoService {
@Autowired
private ReturnOfMaterialsInfoMapper returnOfMaterialsInfoMapper;
@Override
public List<ReturnOfMaterialsInfo> getReturnOfMaterialsInfoAll(ReturnOfMaterialsInfo bean) {
return returnOfMaterialsInfoMapper.getReturnOfMaterialsInfoAll(bean);
}
}

29
sgzb-modules/sgzb-material/src/main/resources/mapper/material/ReturnOfMaterialsInfoMapper.xml Normal file
View File

@ -0,0 +1,29 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.bonus.sgzb.material.mapper.ReturnOfMaterialsInfoMapper">
<select id="getReturnOfMaterialsInfoAll" resultType="com.bonus.sgzb.material.domain.ReturnOfMaterialsInfo">
SELECT
tt.`code` ,bui.unit_name as unitName ,bpl.lot_name as lotName,
mt3.type_name as typeName,mt2.type_name as kindName,mt.type_name as modelName,
iad.input_num as inputNum,mm.ma_code as maCode,
tt.create_time as returnTime,
iad.create_time as submitStorageTime,
iad.create_by as submitToStoragePersonnel,iad.remark as remark
FROM input_apply_details iad
LEFT JOIN tm_task tt ON iad.task_id = tt.task_id
LEFT JOIN tm_task_agreement tta on tta.task_id = tt.task_id
LEFT JOIN bm_agreement_info bai ON bai.agreement_id = tta.agreement_id
LEFT JOIN bm_project_lot bpl ON bpl.lot_id = bai.project_id
LEFT JOIN bm_unit_info bui on bui.unit_id = bai.unit_id
LEFT JOIN ma_type mt on mt.type_id = iad.type_id
LEFT JOIN ma_type mt2 ON mt2.type_id = mt.parent_id AND mt2.`level` = '3'
LEFT JOIN ma_type mt3 ON mt2.parent_id = mt3.type_id AND mt3.`level` = '2'
LEFT JOIN ma_type mt4 ON mt3.parent_id = mt4.type_id AND mt4.`level` = '1'
LEFT JOIN ma_machine mm ON mm.ma_id = iad.ma_id
WHERE tt.task_status = '38' and mt.`level` = '4' and input_type ='2'
</select>
</mapper>