From 8e1a9aa9e896f24f5244f042ecfb9e49effbe6bf Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期五, 18 八月 2023 21:27:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/src/main/java/doumeemes/service/ext/impl/WorkorderRecordStandardServiceImpl.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 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..497bbb0 100644
--- a/server/src/main/java/doumeemes/service/ext/impl/WorkorderRecordStandardServiceImpl.java
+++ b/server/src/main/java/doumeemes/service/ext/impl/WorkorderRecordStandardServiceImpl.java
@@ -298,11 +298,11 @@
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.setPlanId(mp.getPlanId());
@@ -1532,8 +1532,8 @@
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "瀵逛笉璧凤紝鏈煡璇㈠埌鐢熶骇浜哄憳瀵瑰簲浼佷笟鐢ㄦ埛淇℃伅锛�");
}
workorderRecord.setCreateUser(companyUser.getUserId());
- workorderRecord.setRootDepartId(companyUser.getRootDepartId());
- workorderRecord.setDepartId(companyUser.getComDepartId());
+ workorderRecord.setRootDepartId(loginUserInfo.getRootDepartment().getId());
+ workorderRecord.setDepartId(loginUserInfo.getCurComDepartment().getId());
}else{
workorderRecord.setCreateUser(loginUserInfo.getId());
workorderRecord.setRootDepartId(loginUserInfo.getRootDepartment().getId());
@@ -1555,7 +1555,7 @@
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 "));
+ .eq("DEPART_ID",workorderRecord.getFactoryId()).eq("PROCEDURE_ID",workorderRecord.getProcedureId()).eq("TYPE",workorderRecord.getSalaryType()).last(" limit 1 "));
if(!Objects.isNull(salaryParam)&&!Objects.isNull(createWorkorderRecordDTO.getDuration())){
workorderRecord.setSalaryPrice(salaryParam.getSalary());
workorderRecord.setSalaryType(salaryParam.getType());
--
Gitblit v1.9.3