From 001969849cbc4613cafee4d680f7d4ac19597fce Mon Sep 17 00:00:00 2001
From: lsh <lsh>
Date: 星期四, 27 六月 2024 18:14:13 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/WrkMastExecuteServiceImpl.java | 9 +++-
src/main/java/com/zy/asrs/entity/WrkMastExecuteLog.java | 24 +++++++++++-
src/main/java/com/zy/asrs/mapper/WrkMastExecuteMapper.java | 8 ++-
src/main/java/com/zy/asrs/service/WrkMastExecuteService.java | 3 +
src/main/resources/mapper/WrkMastExecuteMapper.xml | 4 ++
src/main/java/com/zy/asrs/task/handler/WrkMastExecuteHandler.java | 23 ++++++++---
src/main/java/com/zy/asrs/entity/WrkMastExecute.java | 3 -
7 files changed, 57 insertions(+), 17 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/WrkMastExecute.java b/src/main/java/com/zy/asrs/entity/WrkMastExecute.java
index 8ab10a7..b241078 100644
--- a/src/main/java/com/zy/asrs/entity/WrkMastExecute.java
+++ b/src/main/java/com/zy/asrs/entity/WrkMastExecute.java
@@ -29,13 +29,13 @@
* ID
*/
@ApiModelProperty(value= "ID")
+ @TableId(value = "id", type = IdType.AUTO)
private Long id;
/**
* 宸ヤ綔鍙�
*/
@ApiModelProperty(value= "宸ヤ綔鍙�")
- @TableId(value = "wrk_no", type = IdType.INPUT)
@TableField("wrk_no")
private Long wrkNo;
@@ -143,7 +143,6 @@
* 浠诲姟绫诲瀷 0: 鏈煡 1: 寮�闂� 2: 鍏抽棬 3: 鍏ョ～鍖栫綈 4: 鍏ュ喎鍗存Ы 5: 绌挎杞﹁繘鍐峰嵈妲� 6: 绌挎杞︾寮�鍐峰嵈妲� 7: 鍑哄喎鍗存Ы
*/
@ApiModelProperty(value= "浠诲姟绫诲瀷 0: 鏈煡 1: 寮�闂� 2: 鍏抽棬 3: 鍏ョ～鍖栫綈 4: 鍏ュ喎鍗存Ы 5: 绌挎杞﹁繘鍐峰嵈妲� 6: 绌挎杞︾寮�鍐峰嵈妲� 7: 鍑哄喎鍗存Ы ")
- @TableId(value = "io_type", type = IdType.INPUT)
@TableField("io_type")
private Integer ioType;
diff --git a/src/main/java/com/zy/asrs/entity/WrkMastExecuteLog.java b/src/main/java/com/zy/asrs/entity/WrkMastExecuteLog.java
index e04d435..e1db7be 100644
--- a/src/main/java/com/zy/asrs/entity/WrkMastExecuteLog.java
+++ b/src/main/java/com/zy/asrs/entity/WrkMastExecuteLog.java
@@ -29,13 +29,13 @@
* ID
*/
@ApiModelProperty(value= "ID")
+ @TableId(value = "id", type = IdType.AUTO)
private Long id;
/**
* 宸ヤ綔鍙�
*/
@ApiModelProperty(value= "宸ヤ綔鍙�")
- @TableId(value = "wrk_no", type = IdType.INPUT)
@TableField("wrk_no")
private Long wrkNo;
@@ -143,7 +143,6 @@
* 浠诲姟绫诲瀷 0: 鏈煡 1: 寮�闂� 2: 鍏抽棬 3: 鍏ョ～鍖栫綈 4: 鍏ュ喎鍗存Ы 5: 绌挎杞﹁繘鍐峰嵈妲� 6: 绌挎杞︾寮�鍐峰嵈妲� 7: 鍑哄喎鍗存Ы
*/
@ApiModelProperty(value= "浠诲姟绫诲瀷 0: 鏈煡 1: 寮�闂� 2: 鍏抽棬 3: 鍏ョ～鍖栫綈 4: 鍏ュ喎鍗存Ы 5: 绌挎杞﹁繘鍐峰嵈妲� 6: 绌挎杞︾寮�鍐峰嵈妲� 7: 鍑哄喎鍗存Ы ")
- @TableId(value = "io_type", type = IdType.INPUT)
@TableField("io_type")
private Integer ioType;
@@ -183,6 +182,27 @@
this.rgvEndId = rgvEndId;
}
+ public WrkMastExecuteLog(WrkMastExecute wrkMastExecute) {
+ this.wrkNo = wrkMastExecute.getWrkNo();
+ this.enterStaNo = wrkMastExecute.getEnterStaNo();
+ this.outStaNo = wrkMastExecute.getOutStaNo();
+ this.jarEnterStaNo = wrkMastExecute.getJarEnterStaNo();
+ this.jarOutStaNo = wrkMastExecute.getJarOutStaNo();
+ this.jarId = wrkMastExecute.getJarId();
+ this.jarRegin = wrkMastExecute.getJarRegin();
+ this.status = wrkMastExecute.getStatus();
+ this.steId = wrkMastExecute.getSteId();
+ this.rgvId = wrkMastExecute.getRgvId();
+ this.ioTime = wrkMastExecute.getIoTime();
+ this.modiTime = wrkMastExecute.getModiTime();
+ this.appeTime = wrkMastExecute.getAppeTime();
+ this.wrkType = wrkMastExecute.getWrkType();
+ this.wrkSts = wrkMastExecute.getWrkSts();
+ this.ioType = wrkMastExecute.getIoType();
+ this.type = wrkMastExecute.getType();
+ this.rgvEndId = wrkMastExecute.getRgvEndId();
+ }
+
// WrkMastExecuteLog wrkMastExecuteLog = new WrkMastExecuteLog(
// null, // 宸ヤ綔鍙穂闈炵┖]
// null, // 鍏ュ簱婧愮珯鐐筟闈炵┖]
diff --git a/src/main/java/com/zy/asrs/mapper/WrkMastExecuteMapper.java b/src/main/java/com/zy/asrs/mapper/WrkMastExecuteMapper.java
index c3f3233..2060f52 100644
--- a/src/main/java/com/zy/asrs/mapper/WrkMastExecuteMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/WrkMastExecuteMapper.java
@@ -2,7 +2,6 @@
import com.zy.asrs.entity.WrkMastExecute;
import com.baomidou.mybatisplus.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Insert;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
@@ -11,6 +10,9 @@
@Repository
public interface WrkMastExecuteMapper extends BaseMapper<WrkMastExecute> {
- @Insert("insert into jar_wrk_mast_execute_log select * from jar_wrk_mast_execute where io_type=#{ioType} and wrk_sts=#{wrkSts} and wrk_type=1")
- int save(@Param("ioType") Integer ioType,@Param("wrkSts") Integer wrkSts);
+// @Insert("insert into jar_wrk_mast_execute_log select * from jar_wrk_mast_execute where io_type=#{ioType} and wrk_sts=#{wrkSts} and wrk_type=2")
+// int save(@Param("ioType") Integer ioType,@Param("wrkSts") Integer wrkSts);
+
+ WrkMastExecute selectIoTypeAndWekSts(@Param("ioType") Integer ioType,@Param("wrkSts") Integer wrkSts);
+
}
diff --git a/src/main/java/com/zy/asrs/service/WrkMastExecuteService.java b/src/main/java/com/zy/asrs/service/WrkMastExecuteService.java
index 1daf3ff..d270e16 100644
--- a/src/main/java/com/zy/asrs/service/WrkMastExecuteService.java
+++ b/src/main/java/com/zy/asrs/service/WrkMastExecuteService.java
@@ -4,5 +4,6 @@
import com.baomidou.mybatisplus.service.IService;
public interface WrkMastExecuteService extends IService<WrkMastExecute> {
- boolean save(int[] excute);
+// boolean save(int[] excute);
+ WrkMastExecute selectIoTypeAndWekSts(int[] excute);
}
diff --git a/src/main/java/com/zy/asrs/service/impl/WrkMastExecuteServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WrkMastExecuteServiceImpl.java
index a076744..498a83c 100644
--- a/src/main/java/com/zy/asrs/service/impl/WrkMastExecuteServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WrkMastExecuteServiceImpl.java
@@ -8,8 +8,13 @@
@Service("wrkMastExecuteService")
public class WrkMastExecuteServiceImpl extends ServiceImpl<WrkMastExecuteMapper, WrkMastExecute> implements WrkMastExecuteService {
+// @Override
+// public boolean save(int[] excute) {
+// return this.baseMapper.save(excute[0],excute[1]) > 0;
+// }
+
@Override
- public boolean save(int[] excute) {
- return this.baseMapper.save(excute[0],excute[1]) > 0;
+ public WrkMastExecute selectIoTypeAndWekSts(int[] excute) {
+ return this.baseMapper.selectIoTypeAndWekSts(excute[0],excute[1]);
}
}
diff --git a/src/main/java/com/zy/asrs/task/handler/WrkMastExecuteHandler.java b/src/main/java/com/zy/asrs/task/handler/WrkMastExecuteHandler.java
index 3a4b3f0..40c43d0 100644
--- a/src/main/java/com/zy/asrs/task/handler/WrkMastExecuteHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WrkMastExecuteHandler.java
@@ -2,7 +2,10 @@
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.core.common.Cools;
import com.zy.asrs.entity.WrkMastExecute;
+import com.zy.asrs.entity.WrkMastExecuteLog;
+import com.zy.asrs.service.WrkMastExecuteLogService;
import com.zy.asrs.service.WrkMastExecuteService;
import com.zy.asrs.task.AbstractHandler;
import com.zy.asrs.task.core.ReturnT;
@@ -22,16 +25,22 @@
public class WrkMastExecuteHandler extends AbstractHandler<String> {
@Autowired
private WrkMastExecuteService wrkMastExecuteService;
+ @Autowired
+ private WrkMastExecuteLogService wrkMastExecuteLogService;
public ReturnT<String> start(int[] excute) {
try {
- //淇濆瓨鍘嗗彶妗ｆ
- if (!wrkMastExecuteService.save(excute)){
- log.error("淇濆瓨纭寲缃愬尯鍩熸墽琛屼换鍔″巻鍙叉。[workNo={"+ JSON.toJSONString(excute) +"}]澶辫触");
- }
- //鍒犻櫎宸ヤ綔妗ｆ
- if (!wrkMastExecuteService.delete(new EntityWrapper<WrkMastExecute>().eq("io_type",excute[0]).eq("wrk_sts",excute[1]).eq("wrk_type",2))){
- log.error("鍒犻櫎纭寲缃愬尯鍩熸墽琛屼换鍔workNo={"+JSON.toJSONString(excute)+"}]澶辫触");
+ WrkMastExecute wrkMastExecute = wrkMastExecuteService.selectIoTypeAndWekSts(excute);
+ if (!Cools.isEmpty(wrkMastExecute)){
+ WrkMastExecuteLog wrkMastExecuteLog = new WrkMastExecuteLog(wrkMastExecute);
+ //淇濆瓨鍘嗗彶妗ｆ
+ if (!wrkMastExecuteLogService.insert(wrkMastExecuteLog)){
+ log.error("淇濆瓨纭寲缃愬尯鍩熸墽琛屼换鍔″巻鍙叉。[workNo={"+ JSON.toJSONString(excute) +"}]澶辫触");
+ }
+ //鍒犻櫎宸ヤ綔妗ｆ
+ if (!wrkMastExecuteService.deleteById(wrkMastExecute)){
+ log.error("鍒犻櫎纭寲缃愬尯鍩熸墽琛屼换鍔workNo={"+JSON.toJSONString(excute)+"}]澶辫触");
+ }
}
}catch (Exception e){
log.error("寮傚父锛侊紒锛�"+e);
diff --git a/src/main/resources/mapper/WrkMastExecuteMapper.xml b/src/main/resources/mapper/WrkMastExecuteMapper.xml
index 43b070d..9eae398 100644
--- a/src/main/resources/mapper/WrkMastExecuteMapper.xml
+++ b/src/main/resources/mapper/WrkMastExecuteMapper.xml
@@ -26,4 +26,8 @@
</resultMap>
+ <select id="selectIoTypeAndWekSts" resultMap="BaseResultMap">
+ select top 1 * from jar_wrk_mast_execute where io_type=#{ioType} and wrk_sts=#{wrkSts} and wrk_type=2
+ </select>
+
</mapper>
--
Gitblit v1.9.1