diff --git a/sgzb-common/sgzb-common-core/src/main/java/com/bonus/sgzb/common/core/enums/TaskStatusEnum.java b/sgzb-common/sgzb-common-core/src/main/java/com/bonus/sgzb/common/core/enums/TaskStatusEnum.java index 5544c24..ba6868d 100644 --- a/sgzb-common/sgzb-common-core/src/main/java/com/bonus/sgzb/common/core/enums/TaskStatusEnum.java +++ b/sgzb-common/sgzb-common-core/src/main/java/com/bonus/sgzb/common/core/enums/TaskStatusEnum.java @@ -31,6 +31,10 @@ public enum TaskStatusEnum { * 维修进行中 */ REPAIRING("43", "维修进行中"), + /** + * 维修待进行 + */ + REPAIRPENDING("42", "维修待进行"), /** * 待报废任务--待审核 diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/impl/BackReceiveServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/impl/BackReceiveServiceImpl.java index 8eff3a2..348d89b 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/impl/BackReceiveServiceImpl.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/impl/BackReceiveServiceImpl.java @@ -223,14 +223,14 @@ public class BackReceiveServiceImpl implements BackReceiveService { throw new RuntimeException("input_apply_details"); } // 如果是成套的机具，成套机具的库存也要添加 - List ctList = backReceiveMapper.getCtList(record); - if (ctList.size() > 0) { - for (BackApplyInfo backApplyInfo : ctList) { - if ("2".equals(backApplyInfo.getManageType())) { - backReceiveMapper.updateMt(backApplyInfo); - } - } - } +// List ctList = backReceiveMapper.getCtList(record); +// if (ctList.size() > 0) { +// for (BackApplyInfo backApplyInfo : ctList) { +// if ("2".equals(backApplyInfo.getManageType())) { +// backReceiveMapper.updateMt(backApplyInfo); +// } +// } +// } res = updateMt(hgList); if (res == 0) { throw new RuntimeException("ma_type"); @@ -493,8 +493,8 @@ public class BackReceiveServiceImpl implements BackReceiveService { applyInfo.setTaskType(Integer.valueOf(taskType)); String taskStatus = ""; if (TaskTypeEnum.MAINTENANCE_TASK.getCode().equals(taskType)) { - //taskStatus = "43"; - taskStatus = TaskStatusEnum.REPAIRING.getCode(); + //taskStatus = "42"; + taskStatus = TaskStatusEnum.REPAIRPENDING.getCode(); } if (TaskTypeEnum.SCRAP_TASK.getCode().equals(taskType)) { //taskStatus = "120"; diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/controller/MaTypeController.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/controller/MaTypeController.java index 8febe50..66fa3c0 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/controller/MaTypeController.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/controller/MaTypeController.java @@ -268,6 +268,12 @@ public class MaTypeController extends BaseController { @Log(title = "机具类型管理ma_type", businessType = BusinessType.UPDATE) @PutMapping public AjaxResult edit(@RequestBody MaType maType) { + Long parentId = maType.getParentId(); + List subMas = maTypeMapper.getListByParentId(parentId, null); + boolean containsSameBrother = subMas.stream().anyMatch(o -> o.getTypeName().equals(maType.getTypeName())); + if (containsSameBrother) { + return AjaxResult.error("修改失败，同级存在相同名称"); + } return toAjax(iTypeService.updateMaType(maType)); } diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/service/impl/MaTypeServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/service/impl/MaTypeServiceImpl.java index d8ccb53..f68e393 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/service/impl/MaTypeServiceImpl.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/service/impl/MaTypeServiceImpl.java @@ -53,7 +53,7 @@ public class MaTypeServiceImpl implements ITypeService { public int insertMaType(MaType maType) { Long parentId = maType.getParentId(); List subMas = maTypeMapper.getListByParentId(parentId, null); - boolean containsSameBrother = subMas.stream().anyMatch(o -> o.getTypeName().contains(maType.getTypeName())); + boolean containsSameBrother = subMas.stream().anyMatch(o -> o.getTypeName().equals(maType.getTypeName())); if (containsSameBrother) { return 0; } diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/service/impl/RepairServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/service/impl/RepairServiceImpl.java index 8a96fbf..00df5d4 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/service/impl/RepairServiceImpl.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/service/impl/RepairServiceImpl.java @@ -10,9 +10,10 @@ import com.bonus.sgzb.base.service.RepairService; import com.bonus.sgzb.common.core.exception.ServiceException; import com.bonus.sgzb.common.core.web.domain.AjaxResult; import com.bonus.sgzb.common.security.utils.SecurityUtils; +import com.bonus.sgzb.material.domain.TmTask; +import com.bonus.sgzb.material.mapper.TaskMapper; import com.bonus.sgzb.system.api.domain.SysUser; import com.bonus.sgzb.system.api.model.LoginUser; -import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -30,6 +31,9 @@ public class RepairServiceImpl implements RepairService { @Autowired private RepairMapper mapper; + @Autowired + private TaskMapper taskMapper; + @Override public List getRepairTaskList(RepairTask bean) { @@ -58,6 +62,12 @@ public class RepairServiceImpl implements RepairService { bean.setCreateBy(loginUser.getUserid()); List partList = bean.getPartList(); BigDecimal sfCosts = new BigDecimal("0"); + // 修改任务状态 + TmTask tmTask = new TmTask(); + tmTask.setTaskStatus(43); + tmTask.setTaskId(Long.valueOf(bean.getTaskId())); + taskMapper.updateTashStatus(tmTask); + String nbType = "1"; String fcType = "2"; String sfPart = "1"; diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/PurchasePartInfo.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/PurchasePartInfo.java index e54d950..e15728b 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/PurchasePartInfo.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/PurchasePartInfo.java @@ -38,14 +38,14 @@ public class PurchasePartInfo extends BaseEntity @DateTimeFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "采购日期") - private Date purchaseTime; + private String purchaseTime; /** 到货日期 */ @ApiModelProperty(value = "到货日期") @DateTimeFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "到货日期") - private Date arrivalTime; + private String arrivalTime; /** 采购员 */ @ApiModelProperty(value = "采购员") @@ -167,21 +167,21 @@ public class PurchasePartInfo extends BaseEntity { return taskId; } - public void setPurchaseTime(Date purchaseTime) + public void setPurchaseTime(String purchaseTime) { this.purchaseTime = purchaseTime; } - public Date getPurchaseTime() + public String getPurchaseTime() { return purchaseTime; } - public void setArrivalTime(Date arrivalTime) + public void setArrivalTime(String arrivalTime) { this.arrivalTime = arrivalTime; } - public Date getArrivalTime() + public String getArrivalTime() { return arrivalTime; } diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/CalMonthlyMapper.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/CalMonthlyMapper.java index f17cd44..90a374e 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/CalMonthlyMapper.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/CalMonthlyMapper.java @@ -6,6 +6,7 @@ import com.bonus.sgzb.material.domain.CalMonthlyBean; import com.bonus.sgzb.material.domain.ProjectMonthCosts; import com.bonus.sgzb.material.domain.ProjectMonthDetail; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -41,4 +42,10 @@ public interface CalMonthlyMapper { List getMonthCosts(AgreementInfo agreementInfo); List getMonthDetails(SltAgreementInfo monthCost); + + void deleteCostByProjectIdAndMonth(ProjectMonthCosts projectMonthCosts); + + List selectIdByProjectIdAndMonth(ProjectMonthCosts projectMonthCosts); + + void deleteDetailsByProMonthCostId(@Param("proMonthCostId") String proMonthCostId); } diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/TaskMapper.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/TaskMapper.java index 2ebdd33..be10051 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/TaskMapper.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/TaskMapper.java @@ -79,6 +79,7 @@ public interface TaskMapper { int insertSelective(TmTask bean); int insertAgreement(TmTask task); + int updateTashStatus(TmTask task); int insertTmTaskByBackInfo(BackApplyInfo backApplyInfo); diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/remind/Inform.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/remind/Inform.java index 5194e5a..7142666 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/remind/Inform.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/remind/Inform.java @@ -17,7 +17,7 @@ public class Inform { @Value("${sgzb.job.settlementJobDay}") private String settlementJobDay; - //@Scheduled(cron = "0 */3 * * * ? ") // 间隔3分钟执行 +// @Scheduled(cron = "0 */5 * * * ? ") // 间隔5分钟执行 @Scheduled(cron = "${sgzb.job.settlementJobCron}") // 结算日次日凌晨执行 @Async public void taskCycle() { diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/remind/service/CalcMonthlyServiceImp.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/remind/service/CalcMonthlyServiceImp.java index 3767413..fbf26a3 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/remind/service/CalcMonthlyServiceImp.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/remind/service/CalcMonthlyServiceImp.java @@ -51,9 +51,9 @@ public class CalcMonthlyServiceImp implements CalcMonthlyService { record.setMonth(month); cleanSameMonthOldRecords(record); List list = agreementInfoService.getAllAgreementId(); - List projectLots = agreementInfoService.getAllprojectId(); +// List projectLots = agreementInfoService.getAllprojectId(); // 如果该工程费用指标已超过，则不需要记录月结记录 - for (BmProjectLot bmProjectLot : projectLots) { + /* for (BmProjectLot bmProjectLot : projectLots) { BigDecimal costIndicatorsByLotId = agreementInfoService.getCostIndicatorsByLotId(bmProjectLot); BigDecimal costByLotId = agreementInfoService.getCostByLotId(bmProjectLot); if (costByLotId.compareTo(costIndicatorsByLotId) > 0) { @@ -61,7 +61,7 @@ public class CalcMonthlyServiceImp implements CalcMonthlyService { List agreementIds = agreementInfoService.getprojectIdByLotId(bmProjectLot); agreementIds.forEach(t -> list.remove(t)); } - } + }*/ list.forEach(t -> { t.setStartTime(startTime); t.setEndTime(endTime); @@ -83,7 +83,7 @@ public class CalcMonthlyServiceImp implements CalcMonthlyService { } } - private List addProjectMonthCosts(List list, CalMonthlyBean record) { + private void addProjectMonthCosts(List list, CalMonthlyBean record) { List leaseList = new ArrayList<>(); calMonthlyMapper.insertCalcRecord(record); String taskId = record.getId(); @@ -112,15 +112,29 @@ public class CalcMonthlyServiceImp implements CalcMonthlyService { agreementInfo.setIds(sltAgreementInfo.getIds()); sltAgreementInfo.setMonth(bean.getMonth()); agreementInfo.setEndTime(sltAgreementInfo.getOffTime()); - List leaseListOneMonth = addProjectMonthDetail(agreementInfo, sltAgreementInfo, pmcId); + // 新增project_month_detail + addProjectMonthDetail(agreementInfo, sltAgreementInfo, pmcId); projectMonthCosts.setCosts(sltAgreementInfo.getCosts()); calMonthlyMapper.updateProMonCosts(projectMonthCosts); - sltAgreementInfo.setNode(leaseListOneMonth); + + // 如果该工程费用指标已超过，则不需要记录月结记录 + BmProjectLot bmProjectLot = new BmProjectLot(); + bmProjectLot.setLotId(projectMonthCosts.getProjectId()); + // 获取已结算金额 + BigDecimal costByLotId = agreementInfoService.getCostByLotId(bmProjectLot); + // 获取该工程费用指标 + BigDecimal costIndicatorsByLotId = agreementInfoService.getCostIndicatorsByLotId(bmProjectLot); + if (costByLotId.compareTo(costIndicatorsByLotId) > 0) { + List proMonthCostIds = calMonthlyMapper.selectIdByProjectIdAndMonth(projectMonthCosts); + calMonthlyMapper.deleteCostByProjectIdAndMonth(projectMonthCosts); + for (String proMonthCostId : proMonthCostIds) { + calMonthlyMapper.deleteDetailsByProMonthCostId(proMonthCostId); + } + } + break; } - leaseList.addAll(monthList); } } - return leaseList; } diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseCheckDetailsServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseCheckDetailsServiceImpl.java index f75530d..fc0eae2 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseCheckDetailsServiceImpl.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseCheckDetailsServiceImpl.java @@ -82,6 +82,9 @@ public class PurchaseCheckDetailsServiceImpl implements IPurchaseCheckDetailsSer purchaseCheckDetails.setStatus(2); } purchaseCheckDetails.setUpdateTime(DateUtils.getNowDate()); + if ("1".equals(purchaseCheckDetails.getManageType())){ + purchaseCheckDetails.setBindNum(purchaseCheckDetails.getCheckNum()); + } purchaseCheckDetailsMapper.updatePurchaseCheckDetails(purchaseCheckDetails); } //判断是否全部已操作（不通过或通过） diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/base/MaPartTypeMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/base/MaPartTypeMapper.xml index 120ccf9..0e11fde 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/base/MaPartTypeMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/base/MaPartTypeMapper.xml @@ -85,30 +85,28 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/CalMonthlyMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/CalMonthlyMapper.xml index 010e2ef..062acc7 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/CalMonthlyMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/CalMonthlyMapper.xml @@ -78,6 +78,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" WHERE pmc.id = #{id} + delete from slt_project_month @@ -95,5 +99,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" delete from project_month_costs where task_id = #{id} + + delete from project_month_costs + where project_id = #{projectId} and month = #{month} + + + delete from project_month_detail + where pro_month_cost_id = #{proMonthCostId} + \ No newline at end of file diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseCheckDetailsMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseCheckDetailsMapper.xml index 6effc2a..a1c0f2b 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseCheckDetailsMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseCheckDetailsMapper.xml @@ -115,6 +115,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" purchase_price = #{purchasePrice}, purchase_num = #{purchaseNum}, check_num = #{checkNum}, + bind_num = #{bindNum}, check_result = #{checkResult}, supplier_id = #{supplierId}, status = #{status}, diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/TaskMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/TaskMapper.xml index 68d5726..61e8fec 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/TaskMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/TaskMapper.xml @@ -211,6 +211,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where task_id = #{taskId} + + UPDATE tm_task tt + SET tt.task_status = #{taskStatus} + WHERE + tt.task_id = #{taskId} + delete from tm_task where task_id = #{taskId}