From d7fe8ae3888c8e2b1eea3c1e3769be0d42a21cc9 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 16 十月 2023 09:03:47 +0800
Subject: [PATCH] Merge branch '1.0.3' of http://139.186.142.91:10010/r/productDev/dmMes into 1.0.3
---
server/src/main/java/doumeemes/service/ext/impl/WorkorderRecordStandardServiceImpl.java | 29 +++++++++++++++++------------
1 files changed, 17 insertions(+), 12 deletions(-)
diff --git a/server/src/main/java/doumeemes/service/ext/impl/WorkorderRecordStandardServiceImpl.java b/server/src/main/java/doumeemes/service/ext/impl/WorkorderRecordStandardServiceImpl.java
index f408243..370d482 100644
--- a/server/src/main/java/doumeemes/service/ext/impl/WorkorderRecordStandardServiceImpl.java
+++ b/server/src/main/java/doumeemes/service/ext/impl/WorkorderRecordStandardServiceImpl.java
@@ -298,15 +298,15 @@
wrModel.setMaterialId(wStock.getMaterialId());
wrModel.setDepartId(mp.getDepartId());
wrModel.setCreateTime(DateUtil.getCurrentDate());
- wrModel.setCreateUser(user.getId());
+ wrModel.setCreateUser(mp.getCreateUser());
wrModel.setMaterialBatch(mp.getBatch());
wrModel.setType(Constants.WORKORDER_RECORD_TYPE.materail);
wrModel.setFactoryId(mp.getFactoryId());
- wrModel.setProcedureId(mp.getProcedureId());
+ wrModel.setProcedureId(wStock.getProcedureId());
wrModel.setBatch(wStock.getBatch());
- wrModel.setUnitId(mp.getUnitId());
+ wrModel.setUnitId(wStock.getUnitId());
wrModel.setPlanId(mp.getPlanId());
- //TODO 鐩墠浣跨敤宸ヨ涓婚敭瀛樺偍璐т綅涓婚敭
+ //鐩墠浣跨敤宸ヨ涓婚敭瀛樺偍璐т綅涓婚敭
wrModel.setAppliancesId(wStock.getId());
wrModel.setMaterialDonetype(wStock.getQualityType());
wrModel.setMaterialProcedureId(wStock.getProcedureId());
@@ -1527,13 +1527,16 @@
workorderRecord = new WorkorderRecord();
workorderRecord.setDeleted(Constants.ZERO);
if(!Objects.isNull(userId)){
- CompanyUser companyUser = companyUserExtMapper.selectById(userId);
+ CompanyUser companyUser = new CompanyUser();
+ companyUser.setUserId(userId);
+ companyUser.setRootDepartId(loginUserInfo.getRootDepartment().getId());
+ companyUser = companyUserExtMapper.selectOne(new QueryWrapper<>(companyUser).last("limit 1"));
if(Objects.isNull(companyUser)){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "瀵逛笉璧凤紝鏈煡璇㈠埌鐢熶骇浜哄憳瀵瑰簲浼佷笟鐢ㄦ埛淇℃伅锛�");
}
- workorderRecord.setCreateUser(companyUser.getUserId());
- workorderRecord.setRootDepartId(companyUser.getRootDepartId());
- workorderRecord.setDepartId(companyUser.getComDepartId());
+ workorderRecord.setCreateUser(userId);
+ workorderRecord.setRootDepartId(loginUserInfo.getRootDepartment().getId());
+ workorderRecord.setDepartId(loginUserInfo.getCurComDepartment().getId());
}else{
workorderRecord.setCreateUser(loginUserInfo.getId());
workorderRecord.setRootDepartId(loginUserInfo.getRootDepartment().getId());
@@ -1555,8 +1558,8 @@
workorderRecord.setQualifiedNum(createWorkorderRecordDTO.getQualifiedNum());
//璁＄畻宸ヨ祫淇℃伅
SalaryParam salaryParam = salaryParamMapper.selectOne(new QueryWrapper<SalaryParam>().eq("DELETED",Constants.ZERO).eq("MATERIAL_ID",workorderRecord.getMaterialId())
- .eq("DEPART_ID",workorderRecord.getFactoryId()).eq("PROCEDURE_ID",workorderRecord.getProcedureId()).last(" limit 1 "));
- if(!Objects.isNull(salaryParam)&&!Objects.isNull(createWorkorderRecordDTO.getDuration())){
+ .eq("DEPART_ID",workorderRecord.getFactoryId()).eq("PROCEDURE_ID",workorderRecord.getProcedureId()).eq("TYPE",createWorkorderRecordDTO.getType()).last(" limit 1 "));
+ if(!Objects.isNull(salaryParam)){
workorderRecord.setSalaryPrice(salaryParam.getSalary());
workorderRecord.setSalaryType(salaryParam.getType());
workorderRecord.setSalaryUnqualified(salaryParam.getUnqualified());
@@ -1565,8 +1568,10 @@
workorderRecord.setSalaryNum(salaryParam.getNum());
workorderRecord.setSalary(salaryParam.getSalary().multiply(salaryParam.getUnqualified()==Constants.ONE?num:createWorkorderRecordDTO.getQualifiedNum()));
}else{
- workorderRecord.setDuration(createWorkorderRecordDTO.getDuration());
- workorderRecord.setSalary(BigDecimal.valueOf(createWorkorderRecordDTO.getDuration()).multiply(salaryParam.getSalary()).divide(new BigDecimal(3600),BigDecimal.ROUND_HALF_UP));
+ if(!Objects.isNull(createWorkorderRecordDTO.getDuration())&&Constants.formatIntegerNum(createWorkorderRecordDTO.getDuration())>Constants.ZERO){
+ workorderRecord.setDuration(createWorkorderRecordDTO.getDuration());
+ workorderRecord.setSalary(BigDecimal.valueOf(createWorkorderRecordDTO.getDuration()).multiply(salaryParam.getSalary()).divide(new BigDecimal(3600),BigDecimal.ROUND_HALF_UP));
+ }
}
}
//鎻掑叆宸ュ崟鎿嶄綔璁板綍锛屽苟涓斿垽鏂槸鍚︽洿鏀逛负宸ュ崟鐨勭姸鎬併�愮敓浜т腑銆�
--
Gitblit v1.9.3