From 796cfcc66392f78362cd72ca2510fc5194c0d079 Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期一, 17 二月 2025 16:00:58 +0800
Subject: [PATCH] 初始化立福德wcs
---
src/main/webapp/views/basShuttle/basShuttle.html | 148 ++++
src/main/java/com/zy/asrs/task/TaskLogScheduler.java | 92 +-
src/main/webapp/static/wcs/js/common.js | 2
src/main/java/com/zy/asrs/entity/TaskWrk.java | 4
src/main/java/com/zy/asrs/mapper/BasShuttleMapper.java | 12
src/main/resources/mapper/BasShuttleMapper.xml | 27
src/main/java/com/zy/asrs/entity/param/NotifyDto.java | 44 +
src/main/java/com/zy/asrs/task/AssignTasksRCSScheduler.java | 94 ++
pom.xml | 4
src/main/webapp/static/wms/js/common.js | 2
src/main/java/com/zy/asrs/service/BasShuttleService.java | 8
src/main/webapp/static/wcs/js/console.map.js | 2
src/main/java/com/zy/asrs/controller/BasShuttleController.java | 127 +++
src/main/java/com/zy/core/MainProcess.java | 8
src/main/java/com/zy/asrs/service/impl/BasShuttleServiceImpl.java | 12
src/main/java/com/zy/asrs/task/SameLayerTransferScheduler.java | 91 ++
src/main/java/com/zy/asrs/entity/BasShuttle.java | 202 ++++++
src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java | 84 +-
src/main/java/com/zy/asrs/controller/OpenController.java | 11
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 515 ++-------------
src/main/webapp/static/wms/js/basShuttle/basShuttle.js | 279 ++++++++
src/main/resources/mapper/TaskWrkMapper.xml | 2
src/main/java/com/zy/core/ServerBootstrap.java | 12
src/main/java/com/zy/core/thread/SiemensCrnThread.java | 72 +-
src/main/java/com/zy/asrs/controller/TaskWrkController.java | 30
src/main/resources/application.yml | 14
26 files changed, 1,330 insertions(+), 568 deletions(-)
diff --git a/pom.xml b/pom.xml
index 7a47d8d..f6d259a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
<relativePath/> <!-- lookup parent from repository -->
</parent>
<groupId>com.zy</groupId>
- <artifactId>jdzwcs</artifactId>
+ <artifactId>wcs</artifactId>
<version>1.0.0</version>
<packaging>war</packaging>
@@ -200,7 +200,7 @@
</dependencies>
<build>
- <finalName>jdzwcs</finalName>
+ <finalName>wcs</finalName>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
diff --git a/src/main/java/com/zy/asrs/controller/BasShuttleController.java b/src/main/java/com/zy/asrs/controller/BasShuttleController.java
new file mode 100644
index 0000000..88a5cc9
--- /dev/null
+++ b/src/main/java/com/zy/asrs/controller/BasShuttleController.java
@@ -0,0 +1,127 @@
+package com.zy.asrs.controller;
+
+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.annotations.ManagerAuth;
+import com.core.common.BaseRes;
+import com.core.common.Cools;
+import com.core.common.DateUtils;
+import com.core.common.R;
+import com.zy.asrs.entity.BasShuttle;
+import com.zy.asrs.service.BasShuttleService;
+import com.zy.common.web.BaseController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@RestController
+public class BasShuttleController extends BaseController {
+
+ @Autowired
+ private BasShuttleService basShuttleService;
+
+ @RequestMapping(value = "/basShuttle/{id}/auth")
+ @ManagerAuth
+ public R get(@PathVariable("id") String id) {
+ return R.ok(basShuttleService.selectById(String.valueOf(id)));
+ }
+
+ @RequestMapping(value = "/basShuttle/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<BasShuttle> wrapper = new EntityWrapper<>();
+ excludeTrash(param);
+ convert(param, wrapper);
+ allLike(BasShuttle.class, param.keySet(), wrapper, condition);
+ if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ return R.ok(basShuttleService.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 = "/basShuttle/add/auth")
+ @ManagerAuth
+ public R add(BasShuttle basShuttle) {
+ basShuttleService.insert(basShuttle);
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/basShuttle/update/auth")
+ @ManagerAuth
+ public R update(BasShuttle basShuttle){
+ if (Cools.isEmpty(basShuttle) || null==basShuttle.getShuttleNo()){
+ return R.error();
+ }
+ basShuttleService.updateById(basShuttle);
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/basShuttle/delete/auth")
+ @ManagerAuth
+ public R delete(@RequestParam(value="ids[]") Long[] ids){
+ for (Long id : ids){
+ basShuttleService.deleteById(id);
+ }
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/basShuttle/export/auth")
+ @ManagerAuth
+ public R export(@RequestBody JSONObject param){
+ EntityWrapper<BasShuttle> wrapper = new EntityWrapper<>();
+ List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
+ Map<String, Object> map = excludeTrash(param.getJSONObject("basShuttle"));
+ convert(map, wrapper);
+ List<BasShuttle> list = basShuttleService.selectList(wrapper);
+ return R.ok(exportSupport(list, fields));
+ }
+
+ @RequestMapping(value = "/basShuttleQuery/auth")
+ @ManagerAuth
+ public R query(String condition) {
+ EntityWrapper<BasShuttle> wrapper = new EntityWrapper<>();
+ wrapper.like("shuttle_no", condition);
+ Page<BasShuttle> page = basShuttleService.selectPage(new Page<>(0, 10), wrapper);
+ List<Map<String, Object>> result = new ArrayList<>();
+ for (BasShuttle basShuttle : page.getRecords()){
+ Map<String, Object> map = new HashMap<>();
+ map.put("id", basShuttle.getShuttleNo());
+ map.put("value", basShuttle.getShuttleNo());
+ result.add(map);
+ }
+ return R.ok(result);
+ }
+
+ @RequestMapping(value = "/basShuttle/check/column/auth")
+ @ManagerAuth
+ public R query(@RequestBody JSONObject param) {
+ Wrapper<BasShuttle> wrapper = new EntityWrapper<BasShuttle>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
+ if (null != basShuttleService.selectOne(wrapper)){
+ return R.parse(BaseRes.REPEAT).add(getComment(BasShuttle.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 9a16f6c..18db281 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -464,6 +464,17 @@
return R.ok(crnStatusParams);
}
+ //璁惧鐘舵�佹煡璇㈡帴鍙�
+ @PostMapping("/devpdeviceStatus")
+ @Transactional
+ public String devpDeviceStatus(@RequestBody HashMap staNo) {
+ BasDevp basDevp=basDevpService.selectOne(new EntityWrapper<BasDevp>().eq("dev_no",staNo.get("staNo")));
+ if(basDevp==null||basDevp.getLoading().equals("Y")||basDevp.getOutEnable().equals("N")){
+ return "no";
+ }
+ return "ok";
+ }
+
public static <T> List<T> convertListMapToListObject(List<HashMap<String, Object>> listMap, Class<T> clazz) throws Exception {
List<T> list = new ArrayList<>();
diff --git a/src/main/java/com/zy/asrs/controller/TaskWrkController.java b/src/main/java/com/zy/asrs/controller/TaskWrkController.java
index e9a44f2..b891f3b 100644
--- a/src/main/java/com/zy/asrs/controller/TaskWrkController.java
+++ b/src/main/java/com/zy/asrs/controller/TaskWrkController.java
@@ -11,6 +11,8 @@
import com.zy.asrs.entity.CommandInfo;
import com.zy.asrs.entity.LocMast;
import com.zy.asrs.entity.TaskWrk;
+import com.zy.asrs.entity.TaskWrkLog;
+import com.zy.asrs.entity.param.NotifyDto;
import com.zy.asrs.entity.param.TaskOverToWms;
import com.zy.asrs.service.ApiLogService;
import com.zy.asrs.service.CommandInfoService;
@@ -349,4 +351,32 @@
}
}
+ @PostMapping(value = "/taskWrk/state")
+// @ManagerAuth(memo = "鎺ユ敹RCS浠诲姟鐘舵��")
+ public R taskWrkState(@RequestBody NotifyDto notifyDto) {
+ log.info("鎺ユ敹RCS浠诲姟鐘舵��={}", notifyDto);
+ TaskWrk taskWrk = taskWrkService.selectByTaskNo(notifyDto.getSuperTaskNo());//wms浠诲姟鍙�
+ if (taskWrk == null) {
+ return R.error("娌℃湁鎵惧埌璇ヤ换鍔�={"+notifyDto+"}");
+ }
+ Date now = new Date();
+ if(notifyDto.getMsgType().equals("task_complete")&&taskWrk.getIoType()==3){
+ taskWrk.setWrkSts(9);//鏇存柊鏁版嵁瀹屾垚锛岀洿鎺ヨ浆鍘嗗彶妗�
+
+ //鏇存柊婧愬簱浣嶇姸鎬佷负绌哄簱浣�
+ LocMast locMast = locMastService.selectByLocNo(taskWrk.getStartPoint());
+ locMast.setLocSts("O");
+ locMastService.updateById(locMast);
+
+ //鏇存柊鐩爣搴撶姸鎬佷负鍦ㄥ簱
+ LocMast locMast2 = locMastService.selectByLocNo(taskWrk.getTargetPoint());
+ locMast2.setLocSts("F");
+ locMastService.updateById(locMast2);
+ taskWrk.setModiTime(now);//鎿嶄綔鏃堕棿
+ taskWrk.setModiUser(9998L);//鎿嶄綔鍛�
+ taskWrkService.updateById(taskWrk);
+ }
+ return R.ok();
+ }
+
}
diff --git a/src/main/java/com/zy/asrs/entity/BasShuttle.java b/src/main/java/com/zy/asrs/entity/BasShuttle.java
new file mode 100644
index 0000000..02f128c
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/BasShuttle.java
@@ -0,0 +1,202 @@
+package com.zy.asrs.entity;
+
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.enums.IdType;
+import com.core.common.Cools;
+import com.core.common.SpringUtils;
+import com.zy.system.entity.User;
+import com.zy.system.service.UserService;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+@Data
+@TableName("asr_bas_shuttle")
+public class BasShuttle implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 鍥涘悜绌挎杞﹀彿
+ */
+ @ApiModelProperty(value= "鍥涘悜绌挎杞﹀彿")
+ @TableId(value = "shuttle_no", type = IdType.INPUT)
+ @TableField("shuttle_no")
+ private Integer shuttleNo;
+
+ /**
+ * 鐘舵�� 1: 姝ｅ父 0: 绂佺敤
+ */
+ @ApiModelProperty(value= "鐘舵�� 1: 姝ｅ父 0: 绂佺敤 ")
+ private Integer status;
+
+ /**
+ * 褰撳墠灏忚溅鐘舵�侊紙鍐呴儴鑷垜缁存姢锛�
+ */
+ @ApiModelProperty(value= "褰撳墠灏忚溅鐘舵�侊紙鍐呴儴鑷垜缁存姢锛�")
+ @TableField("shuttle_status")
+ private Integer shuttleStatus;
+
+ /**
+ * 浠诲姟鍙�
+ */
+ @ApiModelProperty(value= "浠诲姟鍙�")
+ @TableField("wrk_no")
+ private Integer wrkNo;
+
+ /**
+ * 鏆傚瓨搴撲綅
+ */
+ @ApiModelProperty(value= "鏆傚瓨搴撲綅")
+ @TableField("idle_loc")
+ private String idleLoc;
+
+ /**
+ * 鑷姩鍏呯數
+ */
+ @ApiModelProperty(value= "鑷姩鍏呯數")
+ @TableField("auto_charge")
+ private Integer autoCharge;
+
+ /**
+ * 鐢甸噺绾�
+ */
+ @ApiModelProperty(value= "鐢甸噺绾�")
+ @TableField("charge_line")
+ private Integer chargeLine;
+
+ /**
+ * 娣诲姞浜哄憳
+ */
+ @ApiModelProperty(value= "娣诲姞浜哄憳")
+ @TableField("create_by")
+ private Long createBy;
+
+ /**
+ * 娣诲姞鏃堕棿
+ */
+ @ApiModelProperty(value= "娣诲姞鏃堕棿")
+ @TableField("create_time")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date createTime;
+
+ /**
+ * 淇敼浜哄憳
+ */
+ @ApiModelProperty(value= "淇敼浜哄憳")
+ @TableField("update_by")
+ private Long updateBy;
+
+ /**
+ * 淇敼鏃堕棿
+ */
+ @ApiModelProperty(value= "淇敼鏃堕棿")
+ @TableField("update_time")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date updateTime;
+
+ /**
+ * 澶囨敞
+ */
+ @ApiModelProperty(value= "澶囨敞")
+ private String memo;
+
+ /**
+ * 浣滀笟鏍囪
+ */
+ @ApiModelProperty(value= "浣滀笟鏍囪")
+ @TableField("pak_mk")
+ private Boolean pakMk;
+
+ /**
+ * 灏忚溅杩愯閫熷害
+ */
+ @ApiModelProperty(value= "灏忚溅杩愯閫熷害")
+ @TableField("run_speed")
+ private Integer runSpeed;
+
+ /**
+ * 璁惧鐘舵��
+ */
+ @ApiModelProperty(value= "璁惧鐘舵��")
+ @TableField("device_status")
+ private String deviceStatus;
+
+ /**
+ * 灏忚溅绂佺敤妤煎眰
+ */
+ @ApiModelProperty(value= "灏忚溅绂佺敤妤煎眰")
+ @TableField("disable_lev")
+ private String disableLev;
+
+ public BasShuttle() {}
+
+ public BasShuttle(Integer shuttleNo, Integer status, Integer shuttleStatus, Integer wrkNo, String idleLoc, Integer autoCharge, Integer chargeLine, Long createBy, Date createTime, Long updateBy, Date updateTime, String memo, Boolean pakMk, String deviceStatus) {
+ this.shuttleNo = shuttleNo;
+ this.status = status;
+ this.shuttleStatus = shuttleStatus;
+ this.wrkNo = wrkNo;
+ this.idleLoc = idleLoc;
+ this.autoCharge = autoCharge;
+ this.chargeLine = chargeLine;
+ this.createBy = createBy;
+ this.createTime = createTime;
+ this.updateBy = updateBy;
+ this.updateTime = updateTime;
+ this.memo = memo;
+ this.pakMk = pakMk;
+ this.deviceStatus = deviceStatus;
+ }
+
+ public String getStatus$(){
+ if (null == this.status){ return null; }
+ switch (this.status){
+ case 1:
+ return "姝ｅ父";
+ case 0:
+ return "绂佺敤";
+ default:
+ return String.valueOf(this.status);
+ }
+ }
+
+ public String getCreateBy$(){
+ UserService service = SpringUtils.getBean(UserService.class);
+ User user = service.selectById(this.createBy);
+ if (!Cools.isEmpty(user)){
+ return String.valueOf(user.getUsername());
+ }
+ return null;
+ }
+
+ public String getCreateTime$(){
+ if (Cools.isEmpty(this.createTime)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
+ }
+
+ public String getUpdateBy$(){
+ UserService service = SpringUtils.getBean(UserService.class);
+ User user = service.selectById(this.updateBy);
+ if (!Cools.isEmpty(user)){
+ return String.valueOf(user.getUsername());
+ }
+ return null;
+ }
+
+ public String getUpdateTime$(){
+ if (Cools.isEmpty(this.updateTime)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
+ }
+
+
+}
diff --git a/src/main/java/com/zy/asrs/entity/TaskWrk.java b/src/main/java/com/zy/asrs/entity/TaskWrk.java
index b2f7261..398b222 100644
--- a/src/main/java/com/zy/asrs/entity/TaskWrk.java
+++ b/src/main/java/com/zy/asrs/entity/TaskWrk.java
@@ -50,7 +50,7 @@
/**
* 浠诲姟鐘舵�� 1: 鎺ユ敹 2: 娲惧彂 3: 瀹岀粨 4: 鍙栨秷
*/
- @ApiModelProperty(value= "浠诲姟鐘舵�� 1: 鎺ユ敹 2: 娲惧彂 5: 瀹岀粨 4: 鍙栨秷 ")
+ @ApiModelProperty(value= "浠诲姟鐘舵�� 1: 鎺ユ敹 2: 娲惧彂 4: 鍙栨秷 5: 瀹岀粨 ")
private Integer status;
/**
@@ -70,6 +70,8 @@
/**
* 浠诲姟绫诲瀷
+ *
+ *
*/
@ApiModelProperty(value= "浠诲姟绫诲瀷")
@TableField("io_type")
diff --git a/src/main/java/com/zy/asrs/entity/param/NotifyDto.java b/src/main/java/com/zy/asrs/entity/param/NotifyDto.java
new file mode 100644
index 0000000..c25ee2d
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/param/NotifyDto.java
@@ -0,0 +1,44 @@
+package com.zy.asrs.entity.param;
+
+import lombok.Data;
+
+@Data
+public class NotifyDto {
+
+ private Long id;
+
+ //閫氱煡绫诲瀷
+ private String notifyType;
+
+ //璁惧鍙�
+ private Integer device;
+
+ //宸ヤ綔鍙�
+ private String taskNo;
+
+ //娑堟伅绫诲瀷
+ private String msgType;
+
+ //娑堟伅鎻忚堪
+ private String msgDesc;
+
+ //娑堟伅鏁版嵁
+ private String data;
+
+ //澶辫触閲嶈瘯娆℃暟
+ private Integer failTimes = 3;
+
+ //閲嶈瘯娆℃暟
+ private Integer retryTimes = 0;
+
+ //閲嶈瘯闂撮殧榛樿30s
+ private Integer retryTime = 30;
+
+ //涓婃閲嶈瘯鏃堕棿
+ private Long lastRetryTime = 0L;
+
+ //wms宸ヤ綔鍙�
+ private String superTaskNo;
+
+}
+
diff --git a/src/main/java/com/zy/asrs/mapper/BasShuttleMapper.java b/src/main/java/com/zy/asrs/mapper/BasShuttleMapper.java
new file mode 100644
index 0000000..5a2ae32
--- /dev/null
+++ b/src/main/java/com/zy/asrs/mapper/BasShuttleMapper.java
@@ -0,0 +1,12 @@
+package com.zy.asrs.mapper;
+
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.zy.asrs.entity.BasShuttle;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+@Mapper
+@Repository
+public interface BasShuttleMapper extends BaseMapper<BasShuttle> {
+
+}
diff --git a/src/main/java/com/zy/asrs/service/BasShuttleService.java b/src/main/java/com/zy/asrs/service/BasShuttleService.java
new file mode 100644
index 0000000..cfc47dc
--- /dev/null
+++ b/src/main/java/com/zy/asrs/service/BasShuttleService.java
@@ -0,0 +1,8 @@
+package com.zy.asrs.service;
+
+import com.baomidou.mybatisplus.service.IService;
+import com.zy.asrs.entity.BasShuttle;
+
+public interface BasShuttleService extends IService<BasShuttle> {
+
+}
diff --git a/src/main/java/com/zy/asrs/service/impl/BasShuttleServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/BasShuttleServiceImpl.java
new file mode 100644
index 0000000..3f84726
--- /dev/null
+++ b/src/main/java/com/zy/asrs/service/impl/BasShuttleServiceImpl.java
@@ -0,0 +1,12 @@
+package com.zy.asrs.service.impl;
+
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.zy.asrs.entity.BasShuttle;
+import com.zy.asrs.mapper.BasShuttleMapper;
+import com.zy.asrs.service.BasShuttleService;
+import org.springframework.stereotype.Service;
+
+@Service("basShuttleService")
+public class BasShuttleServiceImpl extends ServiceImpl<BasShuttleMapper, BasShuttle> implements BasShuttleService {
+
+}
diff --git a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
index ef957cb..04b0eca 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
@@ -85,48 +85,48 @@
@Override
public R toWmsLocStatus(LocMast locMast) {
- String response = null;
- Map<String, Object> map = new HashMap<>();
- map.put("x-api-key","7a15b5db-29b6-552c-8cff-0cfec3756da2");
- WmsLocStatus param = new WmsLocStatus();
- param.setWarehouseId("1688469798893297665");
- param.setLocationCode(Utils.getWmsLocNo(locMast.getLocNo()));
- param.setEmptyContainer(locMast.getEmptyContainer$());
- if (locMast.getLocSts().equals("Z")){
- param.setStatus("JY");
- }else {
- param.setStatus("QY");
- }
- if (Cools.isEmpty(locMast.getBarcode()) || locMast.getLocSts().equals("O")){
- param.setContainerCode("");
- param.setContainerTypeCode("");
- }else {
- param.setContainerCode(locMast.getBarcode());
- param.setContainerTypeCode(locMast.getContainerTypeCode());
- }
-
- try {
- response = new HttpHandler.Builder()
- .setHeaders(map)
- .setUri(wmsUrl)
- .setPath("wcsManager/wcsInterface/locationUpdate")
- .setJson(JSON.toJSONString(param))
- .build()
- .doPost();
- }catch (Exception e){
- log.error("鍫嗗灈鏈轰换鍔″畬鎴愶紝璇锋眰wms浠诲姟瀹屾垚鎺ュ彛澶辫触");
- }
- JSONObject jsonObject = JSON.parseObject(response);
-
-
- apiLogService.save("Wms鍙樻洿璐т綅鐘舵��"
- ,wmsUrl+"wcsManager/wcsInterface/inboundTaskApply"
- ,null
- ,"127.0.0.1"
- ,JSON.toJSONString(param)
- ,response
- ,true
- );
+// String response = null;
+// Map<String, Object> map = new HashMap<>();
+// map.put("x-api-key","7a15b5db-29b6-552c-8cff-0cfec3756da2");
+// WmsLocStatus param = new WmsLocStatus();
+// param.setWarehouseId("1688469798893297665");
+// param.setLocationCode(Utils.getWmsLocNo(locMast.getLocNo()));
+// param.setEmptyContainer(locMast.getEmptyContainer$());
+// if (locMast.getLocSts().equals("Z")){
+// param.setStatus("JY");
+// }else {
+// param.setStatus("QY");
+// }
+// if (Cools.isEmpty(locMast.getBarcode()) || locMast.getLocSts().equals("O")){
+// param.setContainerCode("");
+// param.setContainerTypeCode("");
+// }else {
+// param.setContainerCode(locMast.getBarcode());
+// param.setContainerTypeCode(locMast.getContainerTypeCode());
+// }
+//
+// try {
+// response = new HttpHandler.Builder()
+// .setHeaders(map)
+// .setUri(wmsUrl)
+// .setPath("wcsManager/wcsInterface/locationUpdate")
+// .setJson(JSON.toJSONString(param))
+// .build()
+// .doPost();
+// }catch (Exception e){
+// log.error("鍫嗗灈鏈轰换鍔″畬鎴愶紝璇锋眰wms浠诲姟瀹屾垚鎺ュ彛澶辫触");
+// }
+// JSONObject jsonObject = JSON.parseObject(response);
+//
+//
+// apiLogService.save("Wms鍙樻洿璐т綅鐘舵��"
+// ,wmsUrl+"wcsManager/wcsInterface/inboundTaskApply"
+// ,null
+// ,"127.0.0.1"
+// ,JSON.toJSONString(param)
+// ,response
+// ,true
+// );
return null;
}
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 5b8eaa2..58df8a5 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -103,6 +103,11 @@
private String TaskExecCallback;
@Value("${wms.taskStatusFeedbackPath}")
private String taskStatusFeedbackPath;
+
+ @Value("${wcs.urlWcs}")
+ private String wcsUrl;
+ @Value("${wcs.inboundTaskApplyPathWcs}")
+ private String wcsInboundTaskApplyPath;
@Autowired
private CrnController crnController;
@Autowired
@@ -198,20 +203,20 @@
.build()
.doPost();
JSONObject jsonObject = JSON.parseObject(response);
- if(back){
- if(staProtocol.getWorkNo()>=9801&&staProtocol.getWorkNo()<=9825){
- staProtocol.setStaNo((short)105);
- } else if (staProtocol.getWorkNo()>=9826&&staProtocol.getWorkNo()<=9850) {
- staProtocol.setStaNo((short)107);
- }else if (staProtocol.getWorkNo()>=9851&&staProtocol.getWorkNo()<=9875) {
- staProtocol.setStaNo((short)109);
- }else{
- staProtocol.setStaNo((short)110);
+ if (back) {
+ if (staProtocol.getWorkNo() >= 9801 && staProtocol.getWorkNo() <= 9825) {
+ staProtocol.setStaNo((short) 105);
+ } else if (staProtocol.getWorkNo() >= 9826 && staProtocol.getWorkNo() <= 9850) {
+ staProtocol.setStaNo((short) 107);
+ } else if (staProtocol.getWorkNo() >= 9851 && staProtocol.getWorkNo() <= 9875) {
+ staProtocol.setStaNo((short) 109);
+ } else {
+ staProtocol.setStaNo((short) 110);
}
devpThread.setPakMk(staProtocol.getSiteId(), false);
MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
- }else{
- if (!Cools.isEmpty(response)&&!Cools.isEmpty(jsonObject.get("ReturnStatus"))&&jsonObject.get("ReturnStatus").equals(0) && !Cools.isEmpty(jsonObject.get("Result").toString())) {
+ } else {
+ if (!Cools.isEmpty(response) && !Cools.isEmpty(jsonObject.get("ReturnStatus")) && jsonObject.get("ReturnStatus").equals(0) && !Cools.isEmpty(jsonObject.get("Result").toString())) {
Result result = JSON.parseObject(jsonObject.get("Result").toString(), Result.class);
// 鍒涙柊涓�涓叆搴撳伐浣滄。
TaskWrk taskWrk = taskWrkService.selectByTaskNo(result.getTaskNo());
@@ -227,7 +232,7 @@
staProtocol.setStaNo(staDesc.getCrnStn().shortValue());
MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
HashMap<String, Object> hashMap = new HashMap<>();
- hashMap.put("TaskNo",taskWrk.getTaskNo());
+ hashMap.put("TaskNo", taskWrk.getTaskNo());
try {
//寮�濮嬩笂鎶�,浠诲姟寮�濮嬫椂锛學CS鍥炶皟WMS
response = new HttpHandler.Builder()
@@ -238,7 +243,7 @@
.doPost();
JSONObject jsonObject1 = JSON.parseObject(response);
Boolean bool = false;
- if(jsonObject1.get("ReturnStatus").equals(0)){
+ if (jsonObject1.get("ReturnStatus").equals(0)) {
bool = true;
}
apiLogService.save("wcs寮�濮嬪叆搴撲换鍔′笂鎶ms"
@@ -255,14 +260,14 @@
}
} else {
// staProtocol.setWorkNo((short) 9991);
- if(staProtocol.getWorkNo()>=9801&&staProtocol.getWorkNo()<=9825){
- staProtocol.setStaNo((short)105);
- } else if (staProtocol.getWorkNo()>=9826&&staProtocol.getWorkNo()<=9850) {
- staProtocol.setStaNo((short)107);
- }else if (staProtocol.getWorkNo()>=9851&&staProtocol.getWorkNo()<=9875) {
- staProtocol.setStaNo((short)109);
- }else{
- staProtocol.setStaNo((short)110);
+ if (staProtocol.getWorkNo() >= 9801 && staProtocol.getWorkNo() <= 9825) {
+ staProtocol.setStaNo((short) 105);
+ } else if (staProtocol.getWorkNo() >= 9826 && staProtocol.getWorkNo() <= 9850) {
+ staProtocol.setStaNo((short) 107);
+ } else if (staProtocol.getWorkNo() >= 9851 && staProtocol.getWorkNo() <= 9875) {
+ staProtocol.setStaNo((short) 109);
+ } else {
+ staProtocol.setStaNo((short) 110);
}
devpThread.setPakMk(staProtocol.getSiteId(), false);
MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
@@ -310,280 +315,6 @@
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
}
}
-
- public synchronized void generateStoreWrkFile() throws IOException, InterruptedException {
- try {
- // 鏍规嵁杈撻�佺嚎plc閬嶅巻
- for (DevpSlave devp : slaveProperties.getDevp()) {
- // 閬嶅巻鍏ュ簱鍙�
- for (DevpSlave.Sta inSta : devp.getInSta()) {
- // 鑾峰彇鍏ュ簱绔欎俊鎭�
- DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
- StaProtocol staProtocol = devpThread.getStation().get(inSta.getStaNo());
- if (staProtocol == null) {
- continue;
- } else {
- staProtocol = staProtocol.clone();
- }
- Short workNo = staProtocol.getWorkNo();
- Short stano = staProtocol.getStaNo();
-
- // 灏哄妫�娴嬪紓甯�
- boolean back = false;
- String errMsg = "";
- if (staProtocol.isFrontErr()) {
- errMsg = "鍓嶈秴闄�";
- back = true;
- }
- if (!back && staProtocol.isBackErr()) {
- errMsg = "鍚庤秴闄�";
- back = true;
- }
- if (!back && staProtocol.isHighErr()) {
- errMsg = "楂樿秴闄�";
- back = true;
- }
- if (!back && staProtocol.isLeftErr()) {
- errMsg = "宸﹁秴闄�";
- back = true;
- }
- if (!back && staProtocol.isRightErr()) {
- errMsg = "鍙宠秴闄�";
- back = true;
- }
- if (!back && staProtocol.isWeightErr()) {
- errMsg = "瓒呴噸";
- back = true;
- }
- if (!back && staProtocol.isBarcodeErr()) {
- errMsg = "鎵爜澶辫触";
- back = true;
- }
- // 閫�鍥�
- if (back) {
- if (stano == inSta.getBackSta().shortValue()) {
- continue;
- }
- if (workNo == 0 && stano == 0) {
- continue;
- }
- if (!staProtocol.isPakMk()) {
- continue;
- }
-// News.warn("鎵爜鍏ュ簱澶辫触锛寋}鍏ュ簱绔欏洜{}寮傚父锛屾墭鐩樺凡琚��鍥�", inSta.getStaNo(), errMsg);
- staProtocol.setWorkNo(workNo);
- staProtocol.setStaNo(inSta.getStaNo().shortValue());
- devpThread.setPakMk(staProtocol.getSiteId(), false);
- MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
- TaskWrk taskWrk = taskWrkMapper.selectByWrkNo(Integer.valueOf(workNo));
- if (taskWrk != null) {
- taskWrk.setMemo(errMsg);//灏嗛敊璇爜瀛樺叆澶囨敞瀛楁杩涜灞曠ず
- taskWrkMapper.updateById(taskWrk);
- }
- continue;
- }
- // 鍒ゆ柇鏄惁婊¤冻鍏ュ簱鏉′欢
- if (staProtocol.isAutoing() && staProtocol.isLoading()
- && staProtocol.isInEnable()
- && !staProtocol.isEmptyMk() && (workNo >= 9899)
- && staProtocol.isPakMk()) {
- // 鑾峰彇鏉＄爜鎵弿浠俊鎭�
- BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, inSta.getBarcode());
- if (barcodeThread == null) {
- continue;
- }
- String barcode = barcodeThread.getBarcode();
- if (!Cools.isEmpty(barcode) && !barcode.equals("99999999")) {
- // 璇锋眰wms鎺ュ彛锛岃幏鍙栧伐浣滃彿鍜岀洰鏍囧簱浣�
- ToWmsDTO toWmsDTO = new ToWmsDTO(barcode, staProtocol.getSiteId(), staProtocol.isHigh() ? 2 : 1);
- TaskWrk taskWrk1 = taskWrkService.selectOne(new EntityWrapper<TaskWrk>().eq("barcode", barcode));
- if (!Cools.isEmpty(taskWrk1)) {
- log.info("鎵樼洏鐮侊細" + barcode + "浠诲姟妗ｅ瓨鍦�");
- if (taskWrk1.getIoType() == 1 && taskWrk1.getStartPoint().equals(staProtocol.getSiteId().toString())) {
- StaDesc staDesc = staDescService.selectOne(new EntityWrapper<StaDesc>()
- .eq("crn_no", taskWrk1.getCrnNo()).eq("type_no", 1).eq("stn_no", staProtocol.getSiteId()));
- if (Cools.isEmpty(staDesc)) {
- log.info("鎵樼洏鐮侊細" + barcode + "浠诲姟妗ｅ瓨鍦�");
- return;
- } else {
- staProtocol.setWorkNo(taskWrk1.getWrkNo().shortValue());
- staProtocol.setStaNo(staDesc.getCrnStn().shortValue());
- MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
- }
- }
- return;
- }
- HashMap<String, Object> headParam = new HashMap<>();
- headParam.put("Content-Type", "application/json");
- System.out.println(JSON.toJSONString(toWmsDTO));
- String response;
- try {
- response = new HttpHandler.Builder()
- // .setHeaders(headParam)
- .setUri(wmsUrl)
- .setPath(inboundTaskApplyPath)
- .setJson(JSON.toJSONString(toWmsDTO))
- .build()
- .doPost();
- } catch (Exception e) {
- log.error("璇锋眰鍏ュ簱璋冪敤鎺ュ彛澶辫触");
- log.error("寮傚父淇℃伅鎵撳嵃锛�" + e);
- try {
- BasDevp basDevp = basDevpService.selectById(inSta.getStaNo());
- if (Cools.isEmpty(basDevp)) {
- log.error("绔欑偣鍙峰紓甯�" + inSta.getStaNo());
- } else if (basDevp.getStaErr() != 0) {
- basDevp.setStaErr(2);
- basDevpService.updateById(basDevp);
- }
- } catch (Exception e1) {
- // 閫�鍥�
- log.error("鎵爜妫�娴嬬▼搴忓紓甯�" + inSta.getStaNo() + "寮傚父淇℃伅" + e1);
- }
- staProtocol.setWorkNo((short) 9999);
- staProtocol.setStaNo(inSta.getStaNo().shortValue());
- devpThread.setPakMk(staProtocol.getSiteId(), false);
- MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
-// TaskWrk taskWrk = taskWrkMapper.selectByWrkNo(Integer.valueOf(workNo));
-// if (taskWrk != null) {
-// taskWrk.setMemo(errMsg);//灏嗛敊璇爜瀛樺叆澶囨敞瀛楁杩涜灞曠ず
-// taskWrkMapper.updateById(taskWrk);
-// }
- continue;
- }
-
- JSONObject jsonObject = JSON.parseObject(response);
- log.info("鍏ュ簱璇锋眰鍙傛暟{}" + JSON.toJSONString(toWmsDTO));
- log.info("鍏ュ簱璇锋眰杩斿洖鍙傛暟{}" + JSON.toJSONString(response));
- if (jsonObject.getInteger("code").equals(200) && !Cools.isEmpty(jsonObject.get("data").toString())) {
- GetWmsDto getWmsDto = JSON.parseObject(jsonObject.get("data").toString(), GetWmsDto.class);
- try {
- BasDevp basDevp = basDevpService.selectById(inSta.getStaNo());
- if (Cools.isEmpty(basDevp)) {
- log.error("绔欑偣鍙峰紓甯�1" + inSta.getStaNo());
- throw new CoolException("绔欑偣鍙峰紓甯�1,鏈煡璇㈠埌绔欑偣淇℃伅" + inSta.getStaNo());
- }
- Integer staNoCrnNo = Utils.StaNoCrnNo(inSta.getStaNo());
- if (staNoCrnNo == 0) {
- basDevp.setStaErr(1);
- basDevpService.updateById(basDevp);
- log.error("绔欑偣鍙峰紓甯�2" + inSta.getStaNo());
- throw new CoolException("绔欑偣鍙峰紓甯�2,绔欑偣鍙蜂笉瀛樺湪" + inSta.getStaNo());
- } else {
- LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>()
- .eq("crn_no", staNoCrnNo.longValue())
- .eq("loc_no", getWmsDto.getLocNo()));
- if (Cools.isEmpty(locMast)) {
- basDevp.setStaErr(1);
- basDevpService.updateById(basDevp);
- log.error("绔欑偣鍙峰紓甯�3" + inSta.getStaNo());
- throw new CoolException("绔欑偣鍙峰紓甯�3锛氭宸烽亾涓嶅瓨鍦ㄧ洰鏍囧簱浣�" + inSta.getStaNo());
- }
- }
- } catch (Exception e) {
-// log.error("鎵爜妫�娴嬬▼搴忓紓甯�"+inSta.getStaNo()+"寮傚父淇℃伅"+e);
- // 閫�鍥�
- log.error("鎵爜妫�娴嬬▼搴忓紓甯�" + inSta.getStaNo() + errMsg);
- log.error("鎵爜妫�娴嬬▼搴忓紓甯�,寮傚父淇℃伅" + e);
-
- staProtocol.setWorkNo((short) 9999);
- staProtocol.setStaNo(inSta.getStaNo().shortValue());
- devpThread.setPakMk(staProtocol.getSiteId(), false);
- MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
-// TaskWrk taskWrk = taskWrkMapper.selectByWrkNo(Integer.valueOf(workNo));
-// if (taskWrk != null) {
-// taskWrk.setMemo(errMsg);//灏嗛敊璇爜瀛樺叆澶囨敞瀛楁杩涜灞曠ず
-// taskWrkMapper.updateById(taskWrk);
-// }
- continue;
- }
- //鏌ョ湅璇ュ簱浣嶆槸鍚︿负绌哄簱浣�
- LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>()
- .eq("loc_sts", "O")
- .eq("loc_no", getWmsDto.getLocNo()));
- if (Cools.isEmpty(locMast)) {
- try {
- HashMap<String, Object> headParam1 = new HashMap<>();
- headParam1.put("taskNo", getWmsDto.getTaskNo());
- headParam1.put("status", 6);
- headParam1.put("ioType", 1);
- headParam1.put("barcode", barcode);
- String response2;
- response2 = new HttpHandler.Builder()
- // .setHeaders(headParam)
- .setUri(wmsUrl)
- .setPath(taskStatusFeedbackPath)
- .setJson(JSON.toJSONString(headParam1))
- .build()
- .doPost();
- JSONObject jsonObject1 = JSON.parseObject(response2);
- apiLogService.save("wcs娲惧彂搴撲綅==銆嬩笉涓虹┖銆�==涓婃姤wms"
- , wmsUrl + taskStatusFeedbackPath
- , null
- , "127.0.0.1"
- , JSON.toJSONString(headParam1)
- , response
- , true
- );
- } catch (Exception e) {
- log.error("wcs娲惧彂搴撲綅==銆嬩笉涓虹┖銆�==涓婃姤wms", getWmsDto.getWrkNo());
- throw new CoolException("wcs娲惧彂鍏ュ簱浠诲姟涓婃姤wms澶辫触,娲惧彂搴撲綅==銆嬩笉涓虹┖銆�==锛屽紓甯镐俊鎭細" + e);
- }
- }
-
- // 鍒涙柊涓�涓叆搴撳伐浣滄。
- TaskWrk taskWrk = taskWrkService.selectByTaskNo(getWmsDto.getWrkNo());
- if (Cools.isEmpty(taskWrk)) {
- taskWrk = createTask(getWmsDto, barcode);
- if (Cools.isEmpty(taskWrk)) {
- log.error("搴撲綅寮傚父锛屽簱浣嶅彿锛歿}", getWmsDto.getTargetLocationCode());
- } else {
- taskWrkService.insert(taskWrk);
- StaDesc staDesc = staDescService.selectOne(new EntityWrapper<StaDesc>()
- .eq("crn_no", taskWrk.getCrnNo()).eq("type_no", 1).eq("stn_no", staProtocol.getSiteId()));
- staProtocol.setWorkNo(taskWrk.getWrkNo().shortValue());
- staProtocol.setStaNo(staDesc.getCrnStn().shortValue());
- MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
- }
- }
-
- } else {
- continue;
- }
- apiLogService.save("wms璇锋眰鍏ュ簱璐т綅鎺ュ彛"
- , wmsUrl + inboundTaskApplyPath
- , null
- , "127.0.0.1"
- , JSON.toJSONString(toWmsDTO)
- , response
- , true
- );
-
- } else {
- // 閫�鍥�
- log.error("鎵爜鍏ュ簱澶辫触锛寋}鍏ュ簱绔欏洜{}寮傚父锛屾墭鐩樺凡琚��鍥�", inSta.getStaNo(), errMsg);
-
- staProtocol.setWorkNo((short) 9999);
- staProtocol.setStaNo(inSta.getStaNo().shortValue());
- devpThread.setPakMk(staProtocol.getSiteId(), false);
- MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
- TaskWrk taskWrk = taskWrkMapper.selectByWrkNo(Integer.valueOf(workNo));
- if (taskWrk != null) {
- taskWrk.setMemo(errMsg);//灏嗛敊璇爜瀛樺叆澶囨敞瀛楁杩涜灞曠ず
- taskWrkMapper.updateById(taskWrk);
- }
- }
- }
-
-
- }
- }
- } catch (Exception e) {
- log.error("generateStoreWrkFile e", e);
- TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
- }
- }
-
/**
* 鍫嗗灈鏈虹珯鍑哄簱鍒板嚭搴撶珯
@@ -642,58 +373,21 @@
}
/**
- * 鍏ュ嚭搴� ===>> 鍫嗗灈鏈哄叆鍑哄簱浣滀笟涓嬪彂
+ * 鍏ュ嚭搴� ===>> 璋冪敤RCS杩涜鍏ュ嚭搴�
*/
public synchronized void crnIoExecute() throws IOException {
for (CrnSlave crn : slaveProperties.getCrn()) {
- // 鑾峰彇鍫嗗灈鏈轰俊鎭�
- CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, crn.getId());
- CrnProtocol crnProtocol = crnThread.getCrnProtocol();
- if (crnProtocol == null) {
- continue;
- }
- BasCrnp basCrnp = basCrnpService.selectById(crn.getId());
- if (basCrnp == null) {
- log.error("{}鍙峰爢鍨涙満灏氭湭鍦ㄦ暟鎹簱杩涜缁存姢锛�", crn.getId());
- continue;
- }
-
-
- // 鍙湁褰撳爢鍨涙満绌洪棽 骞朵笖 鏃犱换鍔℃椂鎵嶇户缁墽琛�
- if (crnProtocol.getStatusType() == CrnStatusType.IDLE && crnProtocol.getTaskNo() == 0 && crnProtocol.getModeType() == CrnModeType.AUTO
- && crnProtocol.getLoaded() == 0 && crnProtocol.getForkPos() == 0) {
- // 濡傛灉鏈�杩戜竴娆℃槸鍏ュ簱妯″紡
- if (crnProtocol.getLastIo().equals("I")) {
- if (basCrnp.getInEnable().equals("Y")) {
- this.crnStnToLoc(crn, crnProtocol); // 鍏ュ簱
- crnProtocol.setLastIo("O");
- } else if (basCrnp.getOutEnable().equals("Y")) {
- this.locToCrnStn(crn, crnProtocol); // 鍑哄簱
- crnProtocol.setLastIo("I");
- }
- }
- // 濡傛灉鏈�杩戜竴娆℃槸鍑哄簱妯″紡
- else if (crnProtocol.getLastIo().equals("O")) {
- if (basCrnp.getOutEnable().equals("Y")) {
- this.locToCrnStn(crn, crnProtocol); // 鍑哄簱
- crnProtocol.setLastIo("I");
- } else if (basCrnp.getInEnable().equals("Y")) {
- this.crnStnToLoc(crn, crnProtocol); // 鍏ュ簱
- crnProtocol.setLastIo("O");
- }
- }
-
- // 搴撲綅绉昏浆
- this.locToLoc(crn, crnProtocol);
- }
-
+ this.crnStnToLoc(crn); // 鍏ュ簱
+ this.locToCrnStn(crn); // 鍑哄簱
+ // 搴撲綅绉昏浆
+// this.locToLoc(crn, crnProtocol);
}
}
/**
* 鍏ュ簱 ===>> 鍫嗗灈鏈虹珯鍒板簱浣�
*/
- public synchronized void crnStnToLoc(CrnSlave slave, CrnProtocol crnProtocol) throws IOException {
+ public synchronized void crnStnToLoc(CrnSlave slave) throws IOException {
for (CrnSlave.CrnStn crnStn : slave.getCrnInStn()) {
List<StaDesc> staDescs = staDescMapper.selectList(new EntityWrapper<StaDesc>().eq("crn_no", slave.getId()).eq("crn_stn", crnStn.getStaNo()));
for (StaDesc staDesc : staDescs) {
@@ -726,49 +420,44 @@
continue;
}
- // 鍫嗗灈鏈烘帶鍒惰繃婊�
- if (!crnProtocol.getStatusType().equals(CrnStatusType.IDLE) || crnProtocol.getTaskNo() != 0) {
- continue;
- }
+ String mbz=taskWrk.getTargetPoint().substring(5);
- // 宸茬粡瀛樺湪鍚婅溅鎵ц浠诲姟鏃讹紝鍒欒繃婊�
- if (taskWrkMapper.selectCrnWorking(slave.getId()) != null) {
- continue;
- }
+ HashMap<String, Object> hashMap = new HashMap<>();
+ hashMap.put("taskNo",taskWrk.getTaskNo());//wms浠诲姟鍙�
+ hashMap.put("sourceStaNo",staDetl.getDevNo());//婧愮珯鐐�
+ hashMap.put("staNo",Integer.parseInt(mbz)+"");//鐩爣绔�
+ hashMap.put("locNo",taskWrk.getTargetPoint());//鐩爣搴撲綅
+ String response = "";
+ Boolean bool = false;
+ try {
+ //寮�濮嬩笂鎶�,鍑哄簱浠诲姟寮�濮嬫椂锛學CS鍥炶皟WMS
+ response = new HttpHandler.Builder()
+ .setUri(wcsUrl)
+ .setPath(wcsInboundTaskApplyPath)
+ .setJson(JSON.toJSONString(hashMap))
+ .build()
+ .doPost();
+ JSONObject jsonObject = JSON.parseObject(response);
-// int workNo = commonService.getWorkNo(WorkNoType.PAKIN.type);//鑾峰彇鍏ュ簱宸ヤ綔鍙�
-// taskWrk.setWrkNo(workNo);//宸ヤ綔鍙�
- taskWrk.setStatus(TaskStatusType.DISTRIBUTE.id);//娲惧彂鐘舵��
- taskWrk.setAssignTime(new Date());//娲惧彂鏃堕棿
- taskWrk.setWrkSts(3);//宸ヤ綔鐘舵�� 3.鍚婅溅鍏ュ簱
- taskWrk.setCrnNo(staDesc.getCrnNo());//鍫嗗灈鏈哄彿
- taskWrk.setModiTime(new Date());
- taskWrk.setModiUser(9988L);
-
- // 鍛戒护涓嬪彂鍖� --------------------------------------------------------------------------
- CrnCommand crnCommand = new CrnCommand();
- crnCommand.setCrnNo(staDesc.getCrnNo()); // 鍫嗗灈鏈虹紪鍙�
- crnCommand.setTaskNo(taskWrk.getWrkNo().shortValue()); // 宸ヤ綔鍙�
- crnCommand.setAckFinish((short) 0); // 浠诲姟瀹屾垚纭浣�
- crnCommand.setTaskMode(CrnTaskModeType.LOC_MOVE); // 浠诲姟妯″紡: 搴撲綅绉昏浆
- crnCommand.setSourcePosX(crnStn.getRow().shortValue()); // 婧愬簱浣嶅垪
- crnCommand.setSourcePosY(crnStn.getBay().shortValue()); // 婧愬簱浣嶅眰
- crnCommand.setSourcePosZ(crnStn.getLev().shortValue()); // 婧愬簱浣嶆帓
- crnCommand.setDestinationPosX(Utils.getRowShort(taskWrk.getTargetPoint())); // 鐩爣搴撲綅鍒�
- crnCommand.setDestinationPosY(Utils.getBayShort(taskWrk.getTargetPoint())); // 鐩爣搴撲綅灞�
- crnCommand.setDestinationPosZ(Utils.getLevShort(taskWrk.getTargetPoint())); // 鐩爣搴撲綅鎺�
- crnCommand.setCommand((short) 1);
- log.info("鍫嗗灈鏈哄叆搴撲换鍔′笅鍙�={}",crnCommand);
- if (!CommandUtils.offer(SlaveType.Crn, taskWrk.getCrnNo(), new Task(2, crnCommand), false)) {
- log.error("鍫嗗灈鏈哄懡浠ょ敓鎴愬け璐ワ紝鍫嗗灈鏈哄彿={}锛屼换鍔℃暟鎹�={}", taskWrk.getCrnNo(), JSON.toJSON(crnCommand));
- throw new CoolException("鍫嗗灈鏈哄懡浠ょ敓鎴愬け璐�");
- } else {
- try {
- taskWrkService.updateById(taskWrk);
- } catch (Exception e) {
- log.error("淇敼宸ヤ綔妗ｇ姸鎬� 2.璁惧涓婅蛋 => 3.鍚婅溅鍏ュ簱涓� 澶辫触锛侊紒锛屽伐浣滃彿={}", taskWrk.getWrkNo());
- log.error("淇敼宸ヤ綔妗ｇ姸鎬� 2.璁惧涓婅蛋 => 3.鍚婅溅鍏ュ簱涓� 澶辫触锛侊紒锛屽紓甯革細" + e);
+ if(jsonObject.get("code").equals(200)){
+ bool = true;
+ taskWrk.setStatus(TaskStatusType.DISTRIBUTE.id);//娲惧彂鐘舵��
+ taskWrk.setAssignTime(new Date());//娲惧彂鏃堕棿
+ taskWrk.setWrkSts(3);//宸ヤ綔鐘舵�� 3.鎴愬姛涓嬪彂鍏ュ簱浠诲姟缁橰CS
+ taskWrk.setCrnNo(staDesc.getCrnNo());//鍫嗗灈鏈哄彿
+ taskWrk.setModiTime(new Date());
+ taskWrk.setModiUser(9988L);
}
+ } catch (Exception e) {
+ }finally {
+ apiLogService.save("wcs娲惧彂鍏ュ簱浠诲姟缁橰CS"
+ , wcsUrl + wcsInboundTaskApplyPath
+ , null
+ , "127.0.0.1"
+ , JSON.toJSONString(hashMap)
+ , response
+ , bool
+ );
}
}
}
@@ -778,7 +467,7 @@
* 鍑哄簱 ===>> 搴撲綅鍒板爢鍨涙満绔�
* 2022-06-09 TQS淇敼锛屾煡璇㈠伐浣滄。LIST锛岄亶鍘嗕笅鍙戯紝闃叉绗竴涓换鍔″牭濉炲嚭搴�
*/
- public synchronized void locToCrnStn(CrnSlave slave, CrnProtocol crnProtocol) {
+ public synchronized void locToCrnStn(CrnSlave slave) {
List<TaskWrk> taskWrksInitial = taskWrkMapper.selectPakOut(slave.getId(), null);
if (taskWrksInitial.size() == 0) {
return;
@@ -798,27 +487,10 @@
continue;
}
- LocMast locMast=locMastService.selectByLocNo(taskWrk.getStartPoint());
+ LocMast locMast = locMastService.selectByLocNo(taskWrk.getStartPoint());
//鍒ゆ柇鍏跺簱浣嶆槸鍚︿负娣卞簱浣嶏紝濡傛灉涓烘繁搴撲綅鎵惧叾娴呭簱浣嶆槸閮芥湁璐�
- if(locMast.getRow1()==1||locMast.getRow1()==5){
- LocMast locMast1=locMastService.selectOne(new EntityWrapper<LocMast>()
- .eq("row1", (locMast.getRow1()+1))
- .eq("bay1",locMast.getBay1())
- .eq("lev1",locMast.getLev1()).eq("loc_sts","F"));
- if (!Cools.isEmpty(locMast1)){
- log.info(locMast.getLocNo()+"鍑烘繁搴撲綅锛屾祬搴撲綅鏈夎揣");
- continue;
- }
- }else if(locMast.getRow1()==4||locMast.getRow1()==8){
- LocMast locMast1=locMastService.selectOne(new EntityWrapper<LocMast>()
- .eq("row1", (locMast.getRow1()-1))
- .eq("bay1",locMast.getBay1())
- .eq("lev1",locMast.getLev1()).eq("loc_sts","F"));
- if (!Cools.isEmpty(locMast1)){
- log.info(locMast.getLocNo()+"鍑烘繁搴撲綅锛屾祬搴撲綅鏈夎揣");
- continue;
- }
- }
+ //棰勭暀
+
// 鑾峰彇鍫嗗灈鏈哄嚭搴撶珯淇℃伅
SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, crnStn.getDevpPlcId());
@@ -841,44 +513,23 @@
&& staProtocol.getWorkNo() == 0 && staProtocol.isOutEnable()) {
// 鍛戒护涓嬪彂鍖� --------------------------------------------------------------------------
- // 鍫嗗灈鏈烘帶鍒惰繃婊�
- if (!crnProtocol.getStatusType().equals(CrnStatusType.IDLE) || crnProtocol.getTaskNo() != 0) {
- break;
- }
-
// 宸茬粡瀛樺湪鍚婅溅鎵ц浠诲姟鏃讹紝鍒欒繃婊�
if (taskWrkMapper.selectCrnWorking(slave.getId()) != null) {
break;
}
- CrnCommand command = new CrnCommand();
- command.setCrnNo(taskWrk.getCrnNo()); // 鍫嗗灈鏈虹紪鍙�
- command.setTaskNo(taskWrk.getWrkNo().shortValue()); // 宸ヤ綔鍙�
- command.setAckFinish((short) 0); // 浠诲姟瀹屾垚纭浣�
- command.setTaskMode(CrnTaskModeType.PAKIN); // 浠诲姟妯″紡
- command.setSourcePosX(Utils.getRowShort(taskWrk.getStartPoint())); // 婧愬簱浣嶆帓
- command.setSourcePosY(Utils.getBayShort(taskWrk.getStartPoint())); // 婧愬簱浣嶅垪
- command.setSourcePosZ(Utils.getLevShort(taskWrk.getStartPoint())); // 婧愬簱浣嶅眰
- command.setDestinationPosX(crnStn.getRow().shortValue()); // 鐩爣搴撲綅鎺�
- command.setDestinationPosY(crnStn.getBay().shortValue()); // 鐩爣搴撲綅鍒�
- command.setDestinationPosZ(crnStn.getLev().shortValue()); // 鐩爣搴撲綅灞�
- command.setCommand((short) 1);
- if (!CommandUtils.offer(SlaveType.Crn, taskWrk.getCrnNo(), new Task(2, command), false)) {
- log.error("鍫嗗灈鏈哄懡浠ょ敓鎴愬け璐ワ紝鍫嗗灈鏈哄彿={}锛屼换鍔℃暟鎹�={}", taskWrk.getCrnNo(), JSON.toJSON(command));
- throw new CoolException("鍫嗗灈鏈哄懡浠ょ敓鎴愬け璐�");
- } else {
- try {
- // 淇敼宸ヤ綔妗ｇ姸鎬� 11.鐢熸垚鍑哄簱ID => 12.鍚婅溅鍑哄簱涓�
- Date now = new Date();
- taskWrk.setWrkSts(12);
- taskWrk.setModiTime(now);
- if (taskWrkMapper.updateById(taskWrk) == 0) {
- log.error("淇敼宸ヤ綔妗ｇ姸鎬� 11.鐢熸垚鍑哄簱ID => 12.鍚婅溅鍑哄簱涓� 澶辫触锛侊紒锛屽伐浣滃彿={}", taskWrk.getWrkNo());
- }
- } catch (Exception e) {
+ try {
+ // 淇敼宸ヤ綔妗ｇ姸鎬� 11.鐢熸垚鍑哄簱ID => 12.鍚婅溅鍑哄簱涓�
+ Date now = new Date();
+ taskWrk.setWrkSts(12);
+ taskWrk.setModiTime(now);
+ if (taskWrkMapper.updateById(taskWrk) == 0) {
log.error("淇敼宸ヤ綔妗ｇ姸鎬� 11.鐢熸垚鍑哄簱ID => 12.鍚婅溅鍑哄簱涓� 澶辫触锛侊紒锛屽伐浣滃彿={}", taskWrk.getWrkNo());
- log.error("淇敼宸ヤ綔妗ｇ姸鎬� 11.鐢熸垚鍑哄簱ID => 12.鍚婅溅鍑哄簱涓� 澶辫触锛侊紒锛屽紓甯革細" + e);
}
+ } catch (Exception e) {
+ log.error("淇敼宸ヤ綔妗ｇ姸鎬� 11.鐢熸垚鍑哄簱ID => 12.鍚婅溅鍑哄簱涓� 澶辫触锛侊紒锛屽伐浣滃彿={}", taskWrk.getWrkNo());
+ log.error("淇敼宸ヤ綔妗ｇ姸鎬� 11.鐢熸垚鍑哄簱ID => 12.鍚婅溅鍑哄簱涓� 澶辫触锛侊紒锛屽紓甯革細" + e);
+ }
// try {
// HashMap<String, Object> headParam = new HashMap<>();
// headParam.put("taskNo", taskWrk.getTaskNo());
@@ -906,7 +557,7 @@
// log.error("wcs娲惧彂鍑哄簱浠诲姟涓婃姤wms澶辫触", JSON.toJSONString(taskWrk));
//// throw new CoolException("wcs娲惧彂鍏ュ簱浠诲姟涓婃姤wms澶辫触");
// }
- }
+
}
}
}
@@ -1085,7 +736,7 @@
crnOperatorParam.setCrnNo(crn.getId());
R r = crnController.crnTaskComplete(crnOperatorParam);
Thread.sleep(1000);
- if(!r.get("code").equals(200)){
+ if (!r.get("code").equals(200)) {
return;
}
if (!Cools.isEmpty(taskWrk)) {
diff --git a/src/main/java/com/zy/asrs/task/AssignTasksRCSScheduler.java b/src/main/java/com/zy/asrs/task/AssignTasksRCSScheduler.java
new file mode 100644
index 0000000..3295e25
--- /dev/null
+++ b/src/main/java/com/zy/asrs/task/AssignTasksRCSScheduler.java
@@ -0,0 +1,94 @@
+package com.zy.asrs.task;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.core.exception.CoolException;
+import com.zy.asrs.entity.TaskWrk;
+import com.zy.asrs.entity.TaskWrkLog;
+import com.zy.asrs.service.ApiLogService;
+import com.zy.asrs.service.TaskWrkService;
+import com.zy.common.utils.HttpHandler;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.List;
+
+@Slf4j
+@Component
+public class AssignTasksRCSScheduler {
+ @Autowired
+ private TaskWrkService taskWrkService;
+ @Autowired
+ private ApiLogService apiLogService;
+ @Value("${wcs.urlWcs}")
+ private String wcsUrl;
+ @Value("${wcs.movePathWcs}")
+ private String wcsmovePath;
+ @Value("${wcs.outboundTaskRequest}")
+ private String wcsoutboundTaskRequest;
+ @Value("${wms.TaskExecCallback}")
+ private String TaskExecCallback;
+ @Value("${wms.taskStatusFeedbackPath}")
+ private String taskStatusFeedbackPath;
+
+ /**
+ * 鑷姩娲惧彂鍑哄簱浠诲姟缁橰CS
+ *
+ * @throws IOException
+ */
+ @Scheduled(cron = "0/3 * * * * ? ")
+ public void execute() throws IOException {
+ if(true){
+ List<TaskWrk> taskWrks=taskWrkService.selectList(new EntityWrapper<TaskWrk>()
+ .eq("wrk_sts",1).eq("io_type",3));
+ for(TaskWrk taskWrk:taskWrks){
+ HashMap<String, Object> headParam = new HashMap<>();
+ String response = "";
+ Boolean bool = false;
+ String dz="";
+ if(taskWrk.getIoType()==2){
+ dz=wcsoutboundTaskRequest;
+ }else{
+ dz=wcsmovePath;
+ }
+ try {
+ headParam.put("taskNo", taskWrk.getTaskNo());
+ headParam.put("sourceLocNo",taskWrk.getStartPoint());//婧愬簱浣�
+ headParam.put("locNo",taskWrk.getTargetPoint());//鐩爣搴撲綅
+ log.info("wcs娲惧彂浠诲姟缁橰CS鍑哄簱={}", taskWrk);
+ response = new HttpHandler.Builder()
+ // .setHeaders(headParam)
+ .setUri(wcsUrl)
+ .setPath(dz)
+ .setJson(JSON.toJSONString(headParam))
+ .build()
+ .doPost();
+ JSONObject jsonObject = JSON.parseObject(response);
+ if(jsonObject.get("code").equals(200)){
+ //娲惧彂鍑哄簱浠诲姟缁橰CS==>鎴愬姛涓嬪彂鍑哄簱浠诲姟
+ taskWrk.setWrkSts(2);
+ taskWrkService.updateById(taskWrk);
+ bool = true;
+ }
+ } catch (Exception e) {
+ log.error("wcs娲惧彂浠诲姟缁橰CS鍑哄簱澶辫触{},杩斿洖鍊�={}", taskWrk, response);
+ } finally {
+ apiLogService.save("wcs娲惧彂浠诲姟缁橰CS鍑哄簱"
+ , wcsUrl + dz
+ , null
+ , "127.0.0.1"
+ , JSON.toJSONString(headParam)
+ , response
+ , bool
+ );
+ }
+ }
+ }
+ }
+}
diff --git a/src/main/java/com/zy/asrs/task/SameLayerTransferScheduler.java b/src/main/java/com/zy/asrs/task/SameLayerTransferScheduler.java
new file mode 100644
index 0000000..0d2d46b
--- /dev/null
+++ b/src/main/java/com/zy/asrs/task/SameLayerTransferScheduler.java
@@ -0,0 +1,91 @@
+package com.zy.asrs.task;
+
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.core.common.Cools;
+import com.zy.asrs.domain.enums.TaskStatusType;
+import com.zy.asrs.domain.enums.WorkNoType;
+import com.zy.asrs.entity.LocMast;
+import com.zy.asrs.entity.TaskWrk;
+import com.zy.asrs.service.LocMastService;
+import com.zy.asrs.service.TaskWrkService;
+import com.zy.asrs.utils.Utils;
+import com.zy.common.service.CommonService;
+import com.zy.system.entity.Config;
+import com.zy.system.service.ConfigService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+import java.io.IOException;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+
+@Slf4j
+@Component
+public class SameLayerTransferScheduler {
+ @Autowired
+ private TaskWrkService taskWrkService;
+ @Autowired
+ private LocMastService locMastService;
+ @Autowired
+ private CommonService commonService;
+ @Autowired
+ private ConfigService configService;
+
+ /**
+ * 鑷姩鐢熸垚绉诲簱浠诲姟
+ *
+ * @throws IOException
+ */
+ @Scheduled(cron = "0/3 * * * * ? ")
+ public void execute() throws IOException {
+ Config config=configService.selectByCode("autoRemove");
+
+ if (config.getValue().equals("true")) {
+ List<TaskWrk> taskWrks = taskWrkService.selectList(new EntityWrapper<TaskWrk>());
+ if (Cools.isEmpty(taskWrks)) {
+ List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("loc_sts", "F"));
+ for (LocMast locMast : locMasts) {
+ List<LocMast> list = locMastService.selectList(new EntityWrapper<LocMast>().eq("loc_sts", "O").eq("lev1", locMast.getLev1()));
+
+ String[] locMs = new String[list.size()];
+ int i = 0;
+ for (LocMast locMast1 : list) {
+ locMs[i] = locMast1.getLocNo();
+ i++;
+ }
+ double v = Math.random() * list.size();
+ int m = (int) v;
+ //鐩爣搴撲綅
+ String locNo = locMs[m];
+
+ HashMap<String, Object> map = new HashMap<>();
+
+ Date now = new Date();
+ TaskWrk taskWrk = new TaskWrk();
+ int workNo1 = commonService.getWorkNo(WorkNoType.PAKOUT.type);//鑾峰彇鍏ュ簱宸ヤ綔鍙�
+ taskWrk.setTaskNo(workNo1+"");//浠诲姟鍙�
+ taskWrk.setWrkNo(workNo1);
+ taskWrk.setStatus(TaskStatusType.RECEIVE.id);//浠诲姟鐘舵�侊細鎺ユ敹
+ taskWrk.setCreateTime(now);
+ taskWrk.setIoType(3);//浠诲姟绫诲瀷
+ taskWrk.setIoPri(10);//浼樺厛绾�
+ taskWrk.setBarcode("123");//鏉＄爜
+ taskWrk.setCrnNo(locMast.getCrnNo());
+ taskWrk.setWrkSts(1);
+ taskWrk.setStartPoint(locMast.getLocNo());//璧风偣
+ taskWrk.setTargetPoint(locNo);//閲嶇偣
+ if (!taskWrkService.insert(taskWrk)) {
+
+ } else {
+
+ }
+ break;
+ }
+ }
+ }
+ }
+
+}
diff --git a/src/main/java/com/zy/asrs/task/TaskLogScheduler.java b/src/main/java/com/zy/asrs/task/TaskLogScheduler.java
index 1e53034..f780841 100644
--- a/src/main/java/com/zy/asrs/task/TaskLogScheduler.java
+++ b/src/main/java/com/zy/asrs/task/TaskLogScheduler.java
@@ -61,47 +61,63 @@
@Scheduled(cron = "0/3 * * * * ? ")
public void execute() throws IOException {
- for (TaskWrk taskWrk : taskWrkService.selectToBeHistoryData()) {
- HashMap<String, Object> headParam = new HashMap<>();
- if (taskWrk.getStatus().equals(TaskStatusType.OVER.id) || taskWrk.getStatus() == 7) {//瀹屾垚
- headParam.put("Result", 1);
- } else if (taskWrk.getStatus().equals(TaskStatusType.CANCEL.id)) {
- headParam.put("Result", 2);
+ //鍏ュ簱9杞巻鍙叉。
+ List<TaskWrk> taskWrkList = taskWrkService.selectList(new EntityWrapper<TaskWrk>().eq("wrk_sts", 9));
+ for (TaskWrk taskWrk : taskWrkList) {
+ TaskWrkLog taskWrkLog = new TaskWrkLog(taskWrk);
+ if (!wrkLogService.insert(taskWrkLog)) {
+ throw new CoolException("杞巻鍙叉。澶辫触" + taskWrkLog);
}
- String response = "";
- Boolean bool = false;
- try {
- headParam.put("TaskNo", taskWrk.getTaskNo());
- log.info("wcs鎵嬪姩瀹屾垚浠诲姟涓婃姤wms={}", taskWrk);
- response = new HttpHandler.Builder()
- // .setHeaders(headParam)
- .setUri(wmsUrl)
- .setPath(TaskExecCallback)
- .setJson(JSON.toJSONString(headParam))
- .build()
- .doPost();
- JSONObject jsonObject = JSON.parseObject(response);
- TaskWrkLog taskWrkLog = new TaskWrkLog(taskWrk);
- if (!wrkLogService.insert(taskWrkLog)) {
- throw new CoolException("杞巻鍙叉。澶辫触" + taskWrkLog);
- }
- if (!taskWrkService.deleteById(taskWrk)) {
- throw new CoolException("浠诲姟妗ｅ垹闄ゅけ璐�" + taskWrkLog);
- }
- bool = true;
- } catch (Exception e) {
- log.error("wcs鎵嬪姩瀹屾垚浠诲姟涓婃姤wms澶辫触{},杩斿洖鍊�={}", taskWrk, response);
- } finally {
- apiLogService.save("wcs瀹屾垚鎴栬�呭彇娑堜换鍔′笂鎶ms"
- , wmsUrl + TaskExecCallback
- , null
- , "127.0.0.1"
- , JSON.toJSONString(headParam)
- , response
- , bool
- );
+ if (!taskWrkService.deleteById(taskWrk)) {
+ throw new CoolException("浠诲姟妗ｅ垹闄ゅけ璐�" + taskWrkLog);
}
+
}
+
+// for (TaskWrk taskWrk : taskWrkService.selectToBeHistoryData()) {
+// HashMap<String, Object> headParam = new HashMap<>();
+// if (taskWrk.getStatus().equals(TaskStatusType.OVER.id) || taskWrk.getStatus() == 7) {//瀹屾垚
+// headParam.put("Result", 1);
+// } else if (taskWrk.getStatus().equals(TaskStatusType.CANCEL.id)) {
+// headParam.put("Result", 2);
+// }
+// String response = "";
+// Boolean bool = false;
+// try {
+// headParam.put("TaskNo", taskWrk.getTaskNo());
+// log.info("wcs鎵嬪姩瀹屾垚浠诲姟涓婃姤wms={}", taskWrk);
+// response = new HttpHandler.Builder()
+// // .setHeaders(headParam)
+// .setUri(wmsUrl)
+// .setPath(TaskExecCallback)
+// .setJson(JSON.toJSONString(headParam))
+// .build()
+// .doPost();
+// JSONObject jsonObject = JSON.parseObject(response);
+// TaskWrkLog taskWrkLog = new TaskWrkLog(taskWrk);
+// if(jsonObject.get("ReturnStatus").equals(0)){
+// taskWrkLog.setWrkSts(8);
+// if (!wrkLogService.insert(taskWrkLog)) {
+// throw new CoolException("杞巻鍙叉。澶辫触" + taskWrkLog);
+// }
+// if (!taskWrkService.deleteById(taskWrk)) {
+// throw new CoolException("浠诲姟妗ｅ垹闄ゅけ璐�" + taskWrkLog);
+// }
+// bool = true;
+// }
+// } catch (Exception e) {
+// log.error("wcs鎵嬪姩瀹屾垚浠诲姟涓婃姤wms澶辫触{},杩斿洖鍊�={}", taskWrk, response);
+// } finally {
+// apiLogService.save("wcs瀹屾垚鎴栬�呭彇娑堜换鍔′笂鎶ms"
+// , wmsUrl + TaskExecCallback
+// , null
+// , "127.0.0.1"
+// , JSON.toJSONString(headParam)
+// , response
+// , bool
+// );
+// }
+// }
}
}
diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java
index 91070ff..105d7c9 100644
--- a/src/main/java/com/zy/core/MainProcess.java
+++ b/src/main/java/com/zy/core/MainProcess.java
@@ -47,15 +47,15 @@
// mainService.crnDemoOfLocMove1();
// 鍏ュ簱 ===>> 鍏ュ簱绔欏埌鍫嗗灈鏈虹珯锛屾牴鎹潯鐮佹壂鎻忕敓鎴愬叆搴撳伐浣滄。
mainService.generateStoreWrkFile1(); // 缁勬墭
+ // 鍏ュ嚭搴� ===>> 璋冪敤RCS杩涜鍏ュ嚭搴�
+ mainService.crnIoExecute();
// 鍑哄簱 ===>> 鍫嗗灈鏈哄嚭搴撶珯鍒板嚭搴撶珯
mainService.crnStnToOutStn();
- // 鍏ュ嚭搴� ===>> 鍫嗗灈鏈哄叆鍑哄簱浣滀笟涓嬪彂
- mainService.crnIoExecute();
// 鍏ュ簱 ===>> 鎵ц瀵瑰伐浣滄。鐨勫畬鎴愭搷浣�
- mainService.storeFinished();
+// mainService.storeFinished();
// 鍫嗗灈鏈哄紓甯镐俊鎭褰�
- mainService.recCrnErr();
+// mainService.recCrnErr();
// 鍏ュ簱 ===>> 绌烘爤鏉垮垵濮嬪寲鍏ュ簱,鍙夎溅鍏ュ簱绔欐斁璐�
// mainService.storeEmptyPlt();
diff --git a/src/main/java/com/zy/core/ServerBootstrap.java b/src/main/java/com/zy/core/ServerBootstrap.java
index a97d9a0..a9772e5 100644
--- a/src/main/java/com/zy/core/ServerBootstrap.java
+++ b/src/main/java/com/zy/core/ServerBootstrap.java
@@ -75,12 +75,12 @@
private void initThread(){
// 鍒濆鍖栧爢鍨涙満绾跨▼
- log.info("鍒濆鍖栧爢鍨涙満绾跨▼...................................................");
- for (CrnSlave crn : slaveProperties.getCrn()) {
- CrnThread crnThread = new SiemensCrnThread(crn);
- new Thread((Runnable) crnThread).start();
- SlaveConnection.put(SlaveType.Crn, crn.getId(), crnThread);
- }
+// log.info("鍒濆鍖栧爢鍨涙満绾跨▼...................................................");
+// for (CrnSlave crn : slaveProperties.getCrn()) {
+// CrnThread crnThread = new SiemensCrnThread(crn);
+// new Thread((Runnable) crnThread).start();
+// SlaveConnection.put(SlaveType.Crn, crn.getId(), crnThread);
+// }
// 鍒濆鍖栬緭閫佺嚎绾跨▼
log.info("鍒濆鍖栬緭閫佺嚎绾跨▼...................................................");
for (DevpSlave devp : slaveProperties.getDevp()) {
diff --git a/src/main/java/com/zy/core/thread/SiemensCrnThread.java b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
index b0cd878..465c081 100644
--- a/src/main/java/com/zy/core/thread/SiemensCrnThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
@@ -76,42 +76,42 @@
if (task != null) {
step = task.getStep();
}
- switch (step) {
- // 璇绘暟鎹�
- case 1:
- readStatus();
- break;
- // 鍐欏叆鏁版嵁
- case 2:
- write5((CrnCommand) task.getData());
- break;
- // 澶嶄綅
- case 3:
- CrnCommand command = (CrnCommand) task.getData();
- if (null == command) {
- command = new CrnCommand();
- }
- command.setCrnNo(slave.getId()); // 鍫嗗灈鏈虹紪鍙�
- command.setTaskNo((short) 0); // 宸ヤ綔鍙�
- command.setAckFinish((short) 1); // 浠诲姟瀹屾垚纭浣�
- command.setTaskMode(CrnTaskModeType.NONE); // 浠诲姟妯″紡
- command.setSourcePosX((short)0); // 婧愬簱浣嶆帓
- command.setSourcePosY((short)0); // 婧愬簱浣嶅垪
- command.setSourcePosZ((short)0); // 婧愬簱浣嶅眰
- command.setDestinationPosX((short)0); // 鐩爣搴撲綅鎺�
- command.setDestinationPosY((short)0); // 鐩爣搴撲綅鍒�
- command.setDestinationPosZ((short)0); // 鐩爣搴撲綅灞�
- write(command);
- break;
- case 4:
- writeAuto((CrnCommand) task.getData());
- break;
- case 5:
- write((CrnCommand) task.getData());
- break;
- default:
- break;
- }
+// switch (step) {
+// // 璇绘暟鎹�
+// case 1:
+// readStatus();
+// break;
+// // 鍐欏叆鏁版嵁
+// case 2:
+// write5((CrnCommand) task.getData());
+// break;
+// // 澶嶄綅
+// case 3:
+// CrnCommand command = (CrnCommand) task.getData();
+// if (null == command) {
+// command = new CrnCommand();
+// }
+// command.setCrnNo(slave.getId()); // 鍫嗗灈鏈虹紪鍙�
+// command.setTaskNo((short) 0); // 宸ヤ綔鍙�
+// command.setAckFinish((short) 1); // 浠诲姟瀹屾垚纭浣�
+// command.setTaskMode(CrnTaskModeType.NONE); // 浠诲姟妯″紡
+// command.setSourcePosX((short)0); // 婧愬簱浣嶆帓
+// command.setSourcePosY((short)0); // 婧愬簱浣嶅垪
+// command.setSourcePosZ((short)0); // 婧愬簱浣嶅眰
+// command.setDestinationPosX((short)0); // 鐩爣搴撲綅鎺�
+// command.setDestinationPosY((short)0); // 鐩爣搴撲綅鍒�
+// command.setDestinationPosZ((short)0); // 鐩爣搴撲綅灞�
+// write(command);
+// break;
+// case 4:
+// writeAuto((CrnCommand) task.getData());
+// break;
+// case 5:
+// write((CrnCommand) task.getData());
+// break;
+// default:
+// break;
+// }
Thread.sleep(500);
} catch (Exception e) {
// e.printStackTrace();
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 3f61057..537b138 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,5 +1,5 @@
server:
- port: 8080
+ port: 9092
servlet:
context-path: /@pom.build.finalName@
@@ -8,7 +8,7 @@
name: @pom.build.finalName@
datasource:
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
- url: jdbc:sqlserver://127.0.0.1:1433;databasename=rywxasrs
+ url: jdbc:sqlserver://127.0.0.1:1433;databasename=lfdwcs_sxc
username: sa
password: sa@123
mvc:
@@ -37,7 +37,7 @@
#License鐩稿叧閰嶇疆
license:
- subject: jdzwcs
+ subject: lfdwcs_sxc
publicAlias: publicCert
storePass: public_zhongyang_123456789
licensePath: license.lic
@@ -61,3 +61,11 @@
TaskExecCallback: api/StereoscopicCallBack/TaskExecFinishedCallback
# 绉诲簱鐢宠鎺ュ彛
movePath: api/InterFace/get_InterFace_TestStorage
+wcs:
+ urlWcs: 10.10.20.200:9090/wcs
+ #鍏ュ簱浠诲姟鐢宠
+ inboundTaskApplyPathWcs: openapi/createInTask
+ #鍑哄簱浠诲姟鐢宠
+ outboundTaskRequest : openapi/createOutTask
+ # 绉诲簱鐢宠鎺ュ彛
+ movePathWcs: openapi/createLocMoveTask
diff --git a/src/main/resources/mapper/BasShuttleMapper.xml b/src/main/resources/mapper/BasShuttleMapper.xml
new file mode 100644
index 0000000..5e44550
--- /dev/null
+++ b/src/main/resources/mapper/BasShuttleMapper.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.BasShuttleMapper">
+
+ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+ <resultMap id="BaseResultMap" type="com.zy.asrs.entity.BasShuttle">
+ <result column="shuttle_no" property="shuttleNo" />
+ <result column="status" property="status" />
+ <result column="shuttle_status" property="shuttleStatus" />
+ <result column="wrk_no" property="wrkNo" />
+ <result column="idle_loc" property="idleLoc" />
+ <result column="auto_charge" property="autoCharge" />
+ <result column="charge_line" property="chargeLine" />
+ <result column="create_by" property="createBy" />
+ <result column="create_time" property="createTime" />
+ <result column="update_by" property="updateBy" />
+ <result column="update_time" property="updateTime" />
+ <result column="memo" property="memo" />
+ <result column="pak_mk" property="pakMk" />
+
+ <result column="run_speed" property="runSpeed" />
+ <result column="device_status" property="deviceStatus" />
+ <result column="disable_lev" property="disableLev" />
+
+ </resultMap>
+
+</mapper>
diff --git a/src/main/resources/mapper/TaskWrkMapper.xml b/src/main/resources/mapper/TaskWrkMapper.xml
index 6055c3a..2b99410 100644
--- a/src/main/resources/mapper/TaskWrkMapper.xml
+++ b/src/main/resources/mapper/TaskWrkMapper.xml
@@ -119,7 +119,7 @@
<select id="selectToBeHistoryData" resultMap="BaseResultMap">
select * from dbo.wcs_task_wrk
where 1=1
- and ((wrk_sts=14 and status=5) or status=7 or status=4 or (wrk_sts=4 and status=5))
+ and ((wrk_sts=14 and status=5) or status=7 or status=4 or (wrk_sts=7 and status=5))
order by io_pri desc,create_time,wrk_no ASC
</select>
diff --git a/src/main/webapp/static/wcs/js/common.js b/src/main/webapp/static/wcs/js/common.js
index 44a248f..dd0efd0 100644
--- a/src/main/webapp/static/wcs/js/common.js
+++ b/src/main/webapp/static/wcs/js/common.js
@@ -1,4 +1,4 @@
-var baseUrl = "/jdzwcs";
+var baseUrl = "/wcs";
// 璧嬪��
function setVal(el, val) {
diff --git a/src/main/webapp/static/wcs/js/console.map.js b/src/main/webapp/static/wcs/js/console.map.js
index b77d4bd..a87dc63 100644
--- a/src/main/webapp/static/wcs/js/console.map.js
+++ b/src/main/webapp/static/wcs/js/console.map.js
@@ -1,5 +1,5 @@
mapInfo = {
- "mapName": "jdzwcs",
+ "mapName": "wcs",
"rackCount": 13,
"crnCount": 4,
"stbCount": 4,
diff --git a/src/main/webapp/static/wms/js/basShuttle/basShuttle.js b/src/main/webapp/static/wms/js/basShuttle/basShuttle.js
new file mode 100644
index 0000000..5fc549b
--- /dev/null
+++ b/src/main/webapp/static/wms/js/basShuttle/basShuttle.js
@@ -0,0 +1,279 @@
+var pageCurr;
+layui.config({
+ base: baseUrl + "/static/wms/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: '#basShuttle',
+ headers: {token: localStorage.getItem('token')},
+ url: baseUrl+'/basShuttle/list/auth',
+ page: true,
+ limit: 15,
+ limits: [15, 30, 50, 100, 200, 500],
+ toolbar: '#toolbar',
+ cellMinWidth: 50,
+ height: 'full-120',
+ cols: [[
+ {type: 'checkbox'}
+ ,{field: 'shuttleNo', align: 'center',title: '鍥涘悜绌挎杞﹀彿', width: 120}
+ ,{field: 'status$', align: 'center',title: '鐘舵��'}
+ ,{field: 'shuttleStatus', align: 'center',title: '浣滀笟鎬�'}
+ ,{field: 'wrkNo', align: 'center',title: '浠诲姟鍙�'}
+ ,{field: 'idleLoc', align: 'center',title: '鏆傚瓨搴撲綅'}
+ // ,{field: 'autoCharge', align: 'center',title: '鑷姩鍏呯數'}
+ ,{field: 'chargeLine', align: 'center',title: '鐢甸噺绾�'}
+ ,{field: 'busyStatus$', align: 'center',title: '灏忚溅蹇欑姸鎬�'}
+ ,{field: 'currentCode', align: 'center',title: '浜岀淮鐮�'}
+ ,{field: 'batteryPower$', align: 'center',title: '鐢甸噺'}
+ ,{field: 'batteryTemp$', align: 'center',title: '鐢垫睜娓╁害'}
+ // ,{field: 'createBy$', align: 'center',title: '娣诲姞浜哄憳'}
+ // ,{field: 'createTime$', align: 'center',title: '娣诲姞鏃堕棿'}
+ // ,{field: 'updateBy$', align: 'center',title: '淇敼浜哄憳'}
+ // ,{field: 'updateTime$', align: 'center',title: '淇敼鏃堕棿'}
+ ,{field: 'memo', align: 'center',title: '澶囨敞'}
+ ,{field: 'liftNo', align: 'center',title: '鎻愬崌鏈哄彿'}
+ ,{field: 'pakMk$', 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(basShuttle)', 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(basShuttle)', 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.shuttleNo;
+ }));
+ 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 = {
+ 'basShuttle': exportData,
+ 'fields': fields
+ };
+ $.ajax({
+ url: baseUrl+"/basShuttle/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(basShuttle)', function(obj){
+ var data = obj.data;
+ switch (obj.event) {
+ case 'edit':
+ showEditModel(data);
+ break;
+ case "del":
+ del([data.shuttleNo]);
+ 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+"/basShuttle/"+(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+"/basShuttle/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 clearFormVal(el) {
+ $(':input', el)
+ .val('')
+ .removeAttr('checked')
+ .removeAttr('selected');
+ }
+
+ // 鏃堕棿閫夋嫨鍣�
+ function layDateRender(data) {
+ setTimeout(function () {
+ layDate.render({
+ elem: '.layui-laydate-range'
+ ,type: 'datetime'
+ ,range: true
+ });
+ layDate.render({
+ elem: '#createTime\\$',
+ type: 'datetime',
+ value: data!==undefined?data['createTime\\$']:null
+ });
+ layDate.render({
+ elem: '#updateTime\\$',
+ type: 'datetime',
+ value: data!==undefined?data['updateTime\\$']: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/static/wms/js/common.js b/src/main/webapp/static/wms/js/common.js
index 4882225..fcb5b63 100644
--- a/src/main/webapp/static/wms/js/common.js
+++ b/src/main/webapp/static/wms/js/common.js
@@ -1,4 +1,4 @@
-var baseUrl = "/jdzwcs";
+var baseUrl = "/wcs";
// 璇︽儏绐楀彛-楂樺害
var detailHeight = '80%';
diff --git a/src/main/webapp/views/basShuttle/basShuttle.html b/src/main/webapp/views/basShuttle/basShuttle.html
new file mode 100644
index 0000000..e791af4
--- /dev/null
+++ b/src/main/webapp/views/basShuttle/basShuttle.html
@@ -0,0 +1,148 @@
+<!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/wms/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../static/wms/css/admin.css?v=318" media="all">
+ <link rel="stylesheet" href="../../static/wms/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="shuttle_no" placeholder="鍥涘悜绌挎杞﹀彿" autocomplete="off">
+ </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="basShuttle" lay-filter="basShuttle"></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/wms/js/jquery/jquery-3.3.1.min.js"></script>
+<script type="text/javascript" src="../../static/wms/layui/layui.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/wms/js/common.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/wms/js/cool.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/wms/js/basShuttle/basShuttle.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">鍥涘悜绌挎杞﹀彿: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="shuttleNo" placeholder="璇疯緭鍏ュ洓鍚戠┛姊溅鍙�" lay-vertype="tips" lay-verify="required">
+ </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="1">姝ｅ父</option>
+ <option value="0">绂佺敤</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="shuttleStatus" placeholder="璇疯緭鍏ヤ綔涓氭��">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">浠诲姟鍙�: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="wrkNo" placeholder="璇疯緭鍏ヤ换鍔″彿">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">鏆傚瓨搴撲綅: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="idleLoc" placeholder="璇疯緭鍏ユ殏瀛樺簱浣�">
+ </div>
+ </div>
+<!-- <div class="layui-form-item">-->
+<!-- <label class="layui-form-label">鑷姩鍏呯數: </label>-->
+<!-- <div class="layui-input-block">-->
+<!-- <input class="layui-input" name="autoCharge" placeholder="璇疯緭鍏ヨ嚜鍔ㄥ厖鐢�">-->
+<!-- </div>-->
+<!-- </div>-->
+ <div class="layui-form-item">
+ <label class="layui-form-label">鐢甸噺绾�: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="chargeLine" placeholder="璇疯緭鍏ョ數閲忕嚎">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">澶囨敞: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="memo" placeholder="璇疯緭鍏ュ娉�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">鎻愬崌鏈哄彿: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="liftNo" placeholder="璇疯緭鍏ユ彁鍗囨満鍙�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">鏍囪: </label>
+ <div class="layui-input-block">
+ <select name="pakMk">
+ <option value="1">Y</option>
+ <option value="0">N</option>
+ </select>
+ </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