From aa7e48e0c3bb800bae361aca11f5164c950855c8 Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期四, 23 五月 2024 13:40:58 +0800
Subject: [PATCH] #海康摄像头
---
zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/WrkMast.java | 3 +
zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/LocMastController.java | 24 ++++++++++-
zy-asrs-wms/src/main/java/com/zy/asrs/wms/task/handler/WorkMastHandler.java | 7 +++
zy-asrs-wms/src/main/webapp/static/js/stoMan/stoQue.js | 39 +++++++++++++++++++
zy-asrs-wms/src/main/resources/application.yml | 3 +
zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/WrkMastLog.java | 3 +
zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/LocMast.java | 3 +
zy-asrs-wms/src/main/webapp/views/stoMan/stoQue.html | 1
8 files changed, 79 insertions(+), 4 deletions(-)
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/LocMast.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/LocMast.java
index d8ec34a..513cace 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/LocMast.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/LocMast.java
@@ -164,6 +164,9 @@
@ApiModelProperty(value= "鎺堟潈鍟嗘埛")
private Long hostId;
+ @ApiModelProperty(value= "鎷嶇収鍥剧墖")
+ private String pic;
+
public LocMast() {}
public LocMast(String locNo,Long whsType,String locSts,Integer crnNo,Integer row1,Integer bay1,Integer lev1,String fullPlt,Short locType1,Short locType2,Short locType3,Date ioTime,Date firstTime,Long modiUser,Date modiTime,Long appeUser,Date appeTime,Date errorTime,String errorMemo,String mk,String barcode,String memo,Long hostId) {
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/WrkMast.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/WrkMast.java
index e84b6fc..c8b0a48 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/WrkMast.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/WrkMast.java
@@ -189,6 +189,9 @@
@ApiModelProperty(value= "鍫嗗灈鏈哄彿")
private Integer crnNo;
+ @ApiModelProperty(value= "鎷嶇収鍥剧墖")
+ private String pic;
+
public WrkMast() {}
public WrkMast(Integer wrkNo, Long wrkSts, Integer ioType, Double ioPri, String locNo, Integer staNo, Integer sourceStaNo, String sourceLocNo, String picking, String exitMk, Integer pltType, String emptyMk, Date ioTime, Integer ctnType, String modiUser, Date modiTime, String appeUser, Date appeTime, Date errorTime, String errorMemo, String manuType, String memo, String barcode, String fullPlt, Long hostId, String oveMk, String invWh, Integer crnNo) {
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/WrkMastLog.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/WrkMastLog.java
index 25fc049..a07bdd3 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/WrkMastLog.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/WrkMastLog.java
@@ -188,6 +188,9 @@
@ApiModelProperty(value= "鍫嗗灈鏈哄彿")
private Integer crnNo;
+ @ApiModelProperty(value= "鎷嶇収鍥剧墖")
+ private String pic;
+
public WrkMastLog() {}
public WrkMastLog(Long id,Integer wrkNo,Long wrkSts,Integer ioType,Double ioPri,String locNo,Integer staNo,Integer sourceStaNo,String sourceLocNo,String picking,String exitMk,Integer pltType,String emptyMk,Date ioTime,Integer ctnType,String modiUser,Date modiTime,String appeUser,Date appeTime,Date errorTime,String errorMemo,String manuType,String memo,String barcode,String fullPlt,Long hostId) {
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/LocMastController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/LocMastController.java
index 3905711..c20a0d4 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/LocMastController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/LocMastController.java
@@ -1,7 +1,5 @@
package com.zy.asrs.wms.controller;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.zy.asrs.common.domain.entity.Parameter;
@@ -18,9 +16,9 @@
import com.zy.asrs.framework.common.DateUtils;
import com.zy.asrs.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
-
import java.util.*;
@RestController
@@ -30,6 +28,9 @@
private LocMastService locMastService;
@Autowired
private LocDetlService locDetlService;
+
+ @Value("${wcs.url}")
+ private String WCS_URL;
@RequestMapping(value = "/locMast/{id}/auth")
@ManagerAuth
@@ -182,4 +183,21 @@
return R.ok("鍒濆鍖栨垚鍔�");
}
+ @GetMapping("/locMast/picUrl")
+ @ManagerAuth
+ public R getPicUrl(@RequestParam String locNo) {
+ LocMast locMast = locMastService.getOne(new LambdaQueryWrapper<LocMast>()
+ .eq(LocMast::getLocNo, locNo)
+ .eq(LocMast::getHostId, getHostId()));
+ if (locMast == null) {
+ return R.error();
+ }
+
+ String pic = locMast.getPic();
+ ArrayList<String> list = new ArrayList<>();
+ list.add("http://" + WCS_URL + "/image/" + pic + "-1.jpg");
+ list.add("http://" + WCS_URL + "/image/" + pic + "-2.jpg");
+ return R.ok().add(list);
+ }
+
}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/task/handler/WorkMastHandler.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/task/handler/WorkMastHandler.java
index 5323ac3..4c303cd 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/task/handler/WorkMastHandler.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/task/handler/WorkMastHandler.java
@@ -68,6 +68,7 @@
locMast.setLocSts("D");
locMast.setIoTime(now);
locMast.setModiTime(now);
+ locMast.setPic(wrkMast.getPic());
if (!locMastService.updateById(locMast)) {
exceptionHandle("绌烘澘鍏ュ簱 ===>> 淇敼搴撲綅鐘舵�佸け璐�;[workNo={0}],[locNo={1}]", wrkMast.getWrkNo(), wrkMast.getLocNo());
}
@@ -130,6 +131,7 @@
locMast.setBarcode(wrkMast.getBarcode());
locMast.setIoTime(now);
locMast.setModiTime(now);
+ locMast.setPic(wrkMast.getPic());
if (!locMastService.updateById(locMast)) {
exceptionHandle("鍏ㄦ澘鍏ュ簱 ===>> 淇敼搴撲綅鐘舵�佸け璐ワ紱[workNo={0}],[locNo={1}]", wrkMast.getWrkNo(), wrkMast.getLocNo());
}
@@ -157,6 +159,7 @@
locMast.setBarcode(wrkMast.getBarcode());
locMast.setIoTime(now);
locMast.setModiTime(now);
+ locMast.setPic(wrkMast.getPic());
if (!locMastService.updateById(locMast)) {
exceptionHandle("鎷ｆ枡鍏ュ簱 ===>> 淇敼搴撲綅鐘舵�佸け璐ワ紱[workNo={0}],[locNo={1}]", wrkMast.getWrkNo(), wrkMast.getLocNo());
}
@@ -196,6 +199,7 @@
locMast.setBarcode(wrkMast.getBarcode());
locMast.setIoTime(now);
locMast.setModiTime(now);
+ locMast.setPic(wrkMast.getPic());
if (!locMastService.updateById(locMast)) {
exceptionHandle("骞舵澘鍏ュ簱 ===>> 淇敼搴撲綅鐘舵�佸け璐ワ紱[workNo={0}],[locNo={1}]", wrkMast.getWrkNo(), wrkMast.getLocNo());
}
@@ -214,6 +218,7 @@
locMast.setBarcode(wrkMast.getBarcode());
locMast.setIoTime(now);
locMast.setModiTime(now);
+ locMast.setPic(wrkMast.getPic());
if (!locMastService.updateById(locMast)) {
exceptionHandle("鐩樼偣鍏ュ簱 ===>> 淇敼搴撲綅鐘舵�佸け璐ワ紱[workNo={0}],[locNo={1}]", wrkMast.getWrkNo(), wrkMast.getLocNo());
}
@@ -303,6 +308,7 @@
locMast.setBarcode("");
locMast.setModiTime(now);
locMast.setIoTime(now);
+ locMast.setPic("");
if (!locMastService.updateById(locMast)) {
exceptionHandle("鍏ㄦ澘鍑哄簱 ===>> 淇敼婧愬簱浣嶇姸鎬佸け璐ワ紱[workNo={0}],[sourceLocNo={1}]", wrkMast.getWrkNo(), wrkMast.getSourceLocNo());
}
@@ -316,6 +322,7 @@
locMast.setBarcode("");
locMast.setModiTime(now);
locMast.setIoTime(now);
+ locMast.setPic("");
if (!locMastService.updateById(locMast)) {
exceptionHandle("绌烘澘鍑哄簱 ===>> 淇敼婧愬簱浣嶇姸鎬佸け璐ワ紱[workNo={0}],[sourceLocNo={1}]", wrkMast.getWrkNo(), wrkMast.getSourceLocNo());
}
diff --git a/zy-asrs-wms/src/main/resources/application.yml b/zy-asrs-wms/src/main/resources/application.yml
index 29b5b96..e13c3ff 100644
--- a/zy-asrs-wms/src/main/resources/application.yml
+++ b/zy-asrs-wms/src/main/resources/application.yml
@@ -44,3 +44,6 @@
super:
pwd: xltys1995
+
+wcs:
+ url: 127.0.0.1:9090/ncwcs
\ No newline at end of file
diff --git a/zy-asrs-wms/src/main/webapp/static/js/stoMan/stoQue.js b/zy-asrs-wms/src/main/webapp/static/js/stoMan/stoQue.js
index 83b1da3..6daaf54 100644
--- a/zy-asrs-wms/src/main/webapp/static/js/stoMan/stoQue.js
+++ b/zy-asrs-wms/src/main/webapp/static/js/stoMan/stoQue.js
@@ -41,7 +41,7 @@
},width:80}
,{field: 'modiUser$', align: 'center',title: '淇敼浜哄憳'}
,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿', width: 180}
- ,{ fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate'}
+ ,{ fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width: 300}
]],
request: {
pageName: 'curr',
@@ -166,6 +166,43 @@
}
locDetlToLayer(data.locNo);
break;
+ // 鏌ョ湅鍥剧墖
+ case 'showPic':
+ let imgHtml = '<div style="height:100%;display: flex;justify-content: space-around;align-items: center;">';
+ $.ajax({
+ url: baseUrl+"/locMast/picUrl",
+ headers: {'token': localStorage.getItem('token')},
+ data: {
+ locNo: data.locNo
+ },
+ method: 'GET',
+ traditional:true,
+ success: function (res) {
+ if (res.code === 200){
+ res.data.forEach((item) => {
+ let tmp = '<img width="600" src="' + item + '" />\'';
+ imgHtml += tmp;
+ })
+ imgHtml += "</div>";
+
+ layer.open({
+ type: 1,
+ title: '鏌ョ湅鍥剧墖',
+ area: [top.detailWidth, top.detailHeight],
+ shadeClose: true,
+ content: imgHtml,
+ success: function(layero, index){
+ }
+ });
+
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ } else {
+ layer.msg(res.msg)
+ }
+ }
+ });
+ break;
}
});
diff --git a/zy-asrs-wms/src/main/webapp/views/stoMan/stoQue.html b/zy-asrs-wms/src/main/webapp/views/stoMan/stoQue.html
index fceb315..01d21df 100644
--- a/zy-asrs-wms/src/main/webapp/views/stoMan/stoQue.html
+++ b/zy-asrs-wms/src/main/webapp/views/stoMan/stoQue.html
@@ -65,6 +65,7 @@
<script type="text/html" id="operate">
<a class="layui-btn layui-btn-xs loc-detl" lay-event="locDetl">鏌ョ湅鏄庣粏</a>
+ <a class="layui-btn layui-btn-xs loc-detl" lay-event="showPic">鏌ョ湅鍥剧墖</a>
</script>
<!--鏄庣粏琛�-->
--
Gitblit v1.9.1