From 513485caca0c56c713797bfd208c6f22c7ce7727 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 17 八月 2023 17:06:54 +0800
Subject: [PATCH] 初始化1.0.1
---
server/src/main/java/doumeemes/dao/system/vo/SystemMenuListVO.java | 1
server/src/main/java/doumeemes/service/ext/impl/CompanyExtServiceImpl.java | 2
server/src/main/java/doumeemes/service/ext/WorkorderRecordExtService.java | 11
server/src/main/java/doumeemes/service/ext/impl/WorkPlansExtServiceImpl.java | 23
server/src/main/resources/mappers/WorkorderRecordExtMapper.xml | 74 --
server/src/main/java/doumeemes/config/shiro/ShiroRealm.java | 16
server/src/main/java/doumeemes/dao/ext/dto/WorkPlansSaveDTO.java | 8
server/src/main/java/doumeemes/service/ext/WorkorderRecordStandardService.java | 5
server/src/main/java/doumeemes/service/business/impl/WOutboundServiceImpl.java | 3
server/src/main/java/doumeemes/service/ext/impl/WorkorderRecordStandardServiceImpl.java | 216 -------
server/src/main/java/doumeemes/dao/business/model/Workorder.java | 5
server/src/main/java/doumeemes/config/shiro/ShiroToken.java | 13
server/src/main/java/doumeemes/service/business/SalaryParamService.java | 24
server/src/main/resources/mappers/WOutboundExtMapper.xml | 9
server/src/main/java/doumeemes/dao/ext/beanDto/QueryWStockDto.java | 2
server/src/main/java/doumeemes/dao/business/model/SalaryParam.java | 41
server/src/main/java/doumeemes/service/system/SystemLoginService.java | 1
server/src/main/java/doumeemes/dao/ext/dto/QueryBomExtDTO.java | 3
server/src/main/java/doumeemes/dao/business/model/CompanyUser.java | 6
server/src/main/java/doumeemes/dao/ext/dto/QueryWorkorderRecordExtDTO.java | 17
server/src/main/java/doumeemes/dao/ext/vo/CompanyExtListVO.java | 3
server/src/main/java/doumeemes/config/shiro/ShiroCredentialsMatcher.java | 3
server/src/main/java/doumeemes/service/system/impl/WxLoginServiceImpl.java | 3
server/src/main/java/doumeemes/dao/ext/vo/WorkPlansExtListVO.java | 8
server/src/main/java/doumeemes/service/ext/impl/WorkorderRecordExtServiceImpl.java | 100 ---
server/src/main/java/doumeemes/api/business/SalaryParamController.java | 42 -
server/src/main/java/doumeemes/api/system/SystemController.java | 23
server/src/main/java/doumeemes/core/utils/excel/EasyExcelUtil.java | 5
server/src/main/resources/mappers/PlansExtMapper.xml | 9
server/src/main/java/doumeemes/dao/ext/vo/BomExtListVO.java | 7
server/src/main/java/doumeemes/service/ext/PlansExtService.java | 8
server/src/main/java/doumeemes/service/ext/impl/WorkorderExtServiceImpl.java | 3
server/src/main/java/doumeemes/config/shiro/ShiroConfig.java | 2
server/src/main/resources/application.yml | 2
server/src/main/java/doumeemes/dao/business/vo/WorkPlansVO.java | 8
server/src/main/java/doumeemes/core/utils/Constants.java | 21
server/src/main/java/doumeemes/dao/ext/vo/WorkorderExtListVO.java | 7
server/src/main/java/doumeemes/dao/ext/vo/WorkorderRecordExtListVO.java | 28 -
server/src/main/java/doumeemes/core/utils/HttpsUtil.java | 107 ---
server/src/main/java/doumeemes/biz/system/impl/SystemRoleBizImpl.java | 1
server/src/main/java/doumeemes/service/business/impl/CompanyServiceImpl.java | 45
server/src/main/java/doumeemes/service/ext/impl/PlansExtServiceImpl.java | 109 ---
server/src/main/java/doumeemes/dao/business/SalaryParamMapper.java | 7
server/src/main/java/doumeemes/core/utils/DateUtil.java | 25
server/src/main/java/doumeemes/service/business/impl/WorkorderCheckServiceImpl.java | 9
web_standard/public/template/workplans_import_template.xlsx | 0
server/src/main/java/doumeemes/api/ext/SalaryParamExtController.java | 45 -
server/src/main/java/doumeemes/dao/system/model/SystemUser.java | 2
server/src/main/resources/mappers/WorkPlansExtMapper.xml | 17
server/src/main/java/doumeemes/dao/ext/vo/WorkorderListModelVO.java | 8
server/src/main/java/doumeemes/dao/business/model/Plans.java | 4
server/src/main/java/doumeemes/dao/ext/WorkorderRecordExtMapper.java | 8
server/src/main/java/doumeemes/service/business/impl/CompanyOpenServiceImpl.java | 21
server/src/main/java/doumeemes/service/system/impl/SystemLoginServiceImpl.java | 19
server/src/main/java/doumeemes/dao/ext/dto/QueryBomDetailExtDTO.java | 2
server/src/main/java/doumeemes/core/annotation/excel/ExcelExporter.java | 6
server/src/main/java/doumeemes/dao/ext/dto/QueryWorkPlansExtDTO.java | 5
server/src/main/java/doumeemes/service/business/impl/SalaryParamServiceImpl.java | 252 ++------
server/src/main/java/doumeemes/dao/business/model/WorkorderRecord.java | 28
server/src/main/java/doumeemes/api/ext/WorkorderRecordExtController.java | 34 -
server/src/main/java/doumeemes/dao/business/model/WorkPlans.java | 19
server/src/main/java/doumeemes/dao/ext/dto/QueryWorkPlansDTO.java | 9
server/src/main/java/doumeemes/api/ext/PlansExtController.java | 9
server/src/main/java/doumeemes/service/ext/impl/DepartmentExtServiceImpl.java | 4
server/src/main/java/doumeemes/service/system/impl/SystemPermissionServiceImpl.java | 1
server/src/main/java/doumeemes/dao/business/model/WorkorderHistory.java | 2
server/src/main/java/doumeemes/dao/ext/vo/PlansExtListVO.java | 25
server/src/main/java/doumeemes/dao/ext/dto/QueryWorkorderExtDTO.java | 4
68 files changed, 229 insertions(+), 1,360 deletions(-)
diff --git a/server/src/main/java/doumeemes/api/business/SalaryParamController.java b/server/src/main/java/doumeemes/api/business/SalaryParamController.java
index 6c7e751..db825bd 100644
--- a/server/src/main/java/doumeemes/api/business/SalaryParamController.java
+++ b/server/src/main/java/doumeemes/api/business/SalaryParamController.java
@@ -7,25 +7,15 @@
import doumeemes.core.model.PageWrap;
import doumeemes.core.model.PageData;
import doumeemes.dao.business.model.SalaryParam;
-import doumeemes.dao.business.vo.SalaryParamVO;
-import doumeemes.dao.ext.dto.SalaryParamDTO;
import doumeemes.service.business.SalaryParamService;
import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.multipart.MultipartHttpServletRequest;
-import org.springframework.web.multipart.commons.CommonsMultipartResolver;
-
-import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.List;
/**
@@ -43,7 +33,7 @@
@PreventRepeat
@ApiOperation("鏂板缓")
@PostMapping("/create")
-// @RequiresPermissions("business:salaryparam:create")
+ @RequiresPermissions("business:salaryparam:create")
public ApiResponse create(@RequestBody SalaryParam salaryParam) {
return ApiResponse.success(salaryParamService.create(salaryParam));
}
@@ -79,16 +69,16 @@
@ApiOperation("鍒嗛〉鏌ヨ")
@PostMapping("/page")
-// @RequiresPermissions("business:salaryparam:query")
- public ApiResponse<PageData<SalaryParamVO>> findPage (@RequestBody PageWrap<SalaryParamDTO> pageWrap) {
+ @RequiresPermissions("business:salaryparam:query")
+ public ApiResponse<PageData<SalaryParam>> findPage (@RequestBody PageWrap<SalaryParam> pageWrap) {
return ApiResponse.success(salaryParamService.findPage(pageWrap));
}
@ApiOperation("瀵煎嚭Excel")
@PostMapping("/exportExcel")
@RequiresPermissions("business:salaryparam:exportExcel")
- public void exportExcel (@RequestBody PageWrap<SalaryParamDTO> pageWrap, HttpServletResponse response) {
- ExcelExporter.build(SalaryParamVO.class).export(salaryParamService.findPage(pageWrap).getRecords(), "璁剧疆绫�-缁╂晥宸ヨ祫閰嶇疆琛�", response);
+ public void exportExcel (@RequestBody PageWrap<SalaryParam> pageWrap, HttpServletResponse response) {
+ ExcelExporter.build(SalaryParam.class).export(salaryParamService.findPage(pageWrap).getRecords(), "璁剧疆绫�-缁╂晥宸ヨ祫閰嶇疆琛�", response);
}
@ApiOperation("鏍规嵁ID鏌ヨ")
@@ -96,25 +86,5 @@
@RequiresPermissions("business:salaryparam:query")
public ApiResponse findById(@PathVariable Integer id) {
return ApiResponse.success(salaryParamService.findById(id));
- }
-
- @ApiOperation(value = "鎵归噺瀵煎叆璁″垝", notes = "鎵归噺瀵煎叆璁″垝", httpMethod = "POST", position = 6)
- @ApiImplicitParams({
- @ApiImplicitParam(name = "folder", value = "鏂囦欢澶�", required = true, paramType = "query", dataType = "String", dataTypeClass = String.class),
- })
- @PostMapping(value = "/importBatch", headers = "content-type=multipart/form-data")
-// @RequiresPermissions("business:salaryparam:create")
- public ApiResponse importBatch(String folder, HttpServletRequest request, HttpServletResponse response) throws Exception {
- CommonsMultipartResolver multipartResovler = new CommonsMultipartResolver();
- if (multipartResovler.isMultipart(request)) {
- MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
- Iterator<String> it = multipartRequest.getFileNames();
- while (it.hasNext()) {
- MultipartFile file = multipartRequest.getFile((String) it.next());
- salaryParamService.importPlans(file);
- break;
- }
- }
- return ApiResponse.success( null);
}
}
diff --git a/server/src/main/java/doumeemes/api/ext/PlansExtController.java b/server/src/main/java/doumeemes/api/ext/PlansExtController.java
index 27cc2d0..d4b6aa7 100644
--- a/server/src/main/java/doumeemes/api/ext/PlansExtController.java
+++ b/server/src/main/java/doumeemes/api/ext/PlansExtController.java
@@ -3,7 +3,6 @@
import doumeemes.config.rocketmq.MqConfig;
import doumeemes.config.rocketmq.RocketMessageProducer;
import doumeemes.core.utils.DateUtil;
-import doumeemes.dao.business.dto.AutoWorkReportDTO;
import doumeemes.dao.business.model.Workorder;
import doumeemes.dao.ext.vo.PlansExtListCountVO;
import doumeemes.dao.ext.vo.PlansExtListH5VO;
@@ -188,7 +187,6 @@
plansExtService.backByIdInBatch(idList);
return ApiResponse.success(null);
}
-
@ApiOperation("鍒嗛〉鏌ヨ")
@PostMapping("/page")
@RequiresPermissions("ext:plansext:query")
@@ -221,13 +219,6 @@
@RequiresPermissions("ext:plansext:query")
public ApiResponse<PlansExtListCountVO> pageCount (@RequestBody QueryPlansExtDTO param) {
return ApiResponse.success(plansExtService.pageCount(param));
- }
-
- @ApiOperation("涓�閿姤宸�")
- @PostMapping("/autoWorkReport")
- public ApiResponse autoWorkReport (@RequestBody AutoWorkReportDTO autoWorkReportDTO) {
- plansExtService.autoWorkReport(getLoginUser(),autoWorkReportDTO);
- return ApiResponse.success("鎿嶄綔鎴愬姛");
}
/**
diff --git a/server/src/main/java/doumeemes/api/ext/SalaryParamExtController.java b/server/src/main/java/doumeemes/api/ext/SalaryParamExtController.java
index 4eec3eb..dbd285c 100644
--- a/server/src/main/java/doumeemes/api/ext/SalaryParamExtController.java
+++ b/server/src/main/java/doumeemes/api/ext/SalaryParamExtController.java
@@ -7,24 +7,15 @@
import doumeemes.core.model.PageData;
import doumeemes.core.model.PageWrap;
import doumeemes.dao.business.model.SalaryParam;
-import doumeemes.dao.business.vo.SalaryParamVO;
-import doumeemes.dao.ext.dto.SalaryParamDTO;
import doumeemes.service.business.SalaryParamService;
import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.multipart.MultipartHttpServletRequest;
-import org.springframework.web.multipart.commons.CommonsMultipartResolver;
-import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.List;
/**
@@ -42,7 +33,7 @@
@PreventRepeat
@ApiOperation("鏂板缓")
@PostMapping("/create")
-// @RequiresPermissions("business:salaryparam:create")
+ @RequiresPermissions("business:salaryparam:create")
public ApiResponse create(@RequestBody SalaryParam salaryParam) {
return ApiResponse.success(salaryParamService.create(salaryParam));
}
@@ -76,26 +67,18 @@
return ApiResponse.success(null);
}
- @ApiOperation("鏍规嵁瀵硅薄淇℃伅鏌ヨ")
- @PostMapping("/queryOne")
- @RequiresPermissions("business:salaryparam:query")
- public ApiResponse<SalaryParam> queryOne(@RequestBody SalaryParam salaryParam) {
- SalaryParam data = salaryParamService.findOne(salaryParam);
- return ApiResponse.success(data);
- }
-
@ApiOperation("鍒嗛〉鏌ヨ")
@PostMapping("/page")
@RequiresPermissions("business:salaryparam:query")
- public ApiResponse<PageData<SalaryParamVO>> findPage (@RequestBody PageWrap<SalaryParamDTO> pageWrap) {
+ public ApiResponse<PageData<SalaryParam>> findPage (@RequestBody PageWrap<SalaryParam> pageWrap) {
return ApiResponse.success(salaryParamService.findPage(pageWrap));
}
@ApiOperation("瀵煎嚭Excel")
@PostMapping("/exportExcel")
@RequiresPermissions("business:salaryparam:exportExcel")
- public void exportExcel (@RequestBody PageWrap<SalaryParamDTO> pageWrap, HttpServletResponse response) {
- ExcelExporter.build(SalaryParamVO.class).export(salaryParamService.findPage(pageWrap).getRecords(), "璁剧疆绫�-缁╂晥宸ヨ祫閰嶇疆琛�", response);
+ public void exportExcel (@RequestBody PageWrap<SalaryParam> pageWrap, HttpServletResponse response) {
+ ExcelExporter.build(SalaryParam.class).export(salaryParamService.findPage(pageWrap).getRecords(), "璁剧疆绫�-缁╂晥宸ヨ祫閰嶇疆琛�", response);
}
@ApiOperation("鏍规嵁ID鏌ヨ")
@@ -103,25 +86,5 @@
@RequiresPermissions("business:salaryparam:query")
public ApiResponse findById(@PathVariable Integer id) {
return ApiResponse.success(salaryParamService.findById(id));
- }
-
- @ApiOperation(value = "鎵归噺瀵煎叆璁″垝", notes = "鎵归噺瀵煎叆璁″垝", httpMethod = "POST", position = 6)
- @ApiImplicitParams({
- @ApiImplicitParam(name = "folder", value = "鏂囦欢澶�", required = true, paramType = "query", dataType = "String", dataTypeClass = String.class),
- })
- @PostMapping(value = "/importBatch", headers = "content-type=multipart/form-data")
- @RequiresPermissions("business:salaryparam:create")
- public ApiResponse importBatch(String folder, HttpServletRequest request, HttpServletResponse response) throws Exception {
- CommonsMultipartResolver multipartResovler = new CommonsMultipartResolver();
- if (multipartResovler.isMultipart(request)) {
- MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
- Iterator<String> it = multipartRequest.getFileNames();
- while (it.hasNext()) {
- MultipartFile file = multipartRequest.getFile((String) it.next());
- salaryParamService.importPlans(file);
- break;
- }
- }
- return ApiResponse.success( null);
}
}
diff --git a/server/src/main/java/doumeemes/api/ext/WorkorderRecordExtController.java b/server/src/main/java/doumeemes/api/ext/WorkorderRecordExtController.java
index 2bd7950..c18ad2f 100644
--- a/server/src/main/java/doumeemes/api/ext/WorkorderRecordExtController.java
+++ b/server/src/main/java/doumeemes/api/ext/WorkorderRecordExtController.java
@@ -14,10 +14,10 @@
import doumeemes.dao.business.model.WorkorderRecord;
import doumeemes.dao.ext.bean.EndCheckApBean;
import doumeemes.dao.ext.beanDto.QueryWStockDto;
-import doumeemes.dao.ext.dto.QuerySalaryStatisticDTO;
-import doumeemes.dao.ext.dto.QueryUserSalaryListDTO;
import doumeemes.dao.ext.dto.QueryWorkorderRecordExtDTO;
-import doumeemes.dao.ext.vo.*;
+import doumeemes.dao.ext.vo.WStockExtListForWorkorderVO;
+import doumeemes.dao.ext.vo.WStockExtListVO;
+import doumeemes.dao.ext.vo.WorkorderRecordExtListVO;
import doumeemes.service.business.WorkorderRecordService;
import doumeemes.service.ext.WorkorderExtService;
import doumeemes.service.ext.WorkorderRecordExtService;
@@ -140,18 +140,6 @@
public ApiResponse<PageData<WorkorderRecordExtListVO>> findPage (@RequestBody PageWrap<QueryWorkorderRecordExtDTO> pageWrap) {
return ApiResponse.success(workorderRecordExtService.findPage(pageWrap));
}
- @ApiOperation("鍛樺伐缁╂晥鍒嗛〉鏌ヨ")
- @PostMapping("/userSalary")
- @RequiresPermissions("ext:workorderrecordext:query")
- public ApiResponse<PageData<UserSalaryListVO>> userSalaryPage (@RequestBody PageWrap<QueryUserSalaryListDTO> pageWrap) {
- return ApiResponse.success(workorderRecordExtService.userSalaryPage(pageWrap));
- }
- @ApiOperation("宸ヨ祫鎶ヨ〃缁熻鍒嗛〉鏌ヨ")
- @PostMapping("/salaryStatistic")
- @RequiresPermissions("ext:workorderrecordext:query")
- public ApiResponse<PageData<SalaryStatisticsListVO>> salaryStatistic (@RequestBody PageWrap<QuerySalaryStatisticDTO> pageWrap) {
- return ApiResponse.success(workorderRecordExtService.salaryStatistic(pageWrap));
- }
@ApiOperation("鏌ヨ鍏ㄩ儴")
@PostMapping("/all")
@@ -174,16 +162,6 @@
// @RequiresPermissions("ext:workorderrecordext:exportExcel")
public void exportExcel (@RequestBody PageWrap<QueryWorkorderRecordExtDTO> pageWrap, HttpServletResponse response) {
workorderRecordExtService.exportExcel(pageWrap,response);
- }
- @ApiOperation("瀵煎嚭鍛樺伐缁╂晥鏄庣粏")
- @PostMapping("/exportUserSalary")
- public void exportUserSalary (@RequestBody PageWrap<QueryUserSalaryListDTO> pageWrap, HttpServletResponse response) {
- workorderRecordExtService.exportUserSalary(pageWrap,response);
- }
- @ApiOperation("瀵煎嚭宸ヨ祫鎶ヨ〃")
- @PostMapping("/exportSalaryStatistics")
- public void exportSalaryStatistics (@RequestBody PageWrap<QuerySalaryStatisticDTO> pageWrap, HttpServletResponse response) {
- workorderRecordExtService.exportSalaryStatistics(pageWrap,response);
}
@ApiOperation("鏍规嵁ID鏌ヨ")
@@ -224,10 +202,6 @@
return ApiResponse.success(workorderRecordStandardService.choiceStockPageForWorkorder(pageWrap,getLoginUser()));
}
- @ApiOperation("鏍规嵁渚涢渶璁″垝鏌ヨ鍙敤搴撳瓨")
- @PostMapping("/getStockByPlansForStandard")
- public ApiResponse<PageData<WStockExtListVO>> getStockByPlansForStandard (@RequestBody PageWrap<QueryWStockDto> pageWrap) {
- return ApiResponse.success(workorderRecordStandardService.choiceStockPageForPlans(pageWrap,getLoginUser()));
- }
+
}
diff --git a/server/src/main/java/doumeemes/api/system/SystemController.java b/server/src/main/java/doumeemes/api/system/SystemController.java
index 468aea0..e9a1f96 100644
--- a/server/src/main/java/doumeemes/api/system/SystemController.java
+++ b/server/src/main/java/doumeemes/api/system/SystemController.java
@@ -8,12 +8,9 @@
import doumeemes.core.model.LoginUserInfo;
import doumeemes.core.utils.Constants;
import doumeemes.dao.business.dto.CompanyInitDataDTO;
-import doumeemes.dao.ext.dto.WxLoginDTO;
-import doumeemes.dao.ext.vo.WxLoginVO;
import doumeemes.dao.system.dto.LoginDTO;
import doumeemes.dao.system.dto.UpdatePwdDto;
import doumeemes.service.system.SystemLoginService;
-import doumeemes.service.system.WxLoginService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -49,37 +46,21 @@
@Autowired
private SystemLoginService systemLoginService;
- @Autowired
- private WxLoginService wxLoginService;
-
@PreventRepeat(limit = 10, lockTime = 10000)
@ApiOperation("鐧诲綍")
@PostMapping("/login")
public ApiResponse<String> login (@Validated @RequestBody LoginDTO dto, HttpServletRequest request) {
+// dto.setCompanyId(Constants.de);
return ApiResponse.success(systemLoginService.loginByPassword(dto, request));
}
-
@PreventRepeat(limit = 10, lockTime = 10000)
@ApiOperation("骞冲彴鐧诲綍")
@PostMapping("/platform/login")
public ApiResponse<String> platformLogin (@Validated @RequestBody LoginDTO dto, HttpServletRequest request) {
+// dto.setCompanyId(Constants.de);
return ApiResponse.success(systemLoginService.platformLogin(dto, request));
}
-
- @PreventRepeat(limit = 10, lockTime = 10000)
- @ApiOperation("寰俊鐧诲綍")
- @GetMapping("/wxLogin")
- public ApiResponse<WxLoginVO> wxLogin (@RequestParam String code, HttpServletRequest request) {
- return ApiResponse.success(wxLoginService.wxLogin(code, request));
- }
-
- @PreventRepeat(limit = 10, lockTime = 10000)
- @ApiOperation("寰俊鐧诲綍璐﹀彿瀵嗙爜")
- @PostMapping("/wxAccountLogin")
- public ApiResponse<String> wxAccountLogin (@Validated @RequestBody WxLoginDTO dto, HttpServletRequest request) {
- return ApiResponse.success(wxLoginService.wxLoginByPassword(dto, request));
- }
@ApiOperation("閫�鍑虹櫥褰�")
@PostMapping("/logout")
diff --git a/server/src/main/java/doumeemes/biz/system/impl/SystemRoleBizImpl.java b/server/src/main/java/doumeemes/biz/system/impl/SystemRoleBizImpl.java
index df50d3f..2a1ea25 100644
--- a/server/src/main/java/doumeemes/biz/system/impl/SystemRoleBizImpl.java
+++ b/server/src/main/java/doumeemes/biz/system/impl/SystemRoleBizImpl.java
@@ -73,6 +73,7 @@
SystemRole queryDto = new SystemRole();
queryDto.setCode(systemRole.getCode());
queryDto.setDeleted(Boolean.FALSE);
+ queryDto.setType(systemRole.getType());
if(Constants.equalsInteger(user.getType(),Constants.USERTYPE.COM)){
systemRole.setType(Constants.ROLETYPE.com);
queryDto.setCompanyId(systemRole.getCompanyId());
diff --git a/server/src/main/java/doumeemes/config/shiro/ShiroConfig.java b/server/src/main/java/doumeemes/config/shiro/ShiroConfig.java
index ee38466..ab1c79b 100644
--- a/server/src/main/java/doumeemes/config/shiro/ShiroConfig.java
+++ b/server/src/main/java/doumeemes/config/shiro/ShiroConfig.java
@@ -71,8 +71,6 @@
Map<String, String> map = new LinkedHashMap<>();
// 璺緞鎷︽埅閰嶇疆
map.put("/system/login", "anon");
- map.put("/system/wxLogin", "anon");
- map.put("/system/wxAccountLogin", "anon");
map.put("/system/initCompany", "anon");
map.put("/system/logout", "anon");
map.put("/common/captcha", "anon");
diff --git a/server/src/main/java/doumeemes/config/shiro/ShiroCredentialsMatcher.java b/server/src/main/java/doumeemes/config/shiro/ShiroCredentialsMatcher.java
index 8d01643..9be80cc 100644
--- a/server/src/main/java/doumeemes/config/shiro/ShiroCredentialsMatcher.java
+++ b/server/src/main/java/doumeemes/config/shiro/ShiroCredentialsMatcher.java
@@ -35,9 +35,6 @@
if(usernamePasswordToken.getDdLogin()){
return Boolean.TRUE;
}
- if(usernamePasswordToken.getWxLogin()){
- return Boolean.TRUE;
- }
// 鍔犲瘑瀵嗙爜
String pwd = Utils.Secure.encryptPassword(new String(usernamePasswordToken.getPassword()), systemUser.getSalt());
// 姣旇緝瀵嗙爜
diff --git a/server/src/main/java/doumeemes/config/shiro/ShiroRealm.java b/server/src/main/java/doumeemes/config/shiro/ShiroRealm.java
index 3db5c23..795623f 100644
--- a/server/src/main/java/doumeemes/config/shiro/ShiroRealm.java
+++ b/server/src/main/java/doumeemes/config/shiro/ShiroRealm.java
@@ -35,9 +35,7 @@
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Component;
-import java.util.Date;
import java.util.List;
-import java.util.Objects;
/**
* 鑷畾涔塕ealm锛屽鐞嗚璇佸拰鏉冮檺
@@ -131,12 +129,6 @@
if(com == null){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝璇ヨ处鎴峰紓甯革紒");
}
- if(Constants.equalsInteger( com.getStatus(),Constants.ZERO) ){
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝璇ヤ紒涓氬凡杩囩鐢紒");
- }
- if(com.getOepnValidDate() != null && com.getOepnValidDate().before(new Date())){
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝璇ヤ紒涓氬凡杩囦娇鐢ㄦ湁鏁堟湡锛�");
- }
//濡傛灉鏄紒涓氱敤鎴�
QueryCompanyUserExtDTO c =new QueryCompanyUserExtDTO();
c.setUserId(user.getId());
@@ -144,11 +136,11 @@
c.setCompanyId(authenticationToken.getCompanyId());
cu = companyUserExtService.selectOne(c);
if(cu == null){
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝璇ヤ紒涓氱敤鎴蜂笉瀛樺湪锛�");
+ return null;
}
-// if(Constants.equalsInteger(cu.getStatus(),Constants.ONE)){
-// throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝璇ヤ紒涓氱敤鎴峰凡绂佺敤锛�");
-// }
+ if(Constants.equalsInteger(cu.getStatus(),Constants.ONE)){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝璇ヤ紒涓氱敤鎴峰凡绂佺敤锛�");
+ }
rootDepart = departmentExtService.getModelById(c.getCompanyId(),cu.getRootDepartId());
comDepart = departmentExtService.getModelById(c.getCompanyId(),cu.getComDepartId());
depart = departmentExtService.getModelById(c.getCompanyId(),cu.getDepartmentId());
diff --git a/server/src/main/java/doumeemes/config/shiro/ShiroToken.java b/server/src/main/java/doumeemes/config/shiro/ShiroToken.java
index b0fa87c..29de55b 100644
--- a/server/src/main/java/doumeemes/config/shiro/ShiroToken.java
+++ b/server/src/main/java/doumeemes/config/shiro/ShiroToken.java
@@ -36,15 +36,13 @@
*/
Integer companyId;
Boolean isDdLogin;
- Boolean isWxLogin;
public ShiroToken() {
}
- public ShiroToken(Integer companyId,String username, String password,boolean isDdLogin,boolean isWxLogin) {
+ public ShiroToken(Integer companyId,String username, String password,boolean isDdLogin) {
super(username, password, false, (String)null);
this.companyId = companyId;
this.isDdLogin = isDdLogin;
- this.isWxLogin = isWxLogin;
}
public Boolean getDdLogin() {
@@ -53,15 +51,6 @@
public void setDdLogin(Boolean ddLogin) {
isDdLogin = ddLogin;
- }
-
-
- public Boolean getWxLogin() {
- return isWxLogin;
- }
-
- public void setWxLogin(Boolean wxLogin) {
- isWxLogin = wxLogin;
}
public Integer getCompanyId() {
diff --git a/server/src/main/java/doumeemes/core/annotation/excel/ExcelExporter.java b/server/src/main/java/doumeemes/core/annotation/excel/ExcelExporter.java
index 010996c..ea33fb8 100644
--- a/server/src/main/java/doumeemes/core/annotation/excel/ExcelExporter.java
+++ b/server/src/main/java/doumeemes/core/annotation/excel/ExcelExporter.java
@@ -2,8 +2,6 @@
import doumeemes.core.constants.ResponseStatus;
import doumeemes.core.exception.BusinessException;
-import doumeemes.dao.ext.vo.UserBaseInfoVO;
-import doumeemes.dao.ext.vo.UserSalaryListVO;
import lombok.AllArgsConstructor;
import lombok.Data;
import org.apache.commons.lang3.BooleanUtils;
@@ -172,10 +170,6 @@
return new ArrayList<>(sortedFields.values());
}
- public static void main(String[] args) {
- ExcelExporter m = new ExcelExporter();
- ExcelExporter.build(UserSalaryListVO.class).getColumns();
- }
/**
* 閰嶇疆鏁版嵁鍗曞厓鏍�
*/
diff --git a/server/src/main/java/doumeemes/core/utils/Constants.java b/server/src/main/java/doumeemes/core/utils/Constants.java
index f2a7b57..a373176 100644
--- a/server/src/main/java/doumeemes/core/utils/Constants.java
+++ b/server/src/main/java/doumeemes/core/utils/Constants.java
@@ -27,11 +27,6 @@
public static final String ACCESS_ID="ACCESS_ID";
public static final String BUCKETNAME = "BUCKETNAME";
public static final String OSS = "OSS";
- public static final String WX_CONFIG = "WX_CONFIG";
- public static final String APPID = "APPID";
- public static final String APPSECRET = "APPSECRET";
- public static final String WX_TOKEN = "WX_TOKEN";
-
public static final String ACCESS_KEY = "ACCESS_KEY";
public static final String ENDPOINT = "ENDPOINT";
public static final String RESOURCE_PATH = "RESOURCE_PATH";
@@ -270,7 +265,6 @@
public static final int baogong= 4;
public static final int instock = 5;
public static final int cancel = 6;
- public static final int producing = 7;
static String getTitleByStatus(WorkorderExtListVO p, int status) {
String title = "";
switch (status){
@@ -294,9 +288,6 @@
break;
case cancel:
title="宸ュ崟鍙栨秷";
- break;
- case producing:
- title="宸ュ崟鐢熶骇涓�";
break;
default:
break;
@@ -326,9 +317,6 @@
break;
case cancel:
title="宸ュ崟鍙栨秷";
- break;
- case producing:
- title="宸ュ崟鐢熶骇涓�";
break;
default:
break;
@@ -390,7 +378,7 @@
}
}
/**
- * 宸ュ崟鐘舵�� 0宸插垱寤恒��1宸叉姇鏂欍��2宸插畬宸ャ��3宸叉楠屻��4宸叉姤宸ャ��5宸插叆搴撱��6宸叉殏鍋溿��7宸插彇娑堛��8宸插叧闂� 9宸叉仮澶� 10鏇存崲浜哄憳 11 宸插鏂� 12 浜у嚭 13鐢熸垚涓�"
+ * 宸ュ崟鐘舵�� 0宸插垱寤恒��1宸叉姇鏂欍��2宸插畬宸ャ��3宸叉楠屻��4宸叉姤宸ャ��5宸插叆搴撱��6宸叉殏鍋溿��7宸插彇娑堛��8宸插叧闂� 9宸叉仮澶� 10鏇存崲浜哄憳 11 宸插鏂� 12 浜у嚭"
*/
public interface WORKORDER_HISTORY_STATUS{
public static final int create = 0;
@@ -406,7 +394,6 @@
public static final int redistribute = 10;
public static final int readyMaterial = 11;
public static final int produce = 12;
- public static final int producing = 13;
static String getTitleByStatus(WorkorderExtListVO p, int status) {
String title = "";
switch (status){
@@ -448,9 +435,6 @@
break;
case produce:
title="宸ュ崟浜у嚭";
- break;
- case producing:
- title="宸ュ崟鐢熸垚涓浗";
break;
default:
break;
@@ -498,9 +482,6 @@
break;
case produce:
title="宸ュ崟浜у嚭";
- break;
- case producing:
- title="宸ュ崟鐢熶骇涓�";
break;
default:
break;
diff --git a/server/src/main/java/doumeemes/core/utils/DateUtil.java b/server/src/main/java/doumeemes/core/utils/DateUtil.java
index fb8c603..eb0a9fa 100644
--- a/server/src/main/java/doumeemes/core/utils/DateUtil.java
+++ b/server/src/main/java/doumeemes/core/utils/DateUtil.java
@@ -10,8 +10,6 @@
import java.text.DateFormatSymbols;
import java.text.ParseException;
import java.text.SimpleDateFormat;
-import java.time.LocalDateTime;
-import java.time.ZoneId;
import java.util.Date;
import java.util.*;
@@ -3004,25 +3002,4 @@
cal.add(Calendar.MINUTE,minutes);
return cal.getTime();
}
-
- /**
- * LocalDateTime to date
- * @param now
- * @return
- */
- public static LocalDateTime toDateLocalDateTime(Date now){
- return LocalDateTime.ofInstant(now.toInstant(), ZoneId.systemDefault());
- }
-
-
- /**
- * LocalDateTime to date
- * @param localDateTime
- * @return
- */
- public static Date toDate(LocalDateTime localDateTime){
- Date from = Date.from(localDateTime.atZone(ZoneId.systemDefault()).toInstant());
- return from;
- }
-
-}
+}
\ No newline at end of file
diff --git a/server/src/main/java/doumeemes/core/utils/HttpsUtil.java b/server/src/main/java/doumeemes/core/utils/HttpsUtil.java
index 4660554..a1d93bd 100644
--- a/server/src/main/java/doumeemes/core/utils/HttpsUtil.java
+++ b/server/src/main/java/doumeemes/core/utils/HttpsUtil.java
@@ -15,12 +15,7 @@
import org.apache.http.util.EntityUtils;
import org.springframework.web.util.UriComponentsBuilder;
-import javax.net.ssl.*;
-import java.io.ByteArrayOutputStream;
import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.URL;
import java.security.KeyManagementException;
import java.security.NoSuchAlgorithmException;
import java.security.SecureRandom;
@@ -29,10 +24,6 @@
import java.util.Map;
public class HttpsUtil {
-
- public static String get(String url,boolean ignoreSSL) {
- return connection(url, "GET", null, null,ignoreSSL);
- }
public static String sendPostByHttps(String url, Map<String, String> body, String token) {
@@ -135,64 +126,6 @@
return null;
}
- public static String connection(String url,String method,String data,String contentType,boolean ignoreSSL){
- HttpsURLConnection connection = null;
- try {
- URL _url = new URL(url);
- connection = (HttpsURLConnection) _url.openConnection();
- connection.setRequestMethod(method);
- connection.setDoOutput(true);
- connection.setDoInput(true);
- connection.setUseCaches(false);
- if(contentType != null){
- connection.setRequestProperty("Content-Type", contentType);
- }
-
- if(ignoreSSL){
- //淇′换鎵�鏈塻sl璇佷功鍜屼富鏈�
- TrustManager[] trustManagers = {new HttpsTrustManager()};
- SSLContext context = SSLContext.getInstance("TLS");
- context.init(null, trustManagers, new SecureRandom());
- connection.setSSLSocketFactory(context.getSocketFactory());
- connection.setHostnameVerifier(new HostnameVerifier() {
- @Override
- public boolean verify(String hostname, SSLSession session) {
- return true;
- }
- });
- }
-
-
- connection.connect();
-
- if(data != null){
- OutputStream outputStream = connection.getOutputStream();
- outputStream.write(data.getBytes("utf-8"));
- outputStream.close();
- }
-
- int responseCode = connection.getResponseCode();
- if (responseCode == HttpsURLConnection.HTTP_OK) {
- InputStream is = connection.getInputStream();
- byte[] b = new byte[4096];
- ByteArrayOutputStream baos = new ByteArrayOutputStream(b.length);
- int len;
- while ((len = is.read(b)) != -1) {
- baos.write(b, 0, len);
- }
- is.close();
- return baos.toString("utf-8");
- }
- return connection.getResponseMessage();
- } catch (Exception e) {
- e.printStackTrace();
- } finally {
- if(connection != null){
- connection.disconnect();
- }
- }
- return null;
- }
public static void main(String[] args) {
@@ -203,43 +136,5 @@
}
+
}
-class HttpsTrustManager implements X509TrustManager {
-
- private static TrustManager[] trustManagers = {new HttpsTrustManager()};
-
- @Override
- public void checkClientTrusted(X509Certificate[] arg0, String arg1) throws CertificateException {
- // TODO Auto-generated method stub
-
- }
-
- @Override
- public void checkServerTrusted(X509Certificate[] arg0, String arg1) throws CertificateException {
- // TODO Auto-generated method stub
-
- }
-
- @Override
- public X509Certificate[] getAcceptedIssuers() {
- // TODO Auto-generated method stub
- return null;
- }
-
- public static void allowAllSSL() {
- try {
- SSLContext context = SSLContext.getInstance("TLS");
- context.init(null, trustManagers, new SecureRandom());
- HttpsURLConnection.setDefaultSSLSocketFactory(context.getSocketFactory());
- HttpsURLConnection.setDefaultHostnameVerifier(new HostnameVerifier() {
- @Override
- public boolean verify(String hostname, SSLSession session) {
- return true;
- }
- });
- } catch (NoSuchAlgorithmException | KeyManagementException e) {
- e.printStackTrace();
- }
- }
-
-}
\ No newline at end of file
diff --git a/server/src/main/java/doumeemes/core/utils/excel/EasyExcelUtil.java b/server/src/main/java/doumeemes/core/utils/excel/EasyExcelUtil.java
index ffde846..952b0cf 100644
--- a/server/src/main/java/doumeemes/core/utils/excel/EasyExcelUtil.java
+++ b/server/src/main/java/doumeemes/core/utils/excel/EasyExcelUtil.java
@@ -87,9 +87,6 @@
}
/**
- *
- * titleRows : 鏍囬鍗犲嚑琛�
- * headerRows : 鍚屽崰鍑犺
* excel甯歌瀵煎叆(榛樿鍙鍙栫涓�寮爏heet宸ヤ綔绨�)
*/
public static <T> List<T> importExcel(MultipartFile file, Integer titleRows, Integer headerRows, Class<T> pojoClass){
@@ -153,4 +150,4 @@
}
return list;
}
-}
+}
\ No newline at end of file
diff --git a/server/src/main/java/doumeemes/dao/business/SalaryParamMapper.java b/server/src/main/java/doumeemes/dao/business/SalaryParamMapper.java
index f47925a..846be1b 100644
--- a/server/src/main/java/doumeemes/dao/business/SalaryParamMapper.java
+++ b/server/src/main/java/doumeemes/dao/business/SalaryParamMapper.java
@@ -1,19 +1,12 @@
package doumeemes.dao.business;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
import doumeemes.dao.business.model.SalaryParam;
-import doumeemes.dao.business.vo.SalaryParamVO;
-import doumeemes.dao.ext.dto.SalaryParamDTO;
-import org.apache.ibatis.annotations.Param;
/**
* @author 姹熻箘韫�
* @date 2023/08/11 15:29
*/
public interface SalaryParamMapper extends BaseMapper<SalaryParam> {
-
-
- IPage<SalaryParamVO> selectPage(IPage<SalaryParam> page, @Param("model") SalaryParamDTO model);
}
diff --git a/server/src/main/java/doumeemes/dao/business/model/CompanyUser.java b/server/src/main/java/doumeemes/dao/business/model/CompanyUser.java
index 50ccf61..2eb96a6 100644
--- a/server/src/main/java/doumeemes/dao/business/model/CompanyUser.java
+++ b/server/src/main/java/doumeemes/dao/business/model/CompanyUser.java
@@ -148,10 +148,4 @@
@ExcelColumn(name="鏄惁鏄富璐︽埛锛�0=鍚︼紱1=鏄紱")
private Integer isMaster;
-
- @ApiModelProperty(value = "寰俊openid")
- private String openid;
-
- @ApiModelProperty(value = "寰俊unionid")
- private String unionid;
}
diff --git a/server/src/main/java/doumeemes/dao/business/model/Plans.java b/server/src/main/java/doumeemes/dao/business/model/Plans.java
index 05b1fc1..a3ddc57 100644
--- a/server/src/main/java/doumeemes/dao/business/model/Plans.java
+++ b/server/src/main/java/doumeemes/dao/business/model/Plans.java
@@ -3,7 +3,6 @@
import cn.afterturn.easypoi.excel.annotation.Excel;
import com.baomidou.mybatisplus.annotation.TableField;
import doumeemes.core.annotation.excel.ExcelColumn;
-import doumeemes.dao.ext.vo.BomExtListVO;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
@@ -161,7 +160,4 @@
@ApiModelProperty(value = "鎴愬搧璁″垝涓婚敭锛堝叧鑱攚ork_plans琛級", example = "1")
private Integer workPlansId;
- @ApiModelProperty(value = "鍏宠仈BOM瀵硅薄",hidden = true)
- @TableField(exist = false)
- private BomExtListVO bomModel;
}
diff --git a/server/src/main/java/doumeemes/dao/business/model/SalaryParam.java b/server/src/main/java/doumeemes/dao/business/model/SalaryParam.java
index 9b815db..e686ebc 100644
--- a/server/src/main/java/doumeemes/dao/business/model/SalaryParam.java
+++ b/server/src/main/java/doumeemes/dao/business/model/SalaryParam.java
@@ -8,11 +8,6 @@
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
-
-import javax.validation.constraints.NotEmpty;
-import java.math.BigDecimal;
-
-import java.math.BigDecimal;
import java.util.Date;
/**
@@ -25,71 +20,69 @@
@TableName("`salary_param`")
public class SalaryParam {
- @ApiModelProperty(value = "涓婚敭")
+ @ApiModelProperty(value = "涓婚敭", example = "1")
@ExcelColumn(name="涓婚敭")
- @TableId(value = "id",type = IdType.AUTO)
private Integer id;
- @ApiModelProperty(value = "鏄惁宸插垹闄� 0鏈垹闄� 1宸插垹闄�")
+ @ApiModelProperty(value = "鏄惁宸插垹闄� 0鏈垹闄� 1宸插垹闄�", example = "1")
@ExcelColumn(name="鏄惁宸插垹闄� 0鏈垹闄� 1宸插垹闄�")
private Byte deleted;
- @ApiModelProperty(value = "鍒涘缓浜虹紪鐮�")
+ @ApiModelProperty(value = "鍒涘缓浜虹紪鐮�", example = "1")
@ExcelColumn(name="鍒涘缓浜虹紪鐮�")
private Integer createUser;
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd")
private Date createTime;
- @ApiModelProperty(value = "鏇存柊浜虹紪鐮�")
+ @ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
@ExcelColumn(name="鏇存柊浜虹紪鐮�")
private Integer updateUser;
@ApiModelProperty(value = "鏇存柊鏃堕棿")
@ExcelColumn(name="鏇存柊鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd")
private Date updateTime;
@ApiModelProperty(value = "澶囨敞")
@ExcelColumn(name="澶囨敞")
private String remark;
- @ApiModelProperty(value = "涓荤粍缁囩紪鐮侊紙鍏宠仈department琛ㄦ牴缁勭粐锛�")
+ @ApiModelProperty(value = "涓荤粍缁囩紪鐮侊紙鍏宠仈department琛ㄦ牴缁勭粐锛�", example = "1")
@ExcelColumn(name="涓荤粍缁囩紪鐮侊紙鍏宠仈department琛ㄦ牴缁勭粐锛�")
private Integer rootDepartId;
- @ApiModelProperty(value = "宸ュ巶缂栫爜锛堝叧鑱攄epartment琛級")
+ @ApiModelProperty(value = "宸ュ巶缂栫爜锛堝叧鑱攄epartment琛級", example = "1")
@ExcelColumn(name="宸ュ巶缂栫爜锛堝叧鑱攄epartment琛級")
- @NotEmpty(message = "宸ュ巶缂栫爜涓嶈兘涓虹┖")
private Integer departId;
- @ApiModelProperty(value = "宸ュ簭缂栫爜锛堝叧鑱攑rocedure琛級")
+ @ApiModelProperty(value = "宸ュ簭缂栫爜锛堝叧鑱攑rocedure琛級", example = "1")
@ExcelColumn(name="宸ュ簭缂栫爜锛堝叧鑱攑rocedure琛級")
- @NotEmpty(message = "宸ュ簭缂栫爜涓嶈兘涓虹┖")
private Integer procedureId;
- @ApiModelProperty(value = "bom缂栫爜锛堝叧鑱攂om琛級")
+ @ApiModelProperty(value = "bom缂栫爜锛堝叧鑱攂om琛級", example = "1")
@ExcelColumn(name="bom缂栫爜锛堝叧鑱攂om琛級")
- @NotEmpty(message = "鐗╂枡缂栫爜涓嶈兘涓虹┖")
- private Integer materialId;
+ private Integer bomId;
@ApiModelProperty(value = "宸ヨ祫鍗曚环锛堝厓)", example = "1")
@ExcelColumn(name="宸ヨ祫鍗曚环锛堝厓)")
- private BigDecimal salary;
+ private Integer salary;
- @ApiModelProperty(value = "鏍囧噯鏁伴噺")
+ @ApiModelProperty(value = "鏍囧噯鏁伴噺", example = "1")
@ExcelColumn(name="鏍囧噯鏁伴噺")
- private BigDecimal num;
+ private Integer num;
@ApiModelProperty(value = "鏍囧噯鏃堕暱锛堢锛�")
@ExcelColumn(name="鏍囧噯鏃堕暱锛堢锛�")
- private Integer times;
+ private String times;
- @ApiModelProperty(value = "涓嶈壇鍝佹槸鍚﹁鍏� 0鍚� 1鏄�")
+ @ApiModelProperty(value = "涓嶈壇鍝佹槸鍚﹁鍏� 0鍚� 1鏄�", example = "1")
@ExcelColumn(name="涓嶈壇鍝佹槸鍚﹁鍏� 0鍚� 1鏄�")
private Integer unqualified;
- @ApiModelProperty(value = "璁′环鏂瑰紡 0璁′欢 1璁℃椂")
+ @ApiModelProperty(value = "璁′环鏂瑰紡 0璁′欢 1璁℃椂", example = "1")
@ExcelColumn(name="璁′环鏂瑰紡 0璁′欢 1璁℃椂")
private Integer type;
diff --git a/server/src/main/java/doumeemes/dao/business/model/WorkPlans.java b/server/src/main/java/doumeemes/dao/business/model/WorkPlans.java
index f5ef864..7fec7be 100644
--- a/server/src/main/java/doumeemes/dao/business/model/WorkPlans.java
+++ b/server/src/main/java/doumeemes/dao/business/model/WorkPlans.java
@@ -61,8 +61,8 @@
@ApiModelProperty(value = "璁″垝缂栫爜")
private String planCode;
- @ApiModelProperty(value = "璁″垝缁撴潫鏃ユ湡")
- @Excel(name="璁″垝缁撴潫鏃ユ湡",orderNum ="2",format = "yyyy-MM-dd")
+ @ApiModelProperty(value = "璁″垝鏃ユ湡")
+ @Excel(name="璁″垝鏃ユ湡",orderNum ="1",format = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date planDate;
@ApiModelProperty(value = "璁″垝寮�濮嬫棩鏈�")
@@ -70,17 +70,14 @@
@JsonFormat(pattern = "yyyy-MM-dd")
private Date startDate;
- @ApiModelProperty(value = "閿�鍞崟鍙�" )
- @Excel(name="閿�鍞崟鍙�",orderNum ="8")
- private String salesorder;
@ApiModelProperty(value = "浜у搧鍚嶇О" )
@TableField(exist = false)
- @Excel(name="浜у搧鍚嶇О",orderNum ="3")
+ @Excel(name="浜у搧鍚嶇О",orderNum ="2")
private String materialName;
@ApiModelProperty(value = "浜у搧缂栫爜" )
@TableField(exist = false)
- @Excel(name="浜у搧缂栫爜",orderNum ="4")
+ @Excel(name="浜у搧缂栫爜",orderNum ="3")
private String materialCode;
@ApiModelProperty(value = "鐗╂枡缂栫爜锛堝叧鑱攎aterial_distribute琛級", example = "1")
@@ -90,11 +87,11 @@
private Integer unitId;
@ApiModelProperty(value = "璁″垝鏁伴噺", example = "1")
- @Excel(name="璁″垝鐢熶骇鏁伴噺",orderNum ="5")
+ @Excel(name="璁″垝鐢熶骇鏁伴噺",orderNum ="4")
private Integer num;
@ApiModelProperty(value = "鎵规鍙�")
- @Excel(name="浜у搧鎵规鍙�",orderNum = "7")
+ @Excel(name="浜у搧鎵规鍙�",orderNum = "6")
private String batch;
@ApiModelProperty(value = "鐘舵�� 0宸茬敓鎴愩��1宸插彂甯冦��2宸叉挙鍥炪��3宸插彇娑堛��4宸插垎閰嶃��5宸叉殏鍋溿��6宸插畬宸ャ��7宸插叆搴撱��8宸插叧闂�", example = "1")
@@ -114,11 +111,11 @@
private Date publishDate;
@ApiModelProperty(value = "鐢熶骇宸ュ巶鏈虹骇缁勭粐鍚嶇О" )
- @Excel(name="鐢熶骇宸ュ巶",orderNum ="6")
+ @Excel(name="鐢熶骇宸ュ巶",orderNum ="5")
@TableField(exist = false)
private String factoryName;
@ApiModelProperty(value = "浼樺厛绾э紙鎺掑簭鐮侊級瀛楁", example = "1")
- @Excel(name="浼樺厛绾�" ,orderNum = "9")
+ @Excel(name="浼樺厛绾�" ,orderNum = "8")
private Integer urgent;
}
diff --git a/server/src/main/java/doumeemes/dao/business/model/Workorder.java b/server/src/main/java/doumeemes/dao/business/model/Workorder.java
index 47a525a..238a80a 100644
--- a/server/src/main/java/doumeemes/dao/business/model/Workorder.java
+++ b/server/src/main/java/doumeemes/dao/business/model/Workorder.java
@@ -143,8 +143,8 @@
@ExcelColumn(name="妫�楠屼汉鍛樼紪鐮�")
private Integer checkUserId;
- @ApiModelProperty(value = "宸ュ崟鐘舵�� 0宸插垱寤恒��1宸插鏂欍��2宸插畬宸ャ��3宸叉楠屻��4宸叉姤宸ャ��5宸插叆搴撱��6宸插彇娑堛��7鐢熶骇涓�", example = "1")
- @ExcelColumn(name="宸ュ崟鐘舵�� 0宸插垱寤恒��1宸插鏂欍��2宸插畬宸ャ��3宸叉楠屻��4宸叉姤宸ャ��5宸插叆搴撱��6宸插彇娑堛��7鐢熶骇涓�")
+ @ApiModelProperty(value = "宸ュ崟鐘舵�� 0宸插垱寤恒��1宸插鏂欍��2宸插畬宸ャ��3宸叉楠屻��4宸叉姤宸ャ��5宸插叆搴撱��6宸插彇娑�", example = "1")
+ @ExcelColumn(name="宸ュ崟鐘舵�� 0宸插垱寤恒��1宸插鏂欍��2宸插畬宸ャ��3宸叉楠屻��4宸叉姤宸ャ��5宸插叆搴撱��6宸插彇娑�")
private Integer status;
@ApiModelProperty(value = "鏄惁鏆傚仠 0鏈殏鍋� 1宸叉殏鍋�", example = "1")
@ExcelColumn(name="鏄惁鏆傚仠 0鏈殏鍋� 1宸叉殏鍋�")
@@ -224,5 +224,4 @@
@ApiModelProperty(value = "宸ュ崟璁惧浜哄憳闆嗗悎" )
@TableField(exist = false)
private List<WorkorderUser> workorderUserList;
-
}
diff --git a/server/src/main/java/doumeemes/dao/business/model/WorkorderHistory.java b/server/src/main/java/doumeemes/dao/business/model/WorkorderHistory.java
index a38ad97..afca5cb 100644
--- a/server/src/main/java/doumeemes/dao/business/model/WorkorderHistory.java
+++ b/server/src/main/java/doumeemes/dao/business/model/WorkorderHistory.java
@@ -76,7 +76,7 @@
@ExcelColumn(name="澶勭悊澶囨敞")
private String info;
- @ApiModelProperty(value = "鎿嶄綔绫诲瀷0宸插垱寤恒��1宸叉姇鏂欍��2瀹屽伐銆�3妫�楠屻��4宸叉姤宸ャ��5鍏ュ簱銆�6鏆傚仠銆�7鍙栨秷銆�8鍏抽棴 13鐢熶骇涓�", example = "1")
+ @ApiModelProperty(value = "鎿嶄綔绫诲瀷0宸插垱寤恒��1宸叉姇鏂欍��2瀹屽伐銆�3妫�楠屻��4宸叉姤宸ャ��5鍏ュ簱銆�6鏆傚仠銆�7鍙栨秷銆�8鍏抽棴", example = "1")
@ExcelColumn(name="鎿嶄綔绫诲瀷0宸插垱寤恒��1宸叉姇鏂欍��2瀹屽伐銆�3妫�楠屻��4宸叉姤宸ャ��5鍏ュ簱銆�6鏆傚仠銆�7鍙栨秷銆�8鍏抽棴")
private Integer type;
diff --git a/server/src/main/java/doumeemes/dao/business/model/WorkorderRecord.java b/server/src/main/java/doumeemes/dao/business/model/WorkorderRecord.java
index 8844310..7b1be66 100644
--- a/server/src/main/java/doumeemes/dao/business/model/WorkorderRecord.java
+++ b/server/src/main/java/doumeemes/dao/business/model/WorkorderRecord.java
@@ -129,11 +129,11 @@
@ApiModelProperty(value = "妫�楠屽悎鏍兼暟閲�", example = "1")
@ExcelColumn(name="妫�楠屽悎鏍兼暟閲�")
- private BigDecimal qualifiedNum;
+ private Integer qualifiedNum;
@ApiModelProperty(value = "妫�楠屼笉鍚堟牸鏁伴噺", example = "1")
@ExcelColumn(name="妫�楠屼笉鍚堟牸鏁伴噺")
- private BigDecimal unqualifiedNum;
+ private Integer unqualifiedNum;
@ApiModelProperty(value = "妫�楠屾棩鏈�")
@ExcelColumn(name="妫�楠屾棩鏈�")
@@ -151,36 +151,22 @@
@ApiModelProperty(value = "鐢熶骇浜哄憳缂栫爜闆嗗悎锛圼1],[2],...褰㈠紡瀛樺偍锛屼紭鍖栨煡璇�)" )
@ExcelColumn(name="鐢熶骇浜哄憳缂栫爜闆嗗悎锛圼1],[2],...褰㈠紡瀛樺偍锛屼紭鍖栨煡璇�)")
private String proUserids;
+
@ApiModelProperty(value = "宸ュ崟鐘舵��" )
@TableField(exist = false)
private Integer workorderStatus;
+
+
@ApiModelProperty(value = "鐗╂枡璐ㄩ噺灞炴��0鍚堟牸 1涓嶈壇 2鎶ュ簾锛堝彧鏈塼ype=1鎵嶆湁鍊硷級" )
private Integer materialDonetype;
@ApiModelProperty(value = "鐗╂枡宸ュ簭缂栫爜锛堝叧鑱攑rocedure琛級" )
private Integer materialProcedureId;
+
@ApiModelProperty(value = "鍏宠仈绁ㄦ嵁缂栫爜锛堟姇鏂欐椂锛�" )
private Integer relobjId;
@ApiModelProperty(value = "鍏宠仈绁ㄦ嵁绫诲瀷 0宸ュ崟 1绡瓙鏇存崲鍗曡褰�" )
private Integer relobjType;
- @ApiModelProperty(value = "鎶ュ伐鏃堕暱锛堢锛�" )
- private Integer duration;
+ //MATERIAL_DONETYPE,MATERIAL_PROCEDURE_ID,RELOBJ_ID銆丷ELOBJ_TYPE
- @ApiModelProperty(value = "宸ヨ祫鍗曚环锛堝垎)" )
- private BigDecimal salaryPrice;
-
- @ApiModelProperty(value = "鏍囧噯鏁伴噺" )
- private BigDecimal salaryNum;
-
- @ApiModelProperty(value = "鏍囧噯鏃堕暱锛堢锛�" )
- private Integer salaryTimes;
-
- @ApiModelProperty(value = "涓嶈壇鍝佹槸鍚﹁鍏� 0鍚� 1鏄�" )
- private Integer salaryUnqualified;
-
- @ApiModelProperty(value = "璁′环鏂瑰紡 0璁′欢 1璁℃椂" )
- private Integer salaryType;
-
- @ApiModelProperty(value = "宸ヨ祫缁撴灉锛堝垎锛�" )
- private BigDecimal salary;
}
diff --git a/server/src/main/java/doumeemes/dao/business/vo/WorkPlansVO.java b/server/src/main/java/doumeemes/dao/business/vo/WorkPlansVO.java
index 3b72cd2..57e4141 100644
--- a/server/src/main/java/doumeemes/dao/business/vo/WorkPlansVO.java
+++ b/server/src/main/java/doumeemes/dao/business/vo/WorkPlansVO.java
@@ -72,11 +72,10 @@
@JsonFormat(pattern = "yyyy-MM-dd")
private Date planDate;
@ApiModelProperty(value = "璁″垝寮�濮嬫棩鏈�")
- @ExcelColumn(name="璁″垝寮�濮嬫棩鏈�",index = 17,width =15)
+ @ExcelColumn(name="璁″垝寮�濮嬫棩鏈�",index = 3,width =15)
@JsonFormat(pattern = "yyyy-MM-dd")
private Date startDate;
- @ApiModelProperty(value = "閿�鍞崟鍙�" )
- private String salesorder;
+
@ApiModelProperty(value = "鐗╂枡缂栫爜锛堝叧鑱攎aterial_distribute琛級", example = "1")
private Integer materialId;
@@ -152,7 +151,4 @@
@ApiModelProperty(value = "瀛愯鍒掓槑缁嗕俊鎭�", example = "1")
private List<PlansExtListVO> plansExtListVOList;
-
- @ApiModelProperty(value = "鏄惁杩囨湡")
- private Boolean hasExpire;
}
diff --git a/server/src/main/java/doumeemes/dao/ext/WorkorderRecordExtMapper.java b/server/src/main/java/doumeemes/dao/ext/WorkorderRecordExtMapper.java
index 6697c0b..1916a9a 100644
--- a/server/src/main/java/doumeemes/dao/ext/WorkorderRecordExtMapper.java
+++ b/server/src/main/java/doumeemes/dao/ext/WorkorderRecordExtMapper.java
@@ -2,9 +2,9 @@
import doumeemes.dao.business.model.WorkorderRecord;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import doumeemes.dao.ext.dto.QuerySalaryStatisticDTO;
-import doumeemes.dao.ext.dto.QueryUserSalaryListDTO;
-import doumeemes.dao.ext.vo.*;
+import doumeemes.dao.ext.vo.WOutboundRecordExtListVO;
+import doumeemes.dao.ext.vo.WStockExtListForWorkorderVO;
+import doumeemes.dao.ext.vo.WorkorderRecordExtListVO;
import doumeemes.dao.ext.dto.QueryWorkorderRecordExtDTO;
import io.lettuce.core.dynamic.annotation.Param;
@@ -18,7 +18,6 @@
* @date 2022/04/20 10:56
*/
List<WorkorderRecordExtListVO> selectListNew(QueryWorkorderRecordExtDTO dto);
- List<SalaryStatisticsListVO> salaryStatistic(QuerySalaryStatisticDTO dto);
List<WStockExtListForWorkorderVO> choiceWorkorderRecordUseStockList(QueryWorkorderRecordExtDTO dto);
@@ -36,5 +35,4 @@
List<WorkorderRecordExtListVO> checkIsWork(@Param("ids")String ids);
- List<UserSalaryListVO> userSalaryPage(QueryUserSalaryListDTO model);
}
diff --git a/server/src/main/java/doumeemes/dao/ext/beanDto/QueryWStockDto.java b/server/src/main/java/doumeemes/dao/ext/beanDto/QueryWStockDto.java
index d1b5074..4dbcd75 100644
--- a/server/src/main/java/doumeemes/dao/ext/beanDto/QueryWStockDto.java
+++ b/server/src/main/java/doumeemes/dao/ext/beanDto/QueryWStockDto.java
@@ -80,7 +80,5 @@
@ApiModelProperty(value = "宸ュ崟涓婚敭")
private Integer workorderId;
- @ApiModelProperty(value = "宸ュ簭璁″垝涓婚敭")
- private Integer plansId;
}
diff --git a/server/src/main/java/doumeemes/dao/ext/dto/QueryBomDetailExtDTO.java b/server/src/main/java/doumeemes/dao/ext/dto/QueryBomDetailExtDTO.java
index c02597a..d5e345e 100644
--- a/server/src/main/java/doumeemes/dao/ext/dto/QueryBomDetailExtDTO.java
+++ b/server/src/main/java/doumeemes/dao/ext/dto/QueryBomDetailExtDTO.java
@@ -256,8 +256,6 @@
@ApiModelProperty(value = "宸ュ崟缂栫爜", example = "1",hidden = true)
private Integer workorderId;
- @ApiModelProperty(value = "宸ュ簭璁″垝涓婚敭", example = "1",hidden = true)
- private Integer plansId;
@ApiModelProperty(value = "鐗╂枡娓呭崟淇℃伅琛ㄦ渶鍚庡惎鐢ㄦ椂闂�")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date bmodelValidTime;
diff --git a/server/src/main/java/doumeemes/dao/ext/dto/QueryBomExtDTO.java b/server/src/main/java/doumeemes/dao/ext/dto/QueryBomExtDTO.java
index b3a00a3..3800a9a 100644
--- a/server/src/main/java/doumeemes/dao/ext/dto/QueryBomExtDTO.java
+++ b/server/src/main/java/doumeemes/dao/ext/dto/QueryBomExtDTO.java
@@ -1,7 +1,5 @@
package doumeemes.dao.ext.dto;
-import com.baomidou.mybatisplus.annotation.TableField;
-import doumeemes.dao.ext.vo.BomExtListVO;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -287,6 +285,5 @@
@ApiModelProperty(value = "鐗╂枡娓呭崟淇℃伅琛ㄤ富閿�", example = "1")
private Integer bmodelId;
-
}
diff --git a/server/src/main/java/doumeemes/dao/ext/dto/QueryWorkPlansDTO.java b/server/src/main/java/doumeemes/dao/ext/dto/QueryWorkPlansDTO.java
index ba03173..813341b 100644
--- a/server/src/main/java/doumeemes/dao/ext/dto/QueryWorkPlansDTO.java
+++ b/server/src/main/java/doumeemes/dao/ext/dto/QueryWorkPlansDTO.java
@@ -47,13 +47,4 @@
@ApiModelProperty(value = "鎴愬搧璁″垝涓婚敭", hidden = true)
private Integer workPlanId;
- @ApiModelProperty(value = "閿�鍞崟鍙�")
- private String salesorder;
-
- @ApiModelProperty(value = "璁″垝寮�濮嬫椂闂� 寮�濮�" )
- private String startDateStart;
-
- @ApiModelProperty(value = "璁″垝寮�濮嬫椂闂� 缁撴潫")
- private String startDateEnd;
-
}
diff --git a/server/src/main/java/doumeemes/dao/ext/dto/QueryWorkPlansExtDTO.java b/server/src/main/java/doumeemes/dao/ext/dto/QueryWorkPlansExtDTO.java
index bc14ec2..feaca2c 100644
--- a/server/src/main/java/doumeemes/dao/ext/dto/QueryWorkPlansExtDTO.java
+++ b/server/src/main/java/doumeemes/dao/ext/dto/QueryWorkPlansExtDTO.java
@@ -64,10 +64,7 @@
@ApiModelProperty(value = "璁″垝鏁伴噺", example = "1")
private Integer num;
- @ApiModelProperty(value = "璁″垝寮�濮嬫棩鏈�")
- private Date startDate;
- @ApiModelProperty(value = "閿�鍞崟鍙�" )
- private String salesorder;
+
@ApiModelProperty(value = "鎵规鍙�")
private String batch;
diff --git a/server/src/main/java/doumeemes/dao/ext/dto/QueryWorkorderExtDTO.java b/server/src/main/java/doumeemes/dao/ext/dto/QueryWorkorderExtDTO.java
index 4265963..fdfa35d 100644
--- a/server/src/main/java/doumeemes/dao/ext/dto/QueryWorkorderExtDTO.java
+++ b/server/src/main/java/doumeemes/dao/ext/dto/QueryWorkorderExtDTO.java
@@ -99,9 +99,9 @@
@ApiModelProperty(value = "妫�楠屼汉鍛樼紪鐮�", example = "1")
private Integer checkUserId;
- @ApiModelProperty(value = "宸ュ崟鐘舵�� 0宸插垱寤恒��1宸插鏂欍��2宸插畬宸ャ��3宸叉楠屻��4宸叉姤宸ャ��5宸插叆搴撱��6宸插彇娑堛��7鐢熶骇涓�", example = "1")
+ @ApiModelProperty(value = "宸ュ崟鐘舵�� 0宸插垱寤恒��1宸插鏂欍��2宸插畬宸ャ��3宸叉楠屻��4宸叉姤宸ャ��5宸插叆搴撱��6宸插彇娑�", example = "1")
private Integer status;
- @ApiModelProperty(value = "宸ュ崟鐘舵�侀泦鍚堬紙寰呯敓浜э細[0,1]锛岀敓浜т腑[2,3锛�7]锛屽凡瀹屾垚[4,5,6]" )
+ @ApiModelProperty(value = "宸ュ崟鐘舵�侀泦鍚堬紙寰呯敓浜э細[0,1]锛岀敓浜т腑[2,3]锛屽凡瀹屾垚[4,5,6]" )
private List<Integer> statusList;
@ApiModelProperty(value = "鏈�杩戠姸鎬佹洿鏂版椂闂�")
diff --git a/server/src/main/java/doumeemes/dao/ext/dto/QueryWorkorderRecordExtDTO.java b/server/src/main/java/doumeemes/dao/ext/dto/QueryWorkorderRecordExtDTO.java
index fd16f61..fbd6dbc 100644
--- a/server/src/main/java/doumeemes/dao/ext/dto/QueryWorkorderRecordExtDTO.java
+++ b/server/src/main/java/doumeemes/dao/ext/dto/QueryWorkorderRecordExtDTO.java
@@ -641,22 +641,5 @@
@ApiModelProperty(value = "鏁版嵁鏉冮檺閮ㄩ棬缂栫爜闆嗗悎" ,hidden = true)
private List<Integer> departIds;
- @ApiModelProperty(value = "鎶ュ伐鏃堕暱锛堢锛�", example = "1")
- private Integer duration;
- @ApiModelProperty(value = "宸ヨ祫缁撴灉锛堝厓)", example = "1")
- private Integer salary;
- @ApiModelProperty(value = "宸ヨ祫鍗曚环锛堝厓)", example = "1")
- private Integer salaryPrice;
- @ApiModelProperty(value = "鏍囧噯鏁伴噺", example = "1")
- private Integer salaryNum;
-
- @ApiModelProperty(value = "鏍囧噯鏃堕暱锛堢锛�")
- private String salaryTimes;
-
- @ApiModelProperty(value = "涓嶈壇鍝佹槸鍚﹁鍏� 0鍚� 1鏄�", example = "1")
- private Integer salaryUnqualified;
-
- @ApiModelProperty(value = "璁′环鏂瑰紡 0璁′欢 1璁℃椂", example = "1")
- private Integer salaryType;
}
diff --git a/server/src/main/java/doumeemes/dao/ext/dto/WorkPlansSaveDTO.java b/server/src/main/java/doumeemes/dao/ext/dto/WorkPlansSaveDTO.java
index 1f25463..2526f21 100644
--- a/server/src/main/java/doumeemes/dao/ext/dto/WorkPlansSaveDTO.java
+++ b/server/src/main/java/doumeemes/dao/ext/dto/WorkPlansSaveDTO.java
@@ -1,6 +1,5 @@
package doumeemes.dao.ext.dto;
-import cn.afterturn.easypoi.excel.annotation.Excel;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -40,12 +39,5 @@
@ApiModelProperty(value = "浼樺厛绾�")
private Integer urgent;
-
- @ApiModelProperty(value = "璁″垝寮�濮嬫棩鏈�")
- @JsonFormat(pattern = "yyyy-MM-dd")
- private Date startDate;
-
- @ApiModelProperty(value = "閿�鍞崟鍙�" )
- private String salesorder;
}
diff --git a/server/src/main/java/doumeemes/dao/ext/vo/BomExtListVO.java b/server/src/main/java/doumeemes/dao/ext/vo/BomExtListVO.java
index 174a563..830af01 100644
--- a/server/src/main/java/doumeemes/dao/ext/vo/BomExtListVO.java
+++ b/server/src/main/java/doumeemes/dao/ext/vo/BomExtListVO.java
@@ -60,8 +60,8 @@
@ExcelColumn(name="鍏徃绾х粍缁囩紪鐮侊紙鍏宠仈department琛級")
private Integer departId;
- @ApiModelProperty(value = "鐗╂枡ID锛堣瀛楁鍏宠仈 material_distribute 琛↖D 锛侊紒锛侊紒 锛�", example = "1")
- @ExcelColumn(name="鐗╂枡ID锛堝叧鑱攎aterial_distribute琛級")
+ @ApiModelProperty(value = "鐗╂枡ID锛堝叧鑱攎aterial琛級", example = "1")
+ @ExcelColumn(name="鐗╂枡ID锛堝叧鑱攎aterial琛級")
private Integer materialId;
@ApiModelProperty(value = "鐗堟湰鍙�")
@@ -157,6 +157,5 @@
@ApiModelProperty(value = "宸ュ簭鍚嶇О")
private String procedureName;
- @ApiModelProperty(value = "material id")
- private Integer realMaterialId;
+
}
diff --git a/server/src/main/java/doumeemes/dao/ext/vo/CompanyExtListVO.java b/server/src/main/java/doumeemes/dao/ext/vo/CompanyExtListVO.java
index f58062f..7df00ab 100644
--- a/server/src/main/java/doumeemes/dao/ext/vo/CompanyExtListVO.java
+++ b/server/src/main/java/doumeemes/dao/ext/vo/CompanyExtListVO.java
@@ -165,7 +165,4 @@
@ApiModelProperty(value = "缇氱緤骞冲彴搴旂敤鍙傛暟锛宩son鏍煎紡瀛樺偍{app_key:,aes_key:,app_secret:}" )
private String lingyangInfo;
- @ApiModelProperty(value = "鐘舵�� 1 寮�鍚� 0 绂佺敤")
- private Integer status;
-
}
diff --git a/server/src/main/java/doumeemes/dao/ext/vo/PlansExtListVO.java b/server/src/main/java/doumeemes/dao/ext/vo/PlansExtListVO.java
index bd47d2a..e07774a 100644
--- a/server/src/main/java/doumeemes/dao/ext/vo/PlansExtListVO.java
+++ b/server/src/main/java/doumeemes/dao/ext/vo/PlansExtListVO.java
@@ -147,12 +147,6 @@
private Integer distributNoDoneNum;
@ApiModelProperty(value = "搴撳瓨鏄惁婊¤冻 0涓嶆弧瓒� 1婊¤冻", example = "0")
private Integer isStock;
- @ApiModelProperty(value = "鏄惁寤舵湡")
- private Boolean hasExpire;
- @ApiModelProperty(value = "鎴愬搧璁″垝寮�濮嬫棩鏈�")
- private Date workPlanPlanDate;
- @ApiModelProperty(value = "鎴愬搧璁″垝缁撴潫鏃ユ湡")
- private Date workPlanStartDate;
@ExcelColumn(name="鐗╂枡鍚嶇О",index = 1,width =15)
@@ -175,24 +169,5 @@
@ExcelColumn(name="鎴愬搧璁″垝缂栫爜")
private String workPlanCode;
-
- @ExcelColumn(name="閿�鍞鍗�")
- private String salesOrder;
-
-// @ApiModelProperty(value = "鎴愬搧璁″垝寮�濮嬫椂闂�")
-// @JsonFormat(pattern = "yyyy-MM-dd")
-// private Date workPlanStartDate;
-
- @ApiModelProperty(value = "鎴愬搧璁″垝缁撴潫鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
- private Date workPlanEndDate;
-
- @ApiModelProperty(value = "宸茬敓浜ф暟閲�")
- private Integer produceNum;
-
- @ApiModelProperty(value = "鏄惁鏈塨om閰嶇疆 0鏃� 1鏈�", example = "1")
- private Integer hasBom;
- @ApiModelProperty(value = "bom鎶曟枡鏂瑰紡 0鎺ㄥ紡 1鎷夊紡", example = "1")
- private Integer bomType;
}
diff --git a/server/src/main/java/doumeemes/dao/ext/vo/WorkPlansExtListVO.java b/server/src/main/java/doumeemes/dao/ext/vo/WorkPlansExtListVO.java
index 02fe90c..8fdb2d2 100644
--- a/server/src/main/java/doumeemes/dao/ext/vo/WorkPlansExtListVO.java
+++ b/server/src/main/java/doumeemes/dao/ext/vo/WorkPlansExtListVO.java
@@ -69,13 +69,7 @@
@ExcelColumn(name="璁″垝鏃ユ湡")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date planDate;
- @ApiModelProperty(value = "璁″垝寮�濮嬫棩鏈�")
- @ExcelColumn(name="璁″垝寮�濮嬫棩鏈�",index = 17,width =15)
- @JsonFormat(pattern = "yyyy-MM-dd")
- private Date startDate;
- @ApiModelProperty(value = "閿�鍞崟鍙�" )
- @ExcelColumn(name="閿�鍞崟鍙�",index = 16,width =15)
- private String salesorder;
+
@ApiModelProperty(value = "鐗╂枡缂栫爜锛堝叧鑱攎aterial_distribute琛級", example = "1")
@ExcelColumn(name="鐗╂枡缂栫爜锛堝叧鑱攎aterial_distribute琛級")
private Integer materialId;
diff --git a/server/src/main/java/doumeemes/dao/ext/vo/WorkorderExtListVO.java b/server/src/main/java/doumeemes/dao/ext/vo/WorkorderExtListVO.java
index c1ce0ba..466ae31 100644
--- a/server/src/main/java/doumeemes/dao/ext/vo/WorkorderExtListVO.java
+++ b/server/src/main/java/doumeemes/dao/ext/vo/WorkorderExtListVO.java
@@ -30,9 +30,6 @@
@ApiModelProperty(value = "鍒涘缓浜虹紪鐮�", example = "1")
private Integer createUser;
- @ApiModelProperty(value = "鍒涘缓浜虹紪鐮佸悕绉�", example = "1")
- private String createUserName;
-
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date createTime;
@@ -114,8 +111,8 @@
@ApiModelProperty(value = "妫�楠屼汉鍛樼紪鐮�", example = "1")
private Integer checkUserId;
- @ApiModelProperty(value = "宸ュ崟鐘舵�� 0宸插垱寤恒��1宸插鏂欍��2宸插畬宸ャ��3宸叉楠屻��4宸叉姤宸ャ��5宸插叆搴撱��6宸插彇娑堛��7鐢熶骇涓�", example = "1")
- @ExcelColumn(name="宸ュ崟鐘舵��",valueMapping = "0=宸插垱寤�;1=宸插鏂�;2=宸插畬宸�;3=宸叉楠�;4=宸叉姤宸�;5=宸插叆搴�;6=宸插彇娑�;7=鐢熶骇涓�;",index = 14,width =15)
+ @ApiModelProperty(value = "宸ュ崟鐘舵�� 0宸插垱寤恒��1宸插鏂欍��2宸插畬宸ャ��3宸叉楠屻��4宸叉姤宸ャ��5宸插叆搴撱��6宸插彇娑�", example = "1")
+ @ExcelColumn(name="宸ュ崟鐘舵��",valueMapping = "0=宸插垱寤�;1=宸插鏂�;2=宸插畬宸�;3=宸叉楠�;4=宸叉姤宸�;5=宸插叆搴�;6=宸插彇娑�;",index = 14,width =15)
private Integer status;
@ApiModelProperty(value = "鏈�杩戠姸鎬佹洿鏂版椂闂�")
diff --git a/server/src/main/java/doumeemes/dao/ext/vo/WorkorderListModelVO.java b/server/src/main/java/doumeemes/dao/ext/vo/WorkorderListModelVO.java
index 01bcd45..81c179c 100644
--- a/server/src/main/java/doumeemes/dao/ext/vo/WorkorderListModelVO.java
+++ b/server/src/main/java/doumeemes/dao/ext/vo/WorkorderListModelVO.java
@@ -63,7 +63,7 @@
@ApiModelProperty(value = "鎶曟枡鍒楄〃")
private List<MaterialModelVo> materialList;
- @ApiModelProperty(value = "宸ュ崟鐘舵�� 0宸插垱寤恒��1宸插鏂欍��2宸插畬宸ャ��3宸叉楠屻��4宸叉姤宸ャ��5宸插叆搴撱��6宸插彇娑堛��7鐢熶骇涓�", example = "1")
+ @ApiModelProperty(value = "宸ュ崟鐘舵�� 0宸插垱寤恒��1宸插鏂欍��2宸插畬宸ャ��3宸叉楠屻��4宸叉姤宸ャ��5宸插叆搴撱��6宸插彇娑�", example = "1")
private Integer status;
@ApiModelProperty(value = "浼樺厛绾э紙鎺掑簭鐮侊級瀛楁", example = "1")
@@ -77,10 +77,4 @@
@ApiModelProperty(value = "鐢熶骇浜哄憳鍒嗛厤闆嗗悎" )
private List<WorkorderUserExtListVO> proUserList;
-
- @ApiModelProperty(value = "鍒涘缓浜�")
- private Integer createUser;
-
- @ApiModelProperty(value = "鍒涘缓浜哄悕绉�")
- private String createUserName;
}
diff --git a/server/src/main/java/doumeemes/dao/ext/vo/WorkorderRecordExtListVO.java b/server/src/main/java/doumeemes/dao/ext/vo/WorkorderRecordExtListVO.java
index 0a1061e..f00e81a 100644
--- a/server/src/main/java/doumeemes/dao/ext/vo/WorkorderRecordExtListVO.java
+++ b/server/src/main/java/doumeemes/dao/ext/vo/WorkorderRecordExtListVO.java
@@ -225,32 +225,4 @@
@ApiModelProperty(value = "瀛楀吀琛ㄥ搴攍ables")
private String smodelLabel;
-
- @ApiModelProperty(value = "鎶ュ伐鏃堕暱锛堢锛�", example = "1")
- @ExcelColumn(name="鎶ュ伐鏃堕暱锛堢锛�")
- private Integer duration;
-
- @ApiModelProperty(value = "宸ヨ祫缁撴灉锛堝厓)", example = "1")
- @ExcelColumn(name="宸ヨ祫缁撴灉锛堝厓)")
- private Integer salary;
- @ApiModelProperty(value = "宸ヨ祫鍗曚环锛堝厓)", example = "1")
- @ExcelColumn(name="宸ヨ祫鍗曚环锛堝厓)")
- private Integer salaryPrice;
-
- @ApiModelProperty(value = "鏍囧噯鏁伴噺", example = "1")
- @ExcelColumn(name="鏍囧噯鏁伴噺")
- private Integer salaryNum;
-
- @ApiModelProperty(value = "鏍囧噯鏃堕暱锛堢锛�")
- @ExcelColumn(name="鏍囧噯鏃堕暱锛堢锛�")
- private String salaryTimes;
-
- @ApiModelProperty(value = "涓嶈壇鍝佹槸鍚﹁鍏� 0鍚� 1鏄�", example = "1")
- @ExcelColumn(name="涓嶈壇鍝佹槸鍚﹁鍏� 0鍚� 1鏄�")
- private Integer salaryUnqualified;
-
- @ApiModelProperty(value = "璁′环鏂瑰紡 0璁′欢 1璁℃椂", example = "1")
- @ExcelColumn(name="璁′环鏂瑰紡 0璁′欢 1璁℃椂")
- private Integer salaryType;
-
}
diff --git a/server/src/main/java/doumeemes/dao/system/model/SystemUser.java b/server/src/main/java/doumeemes/dao/system/model/SystemUser.java
index 0a031e6..9a3a3ed 100644
--- a/server/src/main/java/doumeemes/dao/system/model/SystemUser.java
+++ b/server/src/main/java/doumeemes/dao/system/model/SystemUser.java
@@ -37,7 +37,7 @@
@NotBlank(message = "濮撳悕涓嶈兘涓虹┖", groups = {OperaType.Create.class/*, OperaType.Update.class*/})
private String realname;
-// @NotBlank(message = "宸ュ彿涓嶈兘涓虹┖", groups = {OperaType.Create.class/*, OperaType.Update.class*/})
+ @NotBlank(message = "宸ュ彿涓嶈兘涓虹┖", groups = {OperaType.Create.class/*, OperaType.Update.class*/})
@ApiModelProperty(value = "鎬昏处鍙峰伐鍙�")
private String empNo;
diff --git a/server/src/main/java/doumeemes/dao/system/vo/SystemMenuListVO.java b/server/src/main/java/doumeemes/dao/system/vo/SystemMenuListVO.java
index 36f401d..5438c31 100644
--- a/server/src/main/java/doumeemes/dao/system/vo/SystemMenuListVO.java
+++ b/server/src/main/java/doumeemes/dao/system/vo/SystemMenuListVO.java
@@ -27,6 +27,7 @@
@ApiModelProperty(value = "鏇存柊浜轰俊鎭�")
private SystemUser updateUserInfo;
+
@ApiModelProperty(value = "鏂囦欢璁块棶鍓嶇紑")
private String resourcePath;
}
diff --git a/server/src/main/java/doumeemes/service/business/SalaryParamService.java b/server/src/main/java/doumeemes/service/business/SalaryParamService.java
index 6269780..1e89246 100644
--- a/server/src/main/java/doumeemes/service/business/SalaryParamService.java
+++ b/server/src/main/java/doumeemes/service/business/SalaryParamService.java
@@ -3,10 +3,6 @@
import doumeemes.core.model.PageData;
import doumeemes.core.model.PageWrap;
import doumeemes.dao.business.model.SalaryParam;
-import doumeemes.dao.business.vo.SalaryParamVO;
-import doumeemes.dao.ext.dto.SalaryParamDTO;
-import org.springframework.web.multipart.MultipartFile;
-
import java.util.List;
/**
@@ -18,7 +14,7 @@
/**
* 鍒涘缓
- *
+ *
* @param salaryParam 瀹炰綋瀵硅薄
* @return Integer
*/
@@ -52,14 +48,6 @@
*/
void updateById(SalaryParam salaryParam);
-
- /**
- * 涓婚敭鏇存柊
- *
- * @param salaryParam 瀹炰綋瀵硅薄
- */
- void update(SalaryParam salaryParam);
-
/**
* 鎵归噺涓婚敭鏇存柊
*
@@ -90,14 +78,14 @@
* @return List<SalaryParam>
*/
List<SalaryParam> findList(SalaryParam salaryParam);
-
+
/**
* 鍒嗛〉鏌ヨ
*
* @param pageWrap 鍒嗛〉瀵硅薄
* @return PageData<SalaryParam>
*/
- PageData<SalaryParamVO> findPage(PageWrap<SalaryParamDTO> pageWrap);
+ PageData<SalaryParam> findPage(PageWrap<SalaryParam> pageWrap);
/**
* 鏉′欢缁熻
@@ -106,10 +94,4 @@
* @return long
*/
long count(SalaryParam salaryParam);
-
- /**
- *
- * @param file
- */
- void importPlans(MultipartFile file);
}
diff --git a/server/src/main/java/doumeemes/service/business/impl/CompanyOpenServiceImpl.java b/server/src/main/java/doumeemes/service/business/impl/CompanyOpenServiceImpl.java
index 0dd3049..ab6ebbd 100644
--- a/server/src/main/java/doumeemes/service/business/impl/CompanyOpenServiceImpl.java
+++ b/server/src/main/java/doumeemes/service/business/impl/CompanyOpenServiceImpl.java
@@ -11,18 +11,14 @@
import doumeemes.dao.business.model.Company;
import doumeemes.dao.business.model.CompanyLog;
import doumeemes.dao.business.model.CompanyOpen;
-import doumeemes.dao.ext.vo.CompanyExtListVO;
import doumeemes.service.business.CompanyLogService;
import doumeemes.service.business.CompanyOpenService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import doumeemes.service.ext.DepartmentExtService;
import org.apache.shiro.SecurityUtils;
-import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
@@ -47,10 +43,6 @@
@Autowired
CompanyLogService companyLogService;
-
- @Autowired
- @Lazy
- private DepartmentExtService departmentExtService;
@Override
public Integer create(CompanyOpen companyOpen) {
@@ -98,7 +90,7 @@
company.setOepnValidDate(companyOpen.getValidDate());
company.setOepnType(companyOpen.getOepnType());
companyMapper.updateById(company);
- Company company1 = companyMapper.selectById(companyOpen.getCompanyId());
+
CompanyLog companyLog = new CompanyLog();
companyLog.setDeleted((byte) Constants.ZERO);
@@ -111,15 +103,6 @@
companyLog.setUpdateType(Constants.CompanyUpdateType.UPDATE_VAIL_DATE.getKey());
companyLog.setDetail("鏈夋晥鏈熶粠"+format.format(cyResult.getOepnValidDate())+"鏃ヨ皟鏁磋嚦"+format.format(companyOpen.getValidDate()));
companyLogService.create(companyLog);
-
- initRedisCache(company1);
- }
-
- private void initRedisCache(Company com) {
- CompanyExtListVO c = new CompanyExtListVO();
- BeanUtils.copyProperties(com,c);
- departmentExtService.loadComDepart(c);
- departmentExtService.initCompnayCodesByCom(com);
}
@Override
@@ -148,7 +131,7 @@
QueryWrapper<CompanyOpen> wrapper = new QueryWrapper<>(companyOpen);
return companyOpenMapper.selectList(wrapper);
}
-
+
@Override
public PageData<CompanyOpen> findPage(PageWrap<CompanyOpen> pageWrap) {
IPage<CompanyOpen> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
diff --git a/server/src/main/java/doumeemes/service/business/impl/CompanyServiceImpl.java b/server/src/main/java/doumeemes/service/business/impl/CompanyServiceImpl.java
index 256c3b0..726b6bf 100644
--- a/server/src/main/java/doumeemes/service/business/impl/CompanyServiceImpl.java
+++ b/server/src/main/java/doumeemes/service/business/impl/CompanyServiceImpl.java
@@ -14,7 +14,6 @@
import doumeemes.dao.business.model.CompanyLog;
import doumeemes.dao.business.model.Multifiles;
import doumeemes.dao.ext.dto.DingDingConfig;
-import doumeemes.dao.ext.vo.CompanyExtListVO;
import doumeemes.service.business.CompanyLogService;
import doumeemes.service.business.CompanyService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -22,12 +21,9 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import doumeemes.service.business.MultifilesService;
-import doumeemes.service.ext.DepartmentExtService;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
-import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
@@ -50,10 +46,6 @@
@Autowired
private CompanyLogService companyLogService;
-
- @Autowired
- @Lazy
- private DepartmentExtService departmentExtService;
@Override
@@ -123,35 +115,36 @@
update.setStatus(company.getStatus());
update.setDingdingInfo(company.getDingdingInfo());
companyMapper.updateById(update);
+
// 鏇存柊璁板綍
- CompanyLog companyLog = new CompanyLog();
- companyLog.setDeleted((byte)Constants.ZERO);
- companyLog.setUpdateUser(principal.getId());
- companyLog.setCreateUser(principal.getId());
- companyLog.setCreateTime(new Date());
- companyLog.setUpdateTime(new Date());
- companyLog.setCompanyId(company.getId());
+
if(Objects.nonNull(company.getStatus())){
+ CompanyLog companyLog = new CompanyLog();
+ companyLog.setDeleted((byte)Constants.ZERO);
+ companyLog.setUpdateUser(principal.getId());
+ companyLog.setCreateUser(principal.getId());
+ companyLog.setCreateTime(new Date());
+ companyLog.setUpdateTime(new Date());
companyLog.setRemark(company.getStatus() == 1 ? "鏁版嵁鍚敤" : "鏁版嵁绂佺敤");
+ companyLog.setCompanyId(company.getId());
companyLog.setUpdateType(company.getStatus() == 1 ? Constants.CompanyUpdateType.UPDATE_ENABLE.getKey()
: Constants.CompanyUpdateType.UPDATE_DISABLE.getKey());
companyLog.setDetail(company.getStatus() == 1 ? "鏁版嵁鍚敤" : "鏁版嵁绂佺敤");
+ companyLogService.create(companyLog);
}else {
+ CompanyLog companyLog = new CompanyLog();
+ companyLog.setDeleted((byte)Constants.ZERO);
+ companyLog.setUpdateUser(principal.getId());
+ companyLog.setCreateUser(principal.getId());
+ companyLog.setCreateTime(new Date());
+ companyLog.setUpdateTime(new Date());
companyLog.setRemark("鏇存柊浼佷笟鏁版嵁");
+ companyLog.setCompanyId(company.getId());
companyLog.setUpdateType(Constants.CompanyUpdateType.UPDATE_CONTENT.getKey());
companyLog.setDetail("鏇存柊浼佷笟鏁版嵁");
+ companyLogService.create(companyLog);
}
- companyLogService.create(companyLog);
- Company company1 = companyMapper.selectById(company.getId());
- initRedisCache(company1);
- }
-
- private void initRedisCache(Company com) {
- CompanyExtListVO c = new CompanyExtListVO();
- BeanUtils.copyProperties(com,c);
- departmentExtService.loadComDepart(c);
- departmentExtService.initCompnayCodesByCom(com);
}
private Boolean isParseObject(String dingdingInfo){
@@ -192,7 +185,7 @@
QueryWrapper<Company> wrapper = new QueryWrapper<>(company);
return companyMapper.selectList(wrapper);
}
-
+
@Override
public PageData<Company> findPage(PageWrap<Company> pageWrap) {
IPage<Company> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
diff --git a/server/src/main/java/doumeemes/service/business/impl/SalaryParamServiceImpl.java b/server/src/main/java/doumeemes/service/business/impl/SalaryParamServiceImpl.java
index 7d49fdf..c36de3a 100644
--- a/server/src/main/java/doumeemes/service/business/impl/SalaryParamServiceImpl.java
+++ b/server/src/main/java/doumeemes/service/business/impl/SalaryParamServiceImpl.java
@@ -1,36 +1,20 @@
package doumeemes.service.business.impl;
-import doumeemes.core.constants.ResponseStatus;
-import doumeemes.core.exception.BusinessException;
-import doumeemes.core.model.LoginUserInfo;
import doumeemes.core.model.PageData;
import doumeemes.core.model.PageWrap;
-import doumeemes.core.utils.Constants;
import doumeemes.core.utils.Utils;
-import doumeemes.core.utils.excel.EasyExcelUtil;
-import doumeemes.dao.business.DepartmentMapper;
-import doumeemes.dao.business.MaterialMapper;
-import doumeemes.dao.business.ProceduresMapper;
import doumeemes.dao.business.SalaryParamMapper;
-import doumeemes.dao.business.model.*;
-import doumeemes.dao.business.vo.SalaryParamVO;
-import doumeemes.dao.ext.dto.SalaryParamDTO;
-import doumeemes.dao.ext.dto.SalaryParamImportDTO;
-import doumeemes.service.business.DepartmentService;
+import doumeemes.dao.business.model.SalaryParam;
import doumeemes.service.business.SalaryParamService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import org.apache.shiro.SecurityUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
-import org.springframework.web.multipart.MultipartFile;
-import java.math.BigDecimal;
-import java.util.*;
+import java.util.List;
/**
* 璁剧疆绫�-缁╂晥宸ヨ祫閰嶇疆琛⊿ervice瀹炵幇
@@ -43,41 +27,9 @@
@Autowired
private SalaryParamMapper salaryParamMapper;
- @Autowired
- private DepartmentMapper departmentMapper;
-
- @Autowired
- private MaterialMapper materialMapper;
-
- @Autowired
- private ProceduresMapper proceduresMapper;
-
@Override
public Integer create(SalaryParam salaryParam) {
-
-
- LoginUserInfo principal = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
-
- SalaryParam insert = new SalaryParam();
- insert.setRootDepartId(salaryParam.getRootDepartId());
- insert.setDepartId(salaryParam.getDepartId());
- insert.setProcedureId(salaryParam.getProcedureId());
- insert.setMaterialId(salaryParam.getMaterialId());
- insert.setDeleted((byte) Constants.ZERO);
- if(findOne(insert )!=null){
- throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(),"鍚屼竴涓墿鏂欏湪鐩稿悓宸ュ簭涓嶈兘閲嶅閰嶇疆鍝︼紒");
- }
- insert.setCreateUser(principal.getId());
- insert.setCreateTime(new Date());
- insert.setUpdateUser(principal.getId());
- insert.setUpdateTime(new Date());
- insert.setRemark(salaryParam.getRemark());
- insert.setSalary(salaryParam.getSalary());
- insert.setNum(salaryParam.getNum());
- insert.setTimes(salaryParam.getTimes());
- insert.setUnqualified(salaryParam.getUnqualified());
- insert.setType(salaryParam.getType());
- salaryParamMapper.insert(insert);
+ salaryParamMapper.insert(salaryParam);
return salaryParam.getId();
}
@@ -106,25 +58,6 @@
}
@Override
- public void update(SalaryParam salaryParam) {
- LoginUserInfo principal = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
- UpdateWrapper<SalaryParam> wrapper = new UpdateWrapper<>();
- wrapper.lambda()
- .eq(SalaryParam::getId,salaryParam.getId())
- .set(SalaryParam::getUpdateTime,new Date())
- .set(SalaryParam::getUpdateUser,principal.getId())
- .set(SalaryParam::getType,salaryParam.getType())
- .set(SalaryParam::getDepartId,salaryParam.getDepartId())
- .set(SalaryParam::getMaterialId,salaryParam.getMaterialId())
- .set(SalaryParam::getProcedureId,salaryParam.getProcedureId())
- .set(SalaryParam::getSalary,salaryParam.getSalary())
- .set(SalaryParam::getNum,salaryParam.getNum())
- .set(SalaryParam::getTimes,salaryParam.getTimes())
- .set(SalaryParam::getUnqualified,salaryParam.getUnqualified());
- salaryParamMapper.update(null,wrapper);
- }
-
- @Override
public void updateByIdInBatch(List<SalaryParam> salaryParams) {
if (CollectionUtils.isEmpty(salaryParams)) {
return;
@@ -150,130 +83,75 @@
QueryWrapper<SalaryParam> wrapper = new QueryWrapper<>(salaryParam);
return salaryParamMapper.selectList(wrapper);
}
-
+
@Override
- public PageData<SalaryParamVO> findPage(PageWrap<SalaryParamDTO> pageWrap) {
+ public PageData<SalaryParam> findPage(PageWrap<SalaryParam> pageWrap) {
IPage<SalaryParam> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
- SalaryParamDTO model = pageWrap.getModel();
- return PageData.from(salaryParamMapper.selectPage(page, model));
+ QueryWrapper<SalaryParam> queryWrapper = new QueryWrapper<>();
+ Utils.MP.blankToNull(pageWrap.getModel());
+ if (pageWrap.getModel().getId() != null) {
+ queryWrapper.lambda().eq(SalaryParam::getId, pageWrap.getModel().getId());
+ }
+ if (pageWrap.getModel().getDeleted() != null) {
+ queryWrapper.lambda().eq(SalaryParam::getDeleted, pageWrap.getModel().getDeleted());
+ }
+ if (pageWrap.getModel().getCreateUser() != null) {
+ queryWrapper.lambda().eq(SalaryParam::getCreateUser, pageWrap.getModel().getCreateUser());
+ }
+ if (pageWrap.getModel().getCreateTime() != null) {
+ queryWrapper.lambda().ge(SalaryParam::getCreateTime, Utils.Date.getStart(pageWrap.getModel().getCreateTime()));
+ queryWrapper.lambda().le(SalaryParam::getCreateTime, Utils.Date.getEnd(pageWrap.getModel().getCreateTime()));
+ }
+ if (pageWrap.getModel().getUpdateUser() != null) {
+ queryWrapper.lambda().eq(SalaryParam::getUpdateUser, pageWrap.getModel().getUpdateUser());
+ }
+ if (pageWrap.getModel().getUpdateTime() != null) {
+ queryWrapper.lambda().ge(SalaryParam::getUpdateTime, Utils.Date.getStart(pageWrap.getModel().getUpdateTime()));
+ queryWrapper.lambda().le(SalaryParam::getUpdateTime, Utils.Date.getEnd(pageWrap.getModel().getUpdateTime()));
+ }
+ if (pageWrap.getModel().getRemark() != null) {
+ queryWrapper.lambda().eq(SalaryParam::getRemark, pageWrap.getModel().getRemark());
+ }
+ if (pageWrap.getModel().getRootDepartId() != null) {
+ queryWrapper.lambda().eq(SalaryParam::getRootDepartId, pageWrap.getModel().getRootDepartId());
+ }
+ if (pageWrap.getModel().getDepartId() != null) {
+ queryWrapper.lambda().eq(SalaryParam::getDepartId, pageWrap.getModel().getDepartId());
+ }
+ if (pageWrap.getModel().getProcedureId() != null) {
+ queryWrapper.lambda().eq(SalaryParam::getProcedureId, pageWrap.getModel().getProcedureId());
+ }
+ if (pageWrap.getModel().getBomId() != null) {
+ queryWrapper.lambda().eq(SalaryParam::getBomId, pageWrap.getModel().getBomId());
+ }
+ if (pageWrap.getModel().getSalary() != null) {
+ queryWrapper.lambda().eq(SalaryParam::getSalary, pageWrap.getModel().getSalary());
+ }
+ if (pageWrap.getModel().getNum() != null) {
+ queryWrapper.lambda().eq(SalaryParam::getNum, pageWrap.getModel().getNum());
+ }
+ if (pageWrap.getModel().getTimes() != null) {
+ queryWrapper.lambda().eq(SalaryParam::getTimes, pageWrap.getModel().getTimes());
+ }
+ if (pageWrap.getModel().getUnqualified() != null) {
+ queryWrapper.lambda().eq(SalaryParam::getUnqualified, pageWrap.getModel().getUnqualified());
+ }
+ if (pageWrap.getModel().getType() != null) {
+ queryWrapper.lambda().eq(SalaryParam::getType, pageWrap.getModel().getType());
+ }
+ for(PageWrap.SortData sortData: pageWrap.getSorts()) {
+ if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
+ queryWrapper.orderByDesc(sortData.getProperty());
+ } else {
+ queryWrapper.orderByAsc(sortData.getProperty());
+ }
+ }
+ return PageData.from(salaryParamMapper.selectPage(page, queryWrapper));
}
@Override
public long count(SalaryParam salaryParam) {
QueryWrapper<SalaryParam> wrapper = new QueryWrapper<>(salaryParam);
return salaryParamMapper.selectCount(wrapper);
- }
-
- @Transactional(rollbackFor = {Exception.class,BusinessException.class})
- @Override
- public void importPlans(MultipartFile file) {
-
- LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
- if(!Constants.equalsInteger(user.getType(),Constants.USERTYPE.COM)){
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "瀵逛笉璧凤紝鎮ㄦ棤鏉冮檺杩涜璇ユ搷浣滐紒");
- }
- //瑙ｆ瀽excel
- List<SalaryParamImportDTO> plansList = EasyExcelUtil.importExcel(file, 1, 1, SalaryParamImportDTO.class);
- if(plansList == null || plansList.size()==0){
- throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(), "瀵煎叆鏁版嵁鍐呭鏈夎锛�");
- }
-
- plansList.forEach(s->{
- if (Objects.isNull(s.getType())
- || Objects.isNull(s.getDepartName())
- || Objects.isNull(s.getMaterialCode())
- || Objects.isNull(s.getProcedureName())
- || Objects.isNull(s.getNum())){
- throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(), "瀵煎叆鏁版嵁鍐呭鏈夎锛�");
- }
- });
-
-
- for (int i = 0; i < plansList.size(); i++) {
- SalaryParamImportDTO salaryParamImportDTO = plansList.get(i);
-
- QueryWrapper<Department> wrapper = new QueryWrapper<>();
- wrapper.lambda()
- .eq(Department::getName,salaryParamImportDTO.getDepartName())
- .eq(Department::getType,Constants.DEPART_TYPE.factory)
- .last("limit 1");
- Department department = departmentMapper.selectOne(wrapper);
- if (Objects.isNull(department)){
- throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(), "瀵煎叆鏁版嵁鍐呭銆愬叕鍙稿悕绉般�戞湁璇紒");
- }
-
- QueryWrapper<Material> materialWrapper = new QueryWrapper<>();
- materialWrapper.lambda()
- .eq(Material::getCode,salaryParamImportDTO.getMaterialCode())
- .eq(Material::getRootDepartId,department.getRootId())
- .last("limit 1");
- Material material = materialMapper.selectOne(materialWrapper);
-
- if (Objects.isNull(material)){
- throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(), "瀵煎叆鏁版嵁鍐呭銆愪骇鍝佺紪鐮併�戞湁璇紒");
- }
- if (Objects.nonNull(material) && Objects.equals(material.getName(),salaryParamImportDTO.getMaterialName())){
- throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(), "瀵煎叆鏁版嵁鍐呭銆愪骇鍝佸悕绉般�戞湁璇紒");
- }
- QueryWrapper<Procedures> proceduresWrapper = new QueryWrapper<>();
- proceduresWrapper.lambda()
- .eq(Procedures::getName,salaryParamImportDTO.getProcedureName())
- .eq(Procedures::getRootDepartId,department.getRootId())
- .eq(Procedures::getOrgId,department.getId())
- .last("limit 1");
- Procedures procedures = proceduresMapper.selectOne(proceduresWrapper);
- if (Objects.isNull(procedures)){
- throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(), "瀵煎叆鏁版嵁鍐呭銆愬伐搴忓悕绉般�戞湁璇紒");
- }
- SalaryParam salaryParam = new SalaryParam();
- salaryParam.setRootDepartId(department.getRootId());
- salaryParam.setDepartId(department.getId());
- salaryParam.setProcedureId(procedures.getId());
- salaryParam.setMaterialId(material.getId());
- salaryParam.setSalary(salaryParamImportDTO.getSalary());
- salaryParam.setNum(new BigDecimal(salaryParamImportDTO.getNum()));
- salaryParam.setTimes(getIntegerTimes(salaryParamImportDTO.getTimesName()));
- Integer unqualified = Optional.ofNullable(salaryParamImportDTO.getUnqualified()).map(s -> {
- if ("鍚�".equals(s)) {
- return 0;
- } else {
- return 1;
- }
- }).orElse(0);
- salaryParam.setUnqualified(unqualified);
-
- Integer type = Optional.ofNullable(salaryParamImportDTO.getUnqualified()).map(s -> {
- if ("璁′欢".equals(s)) {
- return 0;
- } else {
- return 1;
- }
- }).orElse(0);
- salaryParam.setType(type);
- create(salaryParam);
- }
-
- }
-
- private Integer getIntegerTimes(String a) {
- int h =0,m=0,s=0;
- try{
- int hIndex =a.lastIndexOf("灏忔椂");
- int mIndex=a.lastIndexOf("鍒嗛挓");
- int sIndex =a.lastIndexOf("绉�");
- if( hIndex>0){
- h = Integer.parseInt(a.substring(0,hIndex));
- }
- if(mIndex > hIndex){
- m = Integer.parseInt(a.substring(hIndex >=0?hIndex+2:0,mIndex));
- }
- if(sIndex > mIndex){
- s = Integer.parseInt(a.substring(mIndex >= 0 ? mIndex+2 : 0, sIndex));
- }
- return h*3600+m*60+s;
- }catch (Exception e){
- throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝鏃堕暱銆�"+a+"銆戞牸寮忎笉姝ｇ‘锛�" );
- }
-
}
}
diff --git a/server/src/main/java/doumeemes/service/business/impl/WOutboundServiceImpl.java b/server/src/main/java/doumeemes/service/business/impl/WOutboundServiceImpl.java
index 67abb5c..d82226a 100644
--- a/server/src/main/java/doumeemes/service/business/impl/WOutboundServiceImpl.java
+++ b/server/src/main/java/doumeemes/service/business/impl/WOutboundServiceImpl.java
@@ -2126,9 +2126,6 @@
WOutboundInBodyBean wOutboundInBodyBean = wOutboundInBodyBeans.get(Constants.ZERO);
//绱鍏ュ簱鏁伴噺
wOutboundInBodyBean.setNum(wOutboundInBodyBeans.stream().map(s -> s.getNum()).reduce(BigDecimal.ZERO, BigDecimal::add));
- if(wOutboundInBodyBean.getNum().compareTo(BigDecimal.ZERO)<=Constants.ZERO){
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "鏁伴噺寮傚父,璇锋鏌ユ暟閲�!");
- }
WOutboundDetail wOutboundDetail = new WOutboundDetail();
//鏌ヨ鐗╂枡鏁版嵁
MaterialDistribute materialDistribute = materialDistributeMapper.selectById(wOutboundInBodyBean.getMaterialId());
diff --git a/server/src/main/java/doumeemes/service/business/impl/WorkorderCheckServiceImpl.java b/server/src/main/java/doumeemes/service/business/impl/WorkorderCheckServiceImpl.java
index faa8b91..51b8316 100644
--- a/server/src/main/java/doumeemes/service/business/impl/WorkorderCheckServiceImpl.java
+++ b/server/src/main/java/doumeemes/service/business/impl/WorkorderCheckServiceImpl.java
@@ -276,11 +276,8 @@
//宸ュ崟瀵硅薄
Workorder workorder=workorderExtMapper.selectById(wc.getWorkorderId());
- if(workorder==null
- || workorder.getStatus()==Constants.WORKORDER_STATUS.done
- ||workorder.getStatus()==Constants.WORKORDER_STATUS.baogong
- ||workorder.getStatus()==Constants.WORKORDER_STATUS.instock
- ||workorder.getStatus()==Constants.WORKORDER_STATUS.cancel){
+ if(workorder==null || workorder.getStatus()==Constants.WORKORDER_STATUS.done||workorder.getStatus()==Constants.WORKORDER_STATUS.baogong
+ ||workorder.getStatus()==Constants.WORKORDER_STATUS.instock ||workorder.getStatus()==Constants.WORKORDER_STATUS.cancel){
return ApiResponse.failed("宸ュ崟涓嶅厑璁告楠�");
}
if(workorder.getPlanNum()!=null){
@@ -401,7 +398,7 @@
//宸ュ崟瀵硅薄
Workorder workorder=workorderExtMapper.selectById(wc.getWorkorderId());
- if(workorder==null || workorder.getStatus()==Constants.WORKORDER_STATUS.done || workorder.getStatus()==Constants.WORKORDER_STATUS.done||workorder.getStatus()==Constants.WORKORDER_STATUS.baogong
+ if(workorder==null || workorder.getStatus()==Constants.WORKORDER_STATUS.done||workorder.getStatus()==Constants.WORKORDER_STATUS.baogong
||workorder.getStatus()==Constants.WORKORDER_STATUS.instock ||workorder.getStatus()==Constants.WORKORDER_STATUS.cancel){
return ApiResponse.failed("宸ュ崟涓嶅厑璁告楠�");
}
diff --git a/server/src/main/java/doumeemes/service/ext/PlansExtService.java b/server/src/main/java/doumeemes/service/ext/PlansExtService.java
index 856f5ff..596d0cf 100644
--- a/server/src/main/java/doumeemes/service/ext/PlansExtService.java
+++ b/server/src/main/java/doumeemes/service/ext/PlansExtService.java
@@ -5,7 +5,6 @@
import doumeemes.core.model.LoginUserInfo;
import doumeemes.core.model.PageData;
import doumeemes.core.model.PageWrap;
-import doumeemes.dao.business.dto.AutoWorkReportDTO;
import doumeemes.dao.business.model.Plans;
import doumeemes.dao.business.model.Workorder;
import doumeemes.dao.ext.vo.PlansExtListCountVO;
@@ -77,11 +76,4 @@
void pauseByIdForStandard(Plans model,LoginUserInfo userInfo);
void regainByIdForStandard(Plans model, LoginUserInfo userInfo);
List<PlansExtListVO> getListByWorkPlan(Integer workPlanId);
-
- /**
- * 涓�閿姤宸�
- * @param user
- * @param autoWorkReportDTO
- */
- void autoWorkReport(LoginUserInfo user, AutoWorkReportDTO autoWorkReportDTO);
}
diff --git a/server/src/main/java/doumeemes/service/ext/WorkorderRecordExtService.java b/server/src/main/java/doumeemes/service/ext/WorkorderRecordExtService.java
index 5fe02b9..6992d45 100644
--- a/server/src/main/java/doumeemes/service/ext/WorkorderRecordExtService.java
+++ b/server/src/main/java/doumeemes/service/ext/WorkorderRecordExtService.java
@@ -6,11 +6,7 @@
import doumeemes.dao.business.model.Workorder;
import doumeemes.dao.business.model.WorkorderRecord;
import doumeemes.dao.ext.bean.EndCheckApBean;
-import doumeemes.dao.ext.dto.QuerySalaryStatisticDTO;
-import doumeemes.dao.ext.dto.QueryUserSalaryListDTO;
import doumeemes.dao.ext.dto.QueryWorkorderRecordExtDTO;
-import doumeemes.dao.ext.vo.SalaryStatisticsListVO;
-import doumeemes.dao.ext.vo.UserSalaryListVO;
import doumeemes.dao.ext.vo.WorkorderRecordExtListVO;
import javax.servlet.http.HttpServletResponse;
@@ -49,11 +45,4 @@
void exportExcel(PageWrap<QueryWorkorderRecordExtDTO> pageWrap ,HttpServletResponse response);
- PageData<SalaryStatisticsListVO> salaryStatistic(PageWrap<QuerySalaryStatisticDTO> pageWrap);
-
- PageData<UserSalaryListVO> userSalaryPage(PageWrap<QueryUserSalaryListDTO> pageWrap);
-
- void exportUserSalary(PageWrap<QueryUserSalaryListDTO> pageWrap, HttpServletResponse response);
-
- void exportSalaryStatistics(PageWrap<QuerySalaryStatisticDTO> pageWrap, HttpServletResponse response);
}
diff --git a/server/src/main/java/doumeemes/service/ext/WorkorderRecordStandardService.java b/server/src/main/java/doumeemes/service/ext/WorkorderRecordStandardService.java
index 8473bf7..0a55846 100644
--- a/server/src/main/java/doumeemes/service/ext/WorkorderRecordStandardService.java
+++ b/server/src/main/java/doumeemes/service/ext/WorkorderRecordStandardService.java
@@ -4,7 +4,6 @@
import doumeemes.core.model.PageData;
import doumeemes.core.model.PageWrap;
import doumeemes.dao.business.dto.CreateMaterialDTO;
-import doumeemes.dao.business.dto.CreateWorkorderRecordDTO;
import doumeemes.dao.business.dto.DealWorkorderRecordDTO;
import doumeemes.dao.business.model.Workorder;
import doumeemes.dao.business.model.WorkorderRecord;
@@ -31,11 +30,7 @@
WorkorderRecord dealWorkorderRecord(DealWorkorderRecordDTO dealWorkorderRecordDTO, LoginUserInfo loginUserInfo);
- WorkorderRecord createWorkorderRecord(CreateWorkorderRecordDTO createWorkorderRecordDTO, LoginUserInfo loginUserInfo);
-
List<WorkorderRecord> getWorkorderRecordList(Integer workorderId);
PageData<WStockExtListVO> choiceStockPageForWorkorder(PageWrap<QueryWStockDto> pageWrap, LoginUserInfo userInfo);
-
- PageData<WStockExtListVO> choiceStockPageForPlans(PageWrap<QueryWStockDto> pageWrap,LoginUserInfo userInfo);
}
diff --git a/server/src/main/java/doumeemes/service/ext/impl/CompanyExtServiceImpl.java b/server/src/main/java/doumeemes/service/ext/impl/CompanyExtServiceImpl.java
index 211c2c9..b890b41 100644
--- a/server/src/main/java/doumeemes/service/ext/impl/CompanyExtServiceImpl.java
+++ b/server/src/main/java/doumeemes/service/ext/impl/CompanyExtServiceImpl.java
@@ -590,7 +590,7 @@
return companyInfoListVO;
}
String rPath =systemDictDataBiz.queryByCode(Constants.OSS,Constants.RESOURCE_PATH).getCode()+systemDictDataBiz.queryByCode(Constants.OSS,Constants.MENU_IMG).getCode();
- companyInfoListVO.setFileurlfull(rPath+companyInfoListVO.getFileStoreAddr());
+ companyInfoListVO.setFileurlfull(rPath+"/"+companyInfoListVO.getFileStoreAddr());
companyInfoListVO.setSystemUrl( systemDictDataBiz.queryByCode(Constants.EDGP_PARAM,Constants.SYSTEM_URL).getCode()+companyInfoListVO.getId());
diff --git a/server/src/main/java/doumeemes/service/ext/impl/DepartmentExtServiceImpl.java b/server/src/main/java/doumeemes/service/ext/impl/DepartmentExtServiceImpl.java
index aedce83..d918101 100644
--- a/server/src/main/java/doumeemes/service/ext/impl/DepartmentExtServiceImpl.java
+++ b/server/src/main/java/doumeemes/service/ext/impl/DepartmentExtServiceImpl.java
@@ -37,7 +37,6 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
-import javax.annotation.PostConstruct;
import java.util.*;
import java.util.stream.Collectors;
@@ -444,7 +443,6 @@
//鍔犲叆redis缂撳瓨锛屽瓨鍌ㄤ紒涓氫俊鎭�
RedisUtil.addObject(redisTemplate,Constants.RedisKeys.COM_DEPART_TREE_KEY+com.getId(),rootDepart);
}
- @PostConstruct
@Override
public void loadAllDepart() {
QueryCompanyExtDTO dto = new QueryCompanyExtDTO();
@@ -798,7 +796,7 @@
for (Department department:departmentList ) {
this.dealDepartmentData(department,user);
}
- }
+ }
}
public void dealDepartmentData(Department department,LoginUserInfo user){
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 4bb8e2c..0c69384 100644
--- a/server/src/main/java/doumeemes/service/ext/impl/PlansExtServiceImpl.java
+++ b/server/src/main/java/doumeemes/service/ext/impl/PlansExtServiceImpl.java
@@ -16,14 +16,11 @@
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.*;
import doumeemes.dao.ext.dto.*;
import doumeemes.dao.ext.vo.*;
import doumeemes.service.ext.*;
-import io.swagger.annotations.ApiModelProperty;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
import org.springframework.beans.BeanUtils;
@@ -35,11 +32,9 @@
import org.springframework.web.multipart.MultipartFile;
import java.math.BigDecimal;
-import java.time.LocalDate;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
-import java.util.Objects;
/**
* 鐢熶骇璁″垝Service瀹炵幇
@@ -66,8 +61,7 @@
private WorkorderHistoryExtMapper workorderHistoryExtMapper;
@Autowired
private WorkorderRecordExtMapper workorderRecordExtMapper;
- @Autowired
- private WorkorderMapper workorderMapper;
+
@Autowired
private RouteProcedureExtMapper routeProcedureExtMapper;
@Autowired
@@ -90,8 +84,6 @@
private MaterialDistributeExtMapper materialDistributeExtMapper;
@Autowired
private WStockExtService wStockExtService;
- @Autowired
- private WorkorderRecordStandardService workorderRecordStandardService;
@Override
public PlansExtListVO findById(Integer id){
@@ -142,19 +134,6 @@
// //缁熻宸插畬宸ユ暟閲�
// 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;
}
@@ -213,14 +192,6 @@
// p.setDistributNum(tp.getDistributNum());
// p.setDoneNum(tp.getDoneNum());
p.setIsStock(wStockExtService.isStockForPlan(p));
- p.setHasExpire(false);
- p.setStatus(Constants.formatIntegerNum(p.getStatus()));
- if ( !p.getStatus().equals(Constants.PLAN_STATUS.done) &&
- !p.getStatus().equals(Constants.PLAN_STATUS.close)){
- if (Objects.nonNull(p.getPlanDate())){
- p.setHasExpire(DateUtil.toDateLocalDateTime(p.getWorkPlanPlanDate()).toLocalDate().isBefore(LocalDate.now()));
- }
- }
}
}
return PageData.from(new PageInfo<>(result));
@@ -594,7 +565,7 @@
distributeDone(user, param,param.getPlanNum());
}
- private Workorder distributeDone(LoginUserInfo user, Workorder param,int thisPlanNum) {
+ private void distributeDone(LoginUserInfo user, Workorder param,int thisPlanNum) {
if(param.getPlanId()== null
||param.getPlanDate() == null
|| param.getProGroupId()==null
@@ -616,7 +587,7 @@
if(Constants.equalsInteger(mp.getPaused(),Constants.ONE)){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "瀵逛笉璧凤紝璁″垝宸叉殏鍋滐紒");
}
- if(Constants.formatIntegerNum(mp.getWorkorderDistributNum())+thisPlanNum > Constants.formatIntegerNum(mp.getNum())){
+ if(Constants.formatIntegerNum(mp.getDistributNum())+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)){
@@ -677,7 +648,7 @@
//鐢熶骇浜哄憳璁板綍
workorderUserExtMapper.insert(wu);
}
- return order;
+
}
private void checkUserAndGroup(Workorder param, PlansExtListVO model,LoginUserInfo user) throws BusinessException{
@@ -1531,7 +1502,7 @@
}
/**
* 鎭㈠璁″垝
- * @param
+ * @param p
*/
@Transactional(rollbackFor = {BusinessException.class,Exception.class})
@Override
@@ -1573,75 +1544,5 @@
}
}
-
-
- /**
- * 涓�閿姤宸�
- * @param user
- */
- @Transactional(rollbackFor = {BusinessException.class,Exception.class})
- @Override
- public void autoWorkReport(LoginUserInfo user, AutoWorkReportDTO autoWorkReportDTO){
- //鏌ヨ宸ュ伐搴忚鍒掔姸鎬�
- Plans plans = plansExtMapper.selectById(autoWorkReportDTO.getPlansId());
- if(Objects.isNull(plans)){
- throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈠埌宸ュ簭璁″垝鏁版嵁");
- }
- if(!(plans.getStatus().equals(Constants.PLAN_STATUS.create)||plans.getStatus().equals(Constants.PLAN_STATUS.distribute))){
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"宸ュ簭璁″垝宸叉祦杞紝鏃犳硶鎿嶄綔");
- }
- if(plans.getPaused().equals(Constants.ONE)){
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"宸ュ簭璁″垝宸叉殏鍋滐紝鏃犳硶鎿嶄綔");
- }
- if(Objects.isNull(autoWorkReportDTO.getCreateWorkorderRecordDTO())){
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鍙傛暟閿欒锛氫骇鍑烘暟鎹�");
- }
- //鏌ヨ宸ュ簭璁″垝宸插垎閰嶆暟閲�
- 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){
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鍙傛暟閿欒锛氫骇鍑烘暟鎹�");
- }
- //宸ュ崟宸插垎閰嶆暟閲�
- Integer produceNum = workorderList.stream().map(s -> s.getPlanNum()).reduce(Constants.ZERO, Integer::sum);
- Integer surplusNum = plans.getNum() - produceNum;
- if(num.compareTo(BigDecimal.valueOf(surplusNum))>0){
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鍙傛暟閿欒锛氳秴鍑哄伐鍗曞墿浣欏彲鍒嗛厤鏁伴噺");
- }
- Workorder param = new Workorder();
- param.setPlanId(autoWorkReportDTO.getPlansId());
- param.setPlanDate(new Date());
- param.setProGroupId(autoWorkReportDTO.getProGroupId());
- param.setProUserList(autoWorkReportDTO.getProUserList());
- param.setPlanNum(plans.getNum());
- //鐢熸垚宸ュ崟淇℃伅
- Workorder workorder = this.distributeDone(user,param,plans.getNum());
- //宸ュ崟鎶曟枡璁板綍
- CreateMaterialDTO createMaterialDTO = new CreateMaterialDTO();
- if(!Objects.isNull(autoWorkReportDTO.getRecordList())&&autoWorkReportDTO.getRecordList().size()>Constants.ZERO){
- createMaterialDTO.setId(workorder.getId());
- createMaterialDTO.setRecordList(autoWorkReportDTO.getRecordList());
- workorderRecordStandardService.createMaterialStandard(createMaterialDTO);
- }
- //宸ュ崟浜у嚭璁板綍
- autoWorkReportDTO.getCreateWorkorderRecordDTO().setWorkorderId(workorder.getId());
- workorderRecordStandardService.createWorkorderRecord(autoWorkReportDTO.getCreateWorkorderRecordDTO(),user);
- //宸ュ崟鎶ュ伐
- workorderRecordStandardService.comfirmDone(workorder);
- //鏇存柊宸ュ崟鐘舵��
- if(num.compareTo(BigDecimal.valueOf(surplusNum))==Constants.ZERO){
- plans.setStatus(Constants.PLAN_STATUS.done);
- }else{
- if(plans.getStatus().equals(Constants.PLAN_STATUS.create)){
- plans.setStatus(Constants.PLAN_STATUS.distribute);
- }
- }
- plansExtMapper.updateById(plans);
-
-
- }
-
}
diff --git a/server/src/main/java/doumeemes/service/ext/impl/WorkPlansExtServiceImpl.java b/server/src/main/java/doumeemes/service/ext/impl/WorkPlansExtServiceImpl.java
index 4885ee4..1e80882 100644
--- a/server/src/main/java/doumeemes/service/ext/impl/WorkPlansExtServiceImpl.java
+++ b/server/src/main/java/doumeemes/service/ext/impl/WorkPlansExtServiceImpl.java
@@ -32,7 +32,6 @@
import org.springframework.web.multipart.MultipartFile;
import java.math.BigDecimal;
-import java.time.LocalDate;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -97,9 +96,7 @@
|| Objects.isNull(workPlansSaveDTO.getNum())
|| Objects.isNull(workPlansSaveDTO.getFactoryId())
|| Objects.isNull(workPlansSaveDTO.getUnitId())
- || Objects.isNull(workPlansSaveDTO.getMaterialId())
- || Objects.isNull(workPlansSaveDTO.getStartDate())
- || workPlansSaveDTO.getStartDate().getTime() > workPlansSaveDTO.getPlanDate().getTime()){
+ || Objects.isNull(workPlansSaveDTO.getMaterialId())){
throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
WorkPlans workPlans = new WorkPlans();
@@ -175,16 +172,6 @@
i.setFinishUnQualifiedNum(Objects.isNull(plansExtListVO.getUnqulifiedNum())?Constants.ZERO:plansExtListVO.getUnqulifiedNum());
i.setFinishNum(Objects.isNull(plansExtListVO.getDoneNum())?Constants.ZERO:plansExtListVO.getDoneNum());
}
- i.setHasExpire(false);
- i.setStatus(Constants.formatIntegerNum(i.getStatus()));
- if ( !i.getStatus().equals(Constants.WORKPLANHISTORY_TYPE.done) &&
- !i.getStatus().equals(Constants.WORKPLANHISTORY_TYPE.close)){
- if (Objects.nonNull(i.getPlanDate())){
- i.setHasExpire(DateUtil.toDateLocalDateTime(i.getPlanDate()).toLocalDate().isBefore(LocalDate.now()));
- }
- }
-
-
});
}
return PageData.from(new PageInfo<>(result));
@@ -378,14 +365,8 @@
if(Constants.formatIntegerNum(p.getNum())<=0){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝绗��"+(index+2)+"銆戣銆愯鍒掔敓浜ф暟閲忋�戞暟鎹敊璇紒");
}
- if(p.getStartDate() == null){
- throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝绗��"+(index+2)+"銆戣銆愯鍒掑紑濮嬫棩鏈熴�戞暟鎹敊璇紝姝ｇ‘鏍煎紡涓猴細yyyy-MM-dd锛堝2022-06-07锛夛紒");
- }
if(p.getPlanDate() == null){
- throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝绗��"+(index+2)+"銆戣銆愯鍒掔粨鏉熸棩鏈熴�戞暟鎹敊璇紝姝ｇ‘鏍煎紡涓猴細yyyy-MM-dd锛堝2022-06-07锛夛紒");
- }
- if(p.getPlanDate().getTime() <= p.getStartDate().getTime()){
- throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝绗��"+(index+2)+"銆戣銆愯鍒掑紑濮嬫棩鏈熴�戣鏃╀簬銆愯鍒掔粨鏉熸棩鏈熴�戯紒");
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝绗��"+(index+2)+"銆戣銆愯鍒掓棩鏈熴�戞暟鎹敊璇紝姝ｇ‘鏍煎紡涓猴細yyyy-MM-dd锛堝2022-06-07锛夛紒");
}
if(StringUtils.isBlank(p.getMaterialCode())){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝绗��"+(index+2)+"銆戣銆愪骇鍝佺紪鐮併�戞暟鎹敊璇紒");
diff --git a/server/src/main/java/doumeemes/service/ext/impl/WorkorderExtServiceImpl.java b/server/src/main/java/doumeemes/service/ext/impl/WorkorderExtServiceImpl.java
index b5e1a8a..0c8029b 100644
--- a/server/src/main/java/doumeemes/service/ext/impl/WorkorderExtServiceImpl.java
+++ b/server/src/main/java/doumeemes/service/ext/impl/WorkorderExtServiceImpl.java
@@ -343,7 +343,6 @@
result.setStartNum(workorderExtMapper.selectCount(param));
param.setStatusList(new ArrayList<>());
param.getStatusList().add(Constants.WORKORDER_STATUS.done);
- param.getStatusList().add(Constants.WORKORDER_STATUS.producing);
param.getStatusList().add(Constants.WORKORDER_STATUS.check);
//杩涜涓暟閲�
result.setIngNum(workorderExtMapper.selectCount(param));
@@ -411,8 +410,6 @@
tModle.setUnqualifiedNum(0);
tModle.setProUserId(w.getProUserId());
tModle.setProUserName(w.getProUserName());
- tModle.setProUserName(w.getProUserName());
- tModle.setCreateUser(w.getCreateUser());
if(w.getProUserId()!=null){
//鏌ヨ鐝粍淇℃伅
QueryCompanyUserExtDTO queryCompanyUserExtDTO = new QueryCompanyUserExtDTO();
diff --git a/server/src/main/java/doumeemes/service/ext/impl/WorkorderRecordExtServiceImpl.java b/server/src/main/java/doumeemes/service/ext/impl/WorkorderRecordExtServiceImpl.java
index 75f7e0d..ba89d09 100644
--- a/server/src/main/java/doumeemes/service/ext/impl/WorkorderRecordExtServiceImpl.java
+++ b/server/src/main/java/doumeemes/service/ext/impl/WorkorderRecordExtServiceImpl.java
@@ -141,52 +141,6 @@
}
return PageData.from(new PageInfo<>(result));
}
- @Override
- public PageData<SalaryStatisticsListVO> salaryStatistic(PageWrap<QuerySalaryStatisticDTO> pageWrap) {
- LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
- if(!Constants.equalsInteger(user.getType(),Constants.USERTYPE.COM)){
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "瀵逛笉璧凤紝鎮ㄦ棤鏉冮檺杩涜璇ユ搷浣滐紒");
- }
- //鍙兘鏌ョ湅褰撳墠鏍圭粍缁囩殑鏁版嵁
- pageWrap.getModel().setRootDepartId(user.getRootDepartment().getId());
- PageHelper.startPage(pageWrap.getPage(), pageWrap.getCapacity());
- List<SalaryStatisticsListVO> result = workorderRecordExtMapper.salaryStatistic(pageWrap.getModel());
- if(result!=null){
- List<DepartmentExtListVO> allDepartList = RedisUtil.getObject(redisTemplate,Constants.RedisKeys.COM_DEPART_LIST_KEY+user.getCompany().getId(),ArrayList.class);
- for(SalaryStatisticsListVO model : result){
- //鏌ヨ鐢熶骇浜哄憳濮撳悕
-// model.setUserName(initProUser(user,model.getUserId(),allDepartList));
- model.setUserInfo(initProUser(user,model.getUserId(),allDepartList));
- }
- }
- return PageData.from(new PageInfo<>(result));
- }
- @Override
- public PageData<UserSalaryListVO> userSalaryPage(PageWrap<QueryUserSalaryListDTO> pageWrap) {
- LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
- if(!Constants.equalsInteger(user.getType(),Constants.USERTYPE.COM)){
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "瀵逛笉璧凤紝鎮ㄦ棤鏉冮檺杩涜璇ユ搷浣滐紒");
- }
- //鍙兘鏌ョ湅褰撳墠鏍圭粍缁囩殑鏁版嵁
- pageWrap.getModel().setRootDepartId(user.getRootDepartment().getId());
- pageWrap.getModel().setRootDepartId(user.getRootDepartment().getId());
- PageHelper.startPage(pageWrap.getPage(), pageWrap.getCapacity());
-
- //鏁版嵁鏉冮檺
-// List<Integer> dataPermission = user.getDepartPermissionList();
- List<UserSalaryListVO> result = workorderRecordExtMapper.userSalaryPage(pageWrap.getModel());
- if(result!=null){
- List<DepartmentExtListVO> allDepartList = RedisUtil.getObject(redisTemplate,Constants.RedisKeys.COM_DEPART_LIST_KEY+user.getCompany().getId(),ArrayList.class);
- for(UserSalaryListVO model : result){
- //鏌ヨ鐢熶骇浜哄憳濮撳悕
- model.setUserInfo(initProUser(user,model.getUserId(),allDepartList));
- if(Constants.formatBigdecimal4Float(model.getNum()).compareTo(new BigDecimal(0))>0){
- model.setRate(Constants.formatBigdecimal4Float(model.getQualifiedNum()).divide(model.getNum(),4).multiply(new BigDecimal(100)));
- }
- }
- }
- return PageData.from(new PageInfo<>(result));
- }
private void initProUser(LoginUserInfo user, WorkorderRecordExtListVO data, List<DepartmentExtListVO> allDepartList) {
if(data.getCreateUser() ==null){
@@ -202,29 +156,6 @@
String dName =d==null?"":StringUtils.defaultString(d.getName(),"");
data.setProcedureName(comp.getName()+"-"+dName);
}
- }
- private UserBaseInfoVO initProUser(LoginUserInfo user, Integer userId, List<DepartmentExtListVO> allDepartList) {
- if(userId ==null){
- return null;
- }
-
- CompanyUser query=new CompanyUser();
- query.setUserId(userId);
- query.setRootDepartId(user.getRootDepartment().getId());
- query.setDeleted(Constants.ZERO);
- CompanyUser comp= companyUserExtMapper.selectOne(new QueryWrapper<>(query).last(" limit 1"));
- if(comp!=null){
- UserBaseInfoVO userinfo = new UserBaseInfoVO();
- DepartmentExtListVO d = departmentExtService.getModelById(user.getCompany().getId(),comp.getDepartmentId(),allDepartList);
- String dName =d==null?"":StringUtils.defaultString(d.getName(),"");
- userinfo.setNameAndDepart (comp.getName()+"-"+dName);
- userinfo.setDepartId(d.getId());
- userinfo.setUserId(userId);
- userinfo.setUserName(comp.getName());
- userinfo.setDepartName(d.getName());
- return userinfo;
- }
- return null;
}
@Override
public List<WorkorderRecordExtListVO> findAll(QueryWorkorderRecordExtDTO pageWrap) {
@@ -1407,13 +1338,6 @@
order.setStatus(Constants.WORKORDER_STATUS.material);
}else if(status ==Constants.WORKORDER_HISTORY_STATUS.done){
order.setStatus(Constants.WORKORDER_STATUS.done);
- }else if(status ==Constants.WORKORDER_HISTORY_STATUS.produce){
- //鎶曟枡鎿嶄綔
- if(Constants.equalsInteger(mp.getStatus(),Constants.WORKORDER_STATUS.create)
- ||Constants.equalsInteger(mp.getStatus(),Constants.WORKORDER_STATUS.material)){
- //濡傛灉鏄凡鍒涘缓鎴栬�呭凡澶囨枡鐘舵�佺殑宸ュ崟锛屼慨鏀瑰叾鐘舵�佷负銆愮敓浜т腑銆�
- order.setStatus(Constants.WORKORDER_STATUS.producing);
- }
}
workorderExtMapper.updateById(order);
workorderHistoryExtMapper.insertBatch(whList);
@@ -1672,30 +1596,6 @@
}
- @Override
- public void exportUserSalary(PageWrap<QueryUserSalaryListDTO> pageWrap, HttpServletResponse response) {
- List<UserSalaryListVO> result=this.userSalaryPage(pageWrap).getRecords();
- for(UserSalaryListVO model : result) {
- if(model.getUserInfo()!=null){
- model.setUserName(model.getUserInfo().getUserName());
- model.setDepartName(model.getUserInfo().getDepartName());
- }
- }
- ExcelExporter.build(UserSalaryListVO.class).export(result, "鍛樺伐缁╂晥鏄庣粏"+System.currentTimeMillis(), response);
-
- }
- @Override
- public void exportSalaryStatistics(PageWrap<QuerySalaryStatisticDTO> pageWrap, HttpServletResponse response){
- List<SalaryStatisticsListVO> result=this.salaryStatistic(pageWrap).getRecords();
- for(SalaryStatisticsListVO model : result) {
- if(model.getUserInfo()!=null){
- model.setUserName(model.getUserInfo().getUserName());
- model.setDepartName(model.getUserInfo().getDepartName());
- }
- }
- ExcelExporter.build(SalaryStatisticsListVO.class).export(result, "宸ヨ祫鎶ヨ〃"+System.currentTimeMillis(), response);
-
- }
@Override
public void exportExcel(PageWrap<QueryWorkorderRecordExtDTO> pageWrap, HttpServletResponse response) {
List<WorkorderRecordExtListVO> result=this.findPage(pageWrap).getRecords();
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 17b1c9d..4933d4f 100644
--- a/server/src/main/java/doumeemes/service/ext/impl/WorkorderRecordStandardServiceImpl.java
+++ b/server/src/main/java/doumeemes/service/ext/impl/WorkorderRecordStandardServiceImpl.java
@@ -16,9 +16,7 @@
import doumeemes.core.utils.redis.RedisUtil;
import doumeemes.dao.business.BackOrderDetailMapper;
import doumeemes.dao.business.BackorderMapper;
-import doumeemes.dao.business.SalaryParamMapper;
import doumeemes.dao.business.dto.CreateMaterialDTO;
-import doumeemes.dao.business.dto.CreateWorkorderRecordDTO;
import doumeemes.dao.business.dto.DealWorkorderRecordDTO;
import doumeemes.dao.business.dto.MaterialListDTO;
import doumeemes.dao.business.model.*;
@@ -81,12 +79,6 @@
private WOutboundRecordExtMapper wOutboundRecordExtMapper;
@Autowired
private MaterialExtMapper materialExtMapper;
- @Autowired
- private SalaryParamMapper salaryParamMapper;
- @Autowired
- private PlansExtMapper plansExtMapper;
- @Autowired
- private DeviceExtMapper deviceExtMapper;
@Transactional(rollbackFor = {BusinessException.class,Exception.class})
@Override
@@ -150,10 +142,9 @@
recordList.add(getWorkrecordModel(user,wStock,mp,materialListDTO.getNum()));
}
}
-
//鎵归噺鎻掑叆鎶曟枡璁板綍
workorderRecordExtMapper.insertBatch(recordList);
- //鍗曟坊鍔犲巻鍙茶褰曪紙鍒ゆ柇鏇存柊涓虹敓浜т腑锛�
+ //鍗曟坊鍔犲巻鍙茶褰曪紙涓嶆洿鏂扮姸鎬侊級
updateOrderInfo(user,mp,Constants.WORKORDER_HISTORY_STATUS.material);
return param.getId();
}
@@ -192,14 +183,6 @@
return mp;
}
- private void getPlansAndValid(LoginUserInfo user, Plans mp) throws BusinessException{
- if(mp== null){
- throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(), "瀵逛笉璧凤紝璇ヨ褰曚笉瀛樺湪锛�");
- }
- if(Constants.equalsInteger(mp.getPaused(),Constants.ONE)){
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "瀵逛笉璧凤紝宸ュ崟宸叉殏鍋滐紒");
- }
- }
private QueryBomDetailExtDTO initBomParam(LoginUserInfo user, Workorder mp) throws BusinessException{
QueryBomExtDTO bb = new QueryBomExtDTO();
@@ -219,27 +202,6 @@
bom.setBomId(versionBom.getBomVersionId());
// bom.setProcedureId(mp.getProcedureId());
bom.setWorkorderId(mp.getId());
- return bom;
- }
-
- private QueryBomDetailExtDTO initBomParamForPlans(LoginUserInfo user, Plans plans) throws BusinessException{
- QueryBomExtDTO bb = new QueryBomExtDTO();
- bb.setDepartId(plans.getDepartId());
- bb.setDeleted(Constants.ZERO);
- bb.setRootDepartId(user.getRootDepartment().getId());
- bb.setMaterialId(plans.getMaterialId());
- bb.setProcedureId(plans.getProcedureId());
- BomExtListVO versionBom = bomExtMapper.selectByModel( bb);
- if(versionBom == null || StringUtils.isBlank(versionBom.getVersion()) || versionBom.getBomVersionId() == null){
- return null;
- // throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(), "瀵逛笉璧凤紝璇ュ伐鍗曠墿鏂橞OM淇℃伅閰嶇疆鏈夎锛岃鑱旂郴绠＄悊鍛橈紒");
- }
- plans.setBomModel(versionBom);
- QueryBomDetailExtDTO bom = new QueryBomDetailExtDTO();
- bom.setDeleted(Constants.ZERO);
- bom.setBomId(versionBom.getBomVersionId());
-// bom.setProcedureId(mp.getProcedureId());
- bom.setPlansId(plans.getId());
return bom;
}
@@ -314,6 +276,7 @@
}
private void updateOrderInfo(LoginUserInfo user, Workorder mp,int status) {
+
List<WorkorderHistory> whList = new ArrayList<>();
//宸ュ崟鍘嗗彶鏁版嵁
Workorder order = new Workorder();
@@ -331,13 +294,6 @@
order.setStatus(Constants.WORKORDER_STATUS.material);
}else if(status ==Constants.WORKORDER_HISTORY_STATUS.done){
order.setStatus(Constants.WORKORDER_STATUS.done);
- }else if(status ==Constants.WORKORDER_HISTORY_STATUS.material ||status ==Constants.WORKORDER_HISTORY_STATUS.produce){
- //鎶曟枡鎿嶄綔
- if(Constants.equalsInteger(mp.getStatus(),Constants.WORKORDER_STATUS.create)
- ||Constants.equalsInteger(mp.getStatus(),Constants.WORKORDER_STATUS.material)){
- //濡傛灉鏄凡鍒涘缓鎴栬�呭凡澶囨枡鐘舵�佺殑宸ュ崟锛屼慨鏀瑰叾鐘舵�佷负銆愮敓浜т腑銆�
- order.setStatus(Constants.WORKORDER_STATUS.producing);
- }
}
workorderExtMapper.updateById(order);
workorderHistoryExtMapper.insertBatch(whList);
@@ -424,7 +380,6 @@
//澶勭悊浜у嚭鏁版嵁
dealAppliancePro(mp,user,allRecordList,updateApplianceList,updateApplianceProList, outboundDetailList,stockList);
}
-
//濡傛灉鏈夋病bom閰嶇疆,妫�鏌ヤ骇鍑猴紙鍖呭惈妫�楠岀殑涓嶈壇鍜屾姤搴熷搧锛夊拰鎶曟枡鏁伴噺鏄惁鐩哥瓑鍖归厤锛屼笉涓�鑷存彁绀洪敊璇�
if(bdparam==null){
@@ -545,7 +500,6 @@
//濡傛灉闇�瑕佹姇鏂欑殑鐗╂枡闆嗗悎锛屽湪搴撳瓨涓鎵炬姇鏂欐潵婧�
for(WStock model : materialList){
for(WStock ts : allList){
-
if(Constants.equalsInteger(model.getMaterialId(),ts.getMaterialId())){
//杩橀渶瑕佹姇鏂欐暟閲�
BigDecimal actNum = Constants.formatBigdecimal(model.getNum()).subtract(Constants.formatBigdecimal(model.getTNum()));
@@ -561,10 +515,6 @@
//濡傛灉宸茬粡婊¤冻鍓╀綑闇�姹傞噺
isfull =true;
}
-
- //娣诲姞鎶曟枡璁板綍
- workorderRecordExtMapper.insert(getWorkrecordModel(user,ts,mp,actNum));
-
//鏇存柊宸茬粡鎶曟枡鏁伴噺
model.setTNum(Constants.formatBigdecimal(model.getTNum()).add(actNum));
WOutbound outbound = getFromOutboundList(ts.getWarehouseId(),outboundList);
@@ -669,13 +619,13 @@
if (bomDetailList == null || bomDetailList.size() == 0) {
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "瀵逛笉璧凤紝璇ョ敓浜х墿鏂欑殑bom閰嶇疆鏈夎锛岃鑱旂郴绠＄悊鍛橈紒");
}
-// for (BomDetailExtListVO i :bomDetailList) {
-// //鏌ヨ鏄惁鎶曟枡
-// if(workorderRecordExtMapper.selectCount(new QueryWrapper<WorkorderRecord>()
-// .eq("DELETED",Constants.ZERO).eq("MATERIAL_ID",i.getMaterialId()).eq("TYPE",Constants.ZERO))<=0){
-// throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀛樺湪鏈姇鏂橞OM鐗╂枡锛屾棤娉曡繘琛屾姤宸�");
-// }
-// }
+ for (BomDetailExtListVO i :bomDetailList) {
+ //鏌ヨ鏄惁鎶曟枡
+ if(workorderRecordExtMapper.selectCount(new QueryWrapper<WorkorderRecord>()
+ .eq("DELETED",Constants.ZERO).eq("MATERIAL_ID",i.getMaterialId()).eq("TYPE",Constants.ZERO))<=0){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀛樺湪鏈姇鏂橞OM鐗╂枡锛屾棤娉曡繘琛屾姤宸�");
+ }
+ }
}
WOutbound outbound = new WOutbound();
@@ -833,16 +783,16 @@
}
//濡傛灉鏄骇鍑�
mp.setHasProduceNum(Constants.formatBigdecimal(tModel.getNum()).intValue()+Constants.formatIntegerNum(mp.getHasProduceNum()));
-// if(tModel.getDoneType() == null){
-// throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "瀵逛笉璧凤紝宸ヨ鍣ㄥ叿銆�"+tModel.getAmodel().getCode()+"銆戜骇鍑鸿川閲忓睘鎬т负绌猴紝鏃犳硶鎶ュ伐锛�");
-// }
-// if(!Constants.equalsInteger(tModel.getDoneType(),Constants.ZERO)){
-// //濡傛灉涓嶈壇锛岀疮璁″伐鍗曠殑涓嶈壇浜у嚭
-// mp.setUnqualifiedNum(Constants.formatIntegerNum(mp.getUnqualifiedNum())+(Constants.formatBigdecimal(tModel.getNum()).intValue()));
-// }else{
-// //濡傛灉鏄悎鏍硷紝绱宸ュ崟鐨勫悎鏍兼暟閲�
-// mp.setQualifiedNum(Constants.formatIntegerNum(mp.getQualifiedNum())+(Constants.formatBigdecimal(tModel.getNum()).intValue()));
-// }
+ if(tModel.getDoneType() == null){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "瀵逛笉璧凤紝宸ヨ鍣ㄥ叿銆�"+tModel.getAmodel().getCode()+"銆戜骇鍑鸿川閲忓睘鎬т负绌猴紝鏃犳硶鎶ュ伐锛�");
+ }
+ if(!Constants.equalsInteger(tModel.getDoneType(),Constants.ZERO)){
+ //濡傛灉涓嶈壇锛岀疮璁″伐鍗曠殑涓嶈壇浜у嚭
+ mp.setUnqualifiedNum(Constants.formatIntegerNum(mp.getUnqualifiedNum())+(Constants.formatBigdecimal(tModel.getNum()).intValue()));
+ }else{
+ //濡傛灉鏄悎鏍硷紝绱宸ュ崟鐨勫悎鏍兼暟閲�
+ mp.setQualifiedNum(Constants.formatIntegerNum(mp.getQualifiedNum())+(Constants.formatBigdecimal(tModel.getNum()).intValue()));
+ }
//鐗╂枡+鎵规+宸ュ簭+璐ㄩ噺灞炴�у幓閲�
WOutboundDetail detail =getWoutbondDetailByList(tModel,detailList);
@@ -1017,15 +967,15 @@
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "瀵逛笉璧凤紝璇ュ伐鍗曚俊鎭紒");
}
if(Objects.isNull(dealWorkorderRecordDTO.getDownType())
- ||Objects.isNull(dealWorkorderRecordDTO.getWorkorderId())
- ||Objects.isNull(dealWorkorderRecordDTO.getNum())
+ ||Objects.isNull(dealWorkorderRecordDTO.getWorkorderId())
+ ||Objects.isNull(dealWorkorderRecordDTO.getNum())
){
throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
WorkorderRecord workorderRecord = new WorkorderRecord();
if(Objects.isNull(dealWorkorderRecordDTO.getRecordId())){
//鏌ヨ宸ュ崟涓嬫槸鍚﹀瓨鍦ㄥ搴旇褰�
- workorderRecord = workorderRecordExtMapper.selectOne(new QueryWrapper<WorkorderRecord>()
+ workorderRecord = workorderRecordExtMapper.selectOne(new QueryWrapper<WorkorderRecord>()
.eq("WORKORDER_ID",dealWorkorderRecordDTO.getWorkorderId())
.eq("DONE_TYPE",dealWorkorderRecordDTO.getDownType())
.eq("TYPE",Constants.ONE)
@@ -1143,127 +1093,5 @@
return PageData.from(new PageInfo<>(result));
}
- @Override
- public PageData<WStockExtListVO> choiceStockPageForPlans(PageWrap<QueryWStockDto> pageWrap,LoginUserInfo userInfo) {
- Plans plans =plansExtMapper.selectById(pageWrap.getModel().getPlansId());
- if(Objects.isNull(plans)){
- throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "瀵逛笉璧凤紝鏈煡璇㈠埌宸ュ簭璁″垝淇℃伅锛�");
- }
- Device device = deviceExtMapper.selectById(pageWrap.getModel().getDeviceId());
- if(Objects.isNull(plans)){
- throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "瀵逛笉璧凤紝鏈煡璇㈠埌璁惧淇℃伅锛�");
- }
- //鏌ヨ骞堕獙璇佸伐鍗曚俊鎭�
- this.getPlansAndValid(userInfo,plans);
- //鏌ヨ鍏ㄩ儴bom缁勬垚鏁版嵁锛屽鏋滄湁BOM閰嶇疆锛屾寜鐓OM缁勬垚杩涜鎶曟枡锛屽鏋滄病鏈塀OM閰嶇疆锛屽垯鎶曟枡鐗╂枡涓哄緟鐢熶骇搴撲綅鐨勭墿鏂欐湰韬�
- QueryBomDetailExtDTO bdparam = initBomParamForPlans(userInfo,plans);
- List<BomDetailExtListVO> bomDetailList = null;
- if(bdparam!=null){
- bomDetailList = bomDetailExtMapper.selectList(bdparam);
- List<Integer> materialDistributeId = bomDetailList.stream().map(BomDetailExtListVO::getMaterialId).collect(Collectors.toList());
- pageWrap.getModel().setMaterialDistributeId(materialDistributeId);
- }else{
- //鏌ヨ鐗╂枡BOM淇℃伅
- Bom bom = bomExtMapper.selectOne(new QueryWrapper<Bom>().eq("MATERIAL_ID",plans.getMaterialId()).eq("DELETED",Constants.ZERO).last(" limit 1 "));
- if(Objects.isNull(bom)){
- throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "瀵逛笉璧凤紝鏈煡璇㈠埌BOM淇℃伅锛�");
- }
- RouteProcedure currentRouteProcedure = routeProcedureExtMapper.selectOne(new QueryWrapper<RouteProcedure>()
- .eq("ROUTE_ID",bom.getRouteId())
- .eq("PROCEDURE_ID",plans.getProcedureId())
- .last(" limit 1 ")
- );
- if(currentRouteProcedure!=null){
- RouteProcedure routeProcedure = routeProcedureExtMapper.selectOne(new QueryWrapper<RouteProcedure>()
- .eq("ROUTE_ID",currentRouteProcedure.getRouteId()).apply(" SORTNUM < " + currentRouteProcedure.getSortnum() ).eq("STATUS",Constants.ONE).orderByDesc(" SORTNUM ").last(" limit 1 ")
- );
- if(Objects.isNull(routeProcedure)){
- throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "瀵逛笉璧凤紝鏈煡璇㈠埌鐢熶骇鐗╂枡涓婁竴姝ュ伐搴忎俊鎭紒");
- }
- pageWrap.getModel().setProcedureId(routeProcedure.getProcedureId());
- pageWrap.getModel().setMaterialId(plans.getMaterialId());
- }
- }
- pageWrap.getModel().setLocationId(device.getProduceWarehouseLocationId());
- PageHelper.startPage(pageWrap.getPage(), pageWrap.getCapacity());
- List<WStockExtListVO> result = wStockExtMapper.choiceStockList(pageWrap.getModel());
- return PageData.from(new PageInfo<>(result));
- }
-
- @Override
- @Transactional(rollbackFor = {BusinessException.class,Exception.class})
- public WorkorderRecord createWorkorderRecord(CreateWorkorderRecordDTO createWorkorderRecordDTO, LoginUserInfo loginUserInfo){
- Workorder workorder = workorderExtMapper.selectById(createWorkorderRecordDTO.getWorkorderId());
- if(Objects.isNull(workorder)){
- throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "瀵逛笉璧凤紝鏈煡璇㈠埌璇ュ伐鍗曚俊鎭紒");
- }
- if(Objects.isNull(createWorkorderRecordDTO.getUnQualifiedNum())
- ||Objects.isNull(createWorkorderRecordDTO.getUnQualifiedNum())
- ||Objects.isNull(createWorkorderRecordDTO.getWorkorderId())
- ){
- throw new BusinessException(ResponseStatus.BAD_REQUEST);
- }
- BigDecimal num = createWorkorderRecordDTO.getQualifiedNum().add(createWorkorderRecordDTO.getUnQualifiedNum());
- WorkorderRecord workorderRecord = new WorkorderRecord();
- //鏌ヨ宸ュ崟涓嬫槸鍚﹀瓨鍦ㄥ搴旇褰�
- workorderRecord = workorderRecordExtMapper.selectOne(new QueryWrapper<WorkorderRecord>()
- .eq("WORKORDER_ID",createWorkorderRecordDTO.getWorkorderId())
- .eq("TYPE",Constants.ONE)
- .eq("DELETED",Constants.ZERO)
- .last(" limit 1 ")
- );
- if(!Objects.isNull(workorderRecord)){
- throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "瀵逛笉璧凤紝璇ュ伐鍗曠殑璇ョ被浜у嚭璁板綍宸插瓨鍦紒");
- }
- if(num.compareTo(BigDecimal.valueOf(workorder.getPlanNum()))>Constants.ZERO){
- throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "瀵逛笉璧凤紝璇ュ伐鍗曠殑浜у嚭鏁伴噺涓嶈兘澶т簬宸ュ崟璁″垝鏁伴噺锛�");
- }
- //鏁版嵁瀛樺偍
- workorderRecord = new WorkorderRecord();
- workorderRecord.setDeleted(Constants.ZERO);
- workorderRecord.setCreateUser(loginUserInfo.getId());
- workorderRecord.setCreateTime(new Date());
- workorderRecord.setNum(num);
- workorderRecord.setRootDepartId(loginUserInfo.getRootDepartment().getId());
- workorderRecord.setDepartId(loginUserInfo.getCurComDepartment().getId());
- workorderRecord.setPlanId(workorder.getPlanId());
- workorderRecord.setWorkorderId(createWorkorderRecordDTO.getWorkorderId());
- workorderRecord.setBatch(workorder.getBatch());
- workorderRecord.setFactoryId(workorder.getFactoryId());
- workorderRecord.setProcedureId(workorder.getProcedureId());
- workorderRecord.setProDate(new Date());
- workorderRecord.setType(Constants.ONE);
- workorderRecord.setMaterialId(workorder.getMaterialId());
- workorderRecord.setUnitId(workorder.getUnitId());
- workorderRecord.setMaterialBatch(workorder.getBatch());
- workorderRecord.setUnqualifiedNum(createWorkorderRecordDTO.getUnQualifiedNum());
- 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)){
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鏈厤缃伐璧勭哗鏁堥厤缃紒");
- }
- workorderRecord.setSalaryPrice(salaryParam.getSalary());
- workorderRecord.setSalaryType(salaryParam.getType());
- workorderRecord.setSalaryUnqualified(salaryParam.getUnqualified());
-
- //璁′欢宸ヨ祫
- if(salaryParam.getType().equals(Constants.ZERO)){
- workorderRecord.setSalaryNum(salaryParam.getNum());
- workorderRecord.setSalary(salaryParam.getSalary().multiply(salaryParam.getUnqualified()==Constants.ZERO?num:createWorkorderRecordDTO.getUnQualifiedNum()));
- }else{
- workorderRecord.setDuration(createWorkorderRecordDTO.getDuration());
- workorderRecord.setSalary(BigDecimal.valueOf(createWorkorderRecordDTO.getDuration()).multiply(salaryParam.getSalary()).divide(new BigDecimal(3600)));
- }
-
- //鎻掑叆宸ュ崟鎿嶄綔璁板綍锛屽苟涓斿垽鏂槸鍚︽洿鏀逛负宸ュ崟鐨勭姸鎬併�愮敓浜т腑銆�
- updateOrderInfo(loginUserInfo,workorder,Constants.WORKORDER_HISTORY_STATUS.produce);
- workorderRecordExtMapper.insert(workorderRecord);
- return workorderRecord;
- }
-
-
-
}
diff --git a/server/src/main/java/doumeemes/service/system/SystemLoginService.java b/server/src/main/java/doumeemes/service/system/SystemLoginService.java
index a0ab910..536b6a4 100644
--- a/server/src/main/java/doumeemes/service/system/SystemLoginService.java
+++ b/server/src/main/java/doumeemes/service/system/SystemLoginService.java
@@ -18,7 +18,6 @@
* @date 2022/04/18 18:12
*/
String loginByPassword (LoginDTO dto, HttpServletRequest request);
-
String platformLogin(LoginDTO dto, HttpServletRequest request);
String loginByDingdingCode(Integer companyId ,String code, HttpServletRequest request);
String loginAutoBylingyangToken( String token, HttpServletRequest request,boolean isDemo);
diff --git a/server/src/main/java/doumeemes/service/system/impl/SystemLoginServiceImpl.java b/server/src/main/java/doumeemes/service/system/impl/SystemLoginServiceImpl.java
index 8c7c205..7380b23 100644
--- a/server/src/main/java/doumeemes/service/system/impl/SystemLoginServiceImpl.java
+++ b/server/src/main/java/doumeemes/service/system/impl/SystemLoginServiceImpl.java
@@ -2,7 +2,6 @@
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.iflytek.antelope.other.client.dto.resp.UserDTO;
import doumeemes.biz.system.SystemDictDataBiz;
import doumeemes.config.shiro.ShiroToken;
@@ -94,10 +93,9 @@
throw e;
}
}
-
// 鏍￠獙鐢ㄦ埛鍚嶅拰瀵嗙爜
Subject subject = SecurityUtils.getSubject();
- ShiroToken token = new ShiroToken(dto.getCompanyId(),dto.getUsername(), dto.getPassword(),false,false);
+ ShiroToken token = new ShiroToken(dto.getCompanyId(),dto.getUsername(), dto.getPassword(),false);
try {
subject.login(token);
LoginUserInfo loginUser = ((LoginUserInfo)subject.getPrincipal());
@@ -151,7 +149,7 @@
}
// 鏍￠獙鐢ㄦ埛鍚嶅拰瀵嗙爜
Subject subject = SecurityUtils.getSubject();
- ShiroToken token = new ShiroToken(dto.getCompanyId(),dto.getUsername(), dto.getPassword(),false,false);
+ ShiroToken token = new ShiroToken(dto.getCompanyId(),dto.getUsername(), dto.getPassword(),false);
try {
subject.login(token);
LoginUserInfo loginUser = ((LoginUserInfo)subject.getPrincipal());
@@ -231,7 +229,7 @@
// 鏍￠獙鐢ㄦ埛鍚嶅拰瀵嗙爜
Subject subject = SecurityUtils.getSubject();
// 閽夐拤鐧诲綍
- ShiroToken token = new ShiroToken(companyId,mobile, null,true,false);
+ ShiroToken token = new ShiroToken(companyId,mobile, null,true);
subject.login(token);
LoginUserInfo loginUser =(LoginUserInfo)subject.getPrincipal();
@@ -297,7 +295,7 @@
// 鏍￠獙鐢ㄦ埛鍚嶅拰瀵嗙爜
Subject subject = SecurityUtils.getSubject();
// 閽夐拤鐧诲綍
- ShiroToken atoken = new ShiroToken(companyId,mobile, null,true,false);
+ ShiroToken atoken = new ShiroToken(companyId,mobile, null,true);
subject.login(atoken);
LoginUserInfo loginUser =(LoginUserInfo)subject.getPrincipal();
loginUser.getCompanyUser().setName(user.getName());
@@ -368,7 +366,7 @@
// 鏍￠獙鐢ㄦ埛鍚嶅拰瀵嗙爜
Subject subject = SecurityUtils.getSubject();
// 閽夐拤鐧诲綍
- ShiroToken atoken = new ShiroToken(companyId,mobile, null,true,false);
+ ShiroToken atoken = new ShiroToken(companyId,mobile, null,true);
subject.login(atoken);
LoginUserInfo loginUser =(LoginUserInfo)subject.getPrincipal();
loginLog.setUserId(loginUser.getId());
@@ -453,7 +451,7 @@
// 鏍￠獙鐢ㄦ埛鍚嶅拰瀵嗙爜
Subject subject = SecurityUtils.getSubject();
// 閽夐拤鐧诲綍
- ShiroToken atoken = new ShiroToken(com.getId(),mobile, null,true,false);
+ ShiroToken atoken = new ShiroToken(com.getId(),mobile, null,true);
subject.login(atoken);
LoginUserInfo loginUser =(LoginUserInfo)subject.getPrincipal();
loginUser.getCompanyUser().setName(user.getName());
@@ -524,7 +522,7 @@
// 鏍￠獙鐢ㄦ埛鍚嶅拰瀵嗙爜
Subject subject = SecurityUtils.getSubject();
// 閽夐拤鐧诲綍
- ShiroToken atoken = new ShiroToken(com.getId(),mobile, null,true,false);
+ ShiroToken atoken = new ShiroToken(com.getId(),mobile, null,true);
subject.login(atoken);
LoginUserInfo loginUser =(LoginUserInfo)subject.getPrincipal();
loginUser.getCompanyUser().setName(user.getName());
@@ -555,8 +553,5 @@
throw new BusinessException(ResponseStatus.ACCOUNT_INCORRECT);
}
}
-
-
-
}
diff --git a/server/src/main/java/doumeemes/service/system/impl/SystemPermissionServiceImpl.java b/server/src/main/java/doumeemes/service/system/impl/SystemPermissionServiceImpl.java
index 538a8ca..d4d2c1d 100644
--- a/server/src/main/java/doumeemes/service/system/impl/SystemPermissionServiceImpl.java
+++ b/server/src/main/java/doumeemes/service/system/impl/SystemPermissionServiceImpl.java
@@ -121,6 +121,7 @@
}else{
pageWrap.getModel().setType(Constants.USERTYPE.PLAT);
}
+
}
PageHelper.startPage(pageWrap.getPage(), pageWrap.getCapacity());
return PageData.from(new PageInfo<>(systemPermissionMapper.selectManageList(pageWrap.getModel(), pageWrap.getOrderByClause())));
diff --git a/server/src/main/java/doumeemes/service/system/impl/WxLoginServiceImpl.java b/server/src/main/java/doumeemes/service/system/impl/WxLoginServiceImpl.java
index 83c9733..c910f17 100644
--- a/server/src/main/java/doumeemes/service/system/impl/WxLoginServiceImpl.java
+++ b/server/src/main/java/doumeemes/service/system/impl/WxLoginServiceImpl.java
@@ -137,6 +137,9 @@
wxLoginVO.setLoginStatus(Constants.ZERO);
wxLoginVO.setSession(session);
return wxLoginVO;
+ }catch (BusinessException e) {
+ wxLoginVO.setLoginStatus(Constants.ONE);
+ return wxLoginVO;
}catch (AuthenticationException e) {
BusinessException ee = null;
loginLog.setSuccess(Boolean.FALSE);
diff --git a/server/src/main/resources/application.yml b/server/src/main/resources/application.yml
index 72fcf23..dd0fac5 100644
--- a/server/src/main/resources/application.yml
+++ b/server/src/main/resources/application.yml
@@ -10,7 +10,7 @@
# application:
# name: doumeemes
profiles:
- active: standard
+ active: standardPro
# JSON杩斿洖閰嶇疆
jackson:
# 榛樿鏃跺尯
diff --git a/server/src/main/resources/mappers/PlansExtMapper.xml b/server/src/main/resources/mappers/PlansExtMapper.xml
index 3ae57d4..7e4878d 100644
--- a/server/src/main/resources/mappers/PlansExtMapper.xml
+++ b/server/src/main/resources/mappers/PlansExtMapper.xml
@@ -123,7 +123,7 @@
<select id="selectByModel" parameterType="doumeemes.dao.ext.dto.QueryPlansExtDTO" resultMap="PlansExtListVO">
SELECT
`a`.*
- ,ifnull(( SELECT sum( b.PLAN_NUM ) FROM workorder b WHERE b.deleted = 0 AND b.PLAN_ID = a.id and b.status not in (7,8) ),0) AS workorderDistributNum
+ ,( SELECT sum( b.PLAN_NUM ) FROM workorder b WHERE b.deleted = 0 AND b.PLAN_ID = a.id and b.status !=6) AS workorderDistributNum
from plans a
<where>
<if test="id != null">
@@ -363,13 +363,10 @@
`usermodel`.`SYSTEMID` AS USERMODEL_SYSTEMID,
`usermodel`.`INVALID_TIME` AS USERMODEL_INVALID_TIME,
`usermodel`.`TYPE` AS USERMODEL_TYPE
- , ifnull(( SELECT sum( b.PLAN_NUM ) FROM workorder b WHERE b.deleted = 0 AND b.PLAN_ID = a.id and b.status !=6),0) AS workorderDistributNum ,
+ ,( SELECT sum( b.PLAN_NUM ) FROM workorder b WHERE b.deleted = 0 AND b.PLAN_ID = a.id and b.status !=6) AS workorderDistributNum ,
`mmodel`.name as materialName , `mmodel`.code as materialCode ,`fmodel`.name as factoryName , `pmodel`.name as produceName ,
concat(`usermodel`.realname,' ',`usermodel`.mobile) as planUserName , `umodel`.name as unitName ,
- w.PLAN_CODE as workPlanCode , w.SALESORDER as salesOrder ,
- w.START_DATE as workPlanStartDate , w.PLAN_DATE as workPlanEndDate,
- w.`PLAN_DATE` as workPlanPlanDate,
- ifnull((select sum(worder.PLAN_NUM) from workorder worder where worder.PLAN_ID = a.id and worder.STATUS not in (7,8) ),0) as produceNum
+ w.PLAN_CODE as workPlanCode
FROM `plans` `a`
LEFT JOIN `department` `dmodel` ON a.DEPART_ID=dmodel.ID
diff --git a/server/src/main/resources/mappers/WOutboundExtMapper.xml b/server/src/main/resources/mappers/WOutboundExtMapper.xml
index 8abffc5..4a83e4b 100644
--- a/server/src/main/resources/mappers/WOutboundExtMapper.xml
+++ b/server/src/main/resources/mappers/WOutboundExtMapper.xml
@@ -558,6 +558,15 @@
<if test="beginDate != null and beginDate != '' ">
AND `w`.`VALID_DATE` >= CONCAT(#{beginDate},' 00:00:00')
</if>
+
+ <if test="rootDepartId != null">
+ AND `w`.`ROOT_DEPART_ID` = #{rootDepartId}
+ </if>
+
+ <if test="departId != null">
+ AND `w`.`DEPART_ID` = #{departId}
+ </if>
+
<if test="endDate != null and endDate != '' ">
AND CONCAT(#{endDate},' 23:59:59') >= `w`.`VALID_DATE`
</if>
diff --git a/server/src/main/resources/mappers/WorkPlansExtMapper.xml b/server/src/main/resources/mappers/WorkPlansExtMapper.xml
index 56afe26..7200c4b 100644
--- a/server/src/main/resources/mappers/WorkPlansExtMapper.xml
+++ b/server/src/main/resources/mappers/WorkPlansExtMapper.xml
@@ -35,7 +35,6 @@
`workPlans`.`IMPORT_ID`,
`workPlans`.`PAUSED`,
`workPlans`.`USER_ID`,
- `workPlans`.`SALESORDER`,
`workPlans`.`PUBLISH_DATE`
FROM `work_plans` `workPlans`
<where>
@@ -108,9 +107,6 @@
<if test="publishDate != null">
AND `workPlans`.`PUBLISH_DATE` = #{publishDate}
</if>
- <if test="salesorder != null">
- AND `workPlans`.`SALESORDER` = #{salesorder}
- </if>
</where>
</select>
@@ -121,7 +117,7 @@
FROM `work_plans` `a`
LEFT JOIN `department` `dmodel` ON a.DEPART_ID=dmodel.ID
LEFT JOIN `material_distribute` `mdmodel` ON a.MATERIAL_ID=mdmodel.ID
- LEFT JOIN `material` `mmodel` ON mdmodel.MATERIAL_ID=mmodel.ID
+ LEFT JOIN `material` `mmodel` ON mdmodel.MATERIAL_ID=mmodel.ID
LEFT JOIN `department` `fmodel` ON a.FACTORY_ID=fmodel.ID
LEFT JOIN `unit` `umodel` ON a.UNIT_ID=umodel.ID
LEFT JOIN `system_user` `usermodel` ON a.USER_ID=usermodel.ID
@@ -152,15 +148,6 @@
<if test="batch != null and batch != ''">
AND `a`.`batch` like concat('%',#{batch},'%')
</if>
- <if test="salesorder != null and salesorder != ''">
- AND `a`.`SALESORDER` like concat('%',#{salesorder},'%')
- </if>
- <if test="startDateStart != null and startDateStart != ''">
- AND `a`.`START_DATE` >= concat(#{planDateStart},' 00:00:00')
- </if>
- <if test="startDateEnd != null and startDateEnd != ''">
- AND concat(#{planDateEnd},' 23:59:59') >= `a`.`START_DATE`
- </if>
<if test="planDateStart != null and planDateStart != ''">
AND `a`.`PLAN_DATE` >= concat(#{planDateStart},' 00:00:00')
</if>
@@ -168,7 +155,7 @@
AND concat(#{planDateEnd},' 23:59:59') >= `a`.`PLAN_DATE`
</if>
</where>
- order by a.START_DATE desc, a.CREATE_TIME desc
+ order by a.PLAN_DATE desc, a.CREATE_TIME desc
</select>
diff --git a/server/src/main/resources/mappers/WorkorderRecordExtMapper.xml b/server/src/main/resources/mappers/WorkorderRecordExtMapper.xml
index f4c1edd..346e661 100644
--- a/server/src/main/resources/mappers/WorkorderRecordExtMapper.xml
+++ b/server/src/main/resources/mappers/WorkorderRecordExtMapper.xml
@@ -431,62 +431,6 @@
</where>
limit 1
</select>
- <select id="userSalaryPage" parameterType="doumeemes.dao.ext.dto.QueryUserSalaryListDTO" resultType="doumeemes.dao.ext.vo.UserSalaryListVO">
- select a.WORKORDER_ID,b.`CODE` as workorderCode,c.`NAME` as materialName,c.code as materialCode
- ,d.name as unitName,a.PROCEDURE_ID,f.`NAME` as procedureName,a.CREATE_USER as userId
- ,sum(a.QUALIFIED_NUM) as qualifiedNum
- ,sum(a.UNQUALIFIED_NUM) as unQualifiedNum
- ,sum(a.num) as NUM
- from `workorder_record` a
- left join workorder b on a.WORKORDER_ID=b.id
- left join material_distribute m on b.MATERIAL_ID = m.ID
- left join material c on m.MATERIAL_ID = c.ID
- left join unit d on a.UNIT_ID = d.ID
- left join procedures f on a.PROCEDURE_ID =f.ID
- where a.DELETED = 0
- <if test="rootDepartId != null">
- AND a.`ROOT_DEPART_ID` = #{rootDepartId}
- </if>
- <if test="procedureId != null">
- AND a.`PROCEDURE_ID` = #{procedureId}
- </if>
- <if test="materialName != null and materialName !=''">
- AND (c.`name` like concat('%', #{materialName},'%') or c.`code` like concat('%', #{materialName},'%'))
- </if>
- <if test="startDate != null">
- AND a.`CREATE_TIME` >= #{startDate}
- </if>
- <if test="endDate != null">
- AND #{endDate} >= a.`CREATE_TIME`
- </if>
- <if test="userId != null">
- AND a.`CREATE_USER` = #{userId}
- </if>
- group by a.`WORKORDER_ID`
- order by a.CREATE_TIME desc
- </select>
- <select id="salaryStatistic" parameterType="doumeemes.dao.ext.dto.QuerySalaryStatisticDTO" resultType="doumeemes.dao.ext.vo.SalaryStatisticsListVO">
- select `CREATE_USER` as userId ,sum(CASE WHEN salary_type=0 THEN salary ELSE 0 END ) as jijianSalary
- ,sum(CASE WHEN salary_type=0 THEN 0 ELSE salary END ) as jishiSalary
- ,count(id) as num
- ,sum(salary) as totalSalary
- from `workorder_record`
- where `DELETED` =0 and `SALARY` >0
- <if test="rootDepartId != null">
- AND `ROOT_DEPART_ID` = #{rootDepartId}
- </if>
- <if test="userId != null">
- AND `CREATE_USER` = #{userId}
- </if>
- <if test="startDate != null">
- AND `CREATE_TIME` >= #{startDate}
- </if>
- <if test="endDate != null">
- AND #{endDate} >= `CREATE_TIME`
- </if>
- group by `CREATE_USER`
- <!-- order by `CREATE_TIME` desc-->
- </select>
<select id="selectListNew" parameterType="doumeemes.dao.ext.dto.QueryWorkorderRecordExtDTO" resultMap="WorkorderRecordExtListVO">
SELECT
`a`.`ID`,
@@ -1480,14 +1424,7 @@
MATERIAL_DONETYPE,
MATERIAL_PROCEDURE_ID,
RELOBJ_ID,
- RELOBJ_TYPE,
- `DURATION`,
- `SALARY`,
- `SALARY_PRICE`,
- `SALARY_NUM`,
- `SALARY_TIMES`,
- `SALARY_UNQUALIFIED`,
- `SALARY_TYPE`
+ RELOBJ_TYPE
)
values <foreach collection="list" separator="," item="item">
(
@@ -1525,14 +1462,7 @@
#{item.materialDonetype},
#{item.materialProcedureId},
#{item.relobjId},
- #{item.relobjType},
- #{item.duration},
- #{item.salary},
- #{item.salaryPrice},
- #{item.salaryNum},
- #{item.salaryTimes},
- #{item.salaryUnqualified},
- #{item.salaryType}
+ #{item.relobjType}
)
</foreach>
</insert>
diff --git a/web_standard/public/template/workplans_import_template.xlsx b/web_standard/public/template/workplans_import_template.xlsx
index d6bc89f..fadb786 100644
--- a/web_standard/public/template/workplans_import_template.xlsx
+++ b/web_standard/public/template/workplans_import_template.xlsx
Binary files differ
--
Gitblit v1.9.3