From 2e586ec3808b5a6d170aba9ddcbf5ef7b69f9eef Mon Sep 17 00:00:00 2001
From: 18516761980 <56479841@qq.com>
Date: 星期六, 13 八月 2022 10:56:22 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/luxiaotao1123/zy-asrs into hylyasrs
---
src/main/resources/mapper/TestMastMapper.xml | 2 +-
src/main/java/com/zy/asrs/entity/TestMast.java | 1 +
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 14 +++++---------
3 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/TestMast.java b/src/main/java/com/zy/asrs/entity/TestMast.java
index 42ff18f..b94c373 100644
--- a/src/main/java/com/zy/asrs/entity/TestMast.java
+++ b/src/main/java/com/zy/asrs/entity/TestMast.java
@@ -47,6 +47,7 @@
* 鐢ㄦ埛鐮�
*/
@ApiModelProperty(value= "鐢ㄦ埛鐮�")
+ @TableField("user_id")
private String userId;
/**
diff --git a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
index 5085744..1801b6f 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -611,27 +611,23 @@
ReturnT<String> result=workLogHandler.startUpTestPACK(testMast);
if (!result.isSuccess()) {
log.error("娴嬭瘯鐢宠澶辫触", testMast.getBarcode());
+// throw new CoolException("娴嬭瘯鐢宠澶辫触");
}
LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", testMast.getLocNo()));
if (Cools.isEmpty(locMast)) {
throw new CoolException(BaseRes.PARAM);
}
- Date date1;
- try {
- date1 = new Date();
- }catch (Exception e){
- throw new CoolException("鑾峰彇鏃堕棿澶辫触");
- }
+ Date now = new Date();
testMast.setChannel(1);
testMast.setStatus(1);
- testMast.setModiTime(date1);
- testMast.setAppeTime(date1);
+ testMast.setModiTime(now);
+ testMast.setAppeTime(now);
if (!testMastService.insert(testMast)){
throw new CoolException("娣诲姞testMast澶辫触");
}
locMast.setPackStatus(2);
- locMast.setModiTime(date1);
+ locMast.setModiTime(now);
if (!locMastService.update(locMast,new EntityWrapper<LocMast>().eq("loc_no", testMast.getLocNo()))){
throw new CoolException("鐢宠娴嬭瘯澶辫触");
}
diff --git a/src/main/resources/mapper/TestMastMapper.xml b/src/main/resources/mapper/TestMastMapper.xml
index c81eb33..0d82166 100644
--- a/src/main/resources/mapper/TestMastMapper.xml
+++ b/src/main/resources/mapper/TestMastMapper.xml
@@ -8,7 +8,7 @@
<result column="channel" property="channel" />
<result column="loc_no" property="locNo" />
<result column="barcode" property="barcode" />
- <result column="userId" property="userId" />
+ <result column="user_id" property="userId" />
<result column="status" property="status" />
<result column="modi_time" property="modiTime" />
<result column="appe_time" property="appeTime" />
--
Gitblit v1.9.1