Public/cf_imes_server
6
0
Fork 0
mirror of http://192.168.1.205:9980/cf_devdept2/cf_imes_server.git synced 2026-08-13 05:12:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source
This commit is contained in:
liuzhaotian
2024-07-08 18:25:42 +08:00
parent fbb57ab252 587af84fce
commit 094e663fb7
5 changed files with 58 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/fileConversion/admin/api/webcad/ApiTypeRealize.java
+6 -3
View File
@@ -610,13 +610,16 @@ public class ApiTypeRealize {
.setDrillsRemark(plate.getString("DrillsRemark"))
.setInfoRemark(plate.getString("InfoRemark"))
.setRemarkJsonDei(plate.getString("RemarkJson"));
if (plateDetail.get(plate.getLong("BlockNo")).getThroughModelCount() > 0){
if (plateDetail.get(plate.getLong("BlockNo")).getThroughModelCount() != null
&& plateDetail.get(plate.getLong("BlockNo")).getThroughModelCount() > 0){
plateInfo.setFilterType(plateInfo.getFilterType() + ",1");
}
if (plateDetail.get(plate.getLong("BlockNo")).getThroughHoleCount() > 0){
if (plateDetail.get(plate.getLong("BlockNo")).getThroughHoleCount() != null
&& plateDetail.get(plate.getLong("BlockNo")).getThroughHoleCount() > 0){
plateInfo.setFilterType(plateInfo.getFilterType() + ",2");
}
if (plateDetail.get(plate.getLong("BlockNo")).getHas2DModel()){
if (plateDetail.get(plate.getLong("BlockNo")).getHas2DModel() != null
&& plateDetail.get(plate.getLong("BlockNo")).getHas2DModel()){
plateInfo.setFilterType(plateInfo.getFilterType() + ",4");
}
cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/plate/vo/remain/RemainPlatePageReqVO.java
+5
View File
@@ -83,4 +83,9 @@ public class RemainPlatePageReqVO extends PageParam {
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] createTime;
@Schema(description = "排序", example = "ascend")
private String order;
@Schema(description = "排序字段", example = "id")
private String field;
}
cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/remainplaten/RemainPlateMapper.java
+41 -4
View File
@@ -22,10 +22,10 @@ import java.util.Set;
public interface RemainPlateMapper extends BaseMapperX<RemainPlateDO> {
default PageResult<RemainPlateDO> selectPage(RemainPlatePageReqVO reqVO) {
return selectPage(reqVO, new LambdaQueryWrapperX<RemainPlateDO>()
LambdaQueryWrapperX<RemainPlateDO> wrapper = new LambdaQueryWrapperX<RemainPlateDO>()
.likeIfPresent(RemainPlateDO::getId,reqVO.getId() != null ? reqVO.getId().toString() : null)
.eqIfPresent(RemainPlateDO::getPlanId, reqVO.getPlanId() != null ? reqVO.getPlanId().toString() : null)
.eqIfPresent(RemainPlateDO::getInitPlanId, reqVO.getInitPlanId())
.eqIfPresent(RemainPlateDO::getInitPlanId, reqVO.getInitPlanId() != null ? reqVO.getInitPlanId().toString() : null)
.eqIfPresent(RemainPlateDO::getStatus, reqVO.getStatus())
.eqIfPresent(RemainPlateDO::getGoodsId, reqVO.getGoodsId())
.eqIfPresent(RemainPlateDO::getIsCutting, reqVO.getIsCutting())
@@ -44,8 +44,45 @@ public interface RemainPlateMapper extends BaseMapperX<RemainPlateDO> {
.eqIfPresent(RemainPlateDO::getOutLineJson, reqVO.getOutLineJson())
.betweenIfPresent(RemainPlateDO::getWidth, reqVO.getWidth())
.betweenIfPresent(RemainPlateDO::getLength, reqVO.getLength())
.betweenIfPresent(RemainPlateDO::getCreateTime, reqVO.getCreateTime())
.orderByDesc(RemainPlateDO::getId));
.betweenIfPresent(RemainPlateDO::getCreateTime, reqVO.getCreateTime());
if (reqVO.getOrder() == null) {
wrapper.orderByDesc(RemainPlateDO::getId);
}else {
if (reqVO.getOrder().equals("ascend")) {
switch (reqVO.getField()) {
case "id" -> wrapper.orderByAsc(RemainPlateDO::getId);
case "length" -> wrapper.orderByAsc(RemainPlateDO::getLength);
case "width" -> wrapper.orderByAsc(RemainPlateDO::getWidth);
case "thickness" -> wrapper.orderByAsc(RemainPlateDO::getThickness);
case "material" -> wrapper.orderByAsc(RemainPlateDO::getMaterial);
case "color" -> wrapper.orderByAsc(RemainPlateDO::getColor);
case "texture" -> wrapper.orderByAsc(RemainPlateDO::getTexture);
case "brand" -> wrapper.orderByAsc(RemainPlateDO::getBrand);
case "store" -> wrapper.orderByAsc(RemainPlateDO::getStore);
case "initPlanId" -> wrapper.orderByAsc(RemainPlateDO::getInitPlanId);
case "planId" -> wrapper.orderByAsc(RemainPlateDO::getPlanId);
case "status" -> wrapper.orderByAsc(RemainPlateDO::getStatus);
}
}else if (reqVO.getOrder().equals("descend")) {
switch (reqVO.getField()) {
case "id" -> wrapper.orderByDesc(RemainPlateDO::getId);
case "length" -> wrapper.orderByDesc(RemainPlateDO::getLength);
case "width" -> wrapper.orderByDesc(RemainPlateDO::getWidth);
case "thickness" -> wrapper.orderByDesc(RemainPlateDO::getThickness);
case "material" -> wrapper.orderByDesc(RemainPlateDO::getMaterial);
case "color" -> wrapper.orderByDesc(RemainPlateDO::getColor);
case "texture" -> wrapper.orderByDesc(RemainPlateDO::getTexture);
case "brand" -> wrapper.orderByDesc(RemainPlateDO::getBrand);
case "store" -> wrapper.orderByDesc(RemainPlateDO::getStore);
case "initPlanId" -> wrapper.orderByDesc(RemainPlateDO::getInitPlanId);
case "planId" -> wrapper.orderByDesc(RemainPlateDO::getPlanId);
case "status" -> wrapper.orderByDesc(RemainPlateDO::getStatus);
}
}
}
return selectPage(reqVO, wrapper);
}
default PageResult<RemainPlateDO> selectPageToAdd(RemainPlatePageReqVO reqVO) {
cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/remainplaten/RemainPlateServiceImpl.java
+5 -5
View File
@@ -111,11 +111,11 @@ public class RemainPlateServiceImpl implements RemainPlateService {
throw exception(REMAIN_PLATE_STATUS_USED);
}
// 判断是否为开料添加
RemainPlateDO updateObj = new RemainPlateDO();
if (validateRemainPlateIsCutting(updateReqVO.getId())) {
RemainPlateDO updateObj = validateRemainPlateIsCutting(updateReqVO.getId());
if (updateObj.getIsCutting()) {
updateObj.setRemark(updateReqVO.getRemark());
updateObj.setStore(updateReqVO.getStore());
} else {
// 更新
updateObj = BeanUtils.toBean(updateReqVO, RemainPlateDO.class);
}
remainPlateMapper.updateById(updateObj);
@@ -151,8 +151,8 @@ public class RemainPlateServiceImpl implements RemainPlateService {
}
}
private boolean validateRemainPlateIsCutting(Long id) {
return remainPlateMapper.selectById(id).getIsCutting();
private RemainPlateDO validateRemainPlateIsCutting(Long id) {
return remainPlateMapper.selectById(id);
}
private Integer validateRemainPlateStatus(Long id) {
cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/process/ProcessController.java
+1 -1
View File
@@ -119,7 +119,7 @@ public class ProcessController {
@GetMapping("/select")
@Operation(summary = "查看当前登录用户的组织的工序信息")
@Parameter(name = "userId", description = "当前登录的用户ID", required = true, example = "1")
@PreAuthorize("@ss.hasPermission('system:process:query')")
@PreAuthorize("@ss.hasAnyPermissions('system:process:query','product:process:query')")
public CommonResult<List<ProcessDO>> getUserPage(@Valid @RequestParam("userId") Long userId) {
return success(processService.getUserProcess(userId));