diff --git a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/LeaseOutDetails.java b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/LeaseOutDetails.java index 83663a78..415b6cd1 100644 --- a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/LeaseOutDetails.java +++ b/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 diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/LeaseOutDetailsController.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/LeaseOutDetailsController.java index cc3e6951..827edf08 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/LeaseOutDetailsController.java +++ b/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 outboundOrder = leaseOutDetailsService.getOutboundOrder(parentId); + return AjaxResult.success(getDataTable(outboundOrder)); + } /** * @param recordList diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/TmTaskController.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/TmTaskController.java index a5bc1629..8eeeb24d 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/TmTaskController.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/TmTaskController.java @@ -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(); diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/LeaseApplyDetails.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/LeaseApplyDetails.java index 4b943aad..dcbd0575 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/LeaseApplyDetails.java +++ b/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; + /** * 规格型号 */ diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/LeaseOutDetailsMapper.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/LeaseOutDetailsMapper.java index a509fdaa..fa5c5572 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/LeaseOutDetailsMapper.java +++ b/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 getOutboundOrder(String parentId); } diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/TmTaskMapper.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/TmTaskMapper.java index 8d3b344e..6ea019cd 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/TmTaskMapper.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/TmTaskMapper.java @@ -139,6 +139,7 @@ public interface TmTaskMapper { int getDeptId(String createBy); List getLeaseOutListByjjbz(TmTask task); + List getLeaseOutListByts(TmTask task); List getLeaseOutListByAdmin(TmTask task); int updateLeaseAuditListByOne(TmTask task); diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/LeaseOutDetailsService.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/LeaseOutDetailsService.java index 85450ac3..c44c8e1a 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/LeaseOutDetailsService.java +++ b/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 getOutboundOrder(String parentId); /** * 根据code编码查询设备信息 * @param maCode 机具编码 diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/LeaseOutDetailsServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/LeaseOutDetailsServiceImpl.java index 950db6b3..54502146 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/LeaseOutDetailsServiceImpl.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/LeaseOutDetailsServiceImpl.java @@ -198,38 +198,43 @@ public class LeaseOutDetailsServiceImpl implements LeaseOutDetailsService { return AjaxResult.success("出库成功"); } + @Override + public List getOutboundOrder(String parentId) { + return leaseOutDetailsMapper.getOutboundOrder(parentId); + } + private int insertRecords(LeaseOutDetails record) { int res = 0; // 首先更新领料任务详情表的领料数及状态（lease_apply_details） res = leaseOutDetailsMapper.updateLeaseApplyDetailsOutNum(record); LeaseApplyDetails leaseApplyDetails = leaseOutDetailsMapper.getLeaseApplyDetails(record); - if (leaseApplyDetails.getPreNum().equals(leaseApplyDetails.getAlNum()) || leaseApplyDetails.getAuditNum().equals(leaseApplyDetails.getAlNum())){ + if (leaseApplyDetails.getPreNum().equals(leaseApplyDetails.getAlNum()) || leaseApplyDetails.getAuditNum().equals(leaseApplyDetails.getAlNum())) { leaseOutDetailsMapper.updateLeaseApplyDetails(record); } + if (res > 0) { + // 插入领料出库明细表（lease_out_details） + res = leaseOutDetailsMapper.insertSelective(record); if (res > 0) { - // 插入领料出库明细表（lease_out_details） - res = leaseOutDetailsMapper.insertSelective(record); - if (res > 0) { - if (record.getManageType() == 2) { - // 成套机具减少 (ma_type 设备规格表)的库存数量 - res = leaseOutDetailsMapper.updateMaTypeStockNum(record); - // 成套机具减少 (ma_type 设备规格表)配件的库存数量 - List typeIds = leaseOutDetailsMapper.getMaTypeDetails(record); - typeIds.removeIf(item -> item == null); - for (TmTask typeId : typeIds) { - MachinePart machinePart = leaseOutDetailsMapper.getMachineParts(typeId); - machinePart.setPartNum((typeId.getPartNum() * record.getOutNum())); - typeId.setNum(machinePart.getNum() - machinePart.getPartNum()); - res = leaseOutDetailsMapper.updateMaTypeStockNumCt(typeId); - } - } else { - // 普通机具减少 (ma_type 设备规格表)的库存数量 - res = leaseOutDetailsMapper.updateMaTypeStockNum(record); + if (record.getManageType() == 2) { + // 成套机具减少 (ma_type 设备规格表)的库存数量 + res = leaseOutDetailsMapper.updateMaTypeStockNum(record); + // 成套机具减少 (ma_type 设备规格表)配件的库存数量 + List typeIds = leaseOutDetailsMapper.getMaTypeDetails(record); + typeIds.removeIf(item -> item == null); + for (TmTask typeId : typeIds) { + MachinePart machinePart = leaseOutDetailsMapper.getMachineParts(typeId); + machinePart.setPartNum((typeId.getPartNum() * record.getOutNum())); + typeId.setNum(machinePart.getNum() - machinePart.getPartNum()); + res = leaseOutDetailsMapper.updateMaTypeStockNumCt(typeId); } - // 更新 (ma_machine 设备表)的状态 - leaseOutDetailsMapper.updateMaMachineStatus(record); + } else { + // 普通机具减少 (ma_type 设备规格表)的库存数量 + res = leaseOutDetailsMapper.updateMaTypeStockNum(record); } + // 更新 (ma_machine 设备表)的状态 + leaseOutDetailsMapper.updateMaMachineStatus(record); } + } return res; } @@ -239,7 +244,7 @@ public class LeaseOutDetailsServiceImpl implements LeaseOutDetailsService { List leaseApplyDetailsList = leaseApplyDetailsMapper.getByParentId(record.getParentId()); int i = 0; for (LeaseApplyDetails bean : leaseApplyDetailsList) { - if (Objects.equals(bean.getPreNum(), bean.getAlNum())) { + if (Objects.equals(bean.getPreNum(), bean.getAlNum()) || "2".equals(bean.getStatus())) { i++; } } diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java index eb330e42..8dc8758d 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java +++ b/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; @@ -230,6 +234,7 @@ public class TmTaskServiceImpl implements TmTaskService { /** * 领料申请审批逐级发送短信通知相关人员审核方法抽取 + * * @param record */ private void sendMessageToLeader(TmTask record) { @@ -248,10 +253,10 @@ public class TmTaskServiceImpl implements TmTaskService { urgentProcessingUser.setTaskStatus(TaskStatusEnum.STAY_INTERNAL_AUDIT.getInfo()); break; } - List userList =remoteUserService.processingUser(urgentProcessingUser).getData(); - if (userList.size()>0) { + List userList = remoteUserService.processingUser(urgentProcessingUser).getData(); + if (userList.size() > 0) { log.info("查询到待发送短信人员信息为：{}", userList); - String message ="尊敬的用户，宁夏智慧仓储管理系统提醒您：您有一个领料单号为:"+ record.getCode() +"的领料申请待处理，请及时查看"; + String message = "尊敬的用户，宁夏智慧仓储管理系统提醒您：您有一个领料单号为:" + record.getCode() + "的领料申请待处理，请及时查看"; if (CollectionUtils.isNotEmpty(userList)) { for (SysUser sysUser : userList) { if (StringUtils.isNotBlank(sysUser.getPhonenumber())) { @@ -332,13 +337,13 @@ public class TmTaskServiceImpl implements TmTaskService { @Override public List getLeaseAuditListByOne(TmTask record) { Set roles = SecurityUtils.getLoginUser().getRoles(); - if (roles.contains("jjbz") || roles.contains("fbz")) { +// if (roles.contains("jjbz") || roles.contains("fbz")) { List leaseDetailByParentId = tmTaskMapper.getLeaseDetailByjjbz(record); return leaseDetailByParentId; - } else { - List leaseDetailByParentId = tmTaskMapper.getLeaseDetailByParentId(record); - return leaseDetailByParentId; - } +// } else { +// List leaseDetailByParentId = tmTaskMapper.getLeaseDetailByParentId(record); +// return leaseDetailByParentId; +// } /* for (TmTask tmTask : leaseDetailByParentId) { if ("2".equals(tmTask.getManageType())) { List manageTypeByTypeId = tmTaskMapper.getManageTypeByTypeId(tmTask); @@ -642,11 +647,15 @@ public class TmTaskServiceImpl implements TmTaskService { @Override public List getLeaseOutListByUser(TmTask task) { Set roles = SecurityUtils.getLoginUser().getRoles(); - if (roles.contains("admin")){ + Long deptId = SecurityUtils.getLoginUser().getSysUser().getDeptId(); + if (roles.contains("admin")) { return tmTaskMapper.getLeaseOutListByAdmin(task); - } else if (roles.contains("jjbz") || roles.contains("fbz")) { - //机具班长和副班长可以出库机具设备 + } else if (roles.contains("jjbz") || roles.contains("fbz") || deptId == 101) { + //机具班长、副班长、机具分公司可以查看机具设备 return tmTaskMapper.getLeaseOutListByjjbz(task); + } else if (deptId == 102) { + //调试分公司可以查看调试设备 + return tmTaskMapper.getLeaseOutListByts(task); } else { return tmTaskMapper.getLeaseOutListByUser(task); } @@ -660,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 = tmTaskMapper.getleaseDetailsStatus(task); @@ -675,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; } } diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/BmProjectInfo.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/BmProjectInfo.java index 9dd1eb17..e3eb3fb8 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/BmProjectInfo.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/BmProjectInfo.java @@ -2,10 +2,12 @@ package com.bonus.sgzb.base.domain; import com.bonus.sgzb.common.core.annotation.Excel; +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.sql.Timestamp; +import java.util.Date; import java.util.List; @Data @@ -59,6 +61,14 @@ public class BmProjectInfo { /**数据所属组织*/ @ApiModelProperty(value = "数据所属组织") private String companyId; + /**开工日期*/ + @ApiModelProperty(value = "开工日期") + @JsonFormat(pattern = "yyyy-MM-dd") + private String startDate; + /**竣工日期*/ + @ApiModelProperty(value = "竣工日期") + @JsonFormat(pattern = "yyyy-MM-dd") + private String completionDate; /**数据所属组织*/ @Excel(name = "所属上级") diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/BmProjectLot.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/BmProjectLot.java index f9381511..8a5e2ffc 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/BmProjectLot.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/BmProjectLot.java @@ -2,10 +2,12 @@ package com.bonus.sgzb.base.domain; import com.bonus.sgzb.common.core.annotation.Excel; +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.sql.Timestamp; +import java.util.Date; import java.util.List; @Data @@ -112,6 +114,20 @@ public class BmProjectLot { */ @ApiModelProperty(value = "数据所属组织") private String companyId; + /** + /** + * 开工日期 + */ + @ApiModelProperty(value = "开工日期") + @JsonFormat(pattern = "yyyy-MM-dd") + private String startDate; + /** + /** + * 竣工日期 + */ + @ApiModelProperty(value = "竣工日期") + @JsonFormat(pattern = "yyyy-MM-dd") + private String completionDate; /** * 数据所属组织 */ diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/largeScreen/service/impl/LargeScreenServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/largeScreen/service/impl/LargeScreenServiceImpl.java index 450eea79..cec081ab 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/largeScreen/service/impl/LargeScreenServiceImpl.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/largeScreen/service/impl/LargeScreenServiceImpl.java @@ -169,23 +169,28 @@ public class LargeScreenServiceImpl implements ILargeScreenService { @Override public PageResultVo getAcceptanceDetailStorage(ParamsDto dto) { extracted(dto); - // 分页 - PageHelper.startPage(dto.getPageNum() == 0 ? 1 : dto.getPageNum(), dto.getPageSize()); - PageResultVo pageResult = new PageResultVo(); - List result; - result = mapper.getAcceptanceDetailStorage(dto); - result = result.stream() + List result = mapper.getAcceptanceDetailStorage(dto); + List filteredResult = result.stream() .filter(storageDetail -> storageDetail.getPurchaseNum() != 0 || storageDetail.getCheckNum() != 0 || storageDetail.getInputNum() != 0) .collect(Collectors.toList()); - // 分页信息 - PageInfo pageInfo = new PageInfo<>(result); - pageResult.setTotal(pageInfo.getTotal()); - pageResult.setTotalPageCount(pageInfo.getPages()); - pageResult.setRows(result); - pageResult.setPageNum (dto.getPageNum()); - pageResult.setPageSize(dto.getPageSize()); + // 手动计算分页信息 + int pageNum = dto.getPageNum() == 0 ? 1 : dto.getPageNum(); + int pageSize = dto.getPageSize(); + int total = filteredResult.size(); + int totalPages = (int) Math.ceil((double) total / pageSize); + // 手动分页，获取当前页的数据 + int startIndex = (pageNum - 1) * pageSize; + int endIndex = Math.min(startIndex + pageSize, total); + List currentPageData = filteredResult.subList(startIndex, endIndex); + // 构建返回结果对象 + PageResultVo pageResult = new PageResultVo(); + pageResult.setTotal(total); + pageResult.setTotalPageCount(totalPages); + pageResult.setRows(currentPageData); + pageResult.setPageNum(pageNum); + pageResult.setPageSize(pageSize); return pageResult; } diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/LeaseOutDetailsMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/LeaseOutDetailsMapper.xml index ad3a9044..9cb398f1 100644 --- a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/LeaseOutDetailsMapper.xml +++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/LeaseOutDetailsMapper.xml @@ -450,4 +450,29 @@ parennt_id = #{record.parentId} AND type_id = #{record.typeId} + + \ No newline at end of file diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml index 043e85ea..9319aa94 100644 --- a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml +++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml @@ -671,15 +671,15 @@ bui.unit_id as unitId,bui.unit_name as unitName, su.nick_name as applyFor,d.`name` as taskName, - su2.user_name as companyAuditBy, + su2.nick_name as companyAuditBy, lai.company_audit_time as companyAuditTime, lai.company_audit_remark as companyAuditRemark, - su3.user_name as deptAuditBy, + su3.nick_name as deptAuditBy, lai.dept_audit_time as deptAuditTime, lai.dept_audit_remark as deptAuditRemark, - su4.user_name as directAuditBy, + su4.nick_name as directAuditBy, lai.direct_audit_time as directAuditTime, lai.direct_audit_remark as directAuditRemark, lai.lease_type as leaseType, @@ -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 @@ -1087,7 +1088,8 @@ mt.type_name as typeModelName, mt.manage_type as manageType, mt.num as num, - GROUP_CONCAT(su.user_name) as userName, + GROUP_CONCAT(su.user_id) as userId, + GROUP_CONCAT(su.nick_name) as userName, lad.status as status, lad.type_id as typeId FROM @@ -1196,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, @@ -1208,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 @@ -1270,7 +1273,8 @@ mt.type_name as typeModelName, mt.manage_type as manageType, mt.num as num, - GROUP_CONCAT(su.user_name) as userName, + GROUP_CONCAT(su.nick_name) as userName, + GROUP_CONCAT(su.user_id) as userId, lad.status as status, lad.type_id as typeId FROM @@ -1300,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, @@ -1312,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 @@ -1334,4 +1339,50 @@ GROUP BY lai.id ORDER BY tt.task_status,tt.create_time desc + diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/BmProjectInfoMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/BmProjectInfoMapper.xml index b510be9a..023ab8ff 100644 --- a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/BmProjectInfoMapper.xml +++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/BmProjectInfoMapper.xml @@ -32,7 +32,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select a.lot_id, a.pro_id, a.lot_name, a.status, a.type_id, a.link_man, a.telphone, a.own_pro, a.dept_id, a.is_share, - a.lon, a.lat, a.del_flag, a.create_by, a.create_time,a.remark,a.company_id ,b.dept_name, c.name + a.lon, a.lat, a.del_flag, a.create_by, a.create_time,a.remark,a.company_id ,b.dept_name, c.name,a.start_date,a.completion_date from bm_project_lot a left join sys_dept b on a.dept_id = b.dept_id left join sys_dic c on a.type_id = c.id @@ -115,6 +115,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update_time, remark, company_id, + start_date, + completion_date, create_time )values( #{lotName}, @@ -130,6 +132,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{updateBy}, #{remark}, #{companyId}, + #{startDate}, + #{completionDate}, sysdate() ) @@ -149,6 +153,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update_by =#{updateBy}, remark = #{remark}, company_id = #{companyId}, + start_date = #{startDate}, + completion_date = #{completionDate}, update_time = sysdate() where lot_id = #{lotId} diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/InventoryAndWarehousingMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/InventoryAndWarehousingMapper.xml index 5c760549..868598d2 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/InventoryAndWarehousingMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/InventoryAndWarehousingMapper.xml @@ -196,7 +196,7 @@ bui.unit_name AS unitName, pisi.`CODE` AS kindName, mt2.type_name AS typeName, - su.user_name AS modelName, + su.nick_name AS modelName, pisi.CREATE_DATE AS createDate, pisi.REMARKS AS remark, ROW_NUMBER() OVER (PARTITION BY pisi.`CODE` ORDER BY pisi.CREATE_DATE DESC) AS row_num diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/LeaseRecordMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/LeaseRecordMapper.xml index 78afe2a5..a5420003 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/LeaseRecordMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/LeaseRecordMapper.xml @@ -61,6 +61,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND lod.create_time BETWEEN CONCAT(#{startTime}, ' 00:00:00') AND CONCAT(#{endTime}, ' 23:59:59') + order by lod.create_time desc SELECT - pci.task_id, pci.purchase_time, pci.arrival_time, pci.purchaser, us.user_name as create_by, pci.create_time, + pci.task_id, pci.purchase_time, pci.arrival_time, pci.purchaser, us.nick_name as create_by, pci.create_time, pci.update_by, pci.update_time, pci.remark, pci.company_id ,tk.code,tk.task_status taskStatus,GROUP_CONCAT(distinct mpt1.pa_name) purchasingTypeName, CASE diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseCheckInfoMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseCheckInfoMapper.xml index fd3dc9dc..6fae32a5 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseCheckInfoMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseCheckInfoMapper.xml @@ -178,7 +178,7 @@ WHERE ma_machine.ma_code = select pci.id,pci.task_id, pci.purchase_time, pci.arrival_time, pci.purchaser, pci.create_by, pci.create_time, pci.update_by, pci.update_time, pci.remark, pci.company_id ,dict.name purchasingStatus,tk.code,tk.task_status - taskStatus,su.user_name purchaserName, + taskStatus,su.nick_name purchaserName, tk.create_by, CASE tk.task_status WHEN 28 THEN @@ -190,9 +190,9 @@ WHERE ma_machine.ma_code = END as inputTime, CASE tk.task_status WHEN 28 THEN - us.user_name + us.nick_name WHEN 123 THEN - us.user_name + us.nick_name ELSE '' END as inputUser diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/ReturnOfMaterialsInfoMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/ReturnOfMaterialsInfoMapper.xml index cad47a19..ec548ac1 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/ReturnOfMaterialsInfoMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/ReturnOfMaterialsInfoMapper.xml @@ -11,7 +11,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" iad.input_num as inputNum,mm.ma_code as maCode, tt.create_time as returnTime, iad.create_time as submitStorageTime, - us.user_name as submitToStoragePersonnel,iad.remark as remark + us.nick_name 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 diff --git a/sgzb-ui/src/api/claimAndRefund/receive.js b/sgzb-ui/src/api/claimAndRefund/receive.js index 0f90ffd6..4dc9835a 100644 --- a/sgzb-ui/src/api/claimAndRefund/receive.js +++ b/sgzb-ui/src/api/claimAndRefund/receive.js @@ -2,22 +2,22 @@ import request from '@/utils/request' // 往来单位-下拉 export function getUnitList(query) { - return request({ - url: '/material/agreementInfo/getUnitList', - method: 'get', - params: query - }) - } + return request({ + url: '/material/agreementInfo/getUnitList', + method: 'get', + params: query + }) +} // 工程名称-下拉 export function getProjectList(query) { - return request({ - url: '/material/agreementInfo/getProjectList', - method: 'get', - params: query - }) - } + return request({ + url: '/material/agreementInfo/getProjectList', + method: 'get', + params: query + }) +} // 协议管理-列表 export function getAgreementList(query) { @@ -29,12 +29,12 @@ export function getAgreementList(query) { } // 协议管理-详情 export function getAgreementInfoId(query) { - return request({ - url: '/material/agreementInfo/getAgreementInfoId', - method: 'get', - params: query - }) - } + return request({ + url: '/material/agreementInfo/getAgreementInfoId', + method: 'get', + params: query + }) +} //协议管理--新增 export function addAgreement(data) { @@ -47,20 +47,20 @@ export function addAgreement(data) { // 协议管理--修改 export function updateAgreement(data) { - return request({ - url: '/material/agreementInfo/update', - method: 'post', - data: data - }) - } + return request({ + url: '/material/agreementInfo/update', + method: 'post', + data: data + }) +} // //协议管理--删除 export function removeAgreement(data) { - return request({ - url: '/material/agreementInfo/remove', - method: 'post', - data: data - }) - } + return request({ + url: '/material/agreementInfo/remove', + method: 'post', + data: data + }) +} // 机具领料-申请列表 export function getLeaseManageListAll(query) { @@ -88,7 +88,7 @@ export function getLeaseAuditListAll(query) { } // 获取 来往单位 列表 -export function getUnitData(params = {}){ +export function getUnitData(params = {}) { return request({ url: '/system/select/getUnitCbx', method: 'post', @@ -97,7 +97,7 @@ export function getUnitData(params = {}){ } // 获取 工程 列表 -export function getProData(params = {}){ +export function getProData(params = {}) { return request({ url: '/system/select/getSectionEngineeringCbx', method: 'post', @@ -106,7 +106,7 @@ export function getProData(params = {}){ } // 获取 设备树 -export function getDeviceTypeTree(params = {}){ +export function getDeviceTypeTree(params = {}) { return request({ url: '/system/select/getDeviceTypeTree', method: 'post', @@ -115,76 +115,76 @@ export function getDeviceTypeTree(params = {}){ } // 根据单位id和工程id 获取 协议id -export function getAgreementInfoById(params = {}){ +export function getAgreementInfoById(params = {}) { return request({ - url:'/system/select/getAgreementInfoById', - method:'post', - data:params + url: '/system/select/getAgreementInfoById', + method: 'post', + data: params }) } //提交 领料申请 -export function submitLeaseApply(params = {}){ +export function submitLeaseApply(params = {}) { return request({ - url:'/base/tm_task/submitLeaseApply', + url: '/base/tm_task/submitLeaseApply', method: 'post', - data:params + data: params }) } //编辑 领料申请 -export function editLeaseApply(params = {}){ +export function editLeaseApply(params = {}) { return request({ - url:'/base/tm_task/edit', + url: '/base/tm_task/edit', method: 'post', - data:params + data: params }) } // 参数 领料任务 -export function deleteTask( taskId ){ +export function deleteTask(taskId) { return request({ - url:`/base/tm_task/${taskId}`, - method:'delete' + url: `/base/tm_task/${taskId}`, + method: 'delete' }) } // 根据 领料任务id 获取详情数据 -export function getLeaseListAll( params = {} ){ +export function getLeaseListAll(params = {}) { return request({ url: '/base/tm_task/getLeaseListAll', - method:'get', - params:params + method: 'get', + params: params }) } // 根据 领料任务id 获取详情数据 -export function getLeaseListAllCq( params = {} ){ +export function getLeaseListAllCq(params = {}) { return request({ url: '/base/tm_task/getLeaseListAllCq', - method:'get', - params:params + method: 'get', + params: params }) } // 领料审核 同意 -export function auditLeaseByCompany(params = {} ){ +export function auditLeaseByCompany(params = {}) { return request({ - url:'/base/tm_task/auditLeaseByCompany', - method:'post', - data:params + url: '/base/tm_task/auditLeaseByCompany', + method: 'post', + data: params }) } // 领料审核 同意 -export function auditLeaseByCompanyCq(params = {} ){ +export function auditLeaseByCompanyCq(params = {}) { return request({ - url:'/base/tm_task/auditLeaseByCompanyCq', - method:'post', - data:params + url: '/base/tm_task/auditLeaseByCompanyCq', + method: 'post', + data: params }) } // 领料审核 拒绝 -export function rejectLeaseByCompany(params = {}){ +export function rejectLeaseByCompany(params = {}) { return request({ url: '/base/tm_task/rejectLeaseByCompany', method: 'post', @@ -192,7 +192,7 @@ export function rejectLeaseByCompany(params = {}){ }) } // 领料审核 拒绝 -export function rejectLeaseByCompanyCq(params = {}){ +export function rejectLeaseByCompanyCq(params = {}) { return request({ url: '/base/tm_task/rejectLeaseByCompanyCq', method: 'post', @@ -201,7 +201,7 @@ export function rejectLeaseByCompanyCq(params = {}){ } // 获取 物品类型 -export function getUseTypeTreee(params = {}){ +export function getUseTypeTreee(params = {}) { return request({ url: '/material/backApply/getUseTypeTree', method: 'post', @@ -256,7 +256,7 @@ export function getDetailsByTypeId(query) { } // 领料出库 编码出库 保存 -export function submitOut(params){ +export function submitOut(params) { return request({ url: '/base/leaseOutDetails/submitOutRfid', method: 'post', @@ -265,7 +265,7 @@ export function submitOut(params){ } // 领料出库 数量出库 保存 -export function submitNumOut(params){ +export function submitNumOut(params) { return request({ url: '/base/leaseOutDetails/submitOutRfid', method: 'post', @@ -273,17 +273,17 @@ export function submitNumOut(params){ }) } - // 领料确认 - export function updateLeaseTaskStatusConfirmByCq(params){ - return request({ - url: '/base/tm_task/updateLeaseTaskStatusConfirmByCq', - method: 'post', - data: params - }) - } - +// 领料确认 +export function updateLeaseTaskStatusConfirmByCq(params) { + return request({ + url: '/base/tm_task/updateLeaseTaskStatusConfirmByCq', + method: 'post', + data: params + }) +} + // 当前在用量 -export function getUseNumByTypeId(params){ +export function getUseNumByTypeId(params) { return request({ url: '/material/backApply/getUseNumByTypeId', method: 'get', @@ -292,7 +292,7 @@ export function getUseNumByTypeId(params){ } // 批量审核 -export function auditAll(params){ +export function auditAll(params) { return request({ url: '/material/backApply/auditAll', method: 'post', @@ -301,7 +301,7 @@ export function auditAll(params){ } // 手动出库结单 -export function outboundCompleted(params){ +export function outboundCompleted(params) { return request({ url: '/base/tm_task/outboundCompleted', method: 'post', @@ -309,6 +309,15 @@ export function outboundCompleted(params){ }) } +// 查看测试单 +export const outboundOrderApi = (params) => { + return request({ + url: '/base/leaseOutDetails/getOutboundOrder', + method: 'get', + params + }) +} + diff --git a/sgzb-ui/src/components/DialogModel/index.vue b/sgzb-ui/src/components/DialogModel/index.vue index bf6d3700..ab8d969c 100644 --- a/sgzb-ui/src/components/DialogModel/index.vue +++ b/sgzb-ui/src/components/DialogModel/index.vue @@ -7,6 +7,7 @@ :visible.sync="dialogConfig.outerVisible" v-if="dialogConfig.outerVisible" :before-close="handleCloseOuter" + :center="dialogConfig.center || false" append-to-body > diff --git a/sgzb-ui/src/views/base/project/index.vue b/sgzb-ui/src/views/base/project/index.vue index 2b528dca..b05ca2ae 100644 --- a/sgzb-ui/src/views/base/project/index.vue +++ b/sgzb-ui/src/views/base/project/index.vue @@ -86,31 +86,43 @@ label="工程项目名称" align="center" prop="proName" - :show-overflow-tooltip="true" + show-overflow-tooltip /> + + @@ -221,6 +233,35 @@ onkeyup="this.value = this.value.replace(/[^\d]/g,'');" /> + + + + + +
= endDate) { + this.form.completionDate = '' + } + } + }, }, } diff --git a/sgzb-ui/src/views/base/section/index.vue b/sgzb-ui/src/views/base/section/index.vue index 5a4eb75c..c1f8e79d 100644 --- a/sgzb-ui/src/views/base/section/index.vue +++ b/sgzb-ui/src/views/base/section/index.vue @@ -84,37 +84,49 @@ label="标段工程名称" align="center" prop="lotName" - :show-overflow-tooltip="true" + show-overflow-tooltip /> + + + + + + + +
= endDate) { + this.form.completionDate = '' + } + } + }, }, } diff --git a/sgzb-ui/src/views/base/unit/index.vue b/sgzb-ui/src/views/base/unit/index.vue index 18b0dacb..b4dd2b32 100644 --- a/sgzb-ui/src/views/base/unit/index.vue +++ b/sgzb-ui/src/views/base/unit/index.vue @@ -93,21 +93,21 @@ prop="status" width="200" > -