From 9d9206ceb0c9fa20b272adcc11c2ce5fc9293eb7 Mon Sep 17 00:00:00 2001
From: cp <513960435@qq.com>
Date: 星期一, 21 十月 2024 16:33:52 +0800
Subject: [PATCH] #
---
zy-asrs-wms/src/main/webapp/static/js/waitPakinLog/waitPakinLog.js | 2
zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/TagServiceImpl.java | 20 ++++++++--
zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/WorkServiceImpl.java | 4 +-
zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WaitPakinLogController.java | 59 +++++++++++++++++++++++++++++
zy-asrs-wms/src/main/java/com/zy/asrs/wms/utils/PostMesDataUtils.java | 6 ++
5 files changed, 83 insertions(+), 8 deletions(-)
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/TagServiceImpl.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/TagServiceImpl.java
index cd2364a..5f90c5e 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/TagServiceImpl.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/TagServiceImpl.java
@@ -10,6 +10,7 @@
import org.springframework.stereotype.Service;
import java.util.Date;
+import java.util.List;
@Service("manTagService")
public class TagServiceImpl extends ServiceImpl<TagMapper, Tag> implements TagService {
@@ -51,9 +52,15 @@
if (!Cools.isEmpty(firstTagName)) {
//瀛樺湪涓�绾у垎绫伙紝鏌ヨ涓�绾у垎绫�
- Tag firstTag = this.getOne(new LambdaQueryWrapper<Tag>()
+ List<Tag> firstList = this.list(new LambdaQueryWrapper<Tag>()
.eq(Tag::getName, firstTagName)
- .eq(Tag::getHostId, hostId));
+ .eq(Tag::getHostId, hostId)
+ .orderByAsc(Tag::getCreateTime));
+ Tag firstTag = null;
+ if (!firstList.isEmpty()) {
+ firstTag = firstList.get(0);
+ }
+
if (firstTag == null) {
//涓�绾у垎绫讳负绌猴紝鍒涘缓涓�绾у垎绫�
firstTag = new Tag();
@@ -68,9 +75,14 @@
if (!Cools.isEmpty(secondTagName)) {
//瀛樺湪浜岀骇鍒嗙被锛屾煡璇簩绾у垎绫�
- Tag secondTag = this.getOne(new LambdaQueryWrapper<Tag>()
+ List<Tag> secondList = this.list(new LambdaQueryWrapper<Tag>()
.eq(Tag::getName, secondTagName)
- .eq(Tag::getHostId, hostId));
+ .eq(Tag::getHostId, hostId)
+ .orderByAsc(Tag::getCreateTime));
+ Tag secondTag = null;
+ if (!secondList.isEmpty()) {
+ secondTag = secondList.get(0);
+ }
if (secondTag == null) {
//浜岀骇鍒嗙被涓虹┖锛屽垱寤轰簩绾у垎绫�
secondTag = new Tag();
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/WorkServiceImpl.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/WorkServiceImpl.java
index 09d2456..82ab630 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/WorkServiceImpl.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/WorkServiceImpl.java
@@ -362,8 +362,8 @@
wrkMast.setWrkSts(101L); // 宸ヤ綔鐘舵�侊細101.鐢熸垚鍑哄簱
wrkMast.setIoType(ioType); // 鍏ュ嚭搴撶姸鎬�
wrkMast.setIoPri(13D); // 浼樺厛绾э細13
- wrkMast.setSourceStaNo(staDesc.getDeviceStn()); // 婧愮珯
- wrkMast.setStaNo(staDesc.getStnNo()); // 鐩爣绔�
+ wrkMast.setSourceStaNo(Cools.isEmpty(staDesc.getDeviceStn())? 0 : staDesc.getDeviceStn()); // 婧愮珯
+ wrkMast.setStaNo(Cools.isEmpty(staDesc.getStnNo()) ? 0:staDesc.getStnNo()); // 鐩爣绔�
wrkMast.setSourceLocNo(dto.getLocNo()); // 婧愬簱浣�
wrkMast.setFullPlt("Y"); // 婊℃澘锛歒
wrkMast.setPicking("N"); // 鎷ｆ枡
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WaitPakinLogController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WaitPakinLogController.java
index 23b70a9..7b25c2e 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WaitPakinLogController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WaitPakinLogController.java
@@ -3,7 +3,9 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.zy.asrs.common.wms.entity.LocDetl;
import com.zy.asrs.common.wms.entity.WaitPakin;
import com.zy.asrs.common.wms.entity.WaitPakinLog;
import com.zy.asrs.common.wms.service.WaitPakinLogService;
@@ -30,6 +32,63 @@
return R.ok(waitPakinLogService.getById(String.valueOf(id)));
}
+ @RequestMapping(value = "/waitPakinLog/export/auth1")
+ @ManagerAuth(memo = "搴撲綅鏄庣粏瀵煎嚭")
+ public synchronized R export(@RequestBody JSONObject param){
+ List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
+ QueryWrapper<WaitPakinLog> wrapper = new QueryWrapper<>();
+ Map<String, Object> map = excludeTrash(param.getJSONObject("waitPakinLog"));
+ String row = "";
+ if (map.get("row") != null) {
+ String chooseRow = (String) map.get("row");
+ if (chooseRow.length() == 1) {
+ row = "0" + chooseRow;
+ map.remove("row");
+ }else {
+ row = chooseRow;
+ map.remove("row");
+ }
+ }
+ convert(map, wrapper);
+// if (!row.equals("")){
+// wrapper.and()
+// .where("loc_no like '" +row +"%'");
+// }
+ List<WaitPakinLog> list = waitPakinLogService.list(wrapper);
+ return R.ok(exportSupport(list, fields));
+ }
+ private <T> void convert(Map<String, Object> map, QueryWrapper<T> wrapper){
+ for (Map.Entry<String, Object> entry : map.entrySet()){
+ if(Cools.eq(entry.getKey(),"curr")
+ || Cools.eq(entry.getKey(),"limit")
+ || Cools.eq(entry.getKey(),"unreason")
+ || Cools.eq(entry.getKey(),"orderByField")
+ || Cools.eq(entry.getKey(),"orderByType")
+ || Cools.eq(entry.getKey(),"row")
+ || Cools.eq(entry.getKey(),"condition")){
+ continue;
+ }
+
+ if(Cools.isEmpty(entry.getValue())){
+ continue;
+ }
+
+ String val = String.valueOf(entry.getValue());
+ if (val.contains(RANGE_TIME_LINK)){
+ String[] dates = val.split(RANGE_TIME_LINK);
+ wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
+ wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
+ } else {
+ if (entry.getKey().equals("locNo")) {
+ wrapper.eq("loc_no", String.valueOf(entry.getValue()));
+ } else {
+ wrapper.like(entry.getKey(), String.valueOf(entry.getValue()));
+ }
+ }
+ }
+ }
+
+
@RequestMapping(value = "/waitPakinLog/page/auth")
@ManagerAuth
public R page(@RequestParam(defaultValue = "1") Integer curr,
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/utils/PostMesDataUtils.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/utils/PostMesDataUtils.java
index 5ee49c6..16bbf4c 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/utils/PostMesDataUtils.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/utils/PostMesDataUtils.java
@@ -20,9 +20,9 @@
public class PostMesDataUtils extends AbstractHandler<String> {
public ReturnT<String> getMesData(String name,String URL,String mesPath, LinkedHashMap<String, Object> combParam){
+ boolean success = false;
if(combParam != null){
String response = "";
- boolean success = false;
try {
response = new HttpHandler.Builder()
.setUri(URL)
@@ -41,6 +41,7 @@
//涓婃姤澶辫触
log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", URL+"/"+mesPath, JSON.toJSONString(combParam), response);
// throw new CoolException("涓婃姤"+name);
+ success = false;
}
// if (jsonObject.getInteger("code").equals(200) || jsonObject.getInteger("Code").equals(200)) {
//
@@ -78,6 +79,9 @@
log.error("", e); }
}
}
+ if (!success){
+ return FAIL.setMsg("涓婂牨澶辨晽");
+ }
return SUCCESS;
}
}
diff --git a/zy-asrs-wms/src/main/webapp/static/js/waitPakinLog/waitPakinLog.js b/zy-asrs-wms/src/main/webapp/static/js/waitPakinLog/waitPakinLog.js
index f0811ee..a050ce5 100644
--- a/zy-asrs-wms/src/main/webapp/static/js/waitPakinLog/waitPakinLog.js
+++ b/zy-asrs-wms/src/main/webapp/static/js/waitPakinLog/waitPakinLog.js
@@ -158,7 +158,7 @@
'fields': fields
};
$.ajax({
- url: baseUrl+"/waitPakinLog/export/auth",
+ url: baseUrl+"/waitPakinLog/export/auth1",
headers: {'token': localStorage.getItem('token')},
data: JSON.stringify(param),
dataType:'json',
--
Gitblit v1.9.1