From 54629f35d244cbe96da1ad5c30c821bb4d300b41 Mon Sep 17 00:00:00 2001
From: zhangchao <zc857179121@qq.com>
Date: 星期五, 06 九月 2024 14:38:27 +0800
Subject: [PATCH] 1
---
src/main/resources/mapper/ApiLogMapper.xml | 36 +++++++++++++++++++-----------------
src/main/java/com/zy/common/web/WcsController.java | 7 +++++--
2 files changed, 24 insertions(+), 19 deletions(-)
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index 0bf1d61..2ffb341 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -84,9 +84,12 @@
return R.parse(CodeRes.NO_COMB_700);
}
int countLoc = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet", param.getBarcode()));
+ if (countLoc > 0) {
+ return R.error("搴撳瓨鏉＄爜鏁版嵁宸插瓨鍦�");
+ }
int countWrk = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("zpallet", param.getBarcode()));
- if (countLoc > 0 || countWrk > 0) {
- return R.error(CodeRes.EXIST_500);
+ if (countWrk > 0) {
+ return R.error("宸ヤ綔妗ｅ凡瀛樺湪");
}
}
if (Cools.isEmpty(param.getLocType1())) {
diff --git a/src/main/resources/mapper/ApiLogMapper.xml b/src/main/resources/mapper/ApiLogMapper.xml
index 05e704e..13a1623 100644
--- a/src/main/resources/mapper/ApiLogMapper.xml
+++ b/src/main/resources/mapper/ApiLogMapper.xml
@@ -4,29 +4,31 @@
<!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
<resultMap id="BaseResultMap" type="com.zy.asrs.entity.ApiLog">
- <id column="id" property="id" />
- <result column="uuid" property="uuid" />
- <result column="namespace" property="namespace" />
- <result column="url" property="url" />
- <result column="appkey" property="appkey" />
- <result column="timestamp" property="timestamp" />
- <result column="client_ip" property="clientIp" />
- <result column="request" property="request" />
- <result column="response" property="response" />
- <result column="err" property="err" />
- <result column="result" property="result" />
- <result column="status" property="status" />
- <result column="create_time" property="createTime" />
- <result column="update_time" property="updateTime" />
- <result column="memo" property="memo" />
+ <id column="id" property="id"/>
+ <result column="uuid" property="uuid"/>
+ <result column="namespace" property="namespace"/>
+ <result column="url" property="url"/>
+ <result column="appkey" property="appkey"/>
+ <result column="timestamp" property="timestamp"/>
+ <result column="client_ip" property="clientIp"/>
+ <result column="request" property="request"/>
+ <result column="response" property="response"/>
+ <result column="err" property="err"/>
+ <result column="result" property="result"/>
+ <result column="status" property="status"/>
+ <result column="create_time" property="createTime"/>
+ <result column="update_time" property="updateTime"/>
+ <result column="memo" property="memo"/>
</resultMap>
<delete id="clearWeekBefore">
+
+
delete from man_api_log
where 1=1
- and datediff(week,create_time,getdate()) >= 1
- and result != 1
+ and datediff(week,create_time,getdate()) >= 1
+ and result != 1
</delete>
</mapper>
--
Gitblit v1.9.1