From 2b72251421b15984711107e6aa061a36562d9d87 Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期一, 24 十一月 2025 13:59:47 +0800
Subject: [PATCH] #pda接口
---
src/main/java/com/zy/asrs/mapper/BasAgvLocNoMapper.java | 12
src/main/java/com/zy/asrs/entity/BasAgvLocNo.java | 80 +++++
src/main/java/com/zy/asrs/entity/param/AgvLocListDetlParam.java | 12
src/main/java/com/zy/asrs/controller/OpenController.java | 60 +++
src/main/java/com/zy/asrs/entity/param/AgvBindCtnrAndBinParam.java | 28 +
src/main/java/com/zy/asrs/entity/param/AgvLocListParam.java | 11
src/main/webapp/static/js/basAgvLocNo/basAgvLocNo.js | 256 ++++++++++++++++
src/main/webapp/views/basAgvLocNo/basAgvLocNo.html | 122 +++++++
src/main/java/com/zy/asrs/service/OpenService.java | 3
src/main/java/com/zy/common/CodeBuilder.java | 2
src/main/java/com/zy/asrs/entity/param/bindCtnrAndBinParam.java | 11
src/main/java/com/zy/asrs/service/impl/BasAgvLocNoServiceImpl.java | 12
src/main/java/com/zy/asrs/entity/LocDetl.java | 12
src/main/java/com/zy/asrs/service/BasAgvLocNoService.java | 8
src/main/java/com/zy/asrs/controller/BasAgvLocNoController.java | 125 +++++++
src/main/java/com/zy/asrs/entity/param/TaskAgvCreateParam.java | 12
src/main/java/basAgvLocNo.sql | 18 +
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 127 +++++++
src/main/resources/mapper/BasAgvLocNoMapper.xml | 17 +
19 files changed, 920 insertions(+), 8 deletions(-)
diff --git a/src/main/java/basAgvLocNo.sql b/src/main/java/basAgvLocNo.sql
new file mode 100644
index 0000000..6a808ae
--- /dev/null
+++ b/src/main/java/basAgvLocNo.sql
@@ -0,0 +1,18 @@
+-- save basAgvLocNo record
+-- mysql
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'basAgvLocNo/basAgvLocNo.html', 'basAgvLocNo绠＄悊', null , '2', null , '1');
+
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'basAgvLocNo#view', '鏌ヨ', '', '3', '0', '1');
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'basAgvLocNo#btn-add', '鏂板', '', '3', '1', '1');
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'basAgvLocNo#btn-edit', '缂栬緫', '', '3', '2', '1');
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'basAgvLocNo#btn-delete', '鍒犻櫎', '', '3', '3', '1');
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'basAgvLocNo#btn-export', '瀵煎嚭', '', '3', '4', '1');
+
+-- sqlserver
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basAgvLocNo/basAgvLocNo.html', N'basAgvLocNo绠＄悊', null, '2', null, '1');
+
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basAgvLocNo#view', N'鏌ヨ', '', '3', '0', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basAgvLocNo#btn-add', N'鏂板', '', '3', '1', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basAgvLocNo#btn-edit', N'缂栬緫', '', '3', '2', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basAgvLocNo#btn-delete', N'鍒犻櫎', '', '3', '3', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basAgvLocNo#btn-export', N'瀵煎嚭', '', '3', '4', '1');
diff --git a/src/main/java/com/zy/asrs/controller/BasAgvLocNoController.java b/src/main/java/com/zy/asrs/controller/BasAgvLocNoController.java
new file mode 100644
index 0000000..25071f3
--- /dev/null
+++ b/src/main/java/com/zy/asrs/controller/BasAgvLocNoController.java
@@ -0,0 +1,125 @@
+package com.zy.asrs.controller;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.mapper.Wrapper;
+import com.baomidou.mybatisplus.plugins.Page;
+import com.core.common.DateUtils;
+import com.zy.asrs.entity.BasAgvLocNo;
+import com.zy.asrs.service.BasAgvLocNoService;
+import com.core.annotations.ManagerAuth;
+import com.core.common.BaseRes;
+import com.core.common.Cools;
+import com.core.common.R;
+import com.zy.common.web.BaseController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.*;
+
+@RestController
+public class BasAgvLocNoController extends BaseController {
+
+ @Autowired
+ private BasAgvLocNoService basAgvLocNoService;
+
+ @RequestMapping(value = "/basAgvLocNo/{id}/auth")
+ @ManagerAuth
+ public R get(@PathVariable("id") String id) {
+ return R.ok(basAgvLocNoService.selectById(String.valueOf(id)));
+ }
+
+ @RequestMapping(value = "/basAgvLocNo/list/auth")
+ @ManagerAuth
+ public R list(@RequestParam(defaultValue = "1")Integer curr,
+ @RequestParam(defaultValue = "10")Integer limit,
+ @RequestParam(required = false)String orderByField,
+ @RequestParam(required = false)String orderByType,
+ @RequestParam(required = false)String condition,
+ @RequestParam Map<String, Object> param){
+ EntityWrapper<BasAgvLocNo> wrapper = new EntityWrapper<>();
+ excludeTrash(param);
+ convert(param, wrapper);
+ allLike(BasAgvLocNo.class, param.keySet(), wrapper, condition);
+ if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ return R.ok(basAgvLocNoService.selectPage(new Page<>(curr, limit), wrapper));
+ }
+
+ private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
+ for (Map.Entry<String, Object> entry : map.entrySet()){
+ 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 {
+ wrapper.like(entry.getKey(), val);
+ }
+ }
+ }
+
+ @RequestMapping(value = "/basAgvLocNo/add/auth")
+ @ManagerAuth
+ public R add(BasAgvLocNo basAgvLocNo) {
+ basAgvLocNoService.insert(basAgvLocNo);
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/basAgvLocNo/update/auth")
+ @ManagerAuth
+ public R update(BasAgvLocNo basAgvLocNo){
+ if (Cools.isEmpty(basAgvLocNo) || null==basAgvLocNo.getId()){
+ return R.error();
+ }
+ basAgvLocNoService.updateById(basAgvLocNo);
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/basAgvLocNo/delete/auth")
+ @ManagerAuth
+ public R delete(@RequestParam(value="ids[]") Long[] ids){
+ for (Long id : ids){
+ basAgvLocNoService.deleteById(id);
+ }
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/basAgvLocNo/export/auth")
+ @ManagerAuth
+ public R export(@RequestBody JSONObject param){
+ EntityWrapper<BasAgvLocNo> wrapper = new EntityWrapper<>();
+ List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
+ Map<String, Object> map = excludeTrash(param.getJSONObject("basAgvLocNo"));
+ convert(map, wrapper);
+ List<BasAgvLocNo> list = basAgvLocNoService.selectList(wrapper);
+ return R.ok(exportSupport(list, fields));
+ }
+
+ @RequestMapping(value = "/basAgvLocNoQuery/auth")
+ @ManagerAuth
+ public R query(String condition) {
+ EntityWrapper<BasAgvLocNo> wrapper = new EntityWrapper<>();
+ wrapper.like("id", condition);
+ Page<BasAgvLocNo> page = basAgvLocNoService.selectPage(new Page<>(0, 10), wrapper);
+ List<Map<String, Object>> result = new ArrayList<>();
+ for (BasAgvLocNo basAgvLocNo : page.getRecords()){
+ Map<String, Object> map = new HashMap<>();
+ map.put("id", basAgvLocNo.getId());
+ map.put("value", basAgvLocNo.getId());
+ result.add(map);
+ }
+ return R.ok(result);
+ }
+
+ @RequestMapping(value = "/basAgvLocNo/check/column/auth")
+ @ManagerAuth
+ public R query(@RequestBody JSONObject param) {
+ Wrapper<BasAgvLocNo> wrapper = new EntityWrapper<BasAgvLocNo>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
+ if (null != basAgvLocNoService.selectOne(wrapper)){
+ return R.parse(BaseRes.REPEAT).add(getComment(BasAgvLocNo.class, String.valueOf(param.get("key"))));
+ }
+ return R.ok();
+ }
+
+}
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 25f2539..e378cb2 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -412,7 +412,7 @@
* AGV涓婃姤鎺ユ敹
*/
@PostMapping("/agv/task/v1/agvCallback")
- @AppAuth(memo = "AGV涓婃姤鎺ユ敹")
+// @AppAuth(memo = "AGV涓婃姤鎺ユ敹")
public synchronized R TaskAgvReport(@RequestHeader(required = false) String appkey,
@RequestBody TaskAgvReportParam param,
HttpServletRequest request) {
@@ -436,4 +436,62 @@
return R.error("浠诲姟鍙蜂笉瀛樺湪");
}
+ /**
+ * PDA鍒涘缓AGV浠诲姟
+ */
+ @PostMapping("/agv/task/v1/createTask")
+ @AppAuth(memo = "PDA鍒涘缓AGV浠诲姟")
+ public synchronized R TaskAgvCreate(@RequestHeader(required = false) String appkey,
+ @RequestBody TaskAgvCreateParam param,
+ HttpServletRequest request) {
+ auth(appkey, param, request);
+ if (Cools.isEmpty(param)) {
+ return R.parse(BaseRes.PARAM);
+ }
+ boolean taskAgvCreate = openService.taskAgvCreate(param);
+ if (taskAgvCreate){
+ return R.ok();
+ }
+ return R.error("浠诲姟鍙蜂笉瀛樺湪");
+ }
+
+ /**
+ * PDA鑾峰彇AGV搴撲綅
+ */
+ @PostMapping("/agv/loc/v1/getLocList")
+ @AppAuth(memo = "PDA妫�绱GV搴撲綅")
+ public synchronized R GetAgvLocList(@RequestHeader(required = false) String appkey,
+ @RequestBody AgvLocListParam param,
+ HttpServletRequest request) {
+ auth(appkey, param, request);
+
+ if (Cools.isEmpty(param)) {
+ return R.parse(BaseRes.PARAM);
+ }
+ List<AgvLocListDetlParam> list = openService.getAgvLocList(param);
+ if (!list.isEmpty()) {
+ return R.ok(list);
+ }
+ return R.error("搴撲綅涓嶅瓨鍦ㄦ垨鏃犳槑缁�");
+ }
+
+ /**
+ * PDA缁戝畾瑙ｇ粦
+ */
+ @PostMapping("/agv/bindCtnrAndBin/v1")
+ @AppAuth(memo = "PDA缁戝畾涓庤В缁�")
+ public synchronized R bindCtnrAndBin(@RequestHeader(required = false) String appkey,
+ @RequestBody bindCtnrAndBinParam param,
+ HttpServletRequest request) {
+ auth(appkey, param, request);
+ if (Cools.isEmpty(param)) {
+ return R.parse(BaseRes.PARAM);
+ }
+ boolean bindCtnrAndBin = openService.bindCtnrAndBin(param);
+ if (bindCtnrAndBin) {
+ return R.ok();
+ }
+ return R.error("搴撲綅涓嶅瓨鍦ㄦ垨鏃犳槑缁�");
+ }
+
}
diff --git a/src/main/java/com/zy/asrs/entity/BasAgvLocNo.java b/src/main/java/com/zy/asrs/entity/BasAgvLocNo.java
new file mode 100644
index 0000000..3512d19
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/BasAgvLocNo.java
@@ -0,0 +1,80 @@
+package com.zy.asrs.entity;
+
+import com.core.common.Cools;import com.baomidou.mybatisplus.annotations.TableField;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import com.baomidou.mybatisplus.annotations.TableName;
+import java.io.Serializable;
+
+@Data
+@TableName("asr_bas_agv_loc_no")
+public class BasAgvLocNo implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * ID
+ */
+ @ApiModelProperty(value= "ID")
+ private Long id;
+
+ /**
+ * agv搴撲綅缂栧彿
+ */
+ @ApiModelProperty(value= "agv搴撲綅缂栧彿")
+ @TableField("agv_loc_no")
+ private String agvLocNo;
+
+ @ApiModelProperty(value= "")
+ @TableField("sta_no")
+ private Integer staNo;
+
+ @ApiModelProperty(value= "")
+ @TableField("loc_no")
+ private String locNo;
+
+ @ApiModelProperty(value= "")
+ private Integer status;
+
+ @ApiModelProperty(value= "")
+ @TableField("io_type")
+ private String ioType;
+
+ @ApiModelProperty(value= "")
+ @TableField("appe_time")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date appeTime;
+
+ public BasAgvLocNo() {}
+
+ public BasAgvLocNo(String agvLocNo,Integer staNo,String locNo,Integer status,String ioType,Date appeTime) {
+ this.agvLocNo = agvLocNo;
+ this.staNo = staNo;
+ this.locNo = locNo;
+ this.status = status;
+ this.ioType = ioType;
+ this.appeTime = appeTime;
+ }
+
+// BasAgvLocNo basAgvLocNo = new BasAgvLocNo(
+// null, // agv搴撲綅缂栧彿
+// null, //
+// null, //
+// null, //
+// null, //
+// null //
+// );
+
+ public String getAppeTime$(){
+ if (Cools.isEmpty(this.appeTime)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
+ }
+
+
+}
diff --git a/src/main/java/com/zy/asrs/entity/LocDetl.java b/src/main/java/com/zy/asrs/entity/LocDetl.java
index 356f4a4..77bdfcb 100644
--- a/src/main/java/com/zy/asrs/entity/LocDetl.java
+++ b/src/main/java/com/zy/asrs/entity/LocDetl.java
@@ -169,21 +169,21 @@
private Integer owner;
/**
- * 澶囩敤1
+ * 澶囩敤1(PO)
*/
- @ApiModelProperty(value= "澶囩敤1")
+ @ApiModelProperty(value= "澶囩敤1")//PO
private String standby1 = "1";
/**
- * 澶囩敤2
+ * 澶囩敤2(UPC)
*/
- @ApiModelProperty(value= "澶囩敤2")
+ @ApiModelProperty(value= "澶囩敤2")//UPC
private String standby2 = "1";
/**
- * 澶囩敤3
+ * 澶囩敤3(SKU)
*/
- @ApiModelProperty(value= "澶囩敤3")
+ @ApiModelProperty(value= "澶囩敤3")//SKU
private String standby3 = "1";
/**
diff --git a/src/main/java/com/zy/asrs/entity/param/AgvBindCtnrAndBinParam.java b/src/main/java/com/zy/asrs/entity/param/AgvBindCtnrAndBinParam.java
new file mode 100644
index 0000000..510d056
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/param/AgvBindCtnrAndBinParam.java
@@ -0,0 +1,28 @@
+package com.zy.asrs.entity.param;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.core.common.SnowflakeIdWorker;
+import com.core.common.SpringUtils;
+import com.zy.asrs.entity.BasAgvLocNo;
+import com.zy.asrs.entity.BasAgvMast;
+import com.zy.asrs.service.BasAgvLocNoService;
+import lombok.Data;
+
+import java.util.ArrayList;
+
+/*
+ * Created by Monkey D. Luffy on 2025.09.09
+ * */
+@Data
+public class AgvBindCtnrAndBinParam {
+
+ private String reqCode;
+ private String reqTime;
+ private String clientCode;
+ private String tokenCode;
+ private String ctnrCode;
+ private String ctnrTyp;
+ private String stgBinCode;
+ private String positionCode;
+ private String indBind;
+
+}
diff --git a/src/main/java/com/zy/asrs/entity/param/AgvLocListDetlParam.java b/src/main/java/com/zy/asrs/entity/param/AgvLocListDetlParam.java
new file mode 100644
index 0000000..bfda81e
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/param/AgvLocListDetlParam.java
@@ -0,0 +1,12 @@
+package com.zy.asrs.entity.param;
+
+import com.zy.asrs.entity.LocDetl;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class AgvLocListDetlParam {
+ String locNo; //搴撲綅鍙�
+ private List<LocDetl> agvDetlList; //鏄庣粏
+}
diff --git a/src/main/java/com/zy/asrs/entity/param/AgvLocListParam.java b/src/main/java/com/zy/asrs/entity/param/AgvLocListParam.java
new file mode 100644
index 0000000..0bd7885
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/param/AgvLocListParam.java
@@ -0,0 +1,11 @@
+package com.zy.asrs.entity.param;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class AgvLocListParam {
+ private List<String> locNoList; // 闇�瑕佹煡璇㈢殑 AGV 搴撲綅
+ String locSys; //搴撲綅鐘舵��
+}
diff --git a/src/main/java/com/zy/asrs/entity/param/TaskAgvCreateParam.java b/src/main/java/com/zy/asrs/entity/param/TaskAgvCreateParam.java
new file mode 100644
index 0000000..a04c614
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/param/TaskAgvCreateParam.java
@@ -0,0 +1,12 @@
+package com.zy.asrs.entity.param;
+
+import lombok.Data;
+
+@Data
+public class TaskAgvCreateParam {
+ Integer sourceStaNo; //婧愮珯鐐�
+ Integer staNo; //鐩爣绔欑偣
+ String sourceLocNo; //鍘熷簱浣�
+ String locNo; //鐩爣搴撲綅
+ Integer ioType; //浠诲姟绫诲瀷
+}
diff --git a/src/main/java/com/zy/asrs/entity/param/bindCtnrAndBinParam.java b/src/main/java/com/zy/asrs/entity/param/bindCtnrAndBinParam.java
new file mode 100644
index 0000000..52a9786
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/param/bindCtnrAndBinParam.java
@@ -0,0 +1,11 @@
+package com.zy.asrs.entity.param;
+
+import lombok.Data;
+
+@Data
+public class bindCtnrAndBinParam {
+ String barcode; //鎵樼洏鏉＄爜
+ String staNo; // 鐩爣绔欑偣
+ String locNo; // 鐩爣搴撲綅
+ String indBind; // 0:瑙ｇ粦 1锛氱粦瀹�
+}
diff --git a/src/main/java/com/zy/asrs/mapper/BasAgvLocNoMapper.java b/src/main/java/com/zy/asrs/mapper/BasAgvLocNoMapper.java
new file mode 100644
index 0000000..58277b5
--- /dev/null
+++ b/src/main/java/com/zy/asrs/mapper/BasAgvLocNoMapper.java
@@ -0,0 +1,12 @@
+package com.zy.asrs.mapper;
+
+import com.zy.asrs.entity.BasAgvLocNo;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+@Mapper
+@Repository
+public interface BasAgvLocNoMapper extends BaseMapper<BasAgvLocNo> {
+
+}
diff --git a/src/main/java/com/zy/asrs/service/BasAgvLocNoService.java b/src/main/java/com/zy/asrs/service/BasAgvLocNoService.java
new file mode 100644
index 0000000..fc6cbb9
--- /dev/null
+++ b/src/main/java/com/zy/asrs/service/BasAgvLocNoService.java
@@ -0,0 +1,8 @@
+package com.zy.asrs.service;
+
+import com.zy.asrs.entity.BasAgvLocNo;
+import com.baomidou.mybatisplus.service.IService;
+
+public interface BasAgvLocNoService extends IService<BasAgvLocNo> {
+
+}
diff --git a/src/main/java/com/zy/asrs/service/OpenService.java b/src/main/java/com/zy/asrs/service/OpenService.java
index 8083759..a9d8ee9 100644
--- a/src/main/java/com/zy/asrs/service/OpenService.java
+++ b/src/main/java/com/zy/asrs/service/OpenService.java
@@ -50,4 +50,7 @@
void taskArmWorkOrderStatus(OrderArmEndParam param);
boolean TaskArmWorkOrderSign(OrderArmEndParam param);
boolean TaskAgvReport(TaskAgvReportParam param);
+ boolean taskAgvCreate(TaskAgvCreateParam param);
+ List<AgvLocListDetlParam> getAgvLocList(AgvLocListParam param);
+ boolean bindCtnrAndBin(bindCtnrAndBinParam param);
}
diff --git a/src/main/java/com/zy/asrs/service/impl/BasAgvLocNoServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/BasAgvLocNoServiceImpl.java
new file mode 100644
index 0000000..9b3ff91
--- /dev/null
+++ b/src/main/java/com/zy/asrs/service/impl/BasAgvLocNoServiceImpl.java
@@ -0,0 +1,12 @@
+package com.zy.asrs.service.impl;
+
+import com.zy.asrs.mapper.BasAgvLocNoMapper;
+import com.zy.asrs.entity.BasAgvLocNo;
+import com.zy.asrs.service.BasAgvLocNoService;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+@Service("basAgvLocNoService")
+public class BasAgvLocNoServiceImpl extends ServiceImpl<BasAgvLocNoMapper, BasAgvLocNo> implements BasAgvLocNoService {
+
+}
diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index efaabed..7e40f99 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -1,10 +1,12 @@
package com.zy.asrs.service.impl;
import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.SnowflakeIdWorker;
+import com.core.common.SpringUtils;
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.*;
@@ -16,6 +18,8 @@
import com.zy.asrs.utils.OrderInAndOutUtil;
import com.zy.asrs.utils.Utils;
import com.zy.common.model.DetlDto;
+import com.zy.common.service.CommonService;
+import com.zy.common.utils.HttpHandler;
import com.zy.common.utils.NodeUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -62,6 +66,8 @@
private BasAgvMastService basAgvMastService;
@Autowired
private LocOwnerService locOwnerService;
+ @Autowired
+ private CommonService commonService;
@Override
@Transactional
@@ -777,5 +783,126 @@
return true;
}
+ @Override
+ @Transactional
+ public boolean taskAgvCreate(TaskAgvCreateParam param) {
+ // 鍙傛暟妫�鏌�
+ if (param == null) {
+ throw new CoolException("鍙傛暟涓嶈兘涓虹┖");
+ }
+ Integer devpId = 1;
+ // 鍒涘缓瀵硅薄锛堟瀯閫犲嚱鏁颁腑宸茬敓鎴� timestamp锛�
+ BasAgvMast basAgvMast = new BasAgvMast();
+ // 鐢熸垚 WMS 浠诲姟鍙凤紙濡傛棤澶栭儴浼犲叆锛屽彲浠ヤ娇鐢ㄩ洩鑺盜D 鎴栬嚜澧烇級
+ basAgvMast.setTaskNo(commonService.getWorkNo(0));
+ // 璧嬪�煎弬鏁�
+ basAgvMast.setSourceStaNo(param.getSourceStaNo());
+ basAgvMast.setStaNo(param.getStaNo());
+ basAgvMast.setSourceLocNo(param.getSourceLocNo());
+ basAgvMast.setLocNo(param.getLocNo());
+ // 榛樿鍊�
+ basAgvMast.setPriority(1L); // 榛樿浼樺厛绾�
+ basAgvMast.setStatus(0); // 鍒濆鐘舵��
+ basAgvMast.setAppeTime(new Date()); // 娣诲姞鏃堕棿
+ basAgvMast.setModiTime(new Date()); // 淇敼鏃堕棿
+ basAgvMast.setIoType(param.getIoType());// 浠诲姟绫诲瀷
+ basAgvMast.setDevpId(devpId);
+
+ // 鎻掑叆鏁版嵁搴�
+ basAgvMastService.insert(basAgvMast);
+
+ return true;
+ }
+
+ @Override
+ @Transactional
+ public List<AgvLocListDetlParam> getAgvLocList(AgvLocListParam param){
+
+ if (param == null || Cools.isEmpty(param.getLocNoList())) {
+ throw new CoolException("搴撲綅鍙蜂笉鑳戒负绌�");
+ }
+
+ List<String> locNos = param.getLocNoList();
+
+ List<AgvLocListDetlParam> result = new ArrayList<>();
+
+ for (String locNo : locNos) {
+
+ // 鏌ヨ璇ュ簱浣� detail
+ List<LocDetl> detlList = locDetlService.selectList(
+ new EntityWrapper<LocDetl>().eq("loc_no", locNo)
+ );
+
+ AgvLocListDetlParam dto = new AgvLocListDetlParam();
+ dto.setLocNo(locNo);
+ dto.setAgvDetlList(detlList);
+ result.add(dto);
+ }
+
+ return result;
+ }
+
+
+ @Override
+ @Transactional
+ public boolean bindCtnrAndBin(bindCtnrAndBinParam param) {
+ // 鍙傛暟妫�鏌�
+ if (param == null) {
+ throw new CoolException("鍙傛暟涓嶈兘涓虹┖");
+ }
+ AgvBindCtnrAndBinParam agvBindCtnrAndBinParam = new AgvBindCtnrAndBinParam();
+ BasAgvLocNoService basAgvLocNoService = SpringUtils.getBean(BasAgvLocNoService.class);
+ BasAgvLocNo basAgvLocNoSou = basAgvLocNoService.selectOne(new EntityWrapper<BasAgvLocNo>().eq("loc_no", param.getLocNo()));
+ BasAgvLocNo basAgvLocNoEnd = basAgvLocNoService.selectOne(new EntityWrapper<BasAgvLocNo>().eq("sta_no", param.getStaNo()));
+ agvBindCtnrAndBinParam.setReqCode(String.valueOf(System.currentTimeMillis()));
+ agvBindCtnrAndBinParam.setCtnrCode(param.getBarcode());
+ agvBindCtnrAndBinParam.setCtnrTyp("1");
+ agvBindCtnrAndBinParam.setPositionCode(
+ basAgvLocNoSou != null && basAgvLocNoSou.getAgvLocNo() != null
+ ? basAgvLocNoSou.getAgvLocNo()
+ : ""
+ );
+ agvBindCtnrAndBinParam.setStgBinCode(
+ basAgvLocNoEnd != null && basAgvLocNoEnd.getAgvLocNo() != null
+ ? basAgvLocNoEnd.getAgvLocNo()
+ : ""
+ );
+ agvBindCtnrAndBinParam.setIndBind(param.getIndBind());
+ try {
+ String URL = "http://10.10.10.200:8181/rcms/services/rest/hikRpcService"; // AGV鎺ュ彛鍦板潃
+ String mesPath = "bindCtnrAndBin"; // 鎺ュ彛璺緞
+ String response = "";
+ boolean success = false;
+
+ try {
+ log.info("AGV缁戝畾瀹瑰櫒鎺ュ彛璇锋眰鍙傛暟: {}", JSON.toJSONString(agvBindCtnrAndBinParam));
+
+ response = new HttpHandler.Builder()
+ .setUri(URL)
+ .setPath(mesPath)
+ .setJson(JSON.toJSONString(agvBindCtnrAndBinParam))
+ .build()
+ .doPost();
+
+ log.info("AGV缁戝畾瀹瑰櫒鎺ュ彛鍝嶅簲: {}", response);
+ JSONObject jsonObject = JSON.parseObject(response);
+
+ if (jsonObject.getInteger("code") != null && jsonObject.getInteger("code").equals(0)) {
+ success = true;
+ } else {
+ log.error("AGV缁戝畾瀹瑰櫒澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", URL + "/" + mesPath, JSON.toJSONString(agvBindCtnrAndBinParam), response);
+ throw new CoolException("AGV缁戝畾瀹瑰櫒澶辫触: " + jsonObject.getString("msg"));
+ }
+ } catch (Exception e) {
+ log.error("AGV缁戝畾瀹瑰櫒鎺ュ彛璋冪敤寮傚父锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", URL + "/" + mesPath, JSON.toJSONString(agvBindCtnrAndBinParam), response, e);
+ throw new CoolException("AGV缁戝畾瀹瑰櫒鎺ュ彛璋冪敤寮傚父: " + e.getMessage());
+ }
+ } catch (Exception e) {
+ throw new CoolException(e.getMessage());
+ }
+ return true;
+ }
+
+
}
diff --git a/src/main/java/com/zy/common/CodeBuilder.java b/src/main/java/com/zy/common/CodeBuilder.java
index bcf969f..a13b6e7 100644
--- a/src/main/java/com/zy/common/CodeBuilder.java
+++ b/src/main/java/com/zy/common/CodeBuilder.java
@@ -20,7 +20,7 @@
generator.url="10.10.10.235:1433;databasename=jshdasrs";
generator.username="sa";
generator.password="sa@123";
- generator.table="bas_loc_supp";
+ generator.table="asr_bas_agv_loc_no";
generator.packagePath="com.zy.asrs";
generator.build();
}
diff --git a/src/main/resources/mapper/BasAgvLocNoMapper.xml b/src/main/resources/mapper/BasAgvLocNoMapper.xml
new file mode 100644
index 0000000..729926d
--- /dev/null
+++ b/src/main/resources/mapper/BasAgvLocNoMapper.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.zy.asrs.mapper.BasAgvLocNoMapper">
+
+ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+ <resultMap id="BaseResultMap" type="com.zy.asrs.entity.BasAgvLocNo">
+ <id column="id" property="id" />
+ <result column="agv_loc_no" property="agvLocNo" />
+ <result column="sta_no" property="staNo" />
+ <result column="loc_no" property="locNo" />
+ <result column="status" property="status" />
+ <result column="io_type" property="ioType" />
+ <result column="appe_time" property="appeTime" />
+
+ </resultMap>
+
+</mapper>
diff --git a/src/main/webapp/static/js/basAgvLocNo/basAgvLocNo.js b/src/main/webapp/static/js/basAgvLocNo/basAgvLocNo.js
new file mode 100644
index 0000000..7bfef62
--- /dev/null
+++ b/src/main/webapp/static/js/basAgvLocNo/basAgvLocNo.js
@@ -0,0 +1,256 @@
+var pageCurr;
+layui.config({
+ base: baseUrl + "/static/layui/lay/modules/"
+}).use(['table','laydate', 'form', 'admin'], function(){
+ var table = layui.table;
+ var $ = layui.jquery;
+ var layer = layui.layer;
+ var layDate = layui.laydate;
+ var form = layui.form;
+ var admin = layui.admin;
+
+ // 鏁版嵁娓叉煋
+ tableIns = table.render({
+ elem: '#basAgvLocNo',
+ headers: {token: localStorage.getItem('token')},
+ url: baseUrl+'/basAgvLocNo/list/auth',
+ page: true,
+ limit: 15,
+ limits: [15, 30, 50, 100, 200, 500],
+ toolbar: '#toolbar',
+ cellMinWidth: 50,
+ height: 'full-120',
+ cols: [[
+ {type: 'checkbox'}
+ ,{field: 'id', align: 'center',title: 'ID'}
+ ,{field: 'agvLocNo', align: 'center',title: 'agv搴撲綅缂栧彿'}
+ ,{field: 'staNo', align: 'center',title: ''}
+ ,{field: 'locNo', align: 'center',title: ''}
+ ,{field: 'status', align: 'center',title: ''}
+ ,{field: 'ioType', align: 'center',title: ''}
+ ,{field: 'appeTime$', align: 'center',title: ''}
+
+ ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:120}
+ ]],
+ request: {
+ pageName: 'curr',
+ pageSize: 'limit'
+ },
+ parseData: function (res) {
+ return {
+ 'code': res.code,
+ 'msg': res.msg,
+ 'count': res.data.total,
+ 'data': res.data.records
+ }
+ },
+ response: {
+ statusCode: 200
+ },
+ done: function(res, curr, count) {
+ if (res.code === 403) {
+ top.location.href = baseUrl+"/";
+ }
+ pageCurr=curr;
+ limit();
+ }
+ });
+
+ // 鐩戝惉鎺掑簭浜嬩欢
+ table.on('sort(basAgvLocNo)', function (obj) {
+ var searchData = {};
+ $.each($('#search-box [name]').serializeArray(), function() {
+ searchData[this.name] = this.value;
+ });
+ searchData['orderByField'] = obj.field;
+ searchData['orderByType'] = obj.type;
+ tableIns.reload({
+ where: searchData,
+ page: {curr: 1}
+ });
+ });
+
+ // 鐩戝惉澶村伐鍏锋爮浜嬩欢
+ table.on('toolbar(basAgvLocNo)', function (obj) {
+ var checkStatus = table.checkStatus(obj.config.id).data;
+ switch(obj.event) {
+ case 'addData':
+ showEditModel();
+ break;
+ case 'deleteData':
+ if (checkStatus.length === 0) {
+ layer.msg('璇烽�夋嫨瑕佸垹闄ょ殑鏁版嵁', {icon: 2});
+ return;
+ }
+ del(checkStatus.map(function (d) {
+ return d.id;
+ }));
+ break;
+ case 'exportData':
+ admin.confirm('纭畾瀵煎嚭Excel鍚�', {shadeClose: true}, function(){
+ var titles=[];
+ var fields=[];
+ obj.config.cols[0].map(function (col) {
+ if (col.type === 'normal' && col.hide === false && col.toolbar == null) {
+ titles.push(col.title);
+ fields.push(col.field);
+ }
+ });
+ var exportData = {};
+ $.each($('#search-box [name]').serializeArray(), function() {
+ exportData[this.name] = this.value;
+ });
+ var param = {
+ 'basAgvLocNo': exportData,
+ 'fields': fields
+ };
+ $.ajax({
+ url: baseUrl+"/basAgvLocNo/export/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: JSON.stringify(param),
+ dataType:'json',
+ contentType:'application/json;charset=UTF-8',
+ method: 'POST',
+ success: function (res) {
+ layer.closeAll();
+ if (res.code === 200) {
+ table.exportFile(titles,res.data,'xls');
+ } else if (res.code === 403) {
+ top.location.href = baseUrl+"/";
+ } else {
+ layer.msg(res.msg, {icon: 2})
+ }
+ }
+ });
+ });
+ break;
+ }
+ });
+
+ // 鐩戝惉琛屽伐鍏蜂簨浠�
+ table.on('tool(basAgvLocNo)', function(obj){
+ var data = obj.data;
+ switch (obj.event) {
+ case 'edit':
+ showEditModel(data);
+ break;
+ case "del":
+ del([data.id]);
+ break;
+ }
+ });
+
+ /* 寮圭獥 - 鏂板銆佷慨鏀� */
+ function showEditModel(mData) {
+ admin.open({
+ type: 1,
+ area: '600px',
+ title: (mData ? '淇敼' : '娣诲姞') + '璁㈠崟鐘舵��',
+ content: $('#editDialog').html(),
+ success: function (layero, dIndex) {
+ layDateRender(mData);
+ form.val('detail', mData);
+ form.on('submit(editSubmit)', function (data) {
+ var loadIndex = layer.load(2);
+ $.ajax({
+ url: baseUrl+"/basAgvLocNo/"+(mData?'update':'add')+"/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: data.field,
+ method: 'POST',
+ success: function (res) {
+ layer.close(loadIndex);
+ if (res.code === 200){
+ layer.close(dIndex);
+ layer.msg(res.msg, {icon: 1});
+ tableReload();
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ }else {
+ layer.msg(res.msg, {icon: 2});
+ }
+ }
+ })
+ return false;
+ });
+ $(layero).children('.layui-layer-content').css('overflow', 'visible');
+ layui.form.render('select');
+ }
+ });
+ }
+
+ /* 鍒犻櫎 */
+ function del(ids) {
+ layer.confirm('纭畾瑕佸垹闄ら�変腑鏁版嵁鍚楋紵', {
+ skin: 'layui-layer-admin',
+ shade: .1
+ }, function (i) {
+ layer.close(i);
+ var loadIndex = layer.load(2);
+ $.ajax({
+ url: baseUrl+"/basAgvLocNo/delete/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: {ids: ids},
+ method: 'POST',
+ success: function (res) {
+ layer.close(loadIndex);
+ if (res.code === 200){
+ layer.msg(res.msg, {icon: 1});
+ tableReload();
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ } else {
+ layer.msg(res.msg, {icon: 2});
+ }
+ }
+ })
+ });
+ }
+
+ // 鎼滅储
+ form.on('submit(search)', function (data) {
+ pageCurr = 1;
+ tableReload(false);
+ });
+
+ // 閲嶇疆
+ form.on('submit(reset)', function (data) {
+ pageCurr = 1;
+ clearFormVal($('#search-box'));
+ tableReload(false);
+ });
+
+ // 鏃堕棿閫夋嫨鍣�
+ function layDateRender(data) {
+ setTimeout(function () {
+ layDate.render({
+ elem: '.layui-laydate-range'
+ ,type: 'datetime'
+ ,range: true
+ });
+ layDate.render({
+ elem: '#appeTime\\$',
+ type: 'datetime',
+ value: data!==undefined?data['appeTime\\$']:null
+ });
+
+ }, 300);
+ }
+ layDateRender();
+
+});
+
+// 鍏抽棴鍔ㄤ綔
+$(document).on('click','#data-detail-close', function () {
+ parent.layer.closeAll();
+});
+
+function tableReload(child) {
+ var searchData = {};
+ $.each($('#search-box [name]').serializeArray(), function() {
+ searchData[this.name] = this.value;
+ });
+ tableIns.reload({
+ where: searchData,
+ page: {curr: pageCurr}
+ });
+}
diff --git a/src/main/webapp/views/basAgvLocNo/basAgvLocNo.html b/src/main/webapp/views/basAgvLocNo/basAgvLocNo.html
new file mode 100644
index 0000000..4d4779a
--- /dev/null
+++ b/src/main/webapp/views/basAgvLocNo/basAgvLocNo.html
@@ -0,0 +1,122 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+ <meta charset="utf-8">
+ <title></title>
+ <meta name="renderer" content="webkit">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+ <link rel="stylesheet" href="../../static/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../static/css/admin.css?v=318" media="all">
+ <link rel="stylesheet" href="../../static/css/cool.css" media="all">
+</head>
+<body>
+
+<div class="layui-fluid">
+ <div class="layui-card">
+ <div class="layui-card-body">
+ <div class="layui-form toolbar" id="search-box">
+ <div class="layui-form-item">
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="id" placeholder="缂栧彿" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline" style="width: 300px">
+ <div class="layui-input-inline">
+ <input class="layui-input layui-laydate-range" name="create_time" type="text" placeholder="璧峰鏃堕棿 - 缁堟鏃堕棿" autocomplete="off" style="width: 300px">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="condition" placeholder="璇疯緭鍏�" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline"> 
+ <button class="layui-btn icon-btn" lay-filter="search" lay-submit>
+ <i class="layui-icon"></i>鎼滅储
+ </button>
+ <button class="layui-btn icon-btn" lay-filter="reset" lay-submit>
+ <i class="layui-icon"></i>閲嶇疆
+ </button>
+ </div>
+ </div>
+ </div>
+ <table class="layui-hide" id="basAgvLocNo" lay-filter="basAgvLocNo"></table>
+ </div>
+ </div>
+</div>
+
+<script type="text/html" id="toolbar">
+ <div class="layui-btn-container">
+ <button class="layui-btn layui-btn-sm" id="btn-add" lay-event="addData">鏂板</button>
+ <button class="layui-btn layui-btn-sm layui-btn-danger" id="btn-delete" lay-event="deleteData">鍒犻櫎</button>
+ <button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData" style="float: right">瀵煎嚭</button>
+ </div>
+</script>
+
+<script type="text/html" id="operate">
+ <a class="layui-btn layui-btn-primary layui-btn-xs btn-edit" lay-event="edit">淇敼</a>
+ <a class="layui-btn layui-btn-danger layui-btn-xs btn-edit" lay-event="del">鍒犻櫎</a>
+</script>
+
+<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
+<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/basAgvLocNo/basAgvLocNo.js" charset="utf-8"></script>
+</body>
+<!-- 琛ㄥ崟寮圭獥 -->
+<script type="text/html" id="editDialog">
+ <form id="detail" lay-filter="detail" class="layui-form admin-form model-form">
+ <input name="id" type="hidden">
+ <div class="layui-row">
+ <div class="layui-col-md12">
+ <div class="layui-form-item">
+ <label class="layui-form-label">agv搴撲綅缂栧彿: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="agvLocNo" placeholder="璇疯緭鍏gv搴撲綅缂栧彿">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="staNo" placeholder="璇疯緭鍏�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="locNo" placeholder="璇疯緭鍏�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="status" placeholder="璇疯緭鍏�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="ioType" placeholder="璇疯緭鍏�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="appeTime" id="appeTime$" placeholder="璇疯緭鍏�">
+ </div>
+ </div>
+
+ </div>
+ </div>
+ <hr class="layui-bg-gray">
+ <div class="layui-form-item text-right">
+ <button class="layui-btn" lay-filter="editSubmit" lay-submit="">淇濆瓨</button>
+ <button class="layui-btn layui-btn-primary" type="button" ew-event="closeDialog">鍙栨秷</button>
+ </div>
+ </form>
+</script>
+</html>
+
--
Gitblit v1.9.1