From 6b656dae5760b0151757f5f82ef756c48f53124c Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期三, 16 八月 2023 11:19:08 +0800
Subject: [PATCH] 111
---
server/src/main/java/doumeemes/service/ext/impl/PlansExtServiceImpl.java | 23 ++++++++++++++++++++---
1 files changed, 20 insertions(+), 3 deletions(-)
diff --git a/server/src/main/java/doumeemes/service/ext/impl/PlansExtServiceImpl.java b/server/src/main/java/doumeemes/service/ext/impl/PlansExtServiceImpl.java
index 46a56fc..e3229c1 100644
--- a/server/src/main/java/doumeemes/service/ext/impl/PlansExtServiceImpl.java
+++ b/server/src/main/java/doumeemes/service/ext/impl/PlansExtServiceImpl.java
@@ -16,6 +16,7 @@
import doumeemes.core.utils.excel.EasyExcelUtil;
import doumeemes.core.utils.redis.RedisUtil;
import doumeemes.dao.business.PlansMapper;
+import doumeemes.dao.business.WorkorderMapper;
import doumeemes.dao.business.dto.*;
import doumeemes.dao.business.model.*;
import doumeemes.dao.ext.*;
@@ -65,7 +66,8 @@
private WorkorderHistoryExtMapper workorderHistoryExtMapper;
@Autowired
private WorkorderRecordExtMapper workorderRecordExtMapper;
-
+ @Autowired
+ private WorkorderMapper workorderMapper;
@Autowired
private RouteProcedureExtMapper routeProcedureExtMapper;
@Autowired
@@ -140,6 +142,19 @@
// //缁熻宸插畬宸ユ暟閲�
// param.setStatus(Constants.WORKORDER_STATUS.done);
// plan.setDoneNum(workorderExtMapper.sumOrderNum(param));
+ QueryBomExtDTO bb = new QueryBomExtDTO();
+ bb.setDepartId(plan.getDepartId());
+ bb.setDeleted(Constants.ZERO);
+ bb.setRootDepartId(user.getRootDepartment().getId());
+ bb.setMaterialId(plan.getMaterialId());
+ bb.setProcedureId(plan.getProcedureId());
+ BomExtListVO versionBom = bomExtMapper.selectByModel( bb);
+ if(versionBom == null || StringUtils.isBlank(versionBom.getVersion()) || versionBom.getBomVersionId() == null){
+ plan.setHasBom(Constants.ZERO);
+ }else {
+ plan.setBomType(Constants.formatIntegerNum(versionBom.getType()));
+ plan.setHasBom(Constants.ONE);
+ }
return plan;
}
@@ -601,7 +616,7 @@
if(Constants.equalsInteger(mp.getPaused(),Constants.ONE)){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "瀵逛笉璧凤紝璁″垝宸叉殏鍋滐紒");
}
- if(Constants.formatIntegerNum(mp.getDistributNum())+thisPlanNum > Constants.formatIntegerNum(mp.getNum())){
+ if(Constants.formatIntegerNum(mp.getWorkorderDistributNum())+thisPlanNum > Constants.formatIntegerNum(mp.getNum())){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "瀵逛笉璧凤紝绱鍒嗛厤鏁伴噺澶т簬璁″垝鏁伴噺锛�");
}
if(!Constants.equalsInteger(mp.getStatus(),Constants.PLAN_STATUS.publish)&&!Constants.equalsInteger(mp.getStatus(),Constants.PLAN_STATUS.distribute)){
@@ -1582,7 +1597,8 @@
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鍙傛暟閿欒锛氫骇鍑烘暟鎹�");
}
//鏌ヨ宸ュ簭璁″垝宸插垎閰嶆暟閲�
- List<Workorder> workorderList = workorderExtMapper.selectList(new QueryWrapper<Workorder>().eq("PLAN_ID",plans.getId()).notIn("STATUS",7,8));
+ List<Workorder> workorderList = workorderMapper.selectList(new QueryWrapper<Workorder>().eq("PLAN_ID",plans.getId())
+ .notIn("STATUS",7,8));
//鏈浜у嚭鏁伴噺
BigDecimal num = autoWorkReportDTO.getCreateWorkorderRecordDTO().getQualifiedNum().add(autoWorkReportDTO.getCreateWorkorderRecordDTO().getUnQualifiedNum());
if(num.compareTo(BigDecimal.ZERO)<=Constants.ZERO){
@@ -1610,6 +1626,7 @@
workorderRecordStandardService.createMaterialStandard(createMaterialDTO);
}
//宸ュ崟浜у嚭璁板綍
+ autoWorkReportDTO.getCreateWorkorderRecordDTO().setWorkorderId(workorder.getId());
workorderRecordStandardService.createWorkorderRecord(autoWorkReportDTO.getCreateWorkorderRecordDTO(),user);
//宸ュ崟鎶ュ伐
workorderRecordStandardService.comfirmDone(workorder);
--
Gitblit v1.9.3