From 02d21f6176ac8d54f7ba121bf42821a405be40f2 Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期四, 23 十月 2025 16:45:21 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/BasAgvMastServiceImpl.java | 12
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 495 +++++++++++++++------
src/main/webapp/views/basAgvMast/basAgvMast.html | 181 ++++++++
src/main/resources/mapper/WrkMastMapper.xml | 2
src/main/resources/mapper/BasAgvMastMapper.xml | 27 +
src/main/java/com/zy/asrs/entity/BasAgvMast.java | 192 ++++++++
src/main/java/com/zy/common/CodeBuilder.java | 2
src/main/java/com/zy/asrs/mapper/BasAgvMastMapper.java | 12
src/main/java/com/zy/asrs/controller/BasAgvMastController.java | 9
src/main/java/basAgvMast.sql | 18
src/main/java/com/zy/common/constant/AgvConstant.java | 15
src/main/java/com/zy/asrs/entity/param/AgvTaskAssignmentParam.java | 22 +
src/main/java/com/zy/core/MainProcess.java | 24 +
src/main/java/com/zy/asrs/service/BasAgvMastService.java | 8
src/main/webapp/static/js/basAgvMast/basAgvMast.js | 274 ++++++++++++
15 files changed, 1,140 insertions(+), 153 deletions(-)
diff --git a/src/main/java/basAgvMast.sql b/src/main/java/basAgvMast.sql
new file mode 100644
index 0000000..d4013cc
--- /dev/null
+++ b/src/main/java/basAgvMast.sql
@@ -0,0 +1,18 @@
+-- save basAgvMast record
+-- mysql
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'basAgvMast/basAgvMast.html', 'basAgvMast绠＄悊', null , '2', null , '1');
+
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'basAgvMast#view', '鏌ヨ', '', '3', '0', '1');
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'basAgvMast#btn-add', '鏂板', '', '3', '1', '1');
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'basAgvMast#btn-edit', '缂栬緫', '', '3', '2', '1');
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'basAgvMast#btn-delete', '鍒犻櫎', '', '3', '3', '1');
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'basAgvMast#btn-export', '瀵煎嚭', '', '3', '4', '1');
+
+-- sqlserver
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basAgvMast/basAgvMast.html', N'basAgvMast绠＄悊', null, '2', null, '1');
+
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basAgvMast#view', N'鏌ヨ', '', '3', '0', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basAgvMast#btn-add', N'鏂板', '', '3', '1', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basAgvMast#btn-edit', N'缂栬緫', '', '3', '2', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basAgvMast#btn-delete', N'鍒犻櫎', '', '3', '3', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basAgvMast#btn-export', N'瀵煎嚭', '', '3', '4', '1');
diff --git a/src/main/java/com/zy/asrs/controller/BasAgvMastController.java b/src/main/java/com/zy/asrs/controller/BasAgvMastController.java
new file mode 100644
index 0000000..29367e7
--- /dev/null
+++ b/src/main/java/com/zy/asrs/controller/BasAgvMastController.java
@@ -0,0 +1,9 @@
+package com.zy.asrs.controller;
+
+import com.zy.common.web.BaseController;
+import org.springframework.web.bind.annotation.*;
+
+
+@RestController
+public class BasAgvMastController extends BaseController {
+}
diff --git a/src/main/java/com/zy/asrs/entity/BasAgvMast.java b/src/main/java/com/zy/asrs/entity/BasAgvMast.java
new file mode 100644
index 0000000..a31a216
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/BasAgvMast.java
@@ -0,0 +1,192 @@
+package com.zy.asrs.entity;
+
+import com.core.common.Cools;import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.enums.IdType;
+import com.baomidou.mybatisplus.annotations.TableField;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import com.core.common.SpringUtils;
+import com.zy.system.service.UserService;
+import com.zy.system.entity.User;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import com.baomidou.mybatisplus.annotations.TableName;
+import java.io.Serializable;
+
+@Data
+@TableName("asr_bas_agv_mast")
+public class BasAgvMast implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * ID
+ */
+ @ApiModelProperty(value= "ID")
+ @TableId(value = "task_no", type = IdType.AUTO)
+ private Long id;
+
+ /**
+ * WMS浠诲姟鍙�
+ */
+ @ApiModelProperty(value= "WMS浠诲姟鍙�")
+ @TableField("task_no")
+ private Integer taskNo;
+
+ /**
+ * RGV浠诲姟鍙�
+ */
+ @ApiModelProperty(value= "RGV浠诲姟鍙�")
+ private Long timestamp;
+
+ /**
+ * 婧愮珯鐐�
+ */
+ @ApiModelProperty(value= "婧愮珯鐐�")
+ @TableField("source_sta_no")
+ private Integer sourceStaNo;
+
+ /**
+ * 鐩殑绔欑偣
+ */
+ @ApiModelProperty(value= "鐩殑绔欑偣")
+ @TableField("sta_no")
+ private Integer staNo;
+
+ /**
+ * 婧愬簱浣�
+ */
+ @ApiModelProperty(value= "婧愬簱浣�")
+ @TableField("source_loc_no")
+ private String sourceLocNo;
+
+ /**
+ * 鐩殑搴撲綅
+ */
+ @ApiModelProperty(value= "鐩殑搴撲綅")
+ @TableField("loc_no")
+ private String locNo;
+
+ /**
+ * 浼樺厛绾�
+ */
+ @ApiModelProperty(value= "浼樺厛绾�")
+ private Long priority;
+
+ /**
+ * 妤煎眰
+ */
+ @ApiModelProperty(value= "妤煎眰")
+ @TableField("floor_no")
+ private Integer floorNo;
+
+ /**
+ * 鐘舵�� 0: 鍒濆 1: 浣滀笟涓� 2: 瀹屾垚
+ */
+ @ApiModelProperty(value= "鐘舵�� 0: 鍒濆 1: 浣滀笟涓� 2: 瀹屾垚 ")
+ private Integer status;
+
+ /**
+ * 寮傚父鏃堕棿
+ */
+ @ApiModelProperty(value= "寮傚父鏃堕棿")
+ @TableField("error_time")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date errorTime;
+
+ /**
+ * 寮傚父淇℃伅
+ */
+ @ApiModelProperty(value= "寮傚父淇℃伅")
+ @TableField("error_memo")
+ private String errorMemo;
+
+ /**
+ * 娣诲姞鏃堕棿
+ */
+ @ApiModelProperty(value= "娣诲姞鏃堕棿")
+ @TableField("appe_time")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date appeTime;
+
+ /**
+ * 淇敼鏃堕棿
+ */
+ @ApiModelProperty(value= "淇敼鏃堕棿")
+ @TableField("modi_time")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date modiTime;
+
+ /**
+ * 淇敼浜哄憳
+ */
+ @ApiModelProperty(value= "淇敼浜哄憳")
+ @TableField("modi_user")
+ private String modiUser;
+
+ @ApiModelProperty(value= "杈撻�丳LCId")
+ @TableField("devp_id")
+ private Integer devpId;
+
+ @ApiModelProperty(value= "浠诲姟绫诲瀷")
+ @TableField("io_type")
+ private Integer ioType;
+
+ public BasAgvMast() {}
+
+ public BasAgvMast(Integer taskNo,Long timestamp,Integer sourceStaNo,Integer staNo,String sourceLocNo,String locNo,Long priority,Integer floorNo,Integer status,Date errorTime,String errorMemo,Date appeTime,Date modiTime,String modiUser) {
+ this.taskNo = taskNo;
+ this.timestamp = timestamp;
+ this.sourceStaNo = sourceStaNo;
+ this.staNo = staNo;
+ this.sourceLocNo = sourceLocNo;
+ this.locNo = locNo;
+ this.priority = priority;
+ this.floorNo = floorNo;
+ this.status = status;
+ this.errorTime = errorTime;
+ this.errorMemo = errorMemo;
+ this.appeTime = appeTime;
+ this.modiTime = modiTime;
+ this.modiUser = modiUser;
+ }
+
+// BasAgvMast basAgvMast = new BasAgvMast(
+// null, // WMS浠诲姟鍙穂闈炵┖]
+// null, // RGV浠诲姟鍙�
+// null, // 婧愮珯鐐�
+// null, // 鐩殑绔欑偣
+// null, // 婧愬簱浣�
+// null, // 鐩殑搴撲綅
+// null, // 浼樺厛绾�
+// null, // 妤煎眰
+// null, // 鐘舵��
+// null, // 寮傚父鏃堕棿
+// null, // 寮傚父淇℃伅
+// null, // 娣诲姞鏃堕棿
+// null, // 淇敼鏃堕棿
+// null // 淇敼浜哄憳
+// );
+
+ public String getStatus$(){
+ if (null == this.status){ return null; }
+ switch (this.status){
+ case 0:
+ return "鍒濆";
+ case 1:
+ return "浣滀笟涓�";
+ case 2:
+ return "瀹屾垚";
+ default:
+ return String.valueOf(this.status);
+ }
+ }
+
+
+}
diff --git a/src/main/java/com/zy/asrs/entity/param/AgvTaskAssignmentParam.java b/src/main/java/com/zy/asrs/entity/param/AgvTaskAssignmentParam.java
new file mode 100644
index 0000000..f6ff49a
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/param/AgvTaskAssignmentParam.java
@@ -0,0 +1,22 @@
+package com.zy.asrs.entity.param;
+
+import lombok.Data;
+
+/*
+ * Created by Monkey D. Luffy on 2025.09.09
+ * */
+@Data
+public class AgvTaskAssignmentParam {
+
+ private String id;
+
+ public AgvTaskAssignmentParam() {}
+
+ public AgvTaskAssignmentParam(String id) {
+ this.id = id;
+ }
+
+ public AgvTaskAssignmentParam(int id) {
+ this.id = String.valueOf(id);
+ }
+}
diff --git a/src/main/java/com/zy/asrs/mapper/BasAgvMastMapper.java b/src/main/java/com/zy/asrs/mapper/BasAgvMastMapper.java
new file mode 100644
index 0000000..628fd0b
--- /dev/null
+++ b/src/main/java/com/zy/asrs/mapper/BasAgvMastMapper.java
@@ -0,0 +1,12 @@
+package com.zy.asrs.mapper;
+
+import com.zy.asrs.entity.BasAgvMast;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+@Mapper
+@Repository
+public interface BasAgvMastMapper extends BaseMapper<BasAgvMast> {
+
+}
diff --git a/src/main/java/com/zy/asrs/service/BasAgvMastService.java b/src/main/java/com/zy/asrs/service/BasAgvMastService.java
new file mode 100644
index 0000000..b451e70
--- /dev/null
+++ b/src/main/java/com/zy/asrs/service/BasAgvMastService.java
@@ -0,0 +1,8 @@
+package com.zy.asrs.service;
+
+import com.zy.asrs.entity.BasAgvMast;
+import com.baomidou.mybatisplus.service.IService;
+
+public interface BasAgvMastService extends IService<BasAgvMast> {
+
+}
diff --git a/src/main/java/com/zy/asrs/service/impl/BasAgvMastServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/BasAgvMastServiceImpl.java
new file mode 100644
index 0000000..5b89e1c
--- /dev/null
+++ b/src/main/java/com/zy/asrs/service/impl/BasAgvMastServiceImpl.java
@@ -0,0 +1,12 @@
+package com.zy.asrs.service.impl;
+
+import com.zy.asrs.mapper.BasAgvMastMapper;
+import com.zy.asrs.entity.BasAgvMast;
+import com.zy.asrs.service.BasAgvMastService;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+@Service("basAgvMastService")
+public class BasAgvMastServiceImpl extends ServiceImpl<BasAgvMastMapper, BasAgvMast> implements BasAgvMastService {
+
+}
diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index 1a0084f..aaf30a6 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -9,6 +9,7 @@
import com.core.common.R;
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
+import com.zy.asrs.entity.param.AgvTaskAssignmentParam;
import com.zy.asrs.entity.param.ArmOrderAssignmentParam;
import com.zy.asrs.entity.param.ArmTaskAssignmentParam;
import com.zy.asrs.entity.param.CombParam;
@@ -20,6 +21,7 @@
import com.zy.asrs.utils.Utils;
import com.zy.asrs.utils.VersionUtils;
import com.zy.asrs.utils.core.ReturnT;
+import com.zy.common.constant.AgvConstant;
import com.zy.common.constant.ArmConstant;
import com.zy.common.model.LocTypeDto;
import com.zy.common.model.MatDto;
@@ -105,6 +107,8 @@
private BasRgvMapService basRgvMapService;
@Autowired
private BasArmService basArmService;
+ @Autowired
+ private BasAgvMastService basAgvMastService;
@Autowired
private BasArmMastService basArmMastService;
@Autowired
@@ -491,10 +495,10 @@
if (Cools.isEmpty(staDesc)) {
News.error(""+mark+" - 2"+" - 鍏ュ簱璺緞涓嶅瓨鍦紒type_no={},stn_no={},crn_no={}", wrkMast.getIoType(), pickSta.getStaNo(), wrkMast.getCrnNo());
staProtocol.setWorkNo(wrkNo++);
- staProtocol.setStaNo((short) (pickSta.getStaNo().shortValue()-(short)1));
+ staProtocol.setStaNo((short) (pickSta.getStaNo().shortValue()));
devpThread.setPakMk(staProtocol.getSiteId(), false);
MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
- log.error("杈撻�佺嚎涓嬪彂4锛�"+9989+","+(pickSta.getStaNo().shortValue()-(short)1));
+ log.error("杈撻�佺嚎涓嬪彂4锛�"+9996+","+(pickSta.getStaNo().shortValue()-(short)1));
//LED
LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, pickSta.getLed());
// led 寮傚父鏄剧ず
@@ -518,6 +522,14 @@
Date now = new Date();
// 鍫嗗灈鏈虹珯鐐�(鐩爣绔�)
Integer staNo = staDesc.getCrnStn();
+ if(wrkMast.getSourceStaNo() > 2000){
+ switch (wrkMast.getCrnNo()){
+ case 1: staNo = 2004;break;
+ case 2: staNo = 2010;break;
+ case 4: staNo = 2022;break;
+ case 5: staNo = 2028;break;
+ }
+ }
// 鏇存柊宸ヤ綔妗ｆ暟鎹姸鎬�
wrkMast.setIoTime(now);
wrkMast.setIoType(wrkMast.getIoType() - 50); // 鍏ュ嚭搴撶被鍨�: 103->53,104->54,107->57
@@ -547,7 +559,7 @@
// 鏇存柊绔欑偣淇℃伅 涓� 涓嬪彂plc鍛戒护
staProtocol.setWorkNo(wrkMast.getWrkNo());
- staProtocol.setStaNo((short) 161);
+ staProtocol.setStaNo(wrkMast.getStaNo().shortValue());
devpThread.setPakMk(staProtocol.getSiteId(), false);
boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
log.error("杈撻�佺嚎涓嬪彂5锛�"+wrkMast.getWrkNo()+","+wrkMast.getStaNo());
@@ -753,14 +765,14 @@
if(crnSlave.getId() == 3 && wrkMast9997 != null){
WrkMast wrkMast107 = wrkMastMapper.selectPakOutStep107(wrkMast9997.getBarcode());
// 鍒ゆ柇鍚婅溅鏄惁瀹為檯宸插畬鎴愶紝涓旂數鑴戠姸鎬佸湪move涓紝浠ュ鐢佃剳杩涜鏇存柊宸ヤ綔妗�
- CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, wrkMast107.getCrnNo());
+ CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn,3);
CrnProtocol crnProtocol = crnThread.getCrnProtocol();
if (crnProtocol.statusType == CrnStatusType.FETCHING || crnProtocol.statusType == CrnStatusType.PUTTING) {
// 绉诲姩涓�
continue;
}
// 鍒ゆ柇鍫嗗灈鏈虹姸鎬佺瓑寰呯‘璁�
- if (crnProtocol.modeType == CrnModeType.AUTO && crnProtocol.getTaskNo().equals(wrkMast107.getWrkNo().shortValue())
+ if (crnProtocol.modeType == CrnModeType.AUTO && crnProtocol.getTaskNo()== 9997
&& crnProtocol.statusType == CrnStatusType.WAITING
&& crnProtocol.forkPosType == CrnForkPosType.HOME) {
log.info("鍫嗗灈鏈哄嚭搴撳畬鎴� - 寮�濮嬫墽琛�");
@@ -799,14 +811,14 @@
if(crnSlave.getId() == 3 && wrkMast9996 != null){
WrkMast wrkMast107 = wrkMastMapper.selectPakOutStep107(wrkMast9996.getBarcode());
// 鍒ゆ柇鍚婅溅鏄惁瀹為檯宸插畬鎴愶紝涓旂數鑴戠姸鎬佸湪move涓紝浠ュ鐢佃剳杩涜鏇存柊宸ヤ綔妗�
- CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, wrkMast107.getCrnNo());
+ CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, 3);
CrnProtocol crnProtocol = crnThread.getCrnProtocol();
if (crnProtocol.statusType == CrnStatusType.FETCHING || crnProtocol.statusType == CrnStatusType.PUTTING) {
// 绉诲姩涓�
continue;
}
// 鍒ゆ柇鍫嗗灈鏈虹姸鎬佺瓑寰呯‘璁�
- if (crnProtocol.modeType == CrnModeType.AUTO && crnProtocol.getTaskNo().equals(wrkMast107.getWrkNo().shortValue())
+ if (crnProtocol.modeType == CrnModeType.AUTO && crnProtocol.getTaskNo() == 9996
&& crnProtocol.statusType == CrnStatusType.WAITING
&& crnProtocol.forkPosType == CrnForkPosType.HOME) {
log.info("鍫嗗灈鏈哄嚭搴撳畬鎴� - 寮�濮嬫墽琛�");
@@ -966,7 +978,13 @@
}
}
}
- if(staProtocolIn.getWorkNo() != null &&staProtocolIn.getStaNo() != 4001){
+ if(staProtocolIn.getWorkNo() != null && staProtocolIn.getStaNo() != 4001){
+ WrkMast wrkMastCrn = wrkMastMapper.selectByWrkNo(staProtocolIn.getWorkNo());
+ if(wrkMastCrn!=null){
+ if(wrkMastCrn.getCrnNo() == 3 ){
+ continue;
+ }
+ }
WrkMast wrkMastIn = wrkMastMapper.selectByWrkNo(staProtocolIn.getWorkNo());
WrkMast wrkMast = wrkMastMapper.selectByWrkNo(9996);
if(wrkMastIn == null){
@@ -1138,62 +1156,69 @@
} else {
staProtocol = staProtocol.clone();
}
- WrkMast wrkMast9996 = wrkMastMapper.selectByWrkNo9996(9996);
-
- if (slave.getId() == 3 && wrkMast9996 != null) {
- SiemensDevpThread devpThread1 = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, crnStn.getDevpPlcId());
- StaProtocol staProtocol2 = devpThread1.getStation().get(4001);
- if (staProtocol2 == null) {
- News.infoNoLog("" + mark + " - 2" + " - 3" + " - 鍫嗗灈鏈哄嚭搴撶珯淇℃伅(staProtocol!=null缁х画鎵ц,鍚﹀垯寰幆缁堟)锛歴taProtocol=" + staProtocol2);
- break;
- } else {
- staProtocol2 = staProtocol2.clone();
- }
- BasDevp staDetl = basDevpService.selectById(crnStn.getStaNo());
- if (staDetl == null) {
- News.error(""+mark+" - 2"+" - 5"+" - 鍑哄簱 ===>> 鍫嗗灈鏈虹珯鐐瑰湪鏁版嵁搴撲笉瀛樺湪, 绔欑偣缂栧彿={}", crnStn.getStaNo());
- break;
-// continue;
- }
- if( staProtocol2.isAutoing() && staProtocol2.isLoading() && staDetl.getCanining() != null && staDetl.getCanining().equals("Y")){
- // 鍫嗗灈鏈烘帶鍒惰繃婊�
- if (!crnProtocol.getStatusType().equals(CrnStatusType.IDLE) || crnProtocol.getTaskNo() != 0) {
-// continue;
- break;
- }
- // 宸茬粡瀛樺湪鍚婅溅鎵ц浠诲姟鏃讹紝鍒欒繃婊�
- if (wrkMastMapper.selectWorking(slave.getId()) != null) {
- break;
-// return;
- }
- // 1.鍫嗗灈鏈哄紑濮嬬Щ鍔�
- CrnCommand crnCommand = new CrnCommand();
- crnCommand.setCrnNo(slave.getId()); // 鍫嗗灈鏈虹紪鍙�
- crnCommand.setTaskNo((short) 9996); // 宸ヤ綔鍙�
-// crnCommand.setAckFinish((short) 0); // 浠诲姟瀹屾垚纭浣�
- crnCommand.setTaskMode(CrnTaskModeType.LOC_MOVE); // 浠诲姟妯″紡: 搴撲綅绉昏浆
- crnCommand.setSourcePosX((short) 9); // 婧愬簱浣嶆帓
- crnCommand.setSourcePosY((short) 52); // 婧愬簱浣嶅垪
- crnCommand.setSourcePosZ((short) 3); // 婧愬簱浣嶅眰
- crnCommand.setDestinationPosX((short) 9); // 鐩爣搴撲綅鎺�
- crnCommand.setDestinationPosY((short) 52); // 鐩爣搴撲綅鍒�
- crnCommand.setDestinationPosZ((short) 2); // 鐩爣搴撲綅灞�
-// crnCommand.setTraySize(sourceSta.getLocType1() == 2); //搴撲綅绫诲瀷
- if (!MessageQueue.offer(SlaveType.Crn, wrkMast9996.getCrnNo(), new Task(2, crnCommand))) {
- News.error("" + mark + " - 2" + " - 13" + " - 鍫嗗灈鏈哄懡浠や笅鍙戝け璐ワ紝鍫嗗灈鏈哄彿={}锛屼换鍔℃暟鎹�={}", wrkMast9996.getCrnNo(), JSON.toJSON(crnCommand));
- } else {
- // 淇敼宸ヤ綔妗ｇ姸鎬� 11.鐢熸垚鍑哄簱ID => 12.鍚婅溅鍑哄簱涓�
- Date now = new Date();
- wrkMast9996.setWrkSts(3L);
- wrkMast9996.setCrnStrTime(now);
- wrkMast9996.setModiTime(now);
- if (wrkMastMapper.updateById(wrkMast9996) == 0) {
- News.error("" + mark + " - 2" + " - 14" + " - 淇敼宸ヤ綔妗ｇ姸鎬� 11.鐢熸垚鍑哄簱ID => 12.鍚婅溅鍑哄簱涓� 澶辫触锛侊紒锛屽伐浣滃彿={}", wrkMast9996.getWrkNo());
- }
- break;
- }
- }
- }
+// WrkMast wrkMast9996 = wrkMastMapper.selectByWrkNo9996(9996);
+//
+// if (slave.getId() == 3 && wrkMast9996 != null) {
+// SiemensDevpThread devpThread1 = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp,2);
+// StaProtocol staProtocol2 = devpThread1.getStation().get(4001);
+// if (staProtocol2 == null) {
+// News.infoNoLog("" + mark + " - 2" + " - 3" + " - 鍫嗗灈鏈哄嚭搴撶珯淇℃伅(staProtocol!=null缁х画鎵ц,鍚﹀垯寰幆缁堟)锛歴taProtocol=" + staProtocol2);
+// break;
+// } else {
+// staProtocol2 = staProtocol2.clone();
+// }
+// BasDevp staDetl = basDevpService.selectById(crnStn.getStaNo());
+// if (staDetl == null) {
+// News.error(""+mark+" - 2"+" - 5"+" - 鍑哄簱 ===>> 鍫嗗灈鏈虹珯鐐瑰湪鏁版嵁搴撲笉瀛樺湪, 绔欑偣缂栧彿={}", crnStn.getStaNo());
+// break;
+//// continue;
+// }
+// if( staProtocol2.isAutoing() && staProtocol2.isLoading() && staDetl.getCanining() != null && staDetl.getCanining().equals("Y")){
+// // 鍫嗗灈鏈烘帶鍒惰繃婊�
+// if (!crnProtocol.getStatusType().equals(CrnStatusType.IDLE) || crnProtocol.getTaskNo() != 0) {
+//// continue;
+// break;
+// }
+// // 宸茬粡瀛樺湪鍚婅溅鎵ц浠诲姟鏃讹紝鍒欒繃婊�
+// if (wrkMastMapper.selectWorking(slave.getId()) != null) {
+// break;
+//// return;
+// }
+// // 1.鍫嗗灈鏈哄紑濮嬬Щ鍔�
+// CrnCommand crnCommand = new CrnCommand();
+// crnCommand.setCrnNo(slave.getId()); // 鍫嗗灈鏈虹紪鍙�
+// crnCommand.setTaskNo((short) 9996); // 宸ヤ綔鍙�
+//// crnCommand.setAckFinish((short) 0); // 浠诲姟瀹屾垚纭浣�
+// crnCommand.setTaskMode(CrnTaskModeType.LOC_MOVE); // 浠诲姟妯″紡: 搴撲綅绉昏浆
+// crnCommand.setSourcePosX((short) 9); // 婧愬簱浣嶆帓
+// crnCommand.setSourcePosY((short) 52); // 婧愬簱浣嶅垪
+// crnCommand.setSourcePosZ((short) 3); // 婧愬簱浣嶅眰
+// if(wrkMast9996.getStaNo()>2000){
+// crnCommand.setDestinationPosX((short) 9); // 鐩爣搴撲綅鎺�
+// crnCommand.setDestinationPosY((short) 52); // 鐩爣搴撲綅鍒�
+// crnCommand.setDestinationPosZ((short) 2); // 鐩爣搴撲綅灞�
+// }else{
+// crnCommand.setDestinationPosX((short) 11); // 鐩爣搴撲綅鎺�
+// crnCommand.setDestinationPosY((short) 52); // 鐩爣搴撲綅鍒�
+// crnCommand.setDestinationPosZ((short) 1); // 鐩爣搴撲綅灞�
+// }
+//
+//// crnCommand.setTraySize(sourceSta.getLocType1() == 2); //搴撲綅绫诲瀷
+// if (!MessageQueue.offer(SlaveType.Crn, wrkMast9996.getCrnNo(), new Task(2, crnCommand))) {
+// News.error("" + mark + " - 2" + " - 13" + " - 鍫嗗灈鏈哄懡浠や笅鍙戝け璐ワ紝鍫嗗灈鏈哄彿={}锛屼换鍔℃暟鎹�={}", wrkMast9996.getCrnNo(), JSON.toJSON(crnCommand));
+// } else {
+// // 淇敼宸ヤ綔妗ｇ姸鎬� 11.鐢熸垚鍑哄簱ID => 12.鍚婅溅鍑哄簱涓�
+// Date now = new Date();
+// wrkMast9996.setWrkSts(3L);
+// wrkMast9996.setCrnStrTime(now);
+// wrkMast9996.setModiTime(now);
+// if (wrkMastMapper.updateById(wrkMast9996) == 0) {
+// News.error("" + mark + " - 2" + " - 14" + " - 淇敼宸ヤ綔妗ｇ姸鎬� 11.鐢熸垚鍑哄簱ID => 12.鍚婅溅鍑哄簱涓� 澶辫触锛侊紒锛屽伐浣滃彿={}", wrkMast9996.getWrkNo());
+// }
+// break;
+// }
+// }
+// }
// 鏌ヨ绔欑偣璇︾粏淇℃伅
BasDevp staDetl = basDevpService.selectById(crnStn.getStaNo());
if (staDetl == null) {
@@ -1339,6 +1364,8 @@
// WrkMast wrkMast = wrkMastMapper.selectPakOutStep1(slave.getId(), crnStn.getStaNo());
List<WrkMast> wrkMasts = wrkMastMapper.selectPakOutStep11(slave.getId(), crnStn.getStaNo());
WrkMast wrkMast9997 = wrkMastMapper.selectByWrkNo9997(9997);
+ WrkMast wrkMast9996 = wrkMastMapper.selectByWrkNo9997(9996);
+
if (slave.getId() == 3 && wrkMast9997 != null) {
SiemensDevpThread devpThread1 = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, 1);
@@ -1435,6 +1462,66 @@
wrkMast9997.setModiTime(now);
if (wrkMastMapper.updateById(wrkMast9997) == 0) {
News.error("" + mark + " - 2" + " - 14" + " - 淇敼宸ヤ綔妗ｇ姸鎬� 11.鐢熸垚鍑哄簱ID => 12.鍚婅溅鍑哄簱涓� 澶辫触锛侊紒锛屽伐浣滃彿={}", wrkMast9997.getWrkNo());
+ }
+ break;
+ }
+ }
+ }
+ if (slave.getId() == 3 && wrkMast9996 != null) {
+ SiemensDevpThread devpThread2 = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, 2);
+ StaProtocol staProtocol4001 = devpThread2.getStation().get(4001);
+ if (staProtocol4001 == null) {
+ News.infoNoLog("" + mark + " - 2" + " - 3" + " - 鍫嗗灈鏈哄嚭搴撶珯淇℃伅(staProtocol!=null缁х画鎵ц,鍚﹀垯寰幆缁堟)锛歴taProtocol=" + staProtocol4001);
+ break;
+ } else {
+ staProtocol4001 = staProtocol4001.clone();
+ }
+ BasDevp staDetl = basDevpService.selectById(crnStn.getStaNo());
+ if (staDetl == null) {
+ News.error(""+mark+" - 2"+" - 5"+" - 鍑哄簱 ===>> 鍫嗗灈鏈虹珯鐐瑰湪鏁版嵁搴撲笉瀛樺湪, 绔欑偣缂栧彿={}", crnStn.getStaNo());
+ break;
+// continue;
+ }
+ if(staProtocol4001.isLoading() && staProtocol4001.isAutoing() && staDetl.getCanouting() != null && staDetl.getCanouting().equals("Y")){
+ // 鍫嗗灈鏈烘帶鍒惰繃婊�
+ if (!crnProtocol.getStatusType().equals(CrnStatusType.IDLE) || crnProtocol.getTaskNo() != 0) {
+// continue;
+ break;
+ }
+ // 宸茬粡瀛樺湪鍚婅溅鎵ц浠诲姟鏃讹紝鍒欒繃婊�
+ if (wrkMastMapper.selectWorking(slave.getId()) != null) {
+ break;
+// return;
+ }
+ // 1.鍫嗗灈鏈哄紑濮嬬Щ鍔�
+ CrnCommand crnCommand = new CrnCommand();
+ crnCommand.setCrnNo(slave.getId()); // 鍫嗗灈鏈虹紪鍙�
+ crnCommand.setTaskNo((short) 9996); // 宸ヤ綔鍙�
+// crnCommand.setAckFinish((short) 0); // 浠诲姟瀹屾垚纭浣�
+ crnCommand.setTaskMode(CrnTaskModeType.LOC_MOVE); // 浠诲姟妯″紡: 搴撲綅绉昏浆
+ crnCommand.setSourcePosX((short) 9); // 婧愬簱浣嶆帓
+ crnCommand.setSourcePosY((short) 52); // 婧愬簱浣嶅垪
+ crnCommand.setSourcePosZ((short) 3); // 婧愬簱浣嶅眰
+ if(wrkMast9996.getStaNo()>2000){
+ crnCommand.setDestinationPosX((short) 9); // 鐩爣搴撲綅鎺�
+ crnCommand.setDestinationPosY((short) 52); // 鐩爣搴撲綅鍒�
+ crnCommand.setDestinationPosZ((short) 2); // 鐩爣搴撲綅灞�
+ }else{
+ crnCommand.setDestinationPosX((short) 11); // 鐩爣搴撲綅鎺�
+ crnCommand.setDestinationPosY((short) 52); // 鐩爣搴撲綅鍒�
+ crnCommand.setDestinationPosZ((short) 1); // 鐩爣搴撲綅灞�
+ }
+// crnCommand.setTraySize(sourceSta.getLocType1() == 2); //搴撲綅绫诲瀷
+ if (!MessageQueue.offer(SlaveType.Crn, wrkMast9996.getCrnNo(), new Task(2, crnCommand))) {
+ News.error("" + mark + " - 2" + " - 13" + " - 鍫嗗灈鏈哄懡浠や笅鍙戝け璐ワ紝鍫嗗灈鏈哄彿={}锛屼换鍔℃暟鎹�={}", wrkMast9996.getCrnNo(), JSON.toJSON(crnCommand));
+ } else {
+ // 淇敼宸ヤ綔妗ｇ姸鎬� 11.鐢熸垚鍑哄簱ID => 12.鍚婅溅鍑哄簱涓�
+ Date now = new Date();
+ wrkMast9996.setWrkSts(12L);
+ wrkMast9996.setCrnStrTime(now);
+ wrkMast9996.setModiTime(now);
+ if (wrkMastMapper.updateById(wrkMast9996) == 0) {
+ News.error("" + mark + " - 2" + " - 14" + " - 淇敼宸ヤ綔妗ｇ姸鎬� 11.鐢熸垚鍑哄簱ID => 12.鍚婅溅鍑哄簱涓� 澶辫触锛侊紒锛屽伐浣滃彿={}", wrkMast9996.getWrkNo());
}
break;
}
@@ -3791,94 +3878,137 @@
/**
* 灏忚溅鍑哄簱鎺ラ┏浠诲姟鍙栬揣涓嬪彂
*/
-// public synchronized void rgvRunWrkToCrn(RgvSlave slave, RgvProtocol rgvProtocol,Integer mark){
-// for (RgvSlave.RgvStn rgvStn : slave.getRgvOutTStn()) {//rgv鍑哄簱鍙栬揣绔欑偣
-// boolean flag = false;
-// //閬嶅巻rgv鍏ュ簱鍙栬揣绔欑偣
-// DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, rgvStn.getDevpPlcId());
-// StaProtocol staProtocol = devpThread.getStation().get(rgvStn.getStaNo());
-// RgvThread rgvThread = (RgvThread) SlaveConnection.get(SlaveType.Rgv, (int) rgvProtocol.getRgvNo());
-// StaProtocol staProtocol2 = null;
-// if(rgvStn.getStaNo2()!= null ){
-// staProtocol2 = devpThread.getStation().get(rgvStn.getStaNo2());
-// if (staProtocol2 == null) {
-// News.infoNoLog("" + mark + " - 1" + " - 1" + " - Rgv鍏ュ簱绔欎俊鎭�(staProtocol!=null缁х画鎵ц)锛歴taProtocol=" + staProtocol);
-// continue;
-// } else {
-// staProtocol2 = staProtocol2.clone();
-// }
-// BasDevp staDetl2 = basDevpService.selectById(rgvStn.getStaNo2());
-// if (staDetl2 == null) {
-// News.error("" + mark + " - 1" + " - 2" + " - 鍏ュ簱 ===>>Rgv绔欑偣鍦ㄦ暟鎹簱涓嶅瓨鍦�, 绔欑偣缂栧彿={}", rgvStn.getStaNo());
-// continue;
-// }
-// }
-// if (staProtocol == null) {
-// News.infoNoLog("" + mark + " - 1" + " - 1" + " - Rgv鍑哄簱绔欎俊鎭�(staProtocol!=null缁х画鎵ц)锛歴taProtocol=" + staProtocol);
-// continue;
-// } else {
-// staProtocol = staProtocol.clone();
-// }
-//
-// // 鏌ヨ绔欑偣璇︾粏淇℃伅
-// BasDevp staDetl = basDevpService.selectById(rgvStn.getStaNo());
-// if (staDetl == null) {
-// News.error("" + mark + " - 1" + " - 2" + " - 鍑哄簱 ===>>Rgv绔欑偣鍦ㄦ暟鎹簱涓嶅瓨鍦�, 绔欑偣缂栧彿={}", rgvStn.getStaNo());
-// continue;
-// }
-//
-// if (staProtocol.isAutoing() && staProtocol.isLoading() && staProtocol.getWorkNo() > 0
-// && staDetl.getCanouting() != null && staDetl.getCanouting().equals("Y")) {
-// flag = true;
-// }
-// if (!flag) {
-// News.errorNoLog("" + mark + " - 1" + " - 3" + " - Rgv鍑哄簱鍙栬揣绔欎俊鎭�(浠ヤ笅闇�瑕佸叏true):"
-// + "鑷姩淇″彿" + staProtocol.isAutoing() + "鏈夌墿淇″彿" + staProtocol.isLoading()
-// + "宸ヤ綔鍙�>0" + staProtocol.getWorkNo() + "鍙叆淇″彿" + staProtocol.isOutEnable()
-// + "鑳藉叆淇″彿锛坵ms璁剧疆锛�.equals(\"Y\")" + staDetl.getCanouting());
-// continue;
-// }
-// BasRgvMap basRgvMap = basRgvMapMapper.selectById(rgvProtocol.getRgvNo());
-// List<Integer> route = new ArrayList<>();
-// switch (rgvProtocol.getRgvNo()){
-// case 1: route = RouteUtils.getRouteOne();break;
-// case 2: route = RouteUtils.getRouteTwo();break;
-// }
-// basRgvMap.setNowRoute(rgvProtocol.getRgvPosI2()); //鏇存柊灏忚溅褰撳墠浣嶇疆绔欑偣鍙�
-// WrkMastSta wrkMastSta = wrkMastStaMapper.selectNoInterfereToCrn(route, route, Long.valueOf(staProtocol.getWorkNo()));//鏍规嵁绔欑偣宸ヤ綔鍙峰拰灏忚溅宸ヤ綔鑼冨洿妫�绱换鍔℃。
-// if( null == wrkMastSta ) {
-// News.infoNoLog("" + mark + " - 1" + " - 4" + " - 鏌ヨ鏃犲緟鍏ュ簱鏁版嵁--wrk_sts0, 宸ヤ綔鍙�={}", staProtocol.getWorkNo());
-// continue;
-// }
-// WrkMastSta wrkMastSta1 = wrkMastStaMapper.selectByWrkNo( rgvProtocol.getTaskNo1());
-// boolean result = false;
-// if(wrkMastSta1!= null && rgvProtocol.getRgvNo() == 1){ //璺濈璁＄畻 2妤煎崟鍏ュ簱鍙ｄ笉闇�瑕佽绠�
-// result = rgvCalcDistance((int) rgvProtocol.getRgvNo(),wrkMastSta1.getStaEnd(),wrkMastSta.getStaStart());//宸ヤ綅2鏀捐揣绔欑偣锛屽伐浣�1鍙栬揣绔欑偣
-// }
-// if(result){//鑻ュ皬杞﹁窛绂绘斁璐х偣璺濈杩戜簬鍙栬揣鐐瑰垯璺宠繃鍙栬揣 true璺宠繃鍙栬揣/false浼樺厛鍙栬揣
-// rgvThread.setPakRgv(false);
-// continue;
-// }
-// wrkMastSta.setWorkSta(wrkMastSta1 !=null ? 2 : 1);//鑻�1鍙峰伐浣嶆湁浠诲姟缁�2鍙峰伐浣�
-// wrkMastSta.setRgvNo((int) rgvProtocol.getRgvNo());
-// boolean sign = false;
-// sign = rgvTakeFullAll(basRgvMap.getRgvNo(), wrkMastSta); //鍛戒护涓嬪彂
-// if (sign){
+ public synchronized void rgvRunWrkToCrn(RgvSlave slave, RgvProtocol rgvProtocol,Integer mark){
+ for (RgvSlave.RgvStn rgvStn : slave.getRgvOutTStn()) {//rgv鍑哄簱鍙栬揣绔欑偣
+ boolean flag = false;
+ //閬嶅巻rgv鍏ュ簱鍙栬揣绔欑偣
+ DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, rgvStn.getDevpPlcId());
+ StaProtocol staProtocol = devpThread.getStation().get(rgvStn.getStaNo());
+ RgvThread rgvThread = (RgvThread) SlaveConnection.get(SlaveType.Rgv, (int) rgvProtocol.getRgvNo());
+ BasRgv basRgv = basRgvService.selectById(slave.getId());
+ if (basRgv == null) {
+ log.error("{}鍙稲GV灏氭湭鍦ㄦ暟鎹簱杩涜缁存姢锛�4", slave.getId());
+ continue;
+ }
+ StaProtocol staProtocol2 = null;
+ WrkMastSta wrkMastSta3 = null;
+
+ if(rgvStn.getStaNo2()!= null ){
+ staProtocol2 = devpThread.getStation().get(rgvStn.getStaNo2());
+ if (staProtocol2 == null) {
+ News.infoNoLog("" + mark + " - 1" + " - 1" + " - Rgv鍏ュ簱绔欎俊鎭�(staProtocol!=null缁х画鎵ц)锛歴taProtocol=" + staProtocol);
+ continue;
+ } else {
+ staProtocol2 = staProtocol2.clone();
+ }
+ BasDevp staDetl2 = basDevpService.selectById(rgvStn.getStaNo2());
+ if (staDetl2 == null) {
+ News.error("" + mark + " - 1" + " - 2" + " - 鍏ュ簱 ===>>Rgv绔欑偣鍦ㄦ暟鎹簱涓嶅瓨鍦�, 绔欑偣缂栧彿={}", rgvStn.getStaNo());
+ continue;
+ }
+ wrkMastSta3 = wrkMastStaMapper.selectByWrkNo(staProtocol2.getWorkNo());
+
+ }
+ if (staProtocol == null) {
+ News.infoNoLog("" + mark + " - 1" + " - 1" + " - Rgv鍑哄簱绔欎俊鎭�(staProtocol!=null缁х画鎵ц)锛歴taProtocol=" + staProtocol);
+ continue;
+ } else {
+ staProtocol = staProtocol.clone();
+ }
+
+ // 鏌ヨ绔欑偣璇︾粏淇℃伅
+ BasDevp staDetl = basDevpService.selectById(rgvStn.getStaNo());
+ if (staDetl == null) {
+ News.error("" + mark + " - 1" + " - 2" + " - 鍑哄簱 ===>>Rgv绔欑偣鍦ㄦ暟鎹簱涓嶅瓨鍦�, 绔欑偣缂栧彿={}", rgvStn.getStaNo());
+ continue;
+ }
+
+ if (staProtocol.isAutoing() && staProtocol.isLoading() && staProtocol.getWorkNo() > 0
+ && staDetl.getCanouting() != null && staDetl.getCanouting().equals("Y")) {
+ flag = true;
+ }
+ if (!flag) {
+ News.errorNoLog("" + mark + " - 1" + " - 3" + " - Rgv鍑哄簱鍙栬揣绔欎俊鎭�(浠ヤ笅闇�瑕佸叏true):"
+ + "鑷姩淇″彿" + staProtocol.isAutoing() + "鏈夌墿淇″彿" + staProtocol.isLoading()
+ + "宸ヤ綔鍙�>0" + staProtocol.getWorkNo() + "鍙叆淇″彿" + staProtocol.isOutEnable()
+ + "鑳藉叆淇″彿锛坵ms璁剧疆锛�.equals(\"Y\")" + staDetl.getCanouting());
+ continue;
+ }
+ BasRgvMap basRgvMap = basRgvMapMapper.selectById(rgvProtocol.getRgvNo());
+ List<Integer> route = new ArrayList<>();
+ switch (rgvProtocol.getRgvNo()){
+ case 1: route = RouteUtils.getRouteOne();break;
+ case 2: route = RouteUtils.getRouteTwo();break;
+ }
+ basRgvMap.setNowRoute(rgvProtocol.getRgvPosI2()); //鏇存柊灏忚溅褰撳墠浣嶇疆绔欑偣鍙�
+ basRgvMapService.updateById(basRgvMap);
+ WrkMastSta wrkMastSta = wrkMastStaMapper.selectNoInterfere(route, route, Long.valueOf(staProtocol.getWorkNo()));//鏍规嵁绔欑偣宸ヤ綔鍙峰拰灏忚溅宸ヤ綔鑼冨洿妫�绱换鍔℃。
+ if( null == wrkMastSta ) {
+ News.infoNoLog("" + mark + " - 1" + " - 4" + " - 鏌ヨ鏃犲緟鍏ュ簱鏁版嵁--wrk_sts0, 宸ヤ綔鍙�={}", staProtocol.getWorkNo());
+ continue;
+ }
+ WrkMastSta wrkMastSta1 = wrkMastStaMapper.selectByWrkNo( rgvProtocol.getTaskNo1());
+ if(basRgv.getPakToCrn().equals("0")){
+ wrkMastSta = wrkMastStaMapper.selectNoInterfereCrn(route, route, Long.valueOf(staProtocol.getWorkNo()));
+ }
+ boolean result = false;
+ if(wrkMastSta1!= null && rgvProtocol.getRgvNo() == 1){ //璺濈璁＄畻 2妤煎崟鍏ュ簱鍙ｄ笉闇�瑕佽绠�
+ result = rgvCalcDistance((int) rgvProtocol.getRgvNo(),wrkMastSta1.getStaEnd(),wrkMastSta.getStaStart());//宸ヤ綅2鏀捐揣绔欑偣锛屽伐浣�1鍙栬揣绔欑偣
+ }
+ if(result){//鑻ュ皬杞﹁窛绂绘斁璐х偣璺濈杩戜簬鍙栬揣鐐瑰垯璺宠繃鍙栬揣 true璺宠繃鍙栬揣/false浼樺厛鍙栬揣
+ basRgv.setPakRgv("0");
+ basRgvService.updateById(basRgv);
+
+ continue;
+ }
+ wrkMastSta.setWorkSta(wrkMastSta1 !=null ? 2 : 1);//鑻�1鍙峰伐浣嶆湁浠诲姟缁�2鍙峰伐浣�
+ wrkMastSta.setRgvNo((int) rgvProtocol.getRgvNo());
+ boolean sign = false;
+ sign = rgvTakeFullAll(basRgvMap.getRgvNo(), wrkMastSta); //鍛戒护涓嬪彂
+ if (sign){
+ if(LEFT_POSITION.contains(wrkMastSta.getStaEnd())){
+ basRgv.setPakToCrn("0");
+ basRgvService.updateById(basRgv);
+ if(wrkMastSta3 != null){
+ if(!LEFT_POSITION.contains(wrkMastSta3.getStaEnd())){
+ wrkMastSta3 = null;//鑻ユ帴椹崇浜屼綅涓嶆帴椹虫椂鍙栨秷杩炵画鍙栬揣
+ }
+ }
+ }
+
+ if(wrkMastSta3 != null ){
+ List<WrkMastSta> wrkMastStaPaking = wrkMastStaService.selectPakingWrk(wrkMastSta3.getStaStart());
+ if(wrkMastStaPaking.size() < 1){
+ wrkMastSta3.setMk(1);
+ basRgv.setPakAll("0");
+ basRgvService.updateById(basRgv);
+ try{
+ wrkMastStaMapper.updateById(wrkMastSta3);
+ log.error("閿佸畾鐩搁殧绔欑偣浠诲姟");
+ }catch (Exception e){
+ log.error("閿佸畾鐩搁殧绔欑偣浠诲姟澶辫触");
+ }
+ }
+ }
+ basRgv.setPakIn("0");
+ basRgvService.updateById(basRgv);
+
+ rgvThread.setPaking(false);
// rgvThread.setPakIn(false);//鍏ュ簱涓嶅厑璁�
-// try{
-// wrkMastSta.setWrkSts(1);
-// wrkMastStaMapper.updateById(wrkMastSta);
-// log.error("鏇存柊灏忚溅浠诲姟鎴愬姛");
-// }catch (Exception e){
-// log.error("鏇存柊灏忚溅浠诲姟澶辫触");
-// }
-// } else {
-// log.error("宸ヤ綔鍙穥}鎵�灞炰换鍔′笅鍙戝け璐�",wrkMastSta.getWrkNo());
-// }
-//
-//
-// }
-// }
+ try{
+ wrkMastSta.setWrkSts(1);
+ wrkMastStaMapper.updateById(wrkMastSta);
+ log.error("鏇存柊灏忚溅浠诲姟鎴愬姛");
+ }catch (Exception e){
+ log.error("鏇存柊灏忚溅浠诲姟澶辫触");
+ }
+ } else {
+ log.error("宸ヤ綔鍙穥}鎵�灞炰换鍔′笅鍙戝け璐�",wrkMastSta.getWrkNo());
+ }
+
+
+ }
+ }
/**
* 鎵ц灏忚溅鎼繍浠诲姟
*
@@ -4483,4 +4613,67 @@
response, bool);
}
+ /*
+ * agv浠诲姟涓嬪彂
+ * */
+ public synchronized void agvTaskAssignment() {
+ try{
+ List<BasAgvMast> basAgvMastList = basAgvMastService.selectList(new EntityWrapper<BasAgvMast>().eq("status", 0));
+ for (BasAgvMast basAgvMast : basAgvMastList) {
+ if (basAgvMast.getStatus()!=0 && basAgvMast.getIoType()!=3){//3==銆嬪嚭搴�==>杈撻�佺嚎绔欑偣==銆婣GV搴撲綅
+ continue;
+ }
+ try{
+ // 鑾峰彇绔欑偣淇℃伅
+ SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, basAgvMast.getDevpId());
+ StaProtocol staProtocol = devpThread.getStation().get(basAgvMast.getSourceStaNo());
+ if (staProtocol == null || !staProtocol.isLoading()) {
+ continue;
+ } else {
+ staProtocol = staProtocol.clone();
+ }
+
+ if (!Cools.isEmpty(staProtocol.getWorkNo()) && staProtocol.getWorkNo().equals(basAgvMast.getTaskNo())){
+
+ AgvTaskAssignmentParam agvTaskAssignmentParam = new AgvTaskAssignmentParam();
+
+ //浠诲姟涓嬪彂
+ ReturnT<String> result = new PostMesDataUtils().postMesData("AGV浠诲姟涓嬪彂", AgvConstant.AGV_URL, AgvConstant.AGV_ADAPTOR, agvTaskAssignmentParam);
+ if (result.getCode()==200){
+ basAgvMast.setStatus(1);
+ basAgvMastService.updateById(basAgvMast);
+ } else {
+ agvTaskAssignmentCallApiLogSave(basAgvMast, "AGV浠诲姟涓嬪彂澶辫触", "浠诲姟鍙凤細"+basAgvMast.getTaskNo()+"浠诲姟淇℃伅涓嬪彂澶辫触锛侊紒锛�", false);
+ }
+ }
+ } catch (Exception e){
+ log.error("浠诲姟鍙凤細"+basAgvMast.getTaskNo()+"====銆婣GV浠诲姟涓嬪彂澶辫触"+e.getMessage());
+ }
+ }
+ }catch (Exception e){
+ log.error("AGV浠诲姟涓嬪彂澶辫触"+e.getMessage());
+ }
+ }
+
+ public void agvTaskAssignmentCallApiLogSave(BasAgvMast basAgvMast ,String tableName, String response, Boolean bool) {
+ ApiLog apiLog = apiLogService.selectOne(new EntityWrapper<ApiLog>()
+ .eq("namespace", "Agv浠诲姟涓嬪彂")
+ .eq("request", "浠诲姟鍙�:" + basAgvMast.getTaskNo())
+ .eq("response", response)
+ .eq("url", tableName)
+ .eq("result", 0)
+ .orderBy("create_time", false)
+ );
+
+ if (!Cools.isEmpty(apiLog)){
+ long parseLong = Long.parseLong(apiLog.getTimestamp());
+ if (new Date().getTime()-parseLong<5*1000*60){
+ return;
+ }
+ }
+ apiLogService.save("Agv浠诲姟涓嬪彂", tableName, "null", "127.0.0.1",
+ "浠诲姟鍙�:" + basAgvMast.getTaskNo() ,
+ response, bool);
+ }
+
}
diff --git a/src/main/java/com/zy/common/CodeBuilder.java b/src/main/java/com/zy/common/CodeBuilder.java
index 023bcda..fa2e16b 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="localhost:1433;databasename=jshdasrs";
generator.username="sa";
generator.password="sa@123";
- generator.table="asr_bas_devp_opt";
+ generator.table="asr_bas_agv_mast";
generator.packagePath="com.zy.asrs";
generator.build();
}
diff --git a/src/main/java/com/zy/common/constant/AgvConstant.java b/src/main/java/com/zy/common/constant/AgvConstant.java
new file mode 100644
index 0000000..f31c8e5
--- /dev/null
+++ b/src/main/java/com/zy/common/constant/AgvConstant.java
@@ -0,0 +1,15 @@
+package com.zy.common.constant;
+
+/*
+ * Created by Monkey D. Luffy on 2025.09.09
+ * */
+public class AgvConstant {
+
+ public static final String AGV_IP = "10.10.10.171";
+ public static final String AGV_URL = "http://10.10.10.171:7002";
+
+ public static final String AGV_ADAPTOR = "adaptor/api/wcs/order";//鍒涘缓璁㈠崟
+
+ public static final String AGV_WORKSPACE = "adaptor/api/wcs/workspace/ready";//閫氱煡宸ヤ綔绌洪棿宸插氨缁�
+
+}
diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java
index c9b6419..f7ef9b8 100644
--- a/src/main/java/com/zy/core/MainProcess.java
+++ b/src/main/java/com/zy/core/MainProcess.java
@@ -25,6 +25,7 @@
// 鎵�灞炵嚎绋�
private Thread thread;
private Thread armThread;
+ private Thread agvThread;
// 棰戠巼
private int i = 0;
private int k = 0;
@@ -39,6 +40,9 @@
armThread = new Thread(this::roboticArmDispatch);
armThread.start();
+
+ agvThread = new Thread(this::agvDispatch);
+ agvThread.start();
}
private void crnAndDevRun() {
while (!Thread.currentThread().isInterrupted()) {
@@ -177,6 +181,26 @@
}
}
+ private void agvDispatch() {
+ while (!Thread.currentThread().isInterrupted()) {
+ try {
+
+ // 闂撮殧
+ Thread.sleep(400);
+
+ // 绯荤粺杩愯鐘舵�佸垽鏂�
+ if (!SystemProperties.WCS_RUNNING_STATUS.get()) {
+ continue;
+ }
+ //agv浠诲姟涓嬪彂
+ mainService.agvTaskAssignment();//0===銆�1
+
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+ }
+
@PreDestroy
public void shutDown(){
if (thread != null) thread.interrupt();
diff --git a/src/main/resources/mapper/BasAgvMastMapper.xml b/src/main/resources/mapper/BasAgvMastMapper.xml
new file mode 100644
index 0000000..73f1b1f
--- /dev/null
+++ b/src/main/resources/mapper/BasAgvMastMapper.xml
@@ -0,0 +1,27 @@
+<?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.BasAgvMastMapper">
+
+ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+ <resultMap id="BaseResultMap" type="com.zy.asrs.entity.BasAgvMast">
+ <result column="id" property="id" />
+ <result column="task_no" property="taskNo" />
+ <result column="timestamp" property="timestamp" />
+ <result column="source_sta_no" property="sourceStaNo" />
+ <result column="sta_no" property="staNo" />
+ <result column="source_loc_no" property="sourceLocNo" />
+ <result column="loc_no" property="locNo" />
+ <result column="priority" property="priority" />
+ <result column="floor_no" property="floorNo" />
+ <result column="status" property="status" />
+ <result column="error_time" property="errorTime" />
+ <result column="error_memo" property="errorMemo" />
+ <result column="appe_time" property="appeTime" />
+ <result column="modi_time" property="modiTime" />
+ <result column="modi_user" property="modiUser" />
+ <result column="devp_id" property="devpId" />
+ <result column="io_type" property="ioType" />
+
+ </resultMap>
+
+</mapper>
diff --git a/src/main/resources/mapper/WrkMastMapper.xml b/src/main/resources/mapper/WrkMastMapper.xml
index 668b0a4..1b90099 100644
--- a/src/main/resources/mapper/WrkMastMapper.xml
+++ b/src/main/resources/mapper/WrkMastMapper.xml
@@ -213,7 +213,7 @@
<select id="selectByWrkNo9996" resultMap="BaseResultMap">
select * from asr_wrk_mast
where wrk_no = #{wrkNo}
- and wrk_sts = 2
+ and wrk_sts = 11
</select>
<select id="selectByWrkNo9997" resultMap="BaseResultMap">
select * from asr_wrk_mast
diff --git a/src/main/webapp/static/js/basAgvMast/basAgvMast.js b/src/main/webapp/static/js/basAgvMast/basAgvMast.js
new file mode 100644
index 0000000..59f5208
--- /dev/null
+++ b/src/main/webapp/static/js/basAgvMast/basAgvMast.js
@@ -0,0 +1,274 @@
+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: '#basAgvMast',
+ headers: {token: localStorage.getItem('token')},
+ url: baseUrl+'/basAgvMast/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: 'taskNo', align: 'center',title: 'WMS浠诲姟鍙�'}
+ ,{field: 'timestamp', align: 'center',title: 'RGV浠诲姟鍙�'}
+ ,{field: 'sourceStaNo', align: 'center',title: '婧愮珯鐐�'}
+ ,{field: 'staNo', align: 'center',title: '鐩殑绔欑偣'}
+ ,{field: 'sourceLocNo', align: 'center',title: '婧愬簱浣�'}
+ ,{field: 'locNo', align: 'center',title: '鐩殑搴撲綅'}
+ ,{field: 'priority', align: 'center',title: '浼樺厛绾�'}
+ ,{field: 'floorNo', align: 'center',title: '妤煎眰'}
+ ,{field: 'status$', align: 'center',title: '鐘舵��'}
+ ,{field: 'errorTime$', align: 'center',title: '寮傚父鏃堕棿'}
+ ,{field: 'errorMemo', align: 'center',title: '寮傚父淇℃伅'}
+ ,{field: 'appeTime$', align: 'center',title: '娣诲姞鏃堕棿'}
+ ,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿'}
+ ,{field: 'modiUser$', 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(basAgvMast)', 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(basAgvMast)', 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 = {
+ 'basAgvMast': exportData,
+ 'fields': fields
+ };
+ $.ajax({
+ url: baseUrl+"/basAgvMast/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(basAgvMast)', 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+"/basAgvMast/"+(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+"/basAgvMast/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: '#errorTime\\$',
+ type: 'datetime',
+ value: data!==undefined?data['errorTime\\$']:null
+ });
+ layDate.render({
+ elem: '#appeTime\\$',
+ type: 'datetime',
+ value: data!==undefined?data['appeTime\\$']:null
+ });
+ layDate.render({
+ elem: '#modiTime\\$',
+ type: 'datetime',
+ value: data!==undefined?data['modiTime\\$']: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/basAgvMast/basAgvMast.html b/src/main/webapp/views/basAgvMast/basAgvMast.html
new file mode 100644
index 0000000..0eb2395
--- /dev/null
+++ b/src/main/webapp/views/basAgvMast/basAgvMast.html
@@ -0,0 +1,181 @@
+<!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="basAgvMast" lay-filter="basAgvMast"></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/basAgvMast/basAgvMast.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 layui-form-required">WMS浠诲姟鍙�: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="taskNo" placeholder="璇疯緭鍏MS浠诲姟鍙�" lay-vertype="tips" lay-verify="required">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">RGV浠诲姟鍙�: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="timestamp" 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="sourceStaNo" placeholder="璇疯緭鍏ユ簮绔欑偣">
+ </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="sourceLocNo" 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="priority" placeholder="璇疯緭鍏ヤ紭鍏堢骇">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">妤煎眰: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="floorNo" placeholder="璇疯緭鍏ユゼ灞�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">鐘舵��: </label>
+ <div class="layui-input-block">
+ <select name="status">
+ <option value="">璇烽�夋嫨鐘舵��</option>
+ <option value="0">鍒濆</option>
+ <option value="1">浣滀笟涓�</option>
+ <option value="2">瀹屾垚</option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">寮傚父鏃堕棿: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="errorTime" id="errorTime$" placeholder="璇疯緭鍏ュ紓甯告椂闂�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">寮傚父淇℃伅: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="errorMemo" 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 class="layui-form-item">
+ <label class="layui-form-label">淇敼鏃堕棿: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="modiTime" id="modiTime$" placeholder="璇疯緭鍏ヤ慨鏀规椂闂�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">淇敼浜哄憳: </label>
+ <div class="layui-input-block cool-auto-complete">
+ <input class="layui-input" name="modiUser" placeholder="璇疯緭鍏ヤ慨鏀逛汉鍛�" style="display: none">
+ <input id="modiUser$" name="modiUser$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏ヤ慨鏀逛汉鍛�" onfocus=this.blur()>
+ <div class="cool-auto-complete-window">
+ <input class="cool-auto-complete-window-input" data-key="userQueryBymodiUser" onkeyup="autoLoad(this.getAttribute('data-key'))">
+ <select class="cool-auto-complete-window-select" data-key="userQueryBymodiUserSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
+ </select>
+ </div>
+ </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