From 566afa95de99a2f7cc3b9c928a6c4448865f8af5 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期一, 01 七月 2024 18:09:03 +0800
Subject: [PATCH] 根据现场变动情况修改接口，添加当前值班表
---
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/test/java/com/mes/CacheVerticalGlassModuleApplicationTest.java | 2
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageServiceImpl.java | 8 +
hangzhoumesParent/common/servicebase/src/main/java/com/mes/work_assignment/service/impl/WorkAssignmentServiceImpl.java | 35 +++++
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageDetailsServiceImpl.java | 101 ++++++++--------
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/controller/BigStorageCageDetailsController.java | 7
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/application.yml | 2
hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/DamageService.java | 2
hangzhoumesParent/common/servicebase/src/main/java/com/mes/tools/CodeGet.java | 6
hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/entity/Damage.java | 9 +
hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/impl/DamageServiceImpl.java | 44 ++++++
hangzhoumesParent/common/servicebase/src/main/java/com/mes/work_assignment/entity/WorkAssignment.java | 44 +++++++
hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/entity/GlassInfo.java | 2
hangzhoumesParent/common/servicebase/src/main/java/com/mes/work_assignment/controller/WorkAssignmentController.java | 36 ++++++
hangzhoumesParent/common/servicebase/src/main/java/com/mes/work_assignment/mapper/xml/WorkAssignmentMapper.xml | 5
hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/entity/OptimizeGlassinfo.java | 2
hangzhoumesParent/common/servicebase/src/main/java/com/mes/work_assignment/mapper/WorkAssignmentMapper.java | 16 ++
hangzhoumesParent/common/servicebase/src/main/java/com/mes/common/config/Const.java | 16 --
hangzhoumesParent/common/servicebase/src/main/java/com/mes/work_assignment/service/WorkAssignmentService.java | 17 ++
18 files changed, 273 insertions(+), 81 deletions(-)
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/common/config/Const.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/common/config/Const.java
index 2100a97..30f1a1f 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/common/config/Const.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/common/config/Const.java
@@ -28,7 +28,7 @@
* 鍗у紡鐞嗙墖绗艰鎯呰〃鐜荤拑鐘舵��
* 璇嗗埆鍚庢垚鍔熺姸鎬�100
* 鍑虹墖浠诲姟101
- * 浜哄伐涓嬬墖101
+ * 浜哄伐涓嬬墖102
* 鎷胯蛋200
* 鐮存崯201
*/
@@ -74,20 +74,6 @@
*/
public static final String BIG_STORAGE_REQUEST = "0";
public static final String BIG_STORAGE_REQUEST_IN = "1";
-
- /**
- * 澶х悊鐗囩璇︽儏鐘舵��
- * 0 澶х悊鐗囩杩涚墖涓�
- * 1 澶х悊鐗囩鍦ㄧ鍐�
- * 2 澶х悊鐗囩鍑虹墖涓�
- * 3 澶х悊鐗囩鍑虹墖瀹屾垚
- * 4 澶х悊鐗囩鎵嬪姩鍑虹墖
- */
- public static final Integer BIG_STORAGE_IN = 0;
- public static final Integer BIG_STORAGE_INSIDE = 1;
- public static final Integer BIG_STORAGE_OUT = 2;
- public static final Integer BIG_STORAGE_OUTSIDE = 3;
- public static final Integer BIG_STORAGE_MANUAL = 4;
/**
* 鍗ц浆绔嬭繘鐗囪姹�
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/entity/Damage.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/entity/Damage.java
index 5b24168..8eb6426 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/entity/Damage.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/entity/Damage.java
@@ -25,9 +25,14 @@
private Long id;
/**
+ * 绾胯矾
+ */
+ private Integer line;
+
+ /**
* 宸ュ簭
*/
- private Integer workingProcedureId;
+ private Integer workingProcedure;
/**
* 鐜荤拑id
@@ -67,7 +72,7 @@
/**
* 娴佺▼鍗�
*/
- private Integer processId;
+ private String processId;
/**
* 搴忓彿
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/DamageService.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/DamageService.java
index 80f141d..43d1142 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/DamageService.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/DamageService.java
@@ -20,5 +20,5 @@
void submitDamage(DateTime startTime, DateTime endTime, int type, int status, int workingProcedureId);
- void insertDamage(String glassId);
+ void insertDamage(Damage damage);
}
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/impl/DamageServiceImpl.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/impl/DamageServiceImpl.java
index ab5a1c7..8d32fb0 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/impl/DamageServiceImpl.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/impl/DamageServiceImpl.java
@@ -9,8 +9,13 @@
import com.mes.damage.service.DamageService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.mes.glassinfo.entity.GlassInfo;
+import com.mes.glassinfo.mapper.GlassInfoMapper;
+import com.mes.work_assignment.entity.WorkAssignment;
+import com.mes.work_assignment.mapper.WorkAssignmentMapper;
import org.springframework.stereotype.Service;
+import javax.annotation.Resource;
+import java.time.LocalDateTime;
import java.util.List;
/**
@@ -24,6 +29,14 @@
@Service
public class DamageServiceImpl extends ServiceImpl<DamageMapper, Damage> implements DamageService {
+ @Resource
+ GlassInfoMapper glassInfoMapper;
+ @Resource
+ WorkAssignmentMapper workAssignmentMapper;
+
+ /**
+ * 鏌ヨ鎶ュ伐淇℃伅
+ */
@Override
public List<Damage> selectDamage(DateTime startTime, DateTime endTime, int type, int status, int workingProcedureId){
LambdaQueryWrapper<Damage> damageSelectWrapper =new LambdaQueryWrapper<>();
@@ -35,11 +48,14 @@
damageSelectWrapper.eq(Damage::getStatus,status);
}
if(workingProcedureId!=0){
- damageSelectWrapper.eq(Damage::getWorkingProcedureId,workingProcedureId);
+ damageSelectWrapper.eq(Damage::getWorkingProcedure,workingProcedureId);
}
return baseMapper.selectList(damageSelectWrapper);
}
+ /**
+ * 鎻愪氦鎶ュ伐
+ */
@Override
public void submitDamage(DateTime startTime, DateTime endTime, int type, int status, int workingProcedureId){
LambdaUpdateWrapper<Damage> damageUpdateWrapper=new LambdaUpdateWrapper<>();
@@ -51,16 +67,36 @@
damageUpdateWrapper.eq(Damage::getStatus,status);
}
if(workingProcedureId!=0){
- damageUpdateWrapper.eq(Damage::getWorkingProcedureId,workingProcedureId);
+ damageUpdateWrapper.eq(Damage::getWorkingProcedure,workingProcedureId);
}
Damage damage=new Damage();
damage.setStatus(2);
baseMapper.update(damage,damageUpdateWrapper);
}
+ /**
+ * 娣诲姞鎶ュ伐淇℃伅
+ */
@Override
- public void insertDamage(String glassId){
+ public void insertDamage(Damage damage){
LambdaQueryWrapper<GlassInfo> glassInfoSelectWrapper=new LambdaQueryWrapper<>();
- GlassInfo glassInfo=new GlassInfo();
+ glassInfoSelectWrapper.eq(GlassInfo::getGlassId,damage.getGlassId());
+ GlassInfo glassInfo=glassInfoMapper.selectOne(glassInfoSelectWrapper);
+
+ LambdaQueryWrapper<WorkAssignment> workAssignmentSelectWrapper=new LambdaQueryWrapper<>();
+ workAssignmentSelectWrapper
+ .eq(WorkAssignment::getLine,damage.getLine())
+ .eq(WorkAssignment::getWorkProcesses,damage.getWorkingProcedure());
+ WorkAssignment workAssignment=workAssignmentMapper.selectOne(workAssignmentSelectWrapper);
+ damage.setTeamsGroupsName(workAssignment.getTeamsGroupsName());
+ damage.setDeviceName(workAssignment.getDeviceName());
+
+ damage.setEngineerId(glassInfo.getEngineerId());
+ damage.setTemperingLayoutId(glassInfo.getTemperingLayoutId());
+ damage.setProcessId(glassInfo.getFlowCardId());
+ damage.setOrderNumber(glassInfo.getGlassType());
+ damage.setTechnologyNumber(glassInfo.getLayer());
+ damage.setDamageTime(LocalDateTime.now());
+ baseMapper.insert(damage);
}
}
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/entity/GlassInfo.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/entity/GlassInfo.java
index 66912e6..0c6ae56 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/entity/GlassInfo.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/entity/GlassInfo.java
@@ -35,7 +35,7 @@
/**
* 娴佺▼鍗＄幓鐠冪被鍨�
*/
- private String glassType;
+ private Integer glassType;
/**
* 瀹�
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/entity/OptimizeGlassinfo.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/entity/OptimizeGlassinfo.java
index 5fd3c47..54e844b 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/entity/OptimizeGlassinfo.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/entity/OptimizeGlassinfo.java
@@ -102,7 +102,7 @@
/**
* 璁㈠崟搴忓彿
*/
- private String orderSort;
+ private Integer orderSort;
/**
* 鏃嬭浆瑙掑害
*/
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/tools/CodeGet.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/tools/CodeGet.java
index da7da7a..006c8f9 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/tools/CodeGet.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/tools/CodeGet.java
@@ -31,7 +31,7 @@
// 3銆佹暟鎹簮閰嶇疆
DataSourceConfig dsc = new DataSourceConfig();
- dsc.setUrl("jdbc:mysql://10.153.19.150:3306/pp?serverTimezone=GMT%2b8");
+ dsc.setUrl("jdbc:mysql://10.153.19.150:3306/hangzhoumes?serverTimezone=GMT%2b8");
dsc.setDriverName("com.mysql.cj.jdbc.Driver");
dsc.setUsername("root");
dsc.setPassword("beibo.123/");
@@ -41,7 +41,7 @@
// 4銆佸寘閰嶇疆
PackageConfig pc = new PackageConfig();
pc.setParent("com.mes");
- pc.setModuleName("reporting_work"); //妯″潡鍚�
+ pc.setModuleName("work_assignment"); //妯″潡鍚�
pc.setController("controller");
pc.setService("service");
pc.setMapper("mapper");
@@ -50,7 +50,7 @@
// 5銆佺瓥鐣ラ厤缃�
StrategyConfig strategy = new StrategyConfig();
- strategy.setInclude("reporting_work");
+ strategy.setInclude("work_assignment");
strategy.setNaming(NamingStrategy.underline_to_camel);//鏁版嵁搴撹〃鏄犲皠鍒板疄浣撶殑鍛藉悕绛栫暐
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/work_assignment/controller/WorkAssignmentController.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/work_assignment/controller/WorkAssignmentController.java
new file mode 100644
index 0000000..9836cf1
--- /dev/null
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/work_assignment/controller/WorkAssignmentController.java
@@ -0,0 +1,36 @@
+package com.mes.work_assignment.controller;
+
+
+import cn.hutool.core.date.DateTime;
+import com.mes.damage.service.DamageService;
+import com.mes.utils.Result;
+import com.mes.work_assignment.service.WorkAssignmentService;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 鍓嶇鎺у埗鍣�
+ * </p>
+ *
+ * @author wu
+ * @since 2024-07-01
+ */
+@RestController
+@RequestMapping("/work_assignment/work-assignment")
+public class WorkAssignmentController {
+
+ @Autowired
+ private WorkAssignmentService workAssignmentService;
+ @ApiOperation("鎶ュ伐鏁版嵁鏌ヨ")
+ @GetMapping("/selectWorkAssignment")
+ public Result selectDamage(int line,String workingProcedure) {
+ return Result.build(200,"鏌ヨ鎴愬姛",workAssignmentService.selectWorkAssignment(line,workingProcedure));
+ }
+
+}
+
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/work_assignment/entity/WorkAssignment.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/work_assignment/entity/WorkAssignment.java
new file mode 100644
index 0000000..44e68a8
--- /dev/null
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/work_assignment/entity/WorkAssignment.java
@@ -0,0 +1,44 @@
+package com.mes.work_assignment.entity;
+
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author wu
+ * @since 2024-07-01
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class WorkAssignment implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ private Integer id;
+
+ /**
+ * 绾胯矾
+ */
+ private Integer line;
+
+ /**
+ * 宸ュ簭
+ */
+ private String workProcesses;
+
+ /**
+ * 鐝粍鍚嶇О
+ */
+ private String teamsGroupsName;
+
+ /**
+ * 璁惧鍚嶇О
+ */
+ private String deviceName;
+
+
+}
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/work_assignment/mapper/WorkAssignmentMapper.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/work_assignment/mapper/WorkAssignmentMapper.java
new file mode 100644
index 0000000..e713455
--- /dev/null
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/work_assignment/mapper/WorkAssignmentMapper.java
@@ -0,0 +1,16 @@
+package com.mes.work_assignment.mapper;
+
+import com.mes.work_assignment.entity.WorkAssignment;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * Mapper 鎺ュ彛
+ * </p>
+ *
+ * @author wu
+ * @since 2024-07-01
+ */
+public interface WorkAssignmentMapper extends BaseMapper<WorkAssignment> {
+
+}
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/work_assignment/mapper/xml/WorkAssignmentMapper.xml b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/work_assignment/mapper/xml/WorkAssignmentMapper.xml
new file mode 100644
index 0000000..db1b33d
--- /dev/null
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/work_assignment/mapper/xml/WorkAssignmentMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mes.work_assignment.mapper.WorkAssignmentMapper">
+
+</mapper>
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/work_assignment/service/WorkAssignmentService.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/work_assignment/service/WorkAssignmentService.java
new file mode 100644
index 0000000..3571fe6
--- /dev/null
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/work_assignment/service/WorkAssignmentService.java
@@ -0,0 +1,17 @@
+package com.mes.work_assignment.service;
+
+import com.mes.work_assignment.entity.WorkAssignment;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 鏈嶅姟绫�
+ * </p>
+ *
+ * @author wu
+ * @since 2024-07-01
+ */
+public interface WorkAssignmentService extends IService<WorkAssignment> {
+
+ WorkAssignment selectWorkAssignment(int line, String workingProcedure);
+}
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/work_assignment/service/impl/WorkAssignmentServiceImpl.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/work_assignment/service/impl/WorkAssignmentServiceImpl.java
new file mode 100644
index 0000000..e80cce6
--- /dev/null
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/work_assignment/service/impl/WorkAssignmentServiceImpl.java
@@ -0,0 +1,35 @@
+package com.mes.work_assignment.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.mes.work_assignment.entity.WorkAssignment;
+import com.mes.work_assignment.mapper.WorkAssignmentMapper;
+import com.mes.work_assignment.service.WorkAssignmentService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 鏈嶅姟瀹炵幇绫�
+ * </p>
+ *
+ * @author wu
+ * @since 2024-07-01
+ */
+@Service
+public class WorkAssignmentServiceImpl extends ServiceImpl<WorkAssignmentMapper, WorkAssignment> implements WorkAssignmentService {
+
+ /**
+ * 鏌ヨ褰撳墠鍊肩彮淇℃伅
+ * @param line
+ * @param workingProcedure
+ * @return
+ */
+ @Override
+ public WorkAssignment selectWorkAssignment(int line, String workingProcedure){
+ LambdaQueryWrapper<WorkAssignment> workAssignmentSelectWrapper=new LambdaQueryWrapper<>();
+ workAssignmentSelectWrapper
+ .eq(WorkAssignment::getLine,line)
+ .eq(WorkAssignment::getWorkProcesses,workingProcedure);
+ return baseMapper.selectOne(workAssignmentSelectWrapper);
+ }
+}
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/controller/BigStorageCageDetailsController.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/controller/BigStorageCageDetailsController.java
index 0fee9b2..bca9539 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/controller/BigStorageCageDetailsController.java
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/controller/BigStorageCageDetailsController.java
@@ -1,6 +1,7 @@
package com.mes.bigstorage.controller;
import com.mes.bigstorage.entity.BigStorageCageDetails;
import com.mes.bigstorage.service.BigStorageCageDetailsService;
+import com.mes.bigstorage.service.BigStorageCageService;
import com.mes.utils.Result;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -25,6 +26,8 @@
@Autowired
private BigStorageCageDetailsService bigStorageCageDetailsService;
+ @Autowired
+ private BigStorageCageService bigStorageCageService;
@ApiOperation("鐜荤拑璇︽儏鏌ヨ")
@@ -38,14 +41,14 @@
@PostMapping("/insertBigStorageCageDetails")
public Result insertBigStorageCageDetails(@RequestBody BigStorageCageDetails bigStorageCageDetails) {
bigStorageCageDetailsService.insertBigStorageCageDetails(bigStorageCageDetails);
- return Result.build(200,"娣诲姞鎴愬姛",1);
+ return Result.build(200,"娣诲姞鎴愬姛",bigStorageCageService.querybigStorageCageDetail(0));
}
@ApiOperation("鐞嗙墖绗艰鎯呭垹闄�")
@PostMapping("/deleteBigStorageCageDetails")
public Result deleteBigStorageCageDetails(@RequestBody BigStorageCageDetails bigStorageCageDetails) {
bigStorageCageDetailsService.deleteBigStorageCageDetails(bigStorageCageDetails);
- return Result.build(200,"鍒犻櫎鎴愬姛",1);
+ return Result.build(200,"鍒犻櫎鎴愬姛",bigStorageCageService.querybigStorageCageDetail(0));
}
@ApiOperation("鐞嗙墖绗间换鍔＄牬鎹�0/鎷胯蛋1")
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageDetailsServiceImpl.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageDetailsServiceImpl.java
index aca1402..e91d0f1 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageDetailsServiceImpl.java
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageDetailsServiceImpl.java
@@ -73,43 +73,43 @@
*/
@Override
public List<BigStorageCageDetails> selectTask(int taskType) {
-
- if (taskType == 1) {
- //杩涚墖浠诲姟鏁版嵁
- LambdaQueryWrapper<BigStorageCageDetails> feedWrapper = new LambdaQueryWrapper<>();
- feedWrapper.eq(BigStorageCageDetails::getState, Const.BIG_STORAGE_IN);
- List<BigStorageCageDetails> bigStorageCageDetailsList = baseMapper.selectList(feedWrapper);
-
- LambdaQueryWrapper<BigStorageCageFeedTask> feedTaskWrapper = new LambdaQueryWrapper<>();
- feedTaskWrapper.lt(BigStorageCageFeedTask::getTaskState, Const.BIG_STORAGE_IN_SLOT);
- List<BigStorageCageFeedTask> bigStorageCageFeedTaskList = bigStorageCageFeedTaskMapper.selectList(feedTaskWrapper);
-
- Map<String, BigStorageCageFeedTask> listMap = bigStorageCageFeedTaskList.stream()
- .collect(Collectors.toMap(BigStorageCageFeedTask::getGlassId, task -> task));
-
- for (BigStorageCageDetails bigStorageCageDetails : bigStorageCageDetailsList) {
- BigStorageCageFeedTask bigStorageCageFeedTask = listMap.get(bigStorageCageDetails.getGlassId());
- bigStorageCageDetails.setBigStorageCageFeedTask(bigStorageCageFeedTask);
- }
- return bigStorageCageDetailsList;
- } else {
- //鍑虹墖浠诲姟鏁版嵁
- LambdaQueryWrapper<BigStorageCageDetails> outWrapper = new LambdaQueryWrapper<>();
- outWrapper.eq(BigStorageCageDetails::getState, Const.BIG_STORAGE_OUT);
- List<BigStorageCageDetails> bigStorageCageDetailsList = baseMapper.selectList(outWrapper);
-
- LambdaQueryWrapper<BigStorageCageOutTask> outTaskWrapper = new LambdaQueryWrapper<>();
- outTaskWrapper.lt(BigStorageCageOutTask::getTaskState, Const.BIG_STORAGE_OUT_SUCCESS);
- List<BigStorageCageOutTask> bigStorageCageOutTaskList = bigStorageCageOutTaskMapper.selectList(outTaskWrapper);
-
- Map<String, BigStorageCageOutTask> listMap = bigStorageCageOutTaskList.stream()
- .collect(Collectors.toMap(BigStorageCageOutTask::getGlassId, task -> task));
- for (BigStorageCageDetails bigStorageCageDetails : bigStorageCageDetailsList) {
- BigStorageCageOutTask bigStorageCageOutTask = listMap.get(bigStorageCageDetails.getGlassId());
- bigStorageCageDetails.setBigStorageCageOutTask(bigStorageCageOutTask);
- }
- return bigStorageCageDetailsList;
- }
+ return null;
+// if (taskType == 1) {
+// //杩涚墖浠诲姟鏁版嵁
+// LambdaQueryWrapper<BigStorageCageDetails> feedWrapper = new LambdaQueryWrapper<>();
+// feedWrapper.eq(BigStorageCageDetails::getState, Const.BIG_STORAGE_IN);
+// List<BigStorageCageDetails> bigStorageCageDetailsList = baseMapper.selectList(feedWrapper);
+//
+// LambdaQueryWrapper<BigStorageCageFeedTask> feedTaskWrapper = new LambdaQueryWrapper<>();
+// feedTaskWrapper.lt(BigStorageCageFeedTask::getTaskState, Const.BIG_STORAGE_IN_SLOT);
+// List<BigStorageCageFeedTask> bigStorageCageFeedTaskList = bigStorageCageFeedTaskMapper.selectList(feedTaskWrapper);
+//
+// Map<String, BigStorageCageFeedTask> listMap = bigStorageCageFeedTaskList.stream()
+// .collect(Collectors.toMap(BigStorageCageFeedTask::getGlassId, task -> task));
+//
+// for (BigStorageCageDetails bigStorageCageDetails : bigStorageCageDetailsList) {
+// BigStorageCageFeedTask bigStorageCageFeedTask = listMap.get(bigStorageCageDetails.getGlassId());
+// bigStorageCageDetails.setBigStorageCageFeedTask(bigStorageCageFeedTask);
+// }
+// return bigStorageCageDetailsList;
+// } else {
+// //鍑虹墖浠诲姟鏁版嵁
+// LambdaQueryWrapper<BigStorageCageDetails> outWrapper = new LambdaQueryWrapper<>();
+// outWrapper.eq(BigStorageCageDetails::getState, Const.BIG_STORAGE_OUT);
+// List<BigStorageCageDetails> bigStorageCageDetailsList = baseMapper.selectList(outWrapper);
+//
+// LambdaQueryWrapper<BigStorageCageOutTask> outTaskWrapper = new LambdaQueryWrapper<>();
+// outTaskWrapper.lt(BigStorageCageOutTask::getTaskState, Const.BIG_STORAGE_OUT_SUCCESS);
+// List<BigStorageCageOutTask> bigStorageCageOutTaskList = bigStorageCageOutTaskMapper.selectList(outTaskWrapper);
+//
+// Map<String, BigStorageCageOutTask> listMap = bigStorageCageOutTaskList.stream()
+// .collect(Collectors.toMap(BigStorageCageOutTask::getGlassId, task -> task));
+// for (BigStorageCageDetails bigStorageCageDetails : bigStorageCageDetailsList) {
+// BigStorageCageOutTask bigStorageCageOutTask = listMap.get(bigStorageCageDetails.getGlassId());
+// bigStorageCageDetails.setBigStorageCageOutTask(bigStorageCageOutTask);
+// }
+// return bigStorageCageDetailsList;
+// }
}
/**
@@ -172,7 +172,11 @@
}
temperingGlassInfoMapper.updateById(temperingGlassInfo);
}
- bigStorageCageDetails.setState(Const.BIG_STORAGE_OUTSIDE);
+ if (status == 0) {
+ bigStorageCageDetails.setState(Const.GLASS_STATE_TAKE);
+ } else {
+ bigStorageCageDetails.setState(Const.GLASS_STATE_DAMAGE);
+ }
baseMapper.updateById(bigStorageCageDetails);
bigStorageCageService.updateRemainWidth(bigStorageCageDetails.getSlot());
//todo:鎻掑叆鐮存崯鏁版嵁
@@ -188,7 +192,7 @@
BigStorageCageDetails bigStorageCageDetails = new BigStorageCageDetails();
if(glassInfo!=null){
BeanUtils.copyProperties(glassInfo, bigStorageCageDetails);
- bigStorageCageDetails.setState(0);
+ bigStorageCageDetails.setState(1);
bigStorageCageDetails.setGap(galssGap);
}
List<BigStorageCageDetails> bigStorageCageDetailsList=new ArrayList<>();
@@ -199,6 +203,7 @@
//鐞嗙墖绗艰鎯呮坊鍔�
@Override
public void insertBigStorageCageDetails(BigStorageCageDetails bigStorageCageDetails) {
+ bigStorageCageDetails.setState(100);
baseMapper.insert(bigStorageCageDetails);
bigStorageCageService.updateRemainWidth(bigStorageCageDetails.getSlot());
}
@@ -206,20 +211,20 @@
//鐞嗙墖绗艰鎯呭畬鎴�
@Override
public void finishBigStorageCageDetails(BigStorageCageDetails bigStorageCageDetails) {
- if (bigStorageCageDetails.getBigStorageCageFeedTask() != null) {
- bigStorageCageDetails.setState(Const.BIG_STORAGE_INSIDE);
- baseMapper.updateById(bigStorageCageDetails);
- } else {
- bigStorageCageDetails.setState(Const.BIG_STORAGE_OUTSIDE);
- baseMapper.updateById(bigStorageCageDetails);
- bigStorageCageService.updateRemainWidth(bigStorageCageDetails.getSlot());
- }
+// if (bigStorageCageDetails.getBigStorageCageFeedTask() != null) {
+// bigStorageCageDetails.setState(Const.BIG_STORAGE_INSIDE);
+// baseMapper.updateById(bigStorageCageDetails);
+// } else {
+// bigStorageCageDetails.setState(Const.BIG_STORAGE_OUTSIDE);
+// baseMapper.updateById(bigStorageCageDetails);
+// bigStorageCageService.updateRemainWidth(bigStorageCageDetails.getSlot());
+// }
}
//鎵嬪姩鍑虹墖
@Override
public void outBigStorageCageDetails(BigStorageCageDetails bigStorageCageDetails) {
- bigStorageCageDetails.setState(4);
+ bigStorageCageDetails.setState(Const.GLASS_STATE_ARTIFICIAL);
baseMapper.updateById(bigStorageCageDetails);
}
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageServiceImpl.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageServiceImpl.java
index 72fc607..db3ca3a 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageServiceImpl.java
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageServiceImpl.java
@@ -222,7 +222,8 @@
LambdaQueryWrapper<BigStorageCageDetails> bigStorageCageDetailsWrapper=new LambdaQueryWrapper();
bigStorageCageDetailsWrapper
.eq(BigStorageCageDetails::getSlot,slot)
- .ne(BigStorageCageDetails::getState,Const.BIG_STORAGE_OUTSIDE);
+ .eq(BigStorageCageDetails::getState,Const.GLASS_STATE_IN)
+ .eq(BigStorageCageDetails::getState,Const.GLASS_STATE_ARTIFICIAL);
List<BigStorageCageDetails> bigStorageCageDetailsList = bigStorageCageDetailsMapper.selectList(bigStorageCageDetailsWrapper);
for (BigStorageCageDetails bigStorageCageDetails : bigStorageCageDetailsList
@@ -244,7 +245,10 @@
public List<BigStorageCage> querybigStorageCageDetail(int deviceId) {
LambdaQueryWrapper<BigStorageCage> bigStorageCageWrapper =new LambdaQueryWrapper<>();
LambdaQueryWrapper<BigStorageCageDetails> bigStorageCageDetailsWrapper =new LambdaQueryWrapper<>();
- bigStorageCageDetailsWrapper.lt(BigStorageCageDetails::getState, Const.BIG_STORAGE_OUTSIDE);
+ bigStorageCageDetailsWrapper
+ .eq(BigStorageCageDetails::getState, Const.GLASS_STATE_IN)
+ .or()
+ .eq(BigStorageCageDetails::getState, Const.GLASS_STATE_ARTIFICIAL);
if(deviceId!=0){
bigStorageCageWrapper.eq(BigStorageCage::getDeviceId,deviceId);
bigStorageCageDetailsWrapper.eq(BigStorageCageDetails::getDeviceId,deviceId);
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/application.yml b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/application.yml
index 7f3890a..ea7f3c9 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/application.yml
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/application.yml
@@ -3,7 +3,7 @@
spring:
profiles:
- active: dev
+ active: prod
application:
name: cacheVerticalGlass
mybatis-plus:
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/test/java/com/mes/CacheVerticalGlassModuleApplicationTest.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/test/java/com/mes/CacheVerticalGlassModuleApplicationTest.java
index 8ab9cf4..14a8a13 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/test/java/com/mes/CacheVerticalGlassModuleApplicationTest.java
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/test/java/com/mes/CacheVerticalGlassModuleApplicationTest.java
@@ -63,7 +63,7 @@
@Test
public void judgeGlassTypeStatus() {
- plcStorageCageTask.judgeGlassTypeStatus("P24060403|6|7", Const.A09_OUT_TARGET_POSITION);
+ plcStorageCageTask.judgeGlassTypeStatus("P24060403|6|7", Const.A09_OUT_TARGET_POSITION,"");
}
@Test
--
Gitblit v1.8.0