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

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

This commit is contained in:
zhouzy062 2024-03-15 16:30:05 +08:00
parent f0842a417f d2fe5b72f1
commit 911af8e99d
27 changed files with 253 additions and 127 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/DirectApplyDetails.java
View File

@ -12,22 +12,29 @@ public class DirectApplyDetails extends BaseEntity {
/**
* id
*/
private int id;
private Integer id;
/**
* 直转单号
*/
private int directId;
private Integer directId;
/**
* 退料单位协议
* 机具类型
*/
private int typeId;
private Integer typeId;
/**
* 退料人
* 机具id
*/
private int maId;
private Integer maId;
/**
* 手机号
* 直转数量
*/
private String directNum;
private String typeName;
private String kindName;
private String modelName;
private String maCode;
private String unitName;
private String useNum;
private String companyId;
}

29
sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/DirectApplyInfo.java
View File

@ -3,6 +3,8 @@ package com.bonus.sgzb.base.api.domain;
import com.bonus.sgzb.common.core.web.domain.BaseEntity;
import lombok.Data;
import java.util.List;
/**
* @Author：梁超
* @date：2024/3/4 - 15:17
@ -13,7 +15,7 @@ public class DirectApplyInfo extends BaseEntity {
/**
* id
*/
private int id;
private Integer id;
/**
* 直转单号(ZZ20240226-1)
*/
@ -21,12 +23,16 @@ public class DirectApplyInfo extends BaseEntity {
/**
* 退料单位协议
*/
private int backAgreementId;
private Integer backAgreementId;
/**
* 退料工程id
*/
private String backProId;
/**
* 关键字
*/
private String keyWord;
/**
* 退料工程名称
*/
@ -105,5 +111,24 @@ public class DirectApplyInfo extends BaseEntity {
* 审核备注
*/
private String auditRemark;
/**
* 退料单位协议
*/
private String backAgreementCode;
/**
* 领料单位协议
*/
private String leaseAgreementCode;
/**
* 退料工程id
*/
private String lotId;
/**
* 退料单位id
*/
private String unitId;
private List<DirectApplyDetails> directApplyDetails;
}

2
sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/MaType.java
View File

@ -122,6 +122,7 @@ public class MaType extends BaseEntity {
private String createBy;
/** 创建时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "创建时间")
private Date createTime;
@ -130,6 +131,7 @@ public class MaType extends BaseEntity {
private String updateBy;
/** 更新时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "更新时间")
private Date updateTime;

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

@ -197,7 +197,7 @@ public class LeaseOutDetailsServiceImpl implements LeaseOutDetailsService {
String agreementId = leaseOutDetailsMapper.getAgreementId(taskId);
String protocol = leaseOutDetailsMapper.getProtocol(agreementId);
MaType ma = leaseOutDetailsMapper.getMaType(record.getTypeId());
if (protocol.isEmpty()) {
if (StringUtils.isEmpty(protocol)) {
ma.setFinalPrice(ma.getLeasePrice());
} else {
if (protocol.equals("1")) {

47
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/MaTypeController.java
View File

@ -4,10 +4,8 @@ import com.bonus.sgzb.base.api.domain.MaType;
import com.bonus.sgzb.base.domain.vo.TreeSelect;
import com.bonus.sgzb.base.mapper.MaTypeMapper;
import com.bonus.sgzb.base.service.ITypeService;
import com.bonus.sgzb.common.core.constant.HttpStatus;
import com.bonus.sgzb.common.core.web.controller.BaseController;
import com.bonus.sgzb.common.core.web.domain.AjaxResult;
import com.bonus.sgzb.common.core.web.page.TableDataInfo;
import com.bonus.sgzb.common.log.annotation.Log;
import com.bonus.sgzb.common.log.enums.BusinessType;
import io.swagger.annotations.Api;
@ -17,8 +15,6 @@ import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;
/**
* 工机具类型管理控制层
@ -69,7 +65,6 @@ public class MaTypeController extends BaseController {
* @param typeId
* @return
*/
@ApiOperation(value = "工器具类型")
@GetMapping("/equipmentType")
public AjaxResult equipmentType(@RequestParam(required = false) Long typeId,
@ -196,30 +191,30 @@ public class MaTypeController extends BaseController {
return success(listByMaType);
}
/* *//**
/**
* 根据左列表类型id查询右表格
* @param typeId
* @return
*//*
@ApiOperation(value = "根据左列表类型id查询右表格")
@GetMapping("/getListByMaType")
public TableDataInfo getListByMaType(@RequestParam(required = false) Long typeId,
@RequestParam(required = false) String typeName,
@RequestParam(required = false) Integer pageSize,
@RequestParam(required = false) Integer pageNum){
if(typeId==null){
return null;
}
List<MaType> listByMaType = iTypeService.getListByMaType(typeId, typeName);
TableDataInfo rspData = new TableDataInfo();
rspData.setTotal(listByMaType.size());
rspData.setCode(HttpStatus.SUCCESS);
// listByMaType = listByMaType.stream().skip((long) (pageNum - 1) * pageSize).limit(pageSize).collect(Collectors.toList());
rspData.setRows(listByMaType);
rspData.setMsg("查询成功");
return rspData;
}*/
*/
// @ApiOperation(value = "根据左列表类型id查询右表格")
// @GetMapping("/getListByMaType")
// public TableDataInfo getListByMaType(@RequestParam(required = false) Long typeId,
// @RequestParam(required = false) String typeName,
// @RequestParam(required = false) Integer pageSize,
// @RequestParam(required = false) Integer pageNum){
// if(typeId==null){
// return null;
// }
// List<MaType> listByMaType = iTypeService.getListByMaType(typeId, typeName);
// TableDataInfo rspData = new TableDataInfo();
// rspData.setTotal(listByMaType.size());
// rspData.setCode(HttpStatus.SUCCESS);
// // listByMaType = listByMaType.stream().skip((long) (pageNum - 1) * pageSize).limit(pageSize).collect(Collectors.toList());
// rspData.setRows(listByMaType);
// rspData.setMsg("查询成功");
//
// return rspData;
// }
/**
* 获取机具类型管理ma_type详细信息

25
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/PurchaseCheckInfoController.java
View File

@ -1,21 +1,22 @@
package com.bonus.sgzb.material.controller;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
import com.bonus.sgzb.common.core.utils.poi.ExcelUtil;
import com.bonus.sgzb.common.core.web.controller.BaseController;
import com.bonus.sgzb.common.core.web.domain.AjaxResult;
import com.bonus.sgzb.common.core.web.page.TableDataInfo;
import com.bonus.sgzb.common.log.annotation.Log;
import com.bonus.sgzb.common.log.enums.BusinessType;
import com.bonus.sgzb.material.domain.PurchaseCheckInfo;
import com.bonus.sgzb.material.domain.PurchaseInput;
import com.bonus.sgzb.material.service.IPurchaseCheckInfoService;
import com.bonus.sgzb.material.domain.PurchaseCheckInfo;
import com.bonus.sgzb.material.vo.NoticeInfoVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import com.bonus.sgzb.common.log.annotation.Log;
import com.bonus.sgzb.common.log.enums.BusinessType;
import com.bonus.sgzb.common.core.web.controller.BaseController;
import com.bonus.sgzb.common.core.web.domain.AjaxResult;
import com.bonus.sgzb.common.core.utils.poi.ExcelUtil;
import com.bonus.sgzb.common.core.web.page.TableDataInfo;
import javax.servlet.http.HttpServletResponse;
import java.util.List;
/**
* 新购验收任务
@ -138,9 +139,9 @@ public class PurchaseCheckInfoController extends BaseController
*/
@ApiOperation("删除新购验收任务")
@Log(title = "新购验收任务", businessType = BusinessType.DELETE)
@DeleteMapping("/{taskIds}")
public AjaxResult remove(@PathVariable Long[] taskIds)
@DeleteMapping("/{taskId}")
public AjaxResult remove(@PathVariable Long taskId)
{
return toAjax(purchaseCheckInfoService.deletePurchaseCheckInfoByTaskIds(taskIds));
return toAjax(purchaseCheckInfoService.deletePurchaseCheckInfoByTaskId(taskId));
}
}

20
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/RepairAuditDetailsController.java
View File

@ -33,8 +33,7 @@ import com.bonus.sgzb.common.core.web.page.TableDataInfo;
*/
@RestController
@RequestMapping("/details")
public class RepairAuditDetailsController extends BaseController
{
public class RepairAuditDetailsController extends BaseController {
@Autowired
private IRepairAuditDetailsService repairAuditDetailsService;
@ -43,11 +42,10 @@ public class RepairAuditDetailsController extends BaseController
*/
@ApiOperation("查询修试审核任务列表")
@GetMapping("/questList")
public TableDataInfo questList(RepairAuditDetails repairAuditDetails)
{
public TableDataInfo questList(RepairAuditDetails repairAuditDetails) {
startPage();
Map<String, Object> params = repairAuditDetails.getParams();
if (!params.isEmpty()){
if (params != null && !params.isEmpty()) {
String beginTime = (String) params.get("beginTime");
String endTime = (String) params.get("endTime");
params.put("beginTime", beginTime + " 00:00:00");
@ -63,8 +61,7 @@ public class RepairAuditDetailsController extends BaseController
*/
@Log(title = "导出修试审核任务列表", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, RepairAuditDetails bean)
{
public void export(HttpServletResponse response, RepairAuditDetails bean) {
Map<String, Object> params = bean.getParams();
if (!params.isEmpty()) {
String beginTime = (String) params.get("beginTime");
@ -83,8 +80,7 @@ public class RepairAuditDetailsController extends BaseController
*/
@ApiOperation("查看修饰审核任务详细列表")
@GetMapping("/getRepairAuditList")
public TableDataInfo getRepairAuditList(RepairAuditDetails repairAuditDetails)
{
public TableDataInfo getRepairAuditList(RepairAuditDetails repairAuditDetails) {
startPage();
List<RepairAuditDetails> list = repairAuditDetailsService.getRepairAuditList(repairAuditDetails);
return getDataTable(list);
@ -95,8 +91,7 @@ public class RepairAuditDetailsController extends BaseController
*/
@ApiOperation("查看维修记录")
@GetMapping("/getRepairRecord")
public TableDataInfo getRepairRecord(RepairAuditDetails repairAuditDetails)
{
public TableDataInfo getRepairRecord(RepairAuditDetails repairAuditDetails) {
startPage();
List<RepairRecord> list = repairAuditDetailsService.getRepairRecord(repairAuditDetails);
return getDataTable(list);
@ -107,8 +102,7 @@ public class RepairAuditDetailsController extends BaseController
*/
@ApiOperation("查看配件记录")
@GetMapping("/getPartRecord")
public TableDataInfo getPartRecord(RepairAuditDetails repairAuditDetails)
{
public TableDataInfo getPartRecord(RepairAuditDetails repairAuditDetails) {
startPage();
List<RepairPart> list = repairAuditDetailsService.getPartRecord(repairAuditDetails);
return getDataTable(list);

2
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/ScrapApplyDetailsController.java
View File

@ -71,7 +71,7 @@ public class ScrapApplyDetailsController extends BaseController
public void export(HttpServletResponse response, ScrapApplyDetails bean)
{
Map<String, Object> params = bean.getParams();
if (!params.isEmpty()){
if (params!=null && !params.isEmpty()){
String beginTime = (String) params.get("beginTime");
String endTime = (String) params.get("endTime");
params.put("beginTime", beginTime+" 00:00:00");

1
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/SecondaryWarehouseController.java
View File

@ -1,7 +1,6 @@
package com.bonus.sgzb.material.controller;
import cn.hutool.core.convert.Convert;
import com.bonus.sgzb.base.api.domain.SltAgreementInfo;
import com.bonus.sgzb.common.core.utils.poi.ExcelUtil;
import com.bonus.sgzb.common.core.web.controller.BaseController;
import com.bonus.sgzb.common.core.web.domain.AjaxResult;

48
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/WorkSiteDirectManageController.java
View File

@ -11,10 +11,7 @@ import com.bonus.sgzb.common.core.web.domain.AjaxResult;
import com.bonus.sgzb.common.core.web.page.TableDataInfo;
import com.bonus.sgzb.common.log.enums.BusinessType;
import com.bonus.sgzb.common.security.utils.SecurityUtils;
import com.bonus.sgzb.material.domain.BackApplyInfo;
import com.bonus.sgzb.material.domain.DirectApplyInfoDetails;
import com.bonus.sgzb.material.domain.DirectPassApplyInfoDetails;
import com.bonus.sgzb.material.domain.TmTask;
import com.bonus.sgzb.material.domain.*;
import com.bonus.sgzb.material.service.ApplyInfoService;
import com.bonus.sgzb.material.service.TaskService;
import com.bonus.sgzb.material.service.WorkSiteDirectManageService;
@ -42,12 +39,10 @@ public class WorkSiteDirectManageController extends BaseController {
private WorkSiteDirectManageService workSiteDirectManageService;
@Resource
private ApplyInfoService leaseApplyInfoService;
/* @Resource
private LeaseApplyDetailsService leaseApplyDetailsService;*/
private TaskService tmTaskService;
@Resource
private TaskService tmTaskService;
private ApplyInfoService applyInfoService;
/**
@ -55,9 +50,9 @@ public class WorkSiteDirectManageController extends BaseController {
*/
@ApiOperation(value = "列表展示")
@GetMapping("/list")
public TableDataInfo list() {
public TableDataInfo list(DirectApplyInfo directApplyInfo) {
startPage();
List<DirectApplyInfo> directApplyInfos = workSiteDirectManageService.getList();
List<DirectApplyInfo> directApplyInfos = workSiteDirectManageService.getList(directApplyInfo);
return getDataTable(directApplyInfos);
}
@ -121,7 +116,7 @@ public class WorkSiteDirectManageController extends BaseController {
return AjaxResult.error("直转信息为空，未通过");
}
TmTask task = directApplyInfoDetails.getTask();
TmTask task = directApplyInfoDetails.getLeaseApplyInfo();
if (task == null) {
return AjaxResult.error("领料任务参数为空");
}
@ -150,12 +145,27 @@ public class WorkSiteDirectManageController extends BaseController {
return AjaxResult.error("领料信息和详情新增失败");
}
List<LeaseOutDetails> leaseOutDetails = directApplyInfoDetails.getLeaseOutDetails();
if (CollUtil.isEmpty(leaseOutDetails)) {
List<LeaseApplyDetails> leaseApplyDetails = task.getLeaseApplyDetails();
if (CollUtil.isEmpty(leaseApplyDetails)) {
return AjaxResult.error("领料出库信息为空");
}
List<LeaseApplyInfo> leaseApplyInfoList = applyInfoService.selectIdByTaskId(task.getTaskId().intValue());
List<LeaseOutDetails> list = new ArrayList();
for (LeaseApplyDetails leaseApplyDetail : leaseApplyDetails) {
LeaseOutDetails leaseOutDetails = new LeaseOutDetails();
for (LeaseApplyInfo leaseApplyInfo : leaseApplyInfoList) {
if (leaseApplyInfo.getCompanyId().equals(leaseApplyDetail.getCompanyId())) {
leaseOutDetails.setParentId(leaseApplyInfo.getId());
}
}
leaseOutDetails.setTypeId(leaseApplyDetail.getTypeId());
leaseOutDetails.setMaId(leaseApplyDetail.getMaId());
leaseOutDetails.setOutNum(leaseApplyDetail.getPreNum());
leaseOutDetails.setCompanyId(leaseApplyDetail.getCompanyId());
list.add(leaseOutDetails);
}
// 新增出库记录
int res4 = workSiteDirectManageService.insertLeaseOutDetail(leaseOutDetails);
int res4 = workSiteDirectManageService.insertLeaseOutDetail(list);
if (res4 == 0) {
return AjaxResult.error("新增出库记录失败");
}
@ -170,7 +180,7 @@ public class WorkSiteDirectManageController extends BaseController {
backApplyInfo.setCode(tcode);
//创建退料任务（tm_task）
backApplyInfo.setTaskType(36);
backApplyInfo.setTaskStatus("37");
backApplyInfo.setTaskStatus("40");
int res5 = workSiteDirectManageService.insertTmTaskByBackInfo(backApplyInfo);
if (res5 == 0) {
return AjaxResult.error("退料任务新建失败");
@ -187,7 +197,11 @@ public class WorkSiteDirectManageController extends BaseController {
return AjaxResult.error("退料信息和详情新增失败");
}
int res8 = workSiteDirectManageService.insertBackCheckDetails(backApplyInfo);
List<BackApplyInfo> backApplyDetails = backApplyInfo.getBackApplyDetails();
if (CollUtil.isEmpty(backApplyDetails)) {
return AjaxResult.error("退料详情信息为空");
}
int res8 = workSiteDirectManageService.insertBackCheckDetails(backApplyDetails);
if (res8 == 0) {
return AjaxResult.error("新增入库记录失败");
}
@ -214,7 +228,7 @@ public class WorkSiteDirectManageController extends BaseController {
@ApiOperation(value = "查看详情")
@GetMapping("/getInfo")
public AjaxResult refuse(String id) {
public AjaxResult getInfo(String id) {
return AjaxResult.success(workSiteDirectManageService.getInfoById(id));
}
}

6
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/BackApplyInfo.java
View File

@ -51,6 +51,12 @@ public class BackApplyInfo extends BaseEntity {
*/
private String backStatus;
/**
* 退料数量
*/
private Integer backNum;
private Integer directNum;
/** 退料单号 */
@Excel(name = "退料单号")
@ApiModelProperty(value = "退料单号")

2
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/DirectPassApplyInfoDetails.java
View File

@ -18,7 +18,7 @@ public class DirectPassApplyInfoDetails extends BaseEntity {
private String id;
private TmTask task;
private TmTask leaseApplyInfo;
private BackApplyInfo backApplyInfo;

7
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/LeaseApplyDetails.java
View File

@ -36,6 +36,13 @@ public class LeaseApplyDetails implements Serializable {
@ApiModelProperty(value = "规格ID")
private Integer typeId;
/**
* 机具ID
*/
@ApiModelProperty(value = "机具Id")
private Integer maId;
/**
* 类型名称
*/

2
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/ApplyInfoMapper.java
View File

@ -14,4 +14,6 @@ import java.util.List;
public interface ApplyInfoMapper {
int insertSelective(LeaseApplyInfo record);
List<LeaseApplyInfo> selectIdByTaskId(Integer id);
}

1
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/BackRecordMapper.java
View File

@ -23,7 +23,6 @@ public interface BackRecordMapper {
*/
List<BackRecord> getBackRecordList(BackRecord bean);
int insertBcd(BackApplyInfo backApplyInfo);
int insertCheckDetails(BackApplyInfo backApplyInfo);

4
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/WorkSiteDirectManageMapper.java
View File

@ -35,6 +35,8 @@ public interface WorkSiteDirectManageMapper {
List<DirectApplyInfo> getList();
List<DirectApplyInfo> getList(@Param("record") DirectApplyInfo directApplyInfo);
DirectApplyInfo getDirectApplyInfoById(String id);
int insertSelective(LeaseApplyInfo leaseApplyInfo);
@ -58,4 +60,6 @@ public interface WorkSiteDirectManageMapper {
int insertBackApplyInfo(TmTask task);
DirectApplyInfo getInfoById(String id);
List<DirectApplyDetails> getDetailById(String id);
}

4
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/ApplyInfoService.java
View File

@ -2,10 +2,14 @@ package com.bonus.sgzb.material.service;
import com.bonus.sgzb.material.domain.LeaseApplyInfo;
import java.util.List;
/**
* @Author：梁超
* @date：2024/3/6 - 17:41
*/
public interface ApplyInfoService {
int genderLeaseCode(LeaseApplyInfo record);
List<LeaseApplyInfo> selectIdByTaskId(Integer id);
}

5
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/WorkSiteDirectManageService.java
View File

@ -21,6 +21,9 @@ public interface WorkSiteDirectManageService {
List<DirectApplyInfo> getList();
List<DirectApplyInfo> getList(DirectApplyInfo directApplyInfo);
String genderLeaseCode();
DirectApplyInfo getDirectApplyInfoById(String id);
@ -39,7 +42,7 @@ public interface WorkSiteDirectManageService {
int insertAgreementByBackInfo(BackApplyInfo backApplyInfo);
int insertBackCheckDetails(BackApplyInfo backApplyInfo);
int insertBackCheckDetails(List<BackApplyInfo> backApplyDetails);
DirectApplyInfo getInfoById(String id);
}

3
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/AgreementInfoServiceImpl.java
View File

@ -1,11 +1,10 @@
package com.bonus.sgzb.material.service.impl;
import com.bonus.sgzb.common.core.utils.StringHelper;
import com.bonus.sgzb.common.core.utils.DateUtils;
import com.bonus.sgzb.common.core.web.domain.AjaxResult;
import com.bonus.sgzb.material.domain.AgreementInfo;
import com.bonus.sgzb.material.mapper.AgreementInfoMapper;
import com.bonus.sgzb.material.service.AgreementInfoService;
import com.bonus.sgzb.common.core.utils.DateUtils;
import com.bonus.sgzb.material.vo.GlobalContants;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

6
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/ApplyInfoServiceImpl.java
View File

@ -7,6 +7,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.List;
/**
* @Author：梁超
@ -22,4 +23,9 @@ public class ApplyInfoServiceImpl implements ApplyInfoService {
public int genderLeaseCode(LeaseApplyInfo record) {
return leaseApplyInfoMapper.insertSelective(record);
}
@Override
public List<LeaseApplyInfo> selectIdByTaskId(Integer id) {
return leaseApplyInfoMapper.selectIdByTaskId(id);
}
}

23
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseCheckInfoServiceImpl.java
View File

@ -1,16 +1,12 @@
package com.bonus.sgzb.material.service.impl;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;
import com.bonus.sgzb.common.core.utils.DateUtils;
import com.bonus.sgzb.common.security.utils.SecurityUtils;
import com.bonus.sgzb.material.domain.*;
import com.bonus.sgzb.material.mapper.PurchaseCheckDetailsMapper;
import com.bonus.sgzb.material.mapper.PurchaseCheckInfoMapper;
import com.bonus.sgzb.material.mapper.TaskMapper;
import com.bonus.sgzb.material.service.IPurchaseCheckInfoService;
import com.bonus.sgzb.common.core.utils.DateUtils;
import com.bonus.sgzb.material.vo.GlobalContants;
import com.bonus.sgzb.material.vo.NoticeInfoVO;
import com.bonus.sgzb.system.api.RemoteUserService;
@ -18,6 +14,9 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;
/**
* 新购验收任务Service业务层处理
@ -216,7 +215,19 @@ public class PurchaseCheckInfoServiceImpl implements IPurchaseCheckInfoService {
*/
@Override
public int deletePurchaseCheckInfoByTaskId(Long taskId) {
return purchaseCheckInfoMapper.deletePurchaseCheckInfoByTaskId(taskId);
int result = 0;
try {
// 第一步：删除验收任务表
purchaseCheckInfoMapper.deletePurchaseCheckInfoByTaskId(taskId);
// 第二步：删除验收任务详情表
purchaseCheckDetailsMapper.deleteCheckDetailsByTaskId(taskId);
// 第三步：删除任务表
taskMapper.deleteTmTaskByTaskId(taskId);
result = 1;
} catch (Exception e) {
throw new RuntimeException(e);
}
return result;
}
/**

2
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/ScrapApplyDetailsServiceImpl.java
View File

@ -72,7 +72,7 @@ public class ScrapApplyDetailsServiceImpl implements IScrapApplyDetailsService {
@Override
public List<String> getFileUrl(String fileIds) {
List<String> fileUrlList = new ArrayList<>();
if (fileIds.isEmpty()){
if (fileIds != null && !fileIds.isEmpty()) {
for (String s : fileIds.split(",")) {
String url = scrapApplyDetailsMapper.getFileUrl(s);
fileUrlList.add(url);

28
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/WorkSiteDirectManageImpl.java
View File

@ -79,6 +79,11 @@ public class WorkSiteDirectManageImpl implements WorkSiteDirectManageService {
return workSiteDirectManageMapper.getList();
}
@Override
public List<DirectApplyInfo> getList(DirectApplyInfo directApplyInfo) {
return workSiteDirectManageMapper.getList(directApplyInfo);
}
@Override
public String genderLeaseCode() {
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMdd");
@ -323,26 +328,25 @@ public class WorkSiteDirectManageImpl implements WorkSiteDirectManageService {
}
@Override
public int insertBackCheckDetails(BackApplyInfo backApplyInfo) {
public int insertBackCheckDetails(List<BackApplyInfo> backApplyDetails) {
//插入back_check_details
return insertBcd(backApplyInfo);
return insertBcd(backApplyDetails);
}
@Override
public DirectApplyInfo getInfoById(String id) {
return workSiteDirectManageMapper.getInfoById(id);
DirectApplyInfo directApplyInfo = workSiteDirectManageMapper.getInfoById(id);
List<DirectApplyDetails> detailById = workSiteDirectManageMapper.getDetailById(id);
directApplyInfo.setDirectApplyDetails(detailById);
return directApplyInfo;
}
public int insertBcd(BackApplyInfo backApplyInfo) {
public int insertBcd(List<BackApplyInfo> backApplyDetails) {
int res = 0;
BackApplyInfo[] arr = backApplyInfo.getArr();
if (arr.length > 0) {
for (int i = 0; i < arr.length; i++) {
res = backRecordMapper.insertCheckDetails(arr[i]);
int maId = arr[i].getMaId();
//退料完成状态改成在库
backRecordMapper.updateMaStatus(maId, "15");
}
for (BackApplyInfo backApplyDetail : backApplyDetails) {
backApplyDetail.setBackNum(Integer.valueOf(backApplyDetail.getDirectNum()));
backApplyDetail.setBackStatus("1");
res = backRecordMapper.insertCheckDetails(backApplyDetail);
}
return res;
}

4
sgzb-modules/sgzb-material/src/main/resources/mapper/material/ApplyInfoMapper.xml
View File

@ -112,5 +112,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</if>
</trim>
</insert>
<select id="selectIdByTaskId" resultType="com.bonus.sgzb.material.domain.LeaseApplyInfo">
select * from lease_apply_info where task_id = #{id}
</select>
</mapper>

3
sgzb-modules/sgzb-material/src/main/resources/mapper/material/BackRecordMapper.xml
View File

@ -3,9 +3,6 @@
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.bonus.sgzb.material.mapper.BackRecordMapper">
<insert id="insertBcd">
</insert>
<insert id="insertCheckDetails">
insert into back_check_details
(

61
sgzb-modules/sgzb-material/src/main/resources/mapper/material/WorkSiteDirectManageMapper.xml
View File

@ -369,7 +369,7 @@
LEFT JOIN ma_machine mm on sai.ma_id = mm.ma_id
where sai.agreement_id = #{agreementId} and sai.status = '0'
GROUP BY
sai.type_id,sai.ma_id
sai.ma_id,sai.type_id
</select>
<select id="getList" resultType="com.bonus.sgzb.base.api.domain.DirectApplyInfo">
SELECT DISTINCT
@ -390,6 +390,27 @@
LEFT JOIN bm_project_lot bpl1 ON bpl1.lot_id = bai1.project_id
LEFT JOIN bm_unit_info bui ON bui.unit_id = bai.unit_id
LEFT JOIN bm_unit_info bui1 ON bui1.unit_id = bai1.unit_id
WHERE
1=1
<if test="record.keyWord != null and record.keyWord != ''">
and (bpl.lot_name like concat('%', #{keyWord}, '%') or
bui.unit_name like concat('%', #{keyWord}, '%'))
</if>
<if test="record.lotId != null and record.lotId != ''">
and bpl.lot_id = #{record.lotId}
</if>
<if test="record.unitId != null and record.unitId != ''">
and bui.unitId = #{record.unitId}
</if>
<if test="record.backMan != null and record.backMan != ''">
and dai.back_man like concat('%', #{backMan}, '%')
</if>
<if test="record.backPhone != null and record.backPhone != ''">
and dai.back_phone like concat('%', #{backPhone}, '%')
</if>
<if test="record.status != null and record.status != ''">
and dai.status = #{status}
</if>
</select>
<select id="getDirectApplyInfoById" resultType="com.bonus.sgzb.base.api.domain.DirectApplyInfo">
select * from direct_apply_info where id = #{id}
@ -412,13 +433,9 @@
<select id="getInfoById" resultType="com.bonus.sgzb.base.api.domain.DirectApplyInfo">
SELECT
dai.*,
dad.direct_num AS directNum,
bai.agreement_code as backAgreementCode,
bai1.agreement_code as leaseAgreementCode,
bpl.lot_id AS backProId,
mt3.type_name AS typeName,
mt2.type_name AS kindName,
mt.type_name AS modelName,
mt.unit_name AS unitName,
mm.ma_code AS maCode,
bpl.lot_name AS backProName,
bui.unit_id AS backUnitId,
bui.unit_name AS backUnitName,
@ -429,17 +446,39 @@
FROM
direct_apply_info dai
LEFT JOIN direct_apply_details dad ON dai.id = dad.direct_id
LEFT JOIN ma_type mt ON mt.type_id = dad.type_id
LEFT JOIN ma_type mt2 ON mt2.type_id = mt.parent_id
LEFT JOIN ma_type mt3 ON mt2.parent_id = mt3.type_id
LEFT JOIN ma_machine mm ON dad.ma_id = mm.ma_id
LEFT JOIN bm_agreement_info bai ON dai.back_agreement_id = bai.agreement_id
LEFT JOIN bm_agreement_info bai1 ON dai.lease_agreement_id = bai1.agreement_id
LEFT JOIN bm_project_lot bpl ON bpl.lot_id = bai.project_id
LEFT JOIN bm_project_lot bpl1 ON bpl1.lot_id = bai1.project_id
LEFT JOIN bm_unit_info bui ON bui.unit_id = bai.unit_id
LEFT JOIN bm_unit_info bui1 ON bui1.unit_id = bai1.unit_id
WHERE
dai.id = #{id} GROUP BY dai.id
</select>
<select id="getDetailById" resultType="com.bonus.sgzb.base.api.domain.DirectApplyDetails">
SELECT
dad.direct_num AS directNum,
dad.type_id AS typeId,
mt.company_id AS companyId,
mt3.type_name AS typeName,
mt2.type_name AS kindName,
mt.type_name AS modelName,
mt.unit_name AS unitName,
sum( sai.num ) AS useNum,
mm.ma_code AS maCode
FROM
direct_apply_info dai
LEFT JOIN direct_apply_details dad ON dai.id = dad.direct_id
LEFT JOIN slt_agreement_info sai ON dai.back_agreement_id = sai.agreement_id
AND sai.type_id = dad.type_id
LEFT JOIN ma_type mt ON mt.type_id = dad.type_id
LEFT JOIN ma_type mt2 ON mt2.type_id = mt.parent_id
LEFT JOIN ma_type mt3 ON mt2.parent_id = mt3.type_id
LEFT JOIN ma_machine mm ON dad.ma_id = mm.ma_id
WHERE
dai.id = #{id}
AND sai.STATUS = '0'
GROUP BY
dad.id,sai.ma_id,sai.type_id
</select>
</mapper>

10
sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/service/impl/SysFileServiceImpl.java
View File

@ -12,6 +12,7 @@ import org.apache.poi.hwpf.extractor.WordExtractor;
import org.apache.poi.openxml4j.util.ZipSecureFile;
import org.apache.poi.xwpf.extractor.XWPFWordExtractor;
import org.apache.poi.xwpf.usermodel.XWPFDocument;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Primary;
import org.springframework.stereotype.Service;
import org.springframework.web.multipart.MultipartFile;
@ -37,6 +38,11 @@ public class SysFileServiceImpl implements SysFileService {
@Resource
private FileInfoMapper dao;
/**
* 上传文件存储在本地的根路径
*/
@Value("${file.path}")
private String localFilePath;
/**
* 本地文件上传接口
@ -133,7 +139,7 @@ public class SysFileServiceImpl implements SysFileService {
String tmpName = multipartFile.getOriginalFilename();
tmpName = tmpName.substring(tmpName.lastIndexOf("\\") + 1);
tmpName = IdUtil.fastSimpleUUID() + System.currentTimeMillis() + tmpName.substring(tmpName.lastIndexOf("."), tmpName.length());
String imageFiles = "/data/sgzb/" + fileType + "/";
String imageFiles = localFilePath + fileType + "/";
String os = System.getProperty("os.name");
if (os.toLowerCase().startsWith(GlobalConstants.STRING_WIN)) {
imageFiles = "D://files/" + fileType + "/";
@ -172,7 +178,7 @@ public class SysFileServiceImpl implements SysFileService {
String tmpName = multipartFile.getOriginalFilename();
tmpName = tmpName.substring(tmpName.lastIndexOf("\\") + 1);
tmpName = IdUtil.fastSimpleUUID() + System.currentTimeMillis() + tmpName.substring(tmpName.lastIndexOf("."), tmpName.length());
String imageFiles = "/data/sgzb/" + fileType + "/";
String imageFiles = localFilePath + fileType + "/";
String os = System.getProperty("os.name");
if (os.toLowerCase().startsWith(GlobalConstants.STRING_WIN)) {
imageFiles = "D://files/" + fileType + "/";