From 9101ad488486cd57be5f27ca4ad6071c07ab9557 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期五, 04 八月 2023 13:55:10 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/WmsWrkLogScheduler.java | 62 -
src/main/webapp/static/wcs/js/common.js | 13
src/main/java/com/zy/asrs/entity/TaskWrk.java | 315 +++++++++
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 48
src/main/webapp/views/commandManage/commandManage.html | 239 +++++-
src/main/java/com/zy/asrs/mapper/CommandInfoMapper.java | 2
src/main/java/com/zy/asrs/entity/WrkMast.java | 6
src/main/java/com/zy/asrs/service/impl/TaskWrkServiceImpl.java | 92 ++
src/main/resources/mapper/TaskWrkMapper.xml | 40 +
/dev/null | 69 --
src/main/java/com/zy/asrs/utils/CommandUtils.java | 38
src/main/webapp/views/taskWrk/taskWrk.html | 295 +++++++++
src/main/java/com/zy/asrs/mapper/TaskWrkMapper.java | 16
src/main/java/com/zy/asrs/entity/CommandInfo.java | 34
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 276 ++++----
src/main/java/com/zy/asrs/service/impl/CommandInfoServiceImpl.java | 4
src/main/webapp/static/wms/js/wmsWrk/wmsWrk.js | 27
src/main/java/com/zy/asrs/controller/TaskWrkController.java | 168 +++++
src/main/java/com/zy/asrs/service/TaskWrkService.java | 24
src/main/java/com/zy/asrs/domain/enums/TaskStatusType.java | 13
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 78 +-
src/main/java/com/zy/common/service/CommonService.java | 8
src/main/java/com/zy/asrs/service/CommandInfoService.java | 2
src/main/resources/mapper/CommandInfoMapper.xml | 6
24 files changed, 1,420 insertions(+), 455 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/TaskWrkController.java b/src/main/java/com/zy/asrs/controller/TaskWrkController.java
new file mode 100644
index 0000000..c9c8b73
--- /dev/null
+++ b/src/main/java/com/zy/asrs/controller/TaskWrkController.java
@@ -0,0 +1,168 @@
+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.common.DateUtils;
+import com.zy.asrs.domain.enums.TaskStatusType;
+import com.zy.asrs.entity.TaskWrk;
+import com.zy.asrs.service.TaskWrkService;
+import com.core.annotations.ManagerAuth;
+import com.core.common.BaseRes;
+import com.core.common.Cools;
+import com.core.common.R;
+import com.zy.common.web.BaseController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.*;
+
+@RestController
+public class TaskWrkController extends BaseController {
+
+ @Autowired
+ private TaskWrkService taskWrkService;
+
+ @RequestMapping(value = "/taskWrk/{id}/auth")
+ @ManagerAuth
+ public R get(@PathVariable("id") String id) {
+ return R.ok(taskWrkService.selectById(String.valueOf(id)));
+ }
+
+ @RequestMapping(value = "/taskWrk/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 Map<String, Object> param){
+ EntityWrapper<TaskWrk> wrapper = new EntityWrapper<>();
+ excludeTrash(param);
+ convert(param, wrapper);
+ if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ return R.ok(taskWrkService.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 = "/taskWrk/add/auth")
+ @ManagerAuth
+ public R add(TaskWrk taskWrk) {
+ taskWrkService.insert(taskWrk);
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/taskWrk/update/auth")
+ @ManagerAuth
+ public R update(TaskWrk taskWrk){
+ if (Cools.isEmpty(taskWrk) || null==taskWrk.getTaskNo()){
+ return R.error();
+ }
+ taskWrkService.updateById(taskWrk);
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/taskWrk/delete/auth")
+ @ManagerAuth
+ public R delete(@RequestParam(value="ids[]") Long[] ids){
+ for (Long id : ids){
+ taskWrkService.deleteById(id);
+ }
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/taskWrk/export/auth")
+ @ManagerAuth
+ public R export(@RequestBody JSONObject param){
+ EntityWrapper<TaskWrk> wrapper = new EntityWrapper<>();
+ List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
+ Map<String, Object> map = excludeTrash(param.getJSONObject("taskWrk"));
+ convert(map, wrapper);
+ List<TaskWrk> list = taskWrkService.selectList(wrapper);
+ return R.ok(exportSupport(list, fields));
+ }
+
+ @RequestMapping(value = "/taskWrkQuery/auth")
+ @ManagerAuth
+ public R query(String condition) {
+ EntityWrapper<TaskWrk> wrapper = new EntityWrapper<>();
+ wrapper.like("id", condition);
+ Page<TaskWrk> page = taskWrkService.selectPage(new Page<>(0, 10), wrapper);
+ List<Map<String, Object>> result = new ArrayList<>();
+ for (TaskWrk taskWrk : page.getRecords()){
+ Map<String, Object> map = new HashMap<>();
+ map.put("id", taskWrk.getTaskNo());
+ map.put("value", taskWrk.getTaskNo());
+ result.add(map);
+ }
+ return R.ok(result);
+ }
+
+ @RequestMapping(value = "/taskWrk/check/column/auth")
+ @ManagerAuth
+ public R query(@RequestBody JSONObject param) {
+ Wrapper<TaskWrk> wrapper = new EntityWrapper<TaskWrk>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
+ if (null != taskWrkService.selectOne(wrapper)){
+ return R.parse(BaseRes.REPEAT).add(getComment(TaskWrk.class, String.valueOf(param.get("key"))));
+ }
+ return R.ok();
+ }
+
+ @PostMapping(value = "/taskWrk/distribute/auth")
+ @ManagerAuth(memo = "鎵嬪姩娲惧彂浠诲姟")
+ public R distribute(@RequestParam String taskNo) {
+ taskWrkService.distribute(taskNo, getUserId());
+ return R.ok();
+ }
+
+ @PostMapping(value = "/taskWrk/complete/auth")
+ @ManagerAuth(memo = "鎵嬪姩瀹屾垚浠诲姟")
+ public R complete(@RequestParam String taskNo) {
+ TaskWrk taskWrk = taskWrkService.selectByTaskNo(taskNo);
+ if (taskWrk == null) {
+ return R.error();
+ }
+ if (taskWrk.getStatus() == TaskStatusType.COMPLETE.id) {
+ return R.error(taskWrk.getTaskNo() + "宸插畬缁�");
+ }
+ Date now = new Date();
+ taskWrk.setStatus(TaskStatusType.COMPLETE.id);
+ taskWrk.setModiTime(now);//鎿嶄綔鏃堕棿
+ taskWrk.setModiUser(getUserId());//鎿嶄綔鍛�
+ taskWrk.setCompleteTime(now);//瀹岀粨鏃堕棿
+ taskWrkService.updateById(taskWrk);
+ return R.ok();
+ }
+
+ @PostMapping(value = "/taskWrk/cancel/auth")
+ @ManagerAuth(memo = "鎵嬪姩鍙栨秷浠诲姟")
+ public R cancel(@RequestParam String taskNo) {
+ TaskWrk taskWrk = taskWrkService.selectByTaskNo(taskNo);
+ if (taskWrk == null) {
+ return R.error();
+ }
+ if (taskWrk.getStatus() == TaskStatusType.CANCEL.id) {
+ return R.error(taskWrk.getTaskNo() + "宸茶鍙栨秷");
+ }
+ Date now = new Date();
+ taskWrk.setStatus(TaskStatusType.CANCEL.id);
+ taskWrk.setModiTime(now);//鎿嶄綔鏃堕棿
+ taskWrk.setModiUser(getUserId());//鎿嶄綔鍛�
+ taskWrk.setCompleteTime(now);//瀹岀粨鏃堕棿
+ taskWrkService.updateById(taskWrk);
+ return R.ok();
+ }
+
+}
diff --git a/src/main/java/com/zy/asrs/controller/WmsWrkController.java b/src/main/java/com/zy/asrs/controller/WmsWrkController.java
deleted file mode 100644
index f01e2f0..0000000
--- a/src/main/java/com/zy/asrs/controller/WmsWrkController.java
+++ /dev/null
@@ -1,194 +0,0 @@
-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.common.DateUtils;
-import com.zy.asrs.domain.enums.WmsWrkStatusType;
-import com.zy.asrs.entity.WmsWrk;
-import com.zy.asrs.service.WmsWrkService;
-import com.core.annotations.ManagerAuth;
-import com.core.common.BaseRes;
-import com.core.common.Cools;
-import com.core.common.R;
-import com.zy.common.web.BaseController;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.*;
-
-@RestController
-public class WmsWrkController extends BaseController {
-
- @Autowired
- private WmsWrkService wmsWrkService;
-
- @RequestMapping(value = "/wmsWrk/{id}/auth")
- @ManagerAuth
- public R get(@PathVariable("id") String id) {
- return R.ok(wmsWrkService.selectById(String.valueOf(id)));
- }
-
- @RequestMapping(value = "/wmsWrk/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 Map<String, Object> param){
- EntityWrapper<WmsWrk> wrapper = new EntityWrapper<>();
- excludeTrash(param);
- convert(param, wrapper);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
- return R.ok(wmsWrkService.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 = "/wmsWrk/add/auth")
- @ManagerAuth
- public R add(WmsWrk wmsWrk) {
- wmsWrkService.insert(wmsWrk);
- return R.ok();
- }
-
- @RequestMapping(value = "/wmsWrk/update/auth")
- @ManagerAuth
- public R update(WmsWrk wmsWrk){
- if (Cools.isEmpty(wmsWrk) || null==wmsWrk.getWmsWrkNo()){
- return R.error();
- }
- wmsWrkService.updateById(wmsWrk);
- return R.ok();
- }
-
- @RequestMapping(value = "/wmsWrk/delete/auth")
- @ManagerAuth
- public R delete(@RequestParam(value="ids[]") Long[] ids){
- for (Long id : ids){
- wmsWrkService.deleteById(id);
- }
- return R.ok();
- }
-
- @RequestMapping(value = "/wmsWrk/export/auth")
- @ManagerAuth
- public R export(@RequestBody JSONObject param){
- EntityWrapper<WmsWrk> wrapper = new EntityWrapper<>();
- List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
- Map<String, Object> map = excludeTrash(param.getJSONObject("wmsWrk"));
- convert(map, wrapper);
- List<WmsWrk> list = wmsWrkService.selectList(wrapper);
- return R.ok(exportSupport(list, fields));
- }
-
- @RequestMapping(value = "/wmsWrkQuery/auth")
- @ManagerAuth
- public R query(String condition) {
- EntityWrapper<WmsWrk> wrapper = new EntityWrapper<>();
- wrapper.like("id", condition);
- Page<WmsWrk> page = wmsWrkService.selectPage(new Page<>(0, 10), wrapper);
- List<Map<String, Object>> result = new ArrayList<>();
- for (WmsWrk wmsWrk : page.getRecords()){
- Map<String, Object> map = new HashMap<>();
- map.put("id", wmsWrk.getWmsWrkNo());
- map.put("value", wmsWrk.getWmsWrkNo());
- result.add(map);
- }
- return R.ok(result);
- }
-
- @RequestMapping(value = "/wmsWrk/check/column/auth")
- @ManagerAuth
- public R query(@RequestBody JSONObject param) {
- Wrapper<WmsWrk> wrapper = new EntityWrapper<WmsWrk>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
- if (null != wmsWrkService.selectOne(wrapper)){
- return R.parse(BaseRes.REPEAT).add(getComment(WmsWrk.class, String.valueOf(param.get("key"))));
- }
- return R.ok();
- }
-
- @RequestMapping(value = "/wmsWrk/add/pri/auth")
- @ManagerAuth(memo = "浠诲姟澧炲姞浼樺厛绾�")
- public R addPri(@RequestBody List<WmsWrk> list) {
- if (list.isEmpty()) {
- return R.error("璇疯嚦灏戦�夋嫨涓�琛屾暟鎹�");
- }
- for (WmsWrk entity : list){
- entity.setIoPri(entity.getIoPri() + 1);
- }
- wmsWrkService.updateBatchById(list);
- return R.ok();
- }
-
- @RequestMapping(value = "/wmsWrk/red/pri/auth")
- @ManagerAuth(memo = "浠诲姟闄嶄綆浼樺厛绾�")
- public R redPri(@RequestBody List<WmsWrk> list) {
- if (list.isEmpty()) {
- return R.error("璇疯嚦灏戦�夋嫨涓�琛屾暟鎹�");
- }
- for (WmsWrk entity : list){
- entity.setIoPri(entity.getIoPri() - 1);
- }
- wmsWrkService.updateBatchById(list);
- return R.ok();
- }
-
- @PostMapping(value = "/wmsWrk/complete/auth")
- @ManagerAuth(memo = "鎵嬪姩瀹屾垚浠诲姟")
- public R complete(@RequestParam Integer wmsWrkNo) {
- WmsWrk wmsWrk = wmsWrkService.selectByWmsWrkNo(wmsWrkNo);
- if (wmsWrk == null) {
- return R.error();
- }
- if (wmsWrk.getWmsStatus() == WmsWrkStatusType.COMPLETE.id) {
- return R.error(wmsWrk.getWmsWrkNo() + "宸插畬缁�");
- }
- Date now = new Date();
- wmsWrk.setWmsStatus(WmsWrkStatusType.COMPLETE.id);
- wmsWrk.setModiTime(now);
- wmsWrk.setModiUser(getUserId());
- wmsWrk.setEndTime(now);
- wmsWrkService.updateById(wmsWrk);
- return R.ok();
- }
-
- @PostMapping(value = "/wmsWrk/cancel/auth")
- @ManagerAuth(memo = "鎵嬪姩鍙栨秷浠诲姟")
- public R cancel(@RequestParam Integer wmsWrkNo) {
- WmsWrk wmsWrk = wmsWrkService.selectByWmsWrkNo(wmsWrkNo);
- if (wmsWrk == null) {
- return R.error();
- }
- if (wmsWrk.getWmsStatus() == WmsWrkStatusType.CANCEL.id) {
- return R.error(wmsWrk.getWmsWrkNo() + "宸茶鍙栨秷");
- }
- Date now = new Date();
- wmsWrk.setWmsStatus(WmsWrkStatusType.CANCEL.id);
- wmsWrk.setModiTime(now);
- wmsWrk.setModiUser(getUserId());
- wmsWrk.setEndTime(now);
- wmsWrkService.updateById(wmsWrk);
- return R.ok();
- }
-
- @PostMapping(value = "/wmsWrk/distribute/auth")
- @ManagerAuth(memo = "鎵嬪姩娲惧彂浠诲姟")
- public R distribute(@RequestParam Integer wmsWrkNo) {
- wmsWrkService.distribute(wmsWrkNo, getUserId());
- return R.ok();
- }
-
-}
diff --git a/src/main/java/com/zy/asrs/controller/WmsWrkLogController.java b/src/main/java/com/zy/asrs/controller/WmsWrkLogController.java
deleted file mode 100644
index d5f3f45..0000000
--- a/src/main/java/com/zy/asrs/controller/WmsWrkLogController.java
+++ /dev/null
@@ -1,123 +0,0 @@
-package com.zy.asrs.controller;
-
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.baomidou.mybatisplus.mapper.Wrapper;
-import com.baomidou.mybatisplus.plugins.Page;
-import com.core.common.DateUtils;
-import com.zy.asrs.entity.WmsWrkLog;
-import com.zy.asrs.service.WmsWrkLogService;
-import com.core.annotations.ManagerAuth;
-import com.core.common.BaseRes;
-import com.core.common.Cools;
-import com.core.common.R;
-import com.zy.common.web.BaseController;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.*;
-
-@RestController
-public class WmsWrkLogController extends BaseController {
-
- @Autowired
- private WmsWrkLogService wmsWrkLogService;
-
- @RequestMapping(value = "/wmsWrkLog/{id}/auth")
- @ManagerAuth
- public R get(@PathVariable("id") String id) {
- return R.ok(wmsWrkLogService.selectById(String.valueOf(id)));
- }
-
- @RequestMapping(value = "/wmsWrkLog/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 Map<String, Object> param){
- EntityWrapper<WmsWrkLog> wrapper = new EntityWrapper<>();
- excludeTrash(param);
- convert(param, wrapper);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
- return R.ok(wmsWrkLogService.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 = "/wmsWrkLog/add/auth")
- @ManagerAuth
- public R add(WmsWrkLog wmsWrkLog) {
- wmsWrkLogService.insert(wmsWrkLog);
- return R.ok();
- }
-
- @RequestMapping(value = "/wmsWrkLog/update/auth")
- @ManagerAuth
- public R update(WmsWrkLog wmsWrkLog){
- if (Cools.isEmpty(wmsWrkLog) || null==wmsWrkLog.getId()){
- return R.error();
- }
- wmsWrkLogService.updateById(wmsWrkLog);
- return R.ok();
- }
-
- @RequestMapping(value = "/wmsWrkLog/delete/auth")
- @ManagerAuth
- public R delete(@RequestParam(value="ids[]") Long[] ids){
- for (Long id : ids){
- wmsWrkLogService.deleteById(id);
- }
- return R.ok();
- }
-
- @RequestMapping(value = "/wmsWrkLog/export/auth")
- @ManagerAuth
- public R export(@RequestBody JSONObject param){
- EntityWrapper<WmsWrkLog> wrapper = new EntityWrapper<>();
- List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
- Map<String, Object> map = excludeTrash(param.getJSONObject("wmsWrkLog"));
- convert(map, wrapper);
- List<WmsWrkLog> list = wmsWrkLogService.selectList(wrapper);
- return R.ok(exportSupport(list, fields));
- }
-
- @RequestMapping(value = "/wmsWrkLogQuery/auth")
- @ManagerAuth
- public R query(String condition) {
- EntityWrapper<WmsWrkLog> wrapper = new EntityWrapper<>();
- wrapper.like("id", condition);
- Page<WmsWrkLog> page = wmsWrkLogService.selectPage(new Page<>(0, 10), wrapper);
- List<Map<String, Object>> result = new ArrayList<>();
- for (WmsWrkLog wmsWrkLog : page.getRecords()){
- Map<String, Object> map = new HashMap<>();
- map.put("id", wmsWrkLog.getId());
- map.put("value", wmsWrkLog.getId());
- result.add(map);
- }
- return R.ok(result);
- }
-
- @RequestMapping(value = "/wmsWrkLog/check/column/auth")
- @ManagerAuth
- public R query(@RequestBody JSONObject param) {
- Wrapper<WmsWrkLog> wrapper = new EntityWrapper<WmsWrkLog>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
- if (null != wmsWrkLogService.selectOne(wrapper)){
- return R.parse(BaseRes.REPEAT).add(getComment(WmsWrkLog.class, String.valueOf(param.get("key"))));
- }
- return R.ok();
- }
-
-}
diff --git a/src/main/java/com/zy/asrs/domain/enums/WmsWrkStatusType.java b/src/main/java/com/zy/asrs/domain/enums/TaskStatusType.java
similarity index 62%
rename from src/main/java/com/zy/asrs/domain/enums/WmsWrkStatusType.java
rename to src/main/java/com/zy/asrs/domain/enums/TaskStatusType.java
index b27edd7..fa50623 100644
--- a/src/main/java/com/zy/asrs/domain/enums/WmsWrkStatusType.java
+++ b/src/main/java/com/zy/asrs/domain/enums/TaskStatusType.java
@@ -1,20 +1,17 @@
package com.zy.asrs.domain.enums;
-import com.zy.core.enums.CrnForkPosType;
-
-public enum WmsWrkStatusType {
+public enum TaskStatusType {
RECEIVE(1,"鎺ユ敹"),
DISTRIBUTE(2,"娲惧彂"),
- WORKING(3,"鎵ц"),
- COMPLETE(4,"瀹岀粨"),
- CANCEL(5,"鍙栨秷"),
+ COMPLETE(3,"瀹岀粨"),
+ CANCEL(4,"鍙栨秷"),
;
public Integer id;
public String desc;
- WmsWrkStatusType(Integer id,String desc){
+ TaskStatusType(Integer id, String desc){
this.id = id;
this.desc = desc;
}
@@ -23,7 +20,7 @@
if (null == id) {
return null;
}
- for (WmsWrkStatusType type : WmsWrkStatusType.values()) {
+ for (TaskStatusType type : TaskStatusType.values()) {
if (type.id.equals(id)) {
return type.desc;
}
diff --git a/src/main/java/com/zy/asrs/entity/CommandInfo.java b/src/main/java/com/zy/asrs/entity/CommandInfo.java
index a29eba9..52f670c 100644
--- a/src/main/java/com/zy/asrs/entity/CommandInfo.java
+++ b/src/main/java/com/zy/asrs/entity/CommandInfo.java
@@ -4,13 +4,8 @@
import com.baomidou.mybatisplus.enums.IdType;
import com.baomidou.mybatisplus.annotations.TableField;
import java.text.SimpleDateFormat;
-import java.time.Duration;
-import java.time.LocalDateTime;
-import java.util.Calendar;
import java.util.Date;
import org.springframework.format.annotation.DateTimeFormat;
-import java.text.SimpleDateFormat;
-import java.util.Date;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -28,18 +23,18 @@
private Integer id;
/**
- * 浠诲姟鍙穡cs_command_info
+ * 宸ヤ綔鍙�
*/
- @ApiModelProperty(value= "浠诲姟鍙�")
+ @ApiModelProperty(value= "宸ヤ綔鍙�")
@TableField("wrk_no")
private Integer wrkNo;
/**
* WMS浠诲姟鍙�
*/
- @ApiModelProperty(value= "WMS浠诲姟鍙�")
- @TableField("wms_wrk_no")
- private Integer wmsWrkNo;
+ @ApiModelProperty(value= "浠诲姟鍙�")
+ @TableField("task_no")
+ private String taskNo;
/**
* 鎸囦护绫诲瀷{1:鍒涘缓,2:鎵ц,3:瀹屾垚}
@@ -100,9 +95,10 @@
public CommandInfo() {}
- public CommandInfo(Integer wrkNo, Integer wmsWrkNo, Integer commandStatus, Date startTime, Date endTime, Integer commandType, String device, String deviceLog, String commandDesc) {
+ public CommandInfo(Integer id, Integer wrkNo, String taskNo, Integer commandStatus, Date startTime, Date endTime, Integer commandType, String device, String deviceLog, String commandDesc, String command) {
+ this.id = id;
this.wrkNo = wrkNo;
- this.wmsWrkNo = wmsWrkNo;
+ this.taskNo = taskNo;
this.commandStatus = commandStatus;
this.startTime = startTime;
this.endTime = endTime;
@@ -110,20 +106,8 @@
this.device = device;
this.deviceLog = deviceLog;
this.commandDesc = commandDesc;
+ this.command = command;
}
-
-// CommandInfo commandInfo = new CommandInfo(
-// null, // 浠诲姟鍙�
-// null, // 璧风偣浣嶇疆
-// null, // 缁堢偣浣嶇疆
-// null, // 鎸囦护鐘舵��
-// null, // 寮�濮嬫椂闂�
-// null, // 缁撴潫鏃堕棿
-// null, // 鎸囦护绫诲瀷
-// null, // 璁惧
-// null, // 璁惧鎵ц淇℃伅
-// null // 鍛戒护鎻忚堪
-// );
public String getStartTime$(){
if (Cools.isEmpty(this.startTime)){
diff --git a/src/main/java/com/zy/asrs/entity/TaskWrk.java b/src/main/java/com/zy/asrs/entity/TaskWrk.java
new file mode 100644
index 0000000..f32dfaa
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/TaskWrk.java
@@ -0,0 +1,315 @@
+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 com.core.common.SpringUtils;
+import com.zy.asrs.service.BasWrkIotypeService;
+import com.zy.asrs.entity.BasWrkIotype;
+import com.core.common.SpringUtils;
+import com.zy.system.service.UserService;
+import com.zy.system.entity.User;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import com.core.common.SpringUtils;
+import com.zy.asrs.service.BasWrkStatusService;
+import com.zy.asrs.entity.BasWrkStatus;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import com.baomidou.mybatisplus.annotations.TableName;
+import java.io.Serializable;
+
+@Data
+@TableName("wcs_task_wrk")
+public class TaskWrk implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * wms浠诲姟鍙�
+ */
+ @ApiModelProperty(value= "wms浠诲姟鍙�")
+ @TableId(value = "task_no", type = IdType.INPUT)
+ @TableField("task_no")
+ private String taskNo;
+
+ /**
+ * 浠诲姟鐘舵�� 1: 鎺ユ敹 2: 娲惧彂 3: 瀹岀粨 4: 鍙栨秷
+ */
+ @ApiModelProperty(value= "浠诲姟鐘舵�� 1: 鎺ユ敹 2: 娲惧彂 3: 瀹岀粨 4: 鍙栨秷 ")
+ private Integer status;
+
+ /**
+ * 浠诲姟鍙�
+ */
+ @ApiModelProperty(value= "浠诲姟鍙�")
+ @TableField("wrk_no")
+ private Integer wrkNo;
+
+ /**
+ * 浠诲姟鏃堕棿(鎺ユ敹鏃堕棿)
+ */
+ @ApiModelProperty(value= "浠诲姟鏃堕棿(鎺ユ敹鏃堕棿)")
+ @TableField("create_time")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date createTime;
+
+ /**
+ * 浠诲姟绫诲瀷
+ */
+ @ApiModelProperty(value= "浠诲姟绫诲瀷")
+ @TableField("io_type")
+ private Integer ioType;
+
+ /**
+ * 浼樺厛绾�
+ */
+ @ApiModelProperty(value= "浼樺厛绾�")
+ @TableField("io_pri")
+ private Double ioPri;
+
+ /**
+ * 璧风偣
+ */
+ @ApiModelProperty(value= "璧风偣")
+ @TableField("start_point")
+ private String startPoint;
+
+ /**
+ * 缁堢偣
+ */
+ @ApiModelProperty(value= "缁堢偣")
+ @TableField("target_point")
+ private String targetPoint;
+
+ /**
+ * 淇敼浜哄憳
+ */
+ @ApiModelProperty(value= "淇敼浜哄憳")
+ @TableField("modi_user")
+ private Long modiUser;
+
+ /**
+ * 淇敼鏃堕棿
+ */
+ @ApiModelProperty(value= "淇敼鏃堕棿")
+ @TableField("modi_time")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date modiTime;
+
+ /**
+ * 澶囨敞
+ */
+ @ApiModelProperty(value= "澶囨敞")
+ private String memo;
+
+ /**
+ * 鏉＄爜
+ */
+ @ApiModelProperty(value= "鏉＄爜")
+ private String barcode;
+
+ /**
+ * 娲惧彂鏃堕棿
+ */
+ @ApiModelProperty(value= "娲惧彂鏃堕棿")
+ @TableField("assign_time")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date assignTime;
+
+ /**
+ * 鎵ц鏃堕棿
+ */
+ @ApiModelProperty(value= "鎵ц鏃堕棿")
+ @TableField("execute_time")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date executeTime;
+
+ /**
+ * 瀹岀粨鏃堕棿
+ */
+ @ApiModelProperty(value= "瀹岀粨鏃堕棿")
+ @TableField("complete_time")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date completeTime;
+
+ /**
+ * 鍙栨秷鏃堕棿
+ */
+ @ApiModelProperty(value= "鍙栨秷鏃堕棿")
+ @TableField("cancel_time")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date cancelTime;
+
+ /**
+ * 宸ヤ綔鐘舵��
+ */
+ @ApiModelProperty(value= "宸ヤ綔鐘舵��")
+ @TableField("wrk_sts")
+ private Integer wrkSts;
+
+ public TaskWrk() {}
+
+ public TaskWrk(String taskNo,Integer status,Integer wrkNo,Date createTime,Integer ioType,Double ioPri,String startPoint,String targetPoint,Long modiUser,Date modiTime,String memo,String barcode,Date assignTime,Date executeTime,Date completeTime,Date cancelTime,Integer wrkSts) {
+ this.taskNo = taskNo;
+ this.status = status;
+ this.wrkNo = wrkNo;
+ this.createTime = createTime;
+ this.ioType = ioType;
+ this.ioPri = ioPri;
+ this.startPoint = startPoint;
+ this.targetPoint = targetPoint;
+ this.modiUser = modiUser;
+ this.modiTime = modiTime;
+ this.memo = memo;
+ this.barcode = barcode;
+ this.assignTime = assignTime;
+ this.executeTime = executeTime;
+ this.completeTime = completeTime;
+ this.cancelTime = cancelTime;
+ this.wrkSts = wrkSts;
+ }
+
+// TaskWrk taskWrk = new TaskWrk(
+// null, // wms浠诲姟鍙穂闈炵┖]
+// null, // 浠诲姟鐘舵��
+// null, // 浠诲姟鍙�
+// null, // 浠诲姟鏃堕棿(鎺ユ敹鏃堕棿)
+// null, // 浠诲姟绫诲瀷
+// 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 1:
+ return "鎺ユ敹";
+ case 2:
+ return "娲惧彂";
+ case 3:
+ return "瀹岀粨";
+ case 4:
+ return "鍙栨秷";
+ default:
+ return String.valueOf(this.status);
+ }
+ }
+
+ public String getCreateTime$(){
+ if (Cools.isEmpty(this.createTime)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
+ }
+
+ public String getIoType$(){
+ BasWrkIotypeService service = SpringUtils.getBean(BasWrkIotypeService.class);
+ BasWrkIotype basWrkIotype = service.selectById(this.ioType);
+ if (!Cools.isEmpty(basWrkIotype)){
+ return String.valueOf(basWrkIotype.getIoDesc());
+ }
+ return null;
+ }
+
+ public String getModiUser$(){
+ UserService service = SpringUtils.getBean(UserService.class);
+ User user = service.selectById(this.modiUser);
+ if (!Cools.isEmpty(user)){
+ return String.valueOf(user.getUsername());
+ }
+ return null;
+ }
+
+ public String getModiTime$(){
+ if (Cools.isEmpty(this.modiTime)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.modiTime);
+ }
+
+ public String getAssignTime$(){
+ if (Cools.isEmpty(this.assignTime)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.assignTime);
+ }
+
+ public String getExecuteTime$(){
+ if (Cools.isEmpty(this.executeTime)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.executeTime);
+ }
+
+ public String getCompleteTime$(){
+ if (Cools.isEmpty(this.completeTime)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.completeTime);
+ }
+
+ public String getCancelTime$(){
+ if (Cools.isEmpty(this.cancelTime)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.cancelTime);
+ }
+
+ public String getWrkSts$(){
+ BasWrkStatusService service = SpringUtils.getBean(BasWrkStatusService.class);
+ BasWrkStatus basWrkStatus = service.selectById(this.wrkSts);
+ if (!Cools.isEmpty(basWrkStatus)){
+ return String.valueOf(basWrkStatus.getWrkDesc());
+ }
+ return null;
+ }
+
+ /**
+ * 鑾峰彇鎸佺画鏃堕棿
+ */
+ public String getDurationTime() {
+ if (Cools.isEmpty(this.createTime)) {
+ return "";
+ }
+
+ Date endDate = new Date();
+ if (!Cools.isEmpty(this.assignTime)) {
+ endDate = this.assignTime;
+ }
+
+ //鐢ㄦ潵鑾峰彇涓や釜鏃堕棿鐩稿樊鐨勬绉掓暟
+ long l = this.createTime.getTime() - endDate.getTime();
+
+ //鍒嗗埆璁＄畻鐩稿樊鐨勫ぉ銆佸皬鏃躲�佸垎銆佺
+ long day = l / (24 * 60 * 60 * 1000);
+ long hour = (l / (60 * 60 * 1000) - day * 24);
+ long min = ((l / (60 * 1000)) - day * 24 * 60 - hour * 60);
+ long s = (l / 1000 - day * 24 * 60 * 60 - hour * 60 * 60 - min * 60);
+
+ return Math.abs(day) + "澶�" + Math.abs(hour) + "灏忔椂" + Math.abs(min) + "鍒�" + Math.abs(s) + "绉�";
+ }
+
+}
diff --git a/src/main/java/com/zy/asrs/entity/WmsWrk.java b/src/main/java/com/zy/asrs/entity/WmsWrk.java
deleted file mode 100644
index 08ca061..0000000
--- a/src/main/java/com/zy/asrs/entity/WmsWrk.java
+++ /dev/null
@@ -1,317 +0,0 @@
-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 com.zy.asrs.domain.enums.WmsWrkStatusType;
-import org.springframework.format.annotation.DateTimeFormat;
-import com.core.common.SpringUtils;
-import com.zy.asrs.service.BasWrkIotypeService;
-import com.zy.asrs.service.LocMastService;
-import com.zy.asrs.service.BasDevpService;
-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;
-import java.util.List;
-
-@Data
-@TableName("wcs_wms_wrk")
-public class WmsWrk implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * wms浠诲姟鍙�
- */
- @ApiModelProperty(value= "wms浠诲姟鍙�")
- @TableId(value = "wms_wrk_no", type = IdType.INPUT)
- @TableField("wms_wrk_no")
- private Integer wmsWrkNo;
-
- /**
- * wms浠诲姟鐘舵�� 1: 鎺ユ敹 2: 娲惧彂 3: 鎵ц 4: 瀹岀粨 5: 鍙栨秷
- */
- @ApiModelProperty(value= "wms浠诲姟鐘舵�� 1: 鎺ユ敹 2: 娲惧彂 3: 鎵ц 4: 瀹岀粨 5: 鍙栨秷")
- @TableField("wms_status")
- private Integer wmsStatus;
-
- /**
- * 浠诲姟鍙�
- */
- @ApiModelProperty(value= "浠诲姟鍙�")
- @TableField("wrk_no")
- private Integer wrkNo;
-
- /**
- * 浠诲姟鏃堕棿
- */
- @ApiModelProperty(value= "浠诲姟鏃堕棿")
- @TableField("create_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private Date createTime;
-
- /**
- * 浠诲姟绫诲瀷
- */
- @ApiModelProperty(value= "浠诲姟绫诲瀷")
- @TableField("io_type")
- private Integer ioType;
-
- /**
- * 浼樺厛绾�
- */
- @ApiModelProperty(value= "浼樺厛绾�")
- @TableField("io_pri")
- private Double ioPri;
-
- /**
- * 鐩爣搴撲綅
- */
- @ApiModelProperty(value= "鐩爣搴撲綅")
- @TableField("loc_no")
- private String locNo;
-
- /**
- * 鐩爣绔�
- */
- @ApiModelProperty(value= "鐩爣绔�")
- @TableField("sta_no")
- private Integer staNo;
-
- /**
- * 婧愮珯
- */
- @ApiModelProperty(value= "婧愮珯")
- @TableField("source_sta_no")
- private Integer sourceStaNo;
-
- /**
- * 婧愬簱浣�
- */
- @ApiModelProperty(value= "婧愬簱浣�")
- @TableField("source_loc_no")
- private String sourceLocNo;
-
- /**
- * 鏉＄爜
- */
- @ApiModelProperty(value= "鏉＄爜")
- @TableField("barcode")
- private String barcode;
-
- /**
- * 淇敼浜哄憳
- */
- @ApiModelProperty(value= "淇敼浜哄憳")
- @TableField("modi_user")
- private Long modiUser;
-
- /**
- * 淇敼鏃堕棿
- */
- @ApiModelProperty(value= "淇敼鏃堕棿")
- @TableField("modi_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private Date modiTime;
-
- /**
- * 鍒涘缓鑰�
- */
- @ApiModelProperty(value= "鍒涘缓鑰�")
- @TableField("appe_user")
- private Long appeUser;
-
- /**
- * 娣诲姞鏃堕棿
- */
- @ApiModelProperty(value= "娣诲姞鏃堕棿")
- @TableField("appe_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private Date appeTime;
-
- /**
- * 澶囨敞
- */
- @ApiModelProperty(value= "澶囨敞")
- private String memo;
-
- /**
- * 缁撴潫鏃堕棿
- */
- @ApiModelProperty(value= "缁撴潫鏃堕棿")
- @TableField("end_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private Date endTime;
-
- public WmsWrk() {}
-
- public WmsWrk(Integer wmsWrkNo, Integer wmsStatus, Integer wrkNo, Date createTime, Integer ioType, Double ioPri, String locNo, Integer staNo, Integer sourceStaNo, String sourceLocNo, Long modiUser, Date modiTime, Long appeUser, Date appeTime, String memo, String barcode, Date endTime) {
- this.wmsWrkNo = wmsWrkNo;
- this.wmsStatus = wmsStatus;
- this.wrkNo = wrkNo;
- this.createTime = createTime;
- this.ioType = ioType;
- this.ioPri = ioPri;
- this.locNo = locNo;
- this.staNo = staNo;
- this.sourceStaNo = sourceStaNo;
- this.sourceLocNo = sourceLocNo;
- this.modiUser = modiUser;
- this.modiTime = modiTime;
- this.appeUser = appeUser;
- this.appeTime = appeTime;
- this.memo = memo;
- this.barcode = barcode;
- this.endTime = endTime;
- }
-
-// WmsWrk wmsWrk = new WmsWrk(
-// null, // wms浠诲姟鍙穂闈炵┖]
-// null, // wms浠诲姟鐘舵��
-// null, // 浠诲姟鍙�
-// null, // 浠诲姟鏃堕棿
-// null, // 鍏ュ嚭搴撶被鍨�
-// null, // 鍫嗗灈鏈�
-// null, // 浼樺厛绾�
-// null, // 鐩爣搴撲綅
-// null, // 鐩爣绔�
-// null, // 婧愮珯
-// null, // 婧愬簱浣�
-// null, // 搴撲綅鐘舵��
-// null, // 鎷ｆ枡(checkBox)
-// null, // 淇敼浜哄憳
-// null, // 淇敼鏃堕棿
-// null, // 鍒涘缓鑰�
-// null, // 娣诲姞鏃堕棿
-// null // 澶囨敞
-// );
-
- public String getWmsStatus$(){
- if (null == this.wmsStatus){ return null; }
- return WmsWrkStatusType.get(this.wmsStatus);
- }
-
- public String getCreateTime$(){
- if (Cools.isEmpty(this.createTime)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
- }
-
- public String getIoType$(){
- BasWrkIotypeService service = SpringUtils.getBean(BasWrkIotypeService.class);
- BasWrkIotype basWrkIotype = service.selectById(this.ioType);
- if (!Cools.isEmpty(basWrkIotype)){
- return String.valueOf(basWrkIotype.getIoDesc());
- }
- return null;
- }
-
- public String getLocNo$(){
- LocMastService service = SpringUtils.getBean(LocMastService.class);
- LocMast locMast = service.selectById(this.locNo);
- if (!Cools.isEmpty(locMast)){
- return String.valueOf(locMast.getLocNo());
- }
- return null;
- }
-
- public String getStaNo$(){
- BasDevpService service = SpringUtils.getBean(BasDevpService.class);
- BasDevp basDevp = service.selectById(this.staNo);
- if (!Cools.isEmpty(basDevp)){
- return String.valueOf(basDevp.getDevNo());
- }
- return null;
- }
-
- public String getSourceStaNo$(){
- BasDevpService service = SpringUtils.getBean(BasDevpService.class);
- BasDevp basDevp = service.selectById(this.sourceStaNo);
- if (!Cools.isEmpty(basDevp)){
- return String.valueOf(basDevp.getDevNo());
- }
- return null;
- }
-
- public String getSourceLocNo$(){
- LocMastService service = SpringUtils.getBean(LocMastService.class);
- LocMast locMast = service.selectById(this.sourceLocNo);
- if (!Cools.isEmpty(locMast)){
- return String.valueOf(locMast.getLocNo());
- }
- return null;
- }
-
- public String getModiUser$(){
- UserService service = SpringUtils.getBean(UserService.class);
- User user = service.selectById(this.modiUser);
- if (!Cools.isEmpty(user)){
- return String.valueOf(user.getUsername());
- }
- return null;
- }
-
- public String getModiTime$(){
- if (Cools.isEmpty(this.modiTime)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.modiTime);
- }
-
- public String getAppeUser$(){
- UserService service = SpringUtils.getBean(UserService.class);
- User user = service.selectById(this.appeUser);
- if (!Cools.isEmpty(user)){
- return String.valueOf(user.getUsername());
- }
- return null;
- }
-
- public String getAppeTime$(){
- if (Cools.isEmpty(this.appeTime)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
- }
-
- public String getEndTime$(){
- if (Cools.isEmpty(this.endTime)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.endTime);
- }
-
- /**
- * 鑾峰彇鎸佺画鏃堕棿
- */
- public String getDurationTime() {
- if (Cools.isEmpty(this.createTime)) {
- return "";
- }
-
- Date endDate = new Date();
- if (!Cools.isEmpty(this.endTime)) {
- endDate = this.endTime;
- }
-
- //鐢ㄦ潵鑾峰彇涓や釜鏃堕棿鐩稿樊鐨勬绉掓暟
- long l = this.createTime.getTime() - endDate.getTime();
-
- //鍒嗗埆璁＄畻鐩稿樊鐨勫ぉ銆佸皬鏃躲�佸垎銆佺
- long day = l / (24 * 60 * 60 * 1000);
- long hour = (l / (60 * 60 * 1000) - day * 24);
- long min = ((l / (60 * 1000)) - day * 24 * 60 - hour * 60);
- long s = (l / 1000 - day * 24 * 60 * 60 - hour * 60 * 60 - min * 60);
-
- return Math.abs(day) + "澶�" + Math.abs(hour) + "灏忔椂" + Math.abs(min) + "鍒�" + Math.abs(s) + "绉�";
- }
-
-}
diff --git a/src/main/java/com/zy/asrs/entity/WmsWrkLog.java b/src/main/java/com/zy/asrs/entity/WmsWrkLog.java
deleted file mode 100644
index a7a8e7b..0000000
--- a/src/main/java/com/zy/asrs/entity/WmsWrkLog.java
+++ /dev/null
@@ -1,329 +0,0 @@
-package com.zy.asrs.entity;
-
-import com.core.common.Cools;import com.baomidou.mybatisplus.annotations.TableField;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import org.springframework.format.annotation.DateTimeFormat;
-import com.core.common.SpringUtils;
-import com.zy.asrs.service.BasWrkIotypeService;
-import com.zy.asrs.entity.BasWrkIotype;
-import com.core.common.SpringUtils;
-import com.zy.asrs.service.LocMastService;
-import com.zy.asrs.entity.LocMast;
-import com.core.common.SpringUtils;
-import com.zy.asrs.service.BasDevpService;
-import com.zy.asrs.entity.BasDevp;
-import com.core.common.SpringUtils;
-import com.zy.asrs.service.BasDevpService;
-import com.zy.asrs.entity.BasDevp;
-import com.core.common.SpringUtils;
-import com.zy.asrs.service.LocMastService;
-import com.zy.asrs.entity.LocMast;
-import com.core.common.SpringUtils;
-import com.zy.system.service.UserService;
-import com.zy.system.entity.User;
-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 java.text.SimpleDateFormat;
-import java.util.Date;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.enums.IdType;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import com.baomidou.mybatisplus.annotations.TableName;
-import java.io.Serializable;
-
-@Data
-@TableName("wcs_wms_wrk_log")
-public class WmsWrkLog implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * wms浠诲姟鍙�
- */
- @ApiModelProperty(value= "wms浠诲姟鍙�")
- @TableField("wms_wrk_no")
- private Integer wmsWrkNo;
-
- /**
- * wms浠诲姟鐘舵�� 1: 鎺ユ敹 2: 娲惧彂 3: 鎵ц 4: 瀹岀粨 5: 鍙栨秷
- */
- @ApiModelProperty(value= "wms浠诲姟鐘舵�� 1: 鎺ユ敹 2: 娲惧彂 3: 鎵ц 4: 瀹岀粨 5: 鍙栨秷 ")
- @TableField("wms_status")
- private Integer wmsStatus;
-
- /**
- * 浠诲姟鍙�
- */
- @ApiModelProperty(value= "浠诲姟鍙�")
- @TableField("wrk_no")
- private Integer wrkNo;
-
- /**
- * 浠诲姟鏃堕棿
- */
- @ApiModelProperty(value= "浠诲姟鏃堕棿")
- @TableField("create_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private Date createTime;
-
- /**
- * 浠诲姟绫诲瀷
- */
- @ApiModelProperty(value= "浠诲姟绫诲瀷")
- @TableField("io_type")
- private Integer ioType;
-
- /**
- * 浼樺厛绾�
- */
- @ApiModelProperty(value= "浼樺厛绾�")
- @TableField("io_pri")
- private Double ioPri;
-
- /**
- * 鐩爣搴撲綅
- */
- @ApiModelProperty(value= "鐩爣搴撲綅")
- @TableField("loc_no")
- private String locNo;
-
- /**
- * 鐩爣绔�
- */
- @ApiModelProperty(value= "鐩爣绔�")
- @TableField("sta_no")
- private Integer staNo;
-
- /**
- * 婧愮珯
- */
- @ApiModelProperty(value= "婧愮珯")
- @TableField("source_sta_no")
- private Integer sourceStaNo;
-
- /**
- * 婧愬簱浣�
- */
- @ApiModelProperty(value= "婧愬簱浣�")
- @TableField("source_loc_no")
- private String sourceLocNo;
-
- /**
- * 淇敼浜哄憳
- */
- @ApiModelProperty(value= "淇敼浜哄憳")
- @TableField("modi_user")
- private Long modiUser;
-
- /**
- * 淇敼鏃堕棿
- */
- @ApiModelProperty(value= "淇敼鏃堕棿")
- @TableField("modi_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private Date modiTime;
-
- /**
- * 鍒涘缓鑰�
- */
- @ApiModelProperty(value= "鍒涘缓鑰�")
- @TableField("appe_user")
- private Long appeUser;
-
- /**
- * 娣诲姞鏃堕棿
- */
- @ApiModelProperty(value= "娣诲姞鏃堕棿")
- @TableField("appe_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private Date appeTime;
-
- /**
- * 澶囨敞
- */
- @ApiModelProperty(value= "澶囨敞")
- private String memo;
-
- /**
- * 鏉＄爜
- */
- @ApiModelProperty(value= "鏉＄爜")
- private String barcode;
-
- /**
- * 缁撴潫鏃堕棿
- */
- @ApiModelProperty(value= "缁撴潫鏃堕棿")
- @TableField("end_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private Date endTime;
-
- /**
- * 涓婚敭
- */
- @ApiModelProperty(value= "涓婚敭")
- @TableId(value = "id", type = IdType.AUTO)
- private Long id;
-
- public WmsWrkLog() {}
-
- public WmsWrkLog(Integer wmsWrkNo,Integer wmsStatus,Integer wrkNo,Date createTime,Integer ioType,Double ioPri,String locNo,Integer staNo,Integer sourceStaNo,String sourceLocNo,Long modiUser,Date modiTime,Long appeUser,Date appeTime,String memo,String barcode,Date endTime) {
- this.wmsWrkNo = wmsWrkNo;
- this.wmsStatus = wmsStatus;
- this.wrkNo = wrkNo;
- this.createTime = createTime;
- this.ioType = ioType;
- this.ioPri = ioPri;
- this.locNo = locNo;
- this.staNo = staNo;
- this.sourceStaNo = sourceStaNo;
- this.sourceLocNo = sourceLocNo;
- this.modiUser = modiUser;
- this.modiTime = modiTime;
- this.appeUser = appeUser;
- this.appeTime = appeTime;
- this.memo = memo;
- this.barcode = barcode;
- this.endTime = endTime;
- }
-
-// WmsWrkLog wmsWrkLog = new WmsWrkLog(
-// null, // wms浠诲姟鍙穂闈炵┖]
-// null, // wms浠诲姟鐘舵��
-// null, // 浠诲姟鍙�
-// null, // 浠诲姟鏃堕棿
-// null, // 浠诲姟绫诲瀷
-// null, // 浼樺厛绾�
-// null, // 鐩爣搴撲綅
-// null, // 鐩爣绔�
-// null, // 婧愮珯
-// null, // 婧愬簱浣�
-// null, // 淇敼浜哄憳
-// null, // 淇敼鏃堕棿
-// null, // 鍒涘缓鑰�
-// null, // 娣诲姞鏃堕棿
-// null, // 澶囨敞
-// null, // 鏉＄爜
-// null, // 缁撴潫鏃堕棿
-
-// );
-
- public String getWmsStatus$(){
- if (null == this.wmsStatus){ return null; }
- switch (this.wmsStatus){
- case 1:
- return "鎺ユ敹";
- case 2:
- return "娲惧彂";
- case 3:
- return "鎵ц";
- case 4:
- return "瀹岀粨";
- case 5:
- return "鍙栨秷";
- default:
- return String.valueOf(this.wmsStatus);
- }
- }
-
- public String getCreateTime$(){
- if (Cools.isEmpty(this.createTime)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
- }
-
- public String getIoType$(){
- BasWrkIotypeService service = SpringUtils.getBean(BasWrkIotypeService.class);
- BasWrkIotype basWrkIotype = service.selectById(this.ioType);
- if (!Cools.isEmpty(basWrkIotype)){
- return String.valueOf(basWrkIotype.getIoDesc());
- }
- return null;
- }
-
- public String getLocNo$(){
- LocMastService service = SpringUtils.getBean(LocMastService.class);
- LocMast locMast = service.selectById(this.locNo);
- if (!Cools.isEmpty(locMast)){
- return String.valueOf(locMast.getLocNo());
- }
- return null;
- }
-
- public String getStaNo$(){
- BasDevpService service = SpringUtils.getBean(BasDevpService.class);
- BasDevp basDevp = service.selectById(this.staNo);
- if (!Cools.isEmpty(basDevp)){
- return String.valueOf(basDevp.getDevNo());
- }
- return null;
- }
-
- public String getSourceStaNo$(){
- BasDevpService service = SpringUtils.getBean(BasDevpService.class);
- BasDevp basDevp = service.selectById(this.sourceStaNo);
- if (!Cools.isEmpty(basDevp)){
- return String.valueOf(basDevp.getDevNo());
- }
- return null;
- }
-
- public String getSourceLocNo$(){
- LocMastService service = SpringUtils.getBean(LocMastService.class);
- LocMast locMast = service.selectById(this.sourceLocNo);
- if (!Cools.isEmpty(locMast)){
- return String.valueOf(locMast.getLocNo());
- }
- return null;
- }
-
- public String getModiUser$(){
- UserService service = SpringUtils.getBean(UserService.class);
- User user = service.selectById(this.modiUser);
- if (!Cools.isEmpty(user)){
- return String.valueOf(user.getUsername());
- }
- return null;
- }
-
- public String getModiTime$(){
- if (Cools.isEmpty(this.modiTime)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.modiTime);
- }
-
- public String getAppeUser$(){
- UserService service = SpringUtils.getBean(UserService.class);
- User user = service.selectById(this.appeUser);
- if (!Cools.isEmpty(user)){
- return String.valueOf(user.getUsername());
- }
- return null;
- }
-
- public String getAppeTime$(){
- if (Cools.isEmpty(this.appeTime)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
- }
-
- public String getEndTime$(){
- if (Cools.isEmpty(this.endTime)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.endTime);
- }
-
-
-}
diff --git a/src/main/java/com/zy/asrs/entity/WrkMast.java b/src/main/java/com/zy/asrs/entity/WrkMast.java
index 2886545..9ac98fe 100644
--- a/src/main/java/com/zy/asrs/entity/WrkMast.java
+++ b/src/main/java/com/zy/asrs/entity/WrkMast.java
@@ -311,11 +311,11 @@
private String fullPlt;
/**
- * 婊℃澘
+ * wms浠诲姟鍙�
*/
@ApiModelProperty(value= "wms浠诲姟鍙�")
- @TableField("wms_wrk_no")
- private Integer wmsWrkNo;
+ @TableField("task_no")
+ private String taskNo;
/**
* 缁撴潫鏃堕棿
diff --git a/src/main/java/com/zy/asrs/mapper/CommandInfoMapper.java b/src/main/java/com/zy/asrs/mapper/CommandInfoMapper.java
index f9680b7..f658218 100644
--- a/src/main/java/com/zy/asrs/mapper/CommandInfoMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/CommandInfoMapper.java
@@ -11,5 +11,5 @@
@Repository
public interface CommandInfoMapper extends BaseMapper<CommandInfo> {
- List<CommandInfo> selectByWmsWrkNoAndWrkNo(Integer wmsWrkNo, Integer wrkNo);
+ List<CommandInfo> selectByTaskNoAndWrkNo(String taskNo, Integer wrkNo);
}
diff --git a/src/main/java/com/zy/asrs/mapper/TaskWrkMapper.java b/src/main/java/com/zy/asrs/mapper/TaskWrkMapper.java
new file mode 100644
index 0000000..b0f3514
--- /dev/null
+++ b/src/main/java/com/zy/asrs/mapper/TaskWrkMapper.java
@@ -0,0 +1,16 @@
+package com.zy.asrs.mapper;
+
+import com.zy.asrs.entity.TaskWrk;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+@Mapper
+@Repository
+public interface TaskWrkMapper extends BaseMapper<TaskWrk> {
+
+ TaskWrk selectByTaskNo(String taskNo);
+
+ TaskWrk selectByWrkNo(Integer wrkNo);
+
+}
diff --git a/src/main/java/com/zy/asrs/mapper/WmsWrkLogMapper.java b/src/main/java/com/zy/asrs/mapper/WmsWrkLogMapper.java
deleted file mode 100644
index 86178e0..0000000
--- a/src/main/java/com/zy/asrs/mapper/WmsWrkLogMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.zy.asrs.mapper;
-
-import com.zy.asrs.entity.WmsWrkLog;
-import com.baomidou.mybatisplus.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Insert;
-import org.apache.ibatis.annotations.Mapper;
-import org.springframework.stereotype.Repository;
-
-@Mapper
-@Repository
-public interface WmsWrkLogMapper extends BaseMapper<WmsWrkLog> {
-
- @Insert("insert into wcs_wms_wrk_log select * from wcs_wms_wrk where wms_wrk_no=#{wmsWrkNo}")
- int save(Integer wmsWrkNo);
-
-}
diff --git a/src/main/java/com/zy/asrs/mapper/WmsWrkMapper.java b/src/main/java/com/zy/asrs/mapper/WmsWrkMapper.java
deleted file mode 100644
index bef7b12..0000000
--- a/src/main/java/com/zy/asrs/mapper/WmsWrkMapper.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.zy.asrs.mapper;
-
-import com.zy.asrs.entity.WmsWrk;
-import com.baomidou.mybatisplus.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-import org.springframework.stereotype.Repository;
-
-import java.util.List;
-
-@Mapper
-@Repository
-public interface WmsWrkMapper extends BaseMapper<WmsWrk> {
-
- WmsWrk selectByWmsWrkNo(Integer wmsWrkNo);
-
- List<WmsWrk> selectToBeHistoryData();
-
-}
diff --git a/src/main/java/com/zy/asrs/service/CommandInfoService.java b/src/main/java/com/zy/asrs/service/CommandInfoService.java
index 07c4fae..ddd8947 100644
--- a/src/main/java/com/zy/asrs/service/CommandInfoService.java
+++ b/src/main/java/com/zy/asrs/service/CommandInfoService.java
@@ -7,6 +7,6 @@
public interface CommandInfoService extends IService<CommandInfo> {
- List<CommandInfo> selectByWmsWrkNoAndWrkNo(Integer wmsWrkNo, Integer wrkNo);
+ List<CommandInfo> selectByTaskNoAndWrkNo(String taskNo, Integer wrkNo);
}
diff --git a/src/main/java/com/zy/asrs/service/TaskWrkService.java b/src/main/java/com/zy/asrs/service/TaskWrkService.java
new file mode 100644
index 0000000..ec8debb
--- /dev/null
+++ b/src/main/java/com/zy/asrs/service/TaskWrkService.java
@@ -0,0 +1,24 @@
+package com.zy.asrs.service;
+
+import com.zy.asrs.entity.TaskWrk;
+import com.baomidou.mybatisplus.service.IService;
+
+public interface TaskWrkService extends IService<TaskWrk> {
+
+ TaskWrk selectByTaskNo(String taskNo);
+
+ TaskWrk selectByWrkNo(Integer wrkNo);
+
+ //娲惧彂浠诲姟
+ void distribute(String taskNo, Long userId);
+
+ //鍏ュ簱
+ void startup(TaskWrk taskWrk, Long userId);
+
+ //鍑哄簱
+ void stockOut(TaskWrk taskWrk, Long userId);
+
+ //搴撲綅绉昏浆
+ void locMove(TaskWrk taskWrk, Long userId);
+
+}
diff --git a/src/main/java/com/zy/asrs/service/WmsWrkLogService.java b/src/main/java/com/zy/asrs/service/WmsWrkLogService.java
deleted file mode 100644
index 0147fbc..0000000
--- a/src/main/java/com/zy/asrs/service/WmsWrkLogService.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.zy.asrs.service;
-
-import com.zy.asrs.entity.WmsWrkLog;
-import com.baomidou.mybatisplus.service.IService;
-
-public interface WmsWrkLogService extends IService<WmsWrkLog> {
-
- boolean save(Integer wmsWrkNo);
-
-}
diff --git a/src/main/java/com/zy/asrs/service/WmsWrkService.java b/src/main/java/com/zy/asrs/service/WmsWrkService.java
deleted file mode 100644
index e4ff79d..0000000
--- a/src/main/java/com/zy/asrs/service/WmsWrkService.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.zy.asrs.service;
-
-import com.zy.asrs.entity.WmsWrk;
-import com.baomidou.mybatisplus.service.IService;
-
-import java.util.List;
-
-public interface WmsWrkService extends IService<WmsWrk> {
-
- WmsWrk selectByWmsWrkNo(Integer wmsWrkNo);
-
- //娲惧彂浠诲姟
- void distribute(Integer wmsWrkNo, Long userId);
-
- //鍏ュ簱
- void startup(WmsWrk wmsWrk, Long userId);
-
- //鍑哄簱
- void stockOut(WmsWrk wmsWrk, Long userId);
-
- //搴撲綅绉昏浆
- void locMove(WmsWrk wmsWrk, Long userId);
-
- List<WmsWrk> selectToBeHistoryData();
-
-}
diff --git a/src/main/java/com/zy/asrs/service/impl/CommandInfoServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/CommandInfoServiceImpl.java
index 768373a..956c215 100644
--- a/src/main/java/com/zy/asrs/service/impl/CommandInfoServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/CommandInfoServiceImpl.java
@@ -12,7 +12,7 @@
public class CommandInfoServiceImpl extends ServiceImpl<CommandInfoMapper, CommandInfo> implements CommandInfoService {
@Override
- public List<CommandInfo> selectByWmsWrkNoAndWrkNo(Integer wmsWrkNo, Integer wrkNo) {
- return this.baseMapper.selectByWmsWrkNoAndWrkNo(wmsWrkNo, wrkNo);
+ public List<CommandInfo> selectByTaskNoAndWrkNo(String taskNo, Integer wrkNo) {
+ return this.baseMapper.selectByTaskNoAndWrkNo(taskNo, wrkNo);
}
}
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 3c74df0..dbeb075 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -6,9 +6,7 @@
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.core.common.Cools;
import com.core.common.DateUtils;
-import com.core.common.SpringUtils;
import com.core.exception.CoolException;
-import com.zy.asrs.domain.enums.WmsWrkStatusType;
import com.zy.asrs.entity.*;
import com.zy.asrs.mapper.BasCrnErrorMapper;
import com.zy.asrs.mapper.WaitPakinMapper;
@@ -89,8 +87,6 @@
private BasErrLogService basErrLogService;
@Autowired
private BasCrnErrorMapper basCrnErrorMapper;
- @Autowired
- private WmsWrkService wmsWrkService;
@Value("${wms.url}")
private String wmsUrl;
@@ -297,28 +293,28 @@
// 鍛戒护涓嬪彂鍖� --------------------------------------------------------------------------
- // 鏇存柊绔欑偣淇℃伅 涓� 涓嬪彂plc鍛戒护
- staProtocol.setWorkNo(wrkMast.getWrkNo().shortValue());
- staProtocol.setStaNo(wrkMast.getStaNo().shortValue());
- devpThread.setPakMk(staProtocol.getSiteId(), false);
- boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
- if (result) {
- // 鏇存柊宸ヤ綔涓绘。
- wrkMast.setWrkSts(2L); // 宸ヤ綔鐘舵�侊細2.璁惧涓婅蛋
- wrkMast.setModiTime(new Date());
- if (wrkMastMapper.updateById(wrkMast) == 0) {
- log.error("鏇存柊宸ヤ綔妗ｅけ璐ワ紒锛侊紒 [宸ヤ綔鍙凤細{}]", wrkMast.getWrkNo());
- }
-
- //鏇存柊WMS浠诲姟鐘舵��
- WmsWrk wmsWrk = wmsWrkService.selectByWmsWrkNo(wrkMast.getWmsWrkNo());
- wmsWrk.setWmsStatus(WmsWrkStatusType.WORKING.id);//鎵ц涓�
- wmsWrk.setModiTime(new Date());
- wmsWrkService.updateById(wmsWrk);
-
- } else {
- log.error("鍙戝竷鍛戒护鑷宠緭閫佺嚎闃熷垪澶辫触锛侊紒锛� [plc缂栧彿锛歿}]", devp.getId());
- }
+// // 鏇存柊绔欑偣淇℃伅 涓� 涓嬪彂plc鍛戒护
+// staProtocol.setWorkNo(wrkMast.getWrkNo().shortValue());
+// staProtocol.setStaNo(wrkMast.getStaNo().shortValue());
+// devpThread.setPakMk(staProtocol.getSiteId(), false);
+// boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
+// if (result) {
+// // 鏇存柊宸ヤ綔涓绘。
+// wrkMast.setWrkSts(2L); // 宸ヤ綔鐘舵�侊細2.璁惧涓婅蛋
+// wrkMast.setModiTime(new Date());
+// if (wrkMastMapper.updateById(wrkMast) == 0) {
+// log.error("鏇存柊宸ヤ綔妗ｅけ璐ワ紒锛侊紒 [宸ヤ綔鍙凤細{}]", wrkMast.getWrkNo());
+// }
+//
+// //鏇存柊WMS浠诲姟鐘舵��
+// WmsWrk wmsWrk = wmsWrkService.selectByWmsWrkNo(wrkMast.getWmsWrkNo());
+// wmsWrk.setWmsStatus(WmsStatusType.WORKING.id);//鎵ц涓�
+// wmsWrk.setModiTime(new Date());
+// wmsWrkService.updateById(wmsWrk);
+//
+// } else {
+// log.error("鍙戝竷鍛戒护鑷宠緭閫佺嚎闃熷垪澶辫触锛侊紒锛� [plc缂栧彿锛歿}]", devp.getId());
+// }
}
diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index f03926f..bc0c5a4 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -1,58 +1,48 @@
package com.zy.asrs.service.impl;
-import com.core.common.Cools;
-import com.core.exception.CoolException;
-import com.zy.asrs.domain.enums.WmsWrkStatusType;
-import com.zy.asrs.entity.WmsWrk;
import com.zy.asrs.entity.param.WmsWrkCreateParam;
import com.zy.asrs.service.OpenService;
-import com.zy.asrs.service.WmsWrkService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-
-import java.util.Date;
@Service
public class OpenServiceImpl implements OpenService {
- @Autowired
- private WmsWrkService wmsWrkService;
-
@Override
public void wmsWrkCreate(WmsWrkCreateParam param) {
- WmsWrk wmsWrk = wmsWrkService.selectByWmsWrkNo(param.getWmsWrkNo());
- if (wmsWrk != null) {
- throw new CoolException(param.getWmsWrkNo() + "浠诲姟宸插瓨鍦紝璇峰嬁閲嶅鎻愪氦");
- }
-
- Date now = new Date();
- wmsWrk = new WmsWrk();
- wmsWrk.setWmsWrkNo(param.getWmsWrkNo());//WMS浠诲姟鍙�
- wmsWrk.setWmsStatus(WmsWrkStatusType.RECEIVE.id);//WMS鐘舵�侊細鎺ユ敹
- wmsWrk.setCreateTime(now);
- wmsWrk.setAppeTime(now);
- wmsWrk.setAppeUser(9527L);
- wmsWrk.setIoType(param.getIoType());//浠诲姟绫诲瀷
- wmsWrk.setIoPri(13D);//浼樺厛绾�
- wmsWrk.setBarcode(param.getBarcode());//鏉＄爜
- if (!Cools.isEmpty(param.getLocNo())) {
- wmsWrk.setLocNo(param.getLocNo());//鐩爣搴撲綅
- }
- if (!Cools.isEmpty(param.getSourceLocNo())) {
- wmsWrk.setSourceLocNo(param.getSourceLocNo());//婧愬簱浣�
- }
- if (!Cools.isEmpty(param.getStaNo())) {
- wmsWrk.setStaNo(param.getStaNo());//鐩爣绔�
- }
- if (!Cools.isEmpty(param.getSourceStaNo())) {
- wmsWrk.setSourceStaNo(param.getSourceStaNo());//婧愮珯
- }
- if (!Cools.isEmpty(param.getMemo())) {
- wmsWrk.setMemo(param.getMemo());//澶囨敞
- }
-
- if (!wmsWrkService.insert(wmsWrk)) {
- throw new CoolException("鐢熸垚浠诲姟澶辫触锛岃鑱旂郴绠＄悊鍛�");
- }
+// WmsWrk wmsWrk = wmsWrkService.selectByWmsWrkNo(param.getWmsWrkNo());
+// if (wmsWrk != null) {
+// throw new CoolException(param.getWmsWrkNo() + "浠诲姟宸插瓨鍦紝璇峰嬁閲嶅鎻愪氦");
+// }
+//
+// Date now = new Date();
+// wmsWrk = new WmsWrk();
+// wmsWrk.setWmsWrkNo(param.getWmsWrkNo());//WMS浠诲姟鍙�
+// wmsWrk.setWmsStatus(WmsWrkStatusType.RECEIVE.id);//WMS鐘舵�侊細鎺ユ敹
+// wmsWrk.setCreateTime(now);
+// wmsWrk.setAppeTime(now);
+// wmsWrk.setAppeUser(9527L);
+// wmsWrk.setIoType(param.getIoType());//浠诲姟绫诲瀷
+// wmsWrk.setIoPri(13D);//浼樺厛绾�
+// wmsWrk.setBarcode(param.getBarcode());//鏉＄爜
+// if (!Cools.isEmpty(param.getLocNo())) {
+// wmsWrk.setLocNo(param.getLocNo());//鐩爣搴撲綅
+// }
+// if (!Cools.isEmpty(param.getSourceLocNo())) {
+// wmsWrk.setSourceLocNo(param.getSourceLocNo());//婧愬簱浣�
+// }
+// if (!Cools.isEmpty(param.getStaNo())) {
+// wmsWrk.setStaNo(param.getStaNo());//鐩爣绔�
+// }
+// if (!Cools.isEmpty(param.getSourceStaNo())) {
+// wmsWrk.setSourceStaNo(param.getSourceStaNo());//婧愮珯
+// }
+// if (!Cools.isEmpty(param.getMemo())) {
+// wmsWrk.setMemo(param.getMemo());//澶囨敞
+// }
+//
+// if (!wmsWrkService.insert(wmsWrk)) {
+// throw new CoolException("鐢熸垚浠诲姟澶辫触锛岃鑱旂郴绠＄悊鍛�");
+// }
}
}
diff --git a/src/main/java/com/zy/asrs/service/impl/TaskWrkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/TaskWrkServiceImpl.java
new file mode 100644
index 0000000..8328226
--- /dev/null
+++ b/src/main/java/com/zy/asrs/service/impl/TaskWrkServiceImpl.java
@@ -0,0 +1,92 @@
+package com.zy.asrs.service.impl;
+
+import com.core.exception.CoolException;
+import com.zy.asrs.domain.enums.TaskStatusType;
+import com.zy.asrs.domain.enums.WorkNoType;
+import com.zy.asrs.mapper.TaskWrkMapper;
+import com.zy.asrs.entity.TaskWrk;
+import com.zy.asrs.service.TaskWrkService;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.zy.common.service.CommonService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Date;
+
+@Service("taskWrkService")
+public class TaskWrkServiceImpl extends ServiceImpl<TaskWrkMapper, TaskWrk> implements TaskWrkService {
+
+ @Autowired
+ private CommonService commonService;
+
+ @Override
+ public TaskWrk selectByTaskNo(String taskNo) {
+ return this.baseMapper.selectByTaskNo(taskNo);
+ }
+
+ @Override
+ public TaskWrk selectByWrkNo(Integer wrkNo) {
+ return this.baseMapper.selectByWrkNo(wrkNo);
+ }
+
+ @Override
+ @Transactional
+ public void distribute(String taskNo, Long userId) {
+ TaskWrk taskWrk = this.selectByTaskNo(taskNo);
+ if (taskWrk == null) {
+ throw new CoolException("WMS浠诲姟涓嶅瓨鍦�");
+ }
+
+ //鍒涘缓浠诲姟
+ if (taskWrk.getIoType() == 1) {
+ //1.鍏ュ簱
+ startup(taskWrk, userId);
+ }else if(taskWrk.getIoType() == 2){
+ //2.鍑哄簱
+ stockOut(taskWrk, userId);
+ } else if (taskWrk.getIoType() == 3) {
+ //3.搴撴牸绉昏浇
+ locMove(taskWrk, userId);
+ }
+ }
+
+ @Override
+ public void startup(TaskWrk taskWrk, Long userId) {
+ //鍏ュ簱浠诲姟娲惧彂
+ int workNo = commonService.getWorkNo(WorkNoType.PAKIN.type);//鑾峰彇鍏ュ簱宸ヤ綔鍙�
+ taskWrk.setWrkNo(workNo);//宸ヤ綔鍙�
+ taskWrk.setStatus(TaskStatusType.DISTRIBUTE.id);//娲惧彂鐘舵��
+ taskWrk.setAssignTime(new Date());//娲惧彂鏃堕棿
+ taskWrk.setWrkSts(2);//宸ヤ綔鐘舵�� 2.璁惧涓婅蛋
+ taskWrk.setModiTime(new Date());
+ taskWrk.setModiUser(userId);
+ updateById(taskWrk);
+ }
+
+ @Override
+ public void stockOut(TaskWrk taskWrk, Long userId) {
+ //鍑哄簱浠诲姟娲惧彂
+ int workNo = commonService.getWorkNo(WorkNoType.PAKOUT.type);//鑾峰彇鍑哄簱宸ヤ綔鍙�
+ taskWrk.setWrkNo(workNo);//宸ヤ綔鍙�
+ taskWrk.setStatus(TaskStatusType.DISTRIBUTE.id);//娲惧彂鐘舵��
+ taskWrk.setAssignTime(new Date());//娲惧彂鏃堕棿
+ taskWrk.setWrkSts(11);//宸ヤ綔鐘舵�� 11.鐢熸垚鍑哄簱ID
+ taskWrk.setModiTime(new Date());
+ taskWrk.setModiUser(userId);
+ updateById(taskWrk);
+ }
+
+ @Override
+ public void locMove(TaskWrk taskWrk, Long userId) {
+ //搴撴牸绉昏浇浠诲姟娲惧彂
+ int workNo = commonService.getWorkNo(WorkNoType.OTHER.type);//鑾峰彇宸ヤ綔鍙�
+ taskWrk.setWrkNo(workNo);//宸ヤ綔鍙�
+ taskWrk.setStatus(TaskStatusType.DISTRIBUTE.id);//娲惧彂鐘舵��
+ taskWrk.setAssignTime(new Date());//娲惧彂鏃堕棿
+ taskWrk.setWrkSts(11);//宸ヤ綔鐘舵�� 11.鐢熸垚鍑哄簱ID
+ taskWrk.setModiTime(new Date());
+ taskWrk.setModiUser(userId);
+ updateById(taskWrk);
+ }
+}
diff --git a/src/main/java/com/zy/asrs/service/impl/WmsWrkLogServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WmsWrkLogServiceImpl.java
deleted file mode 100644
index 85e35ba..0000000
--- a/src/main/java/com/zy/asrs/service/impl/WmsWrkLogServiceImpl.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.zy.asrs.service.impl;
-
-import com.zy.asrs.mapper.WmsWrkLogMapper;
-import com.zy.asrs.entity.WmsWrkLog;
-import com.zy.asrs.service.WmsWrkLogService;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-@Service("wmsWrkLogService")
-public class WmsWrkLogServiceImpl extends ServiceImpl<WmsWrkLogMapper, WmsWrkLog> implements WmsWrkLogService {
-
- @Override
- public boolean save(Integer wmsWrkNo) {
- return this.baseMapper.save(wmsWrkNo) > 0;
- }
-}
diff --git a/src/main/java/com/zy/asrs/service/impl/WmsWrkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WmsWrkServiceImpl.java
deleted file mode 100644
index 41e01df..0000000
--- a/src/main/java/com/zy/asrs/service/impl/WmsWrkServiceImpl.java
+++ /dev/null
@@ -1,283 +0,0 @@
-package com.zy.asrs.service.impl;
-
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.core.common.Cools;
-import com.core.exception.CoolException;
-import com.zy.asrs.domain.enums.WmsWrkStatusType;
-import com.zy.asrs.domain.enums.WorkNoType;
-import com.zy.asrs.entity.*;
-import com.zy.asrs.mapper.WmsWrkMapper;
-import com.zy.asrs.service.*;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
-import com.zy.common.service.CommonService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.Date;
-import java.util.List;
-
-@Service("wmsWrkService")
-public class WmsWrkServiceImpl extends ServiceImpl<WmsWrkMapper, WmsWrk> implements WmsWrkService {
-
- @Autowired
- private BasDevpService basDevpService;
- @Autowired
- private CommonService commonService;
- @Autowired
- private LocMastService locMastService;
- @Autowired
- private WrkMastService wrkMastService;
- @Autowired
- private StaDescService staDescService;
- @Autowired
- private LocDetlService locDetlService;
- @Autowired
- private WrkDetlService wrkDetlService;
-
- @Override
- public WmsWrk selectByWmsWrkNo(Integer wmsWrkNo) {
- return this.baseMapper.selectByWmsWrkNo(wmsWrkNo);
- }
-
- @Override
- @Transactional
- public void distribute(Integer wmsWrkNo, Long userId) {
- WmsWrk wmsWrk = this.selectByWmsWrkNo(wmsWrkNo);
- if (wmsWrk == null) {
- throw new CoolException("WMS浠诲姟涓嶅瓨鍦�");
- }
-
- wmsWrk.setWmsStatus(WmsWrkStatusType.DISTRIBUTE.id);//娲惧彂鐘舵��
- wmsWrk.setModiTime(new Date());
- wmsWrk.setModiUser(userId);
- this.updateById(wmsWrk);
-
- //鍒涘缓浠诲姟
- if (wmsWrk.getIoType() == 1) {
- //1.鍏ュ簱
- startup(wmsWrk, userId);
- }else if(wmsWrk.getIoType() == 11){
- //11.搴撴牸绉昏浇
- locMove(wmsWrk, userId);
- } else if (wmsWrk.getIoType() == 101) {
- //101.鍑哄簱
- stockOut(wmsWrk, userId);
- }
-
- }
-
- @Override
- @Transactional
- public void startup(WmsWrk wmsWrk, Long userId) {
- Date now = new Date();
- LocMast locMast = locMastService.selectByLocNo(wmsWrk.getLocNo());
- if (locMast == null) {
- throw new CoolException("搴撲綅涓嶅瓨鍦�");
- }
-
- // 鐢熸垚浠诲姟鍙�
- int workNo = commonService.getWorkNo(WorkNoType.PAKIN.type);
- wmsWrk.setWrkNo(workNo);
- this.baseMapper.updateById(wmsWrk);
-
- // 婧愮珯鐐圭姸鎬佹娴�
- BasDevp sourceStaNo = basDevpService.checkSiteStatus(wmsWrk.getSourceStaNo(), true);
-
- // 鐢熸垚宸ヤ綔妗�
- WrkMast wrkMast = new WrkMast();
- wrkMast.setWrkNo(workNo);
- wrkMast.setWmsWrkNo(wmsWrk.getWmsWrkNo());//WMS浠诲姟鍙�
- wrkMast.setWmsWrkNo(wmsWrk.getWmsWrkNo());
- wrkMast.setIoTime(now);
- wrkMast.setWrkSts(1L); // 宸ヤ綔鐘舵�侊細鐢熸垚鍏ュ簱ID
- wrkMast.setIoType(1); // 鍏ュ嚭搴撶姸鎬侊細1.鍏ュ簱
- wrkMast.setIoPri(13D); // 浼樺厛绾э細13
- wrkMast.setCrnNo(locMast.getCrnNo());
- wrkMast.setSourceStaNo(wmsWrk.getSourceStaNo());
- wrkMast.setStaNo(wmsWrk.getStaNo());
- wrkMast.setLocNo(wmsWrk.getLocNo());
- wrkMast.setBarcode(wmsWrk.getBarcode()); // 鎵樼洏鐮�
- wrkMast.setFullPlt("Y"); // 婊℃澘锛歒
- wrkMast.setPicking("N"); // 鎷ｆ枡
- wrkMast.setExitMk("N"); // 閫�鍑�
- wrkMast.setEmptyMk("N"); // 绌烘澘
- wrkMast.setLinkMis("N");
- wrkMast.setCtnType(sourceStaNo.getCtnType()); // 瀹瑰櫒绫诲瀷
- wrkMast.setAppeUser(userId);
- wrkMast.setAppeTime(now);
- wrkMast.setModiUser(userId);
- wrkMast.setModiTime(now);
- if (!wrkMastService.insert(wrkMast)) {
- throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐�");
- }
-
- // 鏇存柊婧愮珯鐐逛俊鎭�
- sourceStaNo.setWrkNo(workNo);
- sourceStaNo.setModiUser(userId);
- sourceStaNo.setModiTime(now);
- if (!basDevpService.updateById(sourceStaNo)) {
- throw new CoolException("鏇存柊婧愮珯澶辫触");
- }
-
- // 鏇存柊鐩爣搴撲綅鐘舵��
- if (locMast.getLocSts().equals("O")) {
- locMast.setLocSts("S"); // S.鍏ュ簱棰勭害
- locMast.setModiUser(userId);
- locMast.setModiTime(now);
- if (!locMastService.updateById(locMast)) {
- throw new CoolException("鏀瑰彉搴撲綅鐘舵�佸け璐�");
- }
- } else {
- throw new CoolException(wmsWrk.getLocNo() + "鐩爣搴撲綅宸茶鍗犵敤");
- }
- }
-
- @Override
- @Transactional
- public void stockOut(WmsWrk wmsWrk, Long userId) {
- Date now = new Date();
- LocMast locMast = locMastService.selectByLocNo(wmsWrk.getSourceLocNo());
- if (locMast == null) {
- throw new CoolException("搴撲綅涓嶅瓨鍦�");
- }
-
- // 鐢熸垚浠诲姟鍙�
- int workNo = commonService.getWorkNo(WorkNoType.PAKOUT.type);
- wmsWrk.setWrkNo(workNo);
- this.baseMapper.updateById(wmsWrk);
-
- // 鑾峰彇璺緞
- StaDesc staDesc = staDescService.queryCrnStn(101, locMast.getCrnNo(), wmsWrk.getStaNo());
- // 鐢熸垚宸ヤ綔妗�
- WrkMast wrkMast = new WrkMast();
- wrkMast.setWrkNo(workNo);
- wrkMast.setWmsWrkNo(wmsWrk.getWmsWrkNo());//WMS浠诲姟鍙�
- wrkMast.setIoTime(now);
- wrkMast.setWrkSts(11L); // 宸ヤ綔鐘舵�侊細11.鐢熸垚鍑哄簱ID
- wrkMast.setIoType(101); // 101.鍑哄簱
- wrkMast.setIoPri(13D); // 浼樺厛绾э細13
- wrkMast.setCrnNo(locMast.getCrnNo());
- wrkMast.setSourceStaNo(staDesc.getCrnStn()); // 婧愮珯
- wrkMast.setStaNo(staDesc.getStnNo()); // 鐩爣绔�
- wrkMast.setSourceLocNo(wmsWrk.getSourceLocNo()); // 婧愬簱浣�
- wrkMast.setFullPlt("Y"); // 婊℃澘锛歒
- wrkMast.setPicking("N"); // 鎷ｆ枡
- wrkMast.setExitMk("N"); // 閫�鍑�
- wrkMast.setEmptyMk("N"); // 绌烘澘
- wrkMast.setLinkMis("N");
- wrkMast.setBarcode(locMast.getBarcode());
- wrkMast.setAppeUser(userId); // 鎿嶄綔浜哄憳鏁版嵁
- wrkMast.setAppeTime(now);
- wrkMast.setModiUser(userId);
- wrkMast.setModiTime(now);
- if (!wrkMastService.insert(wrkMast)) {
- throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐ワ紝鍑哄簱搴撲綅鍙凤細" + wmsWrk.getSourceLocNo());
- }
-
- // 淇敼搴撲綅鐘舵��: F.鍦ㄥ簱 ====>>> R.鍑哄簱棰勭害/P.鎷ｆ枡/鐩樼偣/骞舵澘鍑哄簱涓�
- locMast = locMastService.selectById(wmsWrk.getSourceLocNo());
- if (locMast.getLocSts().equals("F")) {
- locMast.setLocSts("R");
- locMast.setModiUser(userId);
- locMast.setModiTime(now);
- if (!locMastService.updateById(locMast)) {
- throw new CoolException("棰勭害搴撲綅鐘舵�佸け璐ワ紝搴撲綅鍙凤細" + wmsWrk.getSourceLocNo());
- }
- } else {
- throw new CoolException(wmsWrk.getSourceLocNo() + "搴撲綅涓嶆槸鍦ㄥ簱鐘舵��");
- }
- }
-
- //搴撲綅绉昏浆
- @Override
- @Transactional
- public void locMove(WmsWrk wmsWrk, Long userId) {
- String sourceLocNo = wmsWrk.getSourceLocNo();
- String locNo = wmsWrk.getLocNo();
- LocMast sourceLoc = locMastService.selectById(sourceLocNo);
- List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("loc_no", sourceLocNo));
- if (Cools.isEmpty(sourceLoc)){
- throw new CoolException("鏈壘鍒板簱浣�");
- }
- LocMast loc = locMastService.selectById(locNo);
- if (Cools.isEmpty(loc)){
- throw new CoolException("鏈壘鍒板簱浣�");
- }
- if (!sourceLoc.getCrnNo().equals(loc.getCrnNo())) {
- throw new CoolException("绉昏浆搴撲綅灞炰簬涓嶅悓鍫嗗灈鏈�");
- }
- Date now = new Date();
- // 鑾峰彇宸ヤ綔鍙�
- int workNo = commonService.getWorkNo(WorkNoType.PICK.type);
- wmsWrk.setWrkNo(workNo);
- this.baseMapper.updateById(wmsWrk);
- // 淇濆瓨宸ヤ綔妗�
- WrkMast wrkMast = new WrkMast();
- wrkMast.setWrkNo(workNo);
- wrkMast.setWmsWrkNo(wmsWrk.getWmsWrkNo());//WMS浠诲姟鍙�
- wrkMast.setIoTime(now);
- wrkMast.setWrkSts(11L); // 宸ヤ綔鐘舵�侊細11.鐢熸垚鍑哄簱ID
- wrkMast.setIoType(11); // 鍏ュ嚭搴撶姸鎬侊細 11.搴撴牸绉昏浇
- wrkMast.setIoPri(10D);
- wrkMast.setCrnNo(sourceLoc.getCrnNo());
- wrkMast.setSourceLocNo(sourceLocNo); // 婧愬簱浣�
- wrkMast.setLocNo(locNo); // 鐩爣搴撲綅
- wrkMast.setFullPlt(Cools.isEmpty(locDetls)?"N":"Y"); // 婊℃澘锛歒
- wrkMast.setPicking("N"); // 鎷ｆ枡
- wrkMast.setExitMk("N"); // 閫�鍑�
- wrkMast.setEmptyMk(sourceLoc.getLocSts().equals("D")?"Y":"N"); // 绌烘澘
- wrkMast.setBarcode(sourceLoc.getBarcode()); // 鎵樼洏鐮�
- wrkMast.setLinkMis("N");
- wrkMast.setAppeUser(userId);
- wrkMast.setAppeTime(now);
- wrkMast.setModiUser(userId);
- wrkMast.setModiTime(now);
- boolean res = wrkMastService.insert(wrkMast);
- if (!res) {
- throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐�");
- }
- // 宸ヤ綔妗ｆ槑缁嗕繚瀛�
- for (LocDetl locDetl : locDetls) {
- WrkDetl wrkDetl = new WrkDetl();
- wrkDetl.sync(locDetl);
- wrkDetl.setWrkNo(workNo);
- wrkDetl.setIoTime(now);
- wrkDetl.setAnfme(locDetl.getAnfme());
- wrkDetl.setAppeTime(now);
- wrkDetl.setAppeUser(userId);
- wrkDetl.setModiTime(now);
- wrkDetl.setModiUser(userId);
- if (!wrkDetlService.insert(wrkDetl)) {
- throw new CoolException("淇濆瓨宸ヤ綔妗ｆ槑缁嗗け璐�");
- }
- }
- // 淇敼婧愬簱浣嶇姸鎬�
- if (sourceLoc.getLocSts().equals("D") || sourceLoc.getLocSts().equals("F")) {
- sourceLoc.setLocSts("R"); // R.鍑哄簱棰勭害
- sourceLoc.setModiUser(userId);
- sourceLoc.setModiTime(now);
- if (!locMastService.updateById(sourceLoc)){
- throw new CoolException("鏇存柊婧愬簱浣嶇姸鎬佸け璐�");
- }
- } else {
- throw new CoolException("婧愬簱浣嶅嚭搴撳け璐ワ紝鐘舵�侊細"+sourceLoc.getLocSts$());
- }
- // 淇敼鐩爣搴撲綅鐘舵��
- if (loc.getLocSts().equals("O")) {
- loc.setLocSts("S"); // S.鍏ュ簱棰勭害
- loc.setModiTime(now);
- loc.setModiUser(userId);
- if (!locMastService.updateById(loc)) {
- throw new CoolException("鏇存柊鐩爣搴撲綅鐘舵�佸け璐�");
- }
- } else {
- throw new CoolException("绉昏浆澶辫触锛岀洰鏍囧簱浣嶇姸鎬侊細"+loc.getLocSts$());
- }
- }
-
- @Override
- public List<WmsWrk> selectToBeHistoryData() {
- return this.baseMapper.selectToBeHistoryData();
- }
-}
diff --git a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
index ea9cf53..e07050c 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -1,27 +1,15 @@
package com.zy.asrs.service.impl;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.core.common.Cools;
-import com.core.common.DateUtils;
-import com.core.exception.CoolException;
-import com.zy.asrs.domain.enums.WmsWrkStatusType;
-import com.zy.asrs.entity.*;
import com.zy.asrs.service.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-
-import java.util.Date;
-import java.util.List;
-import java.util.concurrent.TimeUnit;
@Service
public class WorkServiceImpl implements WorkService {
@Autowired
private WrkMastService wrkMastService;
- @Autowired
- private WmsWrkService wmsWrkService;
@Autowired
private LocMastService locMastService;
@Autowired
@@ -36,142 +24,142 @@
@Override
@Transactional
public void completeWrkMast(String workNo, Long userId) {
- WrkMast wrkMast = wrkMastService.selectById(workNo);
- WmsWrk wmsWrk = wmsWrkService.selectByWmsWrkNo(wrkMast.getWmsWrkNo());
- if (Cools.isEmpty(wrkMast, wmsWrk)) {
- throw new CoolException(workNo + "浠诲姟涓嶅瓨鍦�");
- }
- if (wrkMast.getWrkSts() == 4 || wrkMast.getWrkSts() == 14) {
- throw new CoolException("褰撳墠浠诲姟宸插畬鎴�");
- }
- // 鍏ュ簱 + 搴撲綅杞Щ
- if (wrkMast.getWrkSts() < 4 || (wrkMast.getWrkSts() > 10 && wrkMast.getIoType()==11)) {
- wrkMast.setWrkSts(4L);
- // 鍑哄簱
- } else if (wrkMast.getWrkSts() > 10) {
- wrkMast.setWrkSts(14L);
- }
- Date now = new Date();
- wrkMast.setCrnStrTime(DateUtils.calculate(now, 1L, TimeUnit.SECONDS, true));
- wrkMast.setCrnEndTime(now);
- wrkMast.setModiTime(now);
- wrkMast.setModiUser(userId);
- // 瀹屾垚鎿嶄綔浜哄憳璁板綍
- wrkMast.setManuType("鎵嬪姩瀹屾垚");
-
- wmsWrk.setWmsStatus(WmsWrkStatusType.COMPLETE.id);
- wmsWrk.setModiUser(userId);
- wmsWrk.setModiTime(now);
- wmsWrk.setEndTime(now);
- if (!wrkMastService.updateById(wrkMast) || !wmsWrkService.updateById(wmsWrk)) {
- throw new CoolException("淇敼浠诲姟澶辫触");
- }
+// WrkMast wrkMast = wrkMastService.selectById(workNo);
+// WmsWrk wmsWrk = wmsWrkService.selectByTaskNo(wrkMast.getWmsWrkNo());
+// if (Cools.isEmpty(wrkMast, wmsWrk)) {
+// throw new CoolException(workNo + "浠诲姟涓嶅瓨鍦�");
+// }
+// if (wrkMast.getWrkSts() == 4 || wrkMast.getWrkSts() == 14) {
+// throw new CoolException("褰撳墠浠诲姟宸插畬鎴�");
+// }
+// // 鍏ュ簱 + 搴撲綅杞Щ
+// if (wrkMast.getWrkSts() < 4 || (wrkMast.getWrkSts() > 10 && wrkMast.getIoType()==11)) {
+// wrkMast.setWrkSts(4L);
+// // 鍑哄簱
+// } else if (wrkMast.getWrkSts() > 10) {
+// wrkMast.setWrkSts(14L);
+// }
+// Date now = new Date();
+// wrkMast.setCrnStrTime(DateUtils.calculate(now, 1L, TimeUnit.SECONDS, true));
+// wrkMast.setCrnEndTime(now);
+// wrkMast.setModiTime(now);
+// wrkMast.setModiUser(userId);
+// // 瀹屾垚鎿嶄綔浜哄憳璁板綍
+// wrkMast.setManuType("鎵嬪姩瀹屾垚");
+//
+// wmsWrk.setStatus(WmsStatusType.COMPLETE.id);
+// wmsWrk.setModiUser(userId);
+// wmsWrk.setModiTime(now);
+// wmsWrk.setCompleteTime(now);
+// if (!wrkMastService.updateById(wrkMast) || !wmsWrkService.updateById(wmsWrk)) {
+// throw new CoolException("淇敼浠诲姟澶辫触");
+// }
}
@Override
@Transactional
public void cancelWrkMast(String workNo, Long userId) {
- Date now = new Date();
- WrkMast wrkMast = wrkMastService.selectById(workNo);
- WmsWrk wmsWrk = wmsWrkService.selectByWmsWrkNo(wrkMast.getWmsWrkNo());
- if (Cools.isEmpty(wrkMast, wmsWrk)) {
- throw new CoolException(workNo + "浠诲姟涓嶅瓨鍦�");
- }
-
- String locNo = ""; // 寰呬慨鏀圭洰鏍囧簱浣�
- String locSts = ""; // 寰呬慨鏀圭洰鏍囧簱浣嶇姸鎬�
- // 鍏ュ簱鍙栨秷锛堜慨鏀圭洰鏍囧簱浣嶏級
- if (wrkMast.getWrkSts() < 4) {
- locNo = wrkMast.getLocNo();
- locSts = "O";
-
- // 搴撲綅杞Щ
- if (wrkMast.getIoType() == 11) {
- // 搴撲綅杞Щ锛氭簮搴撲綅
- LocMast locMast = locMastService.selectById(wrkMast.getSourceLocNo());
- if (Cools.isEmpty(locMast)) {
- throw new CoolException("鍙栨秷搴撲綅杞Щ澶辫触锛屾簮搴撲綅涓嶅瓨鍦�:"+ wrkMast.getSourceLocNo());
- }
- locMast.setLocSts(wrkMast.getFullPlt().equalsIgnoreCase("N")?"D":"F");
- locMast.setModiTime(now);
- locMast.setModiUser(userId);
- locMastService.updateById(locMast);
- }
- // 鍑哄簱鍙栨秷锛堜慨鏀规簮搴撲綅锛�
- } else if (wrkMast.getWrkSts() > 10 && wrkMast.getWrkSts() != 14) {
- locNo = wrkMast.getSourceLocNo();
- // 鍑哄簱 ===>> F.鍦ㄥ簱
- if (wrkMast.getIoType() > 100 && wrkMast.getIoType() != 110) {
- locSts = "F";
- // 绌烘澘鍑哄簱 ===>> D.绌烘《/绌烘爤鏉�
- } else if (wrkMast.getIoType() == 110) {
- locSts = "D";
- // 搴撲綅杞Щ ===>> D.绌烘《/绌烘爤鏉�
- } else if (wrkMast.getIoType() == 11) {
- locSts = wrkMast.getFullPlt().equalsIgnoreCase("N")?"D":"F";
- // 搴撲綅杞Щ锛氱洰鏍囧簱浣�
- LocMast locMast = locMastService.selectById(wrkMast.getLocNo());
- if (Cools.isEmpty(locMast)) {
- throw new CoolException("鍙栨秷搴撲綅杞Щ澶辫触锛岀洰鏍囧簱浣嶄笉瀛樺湪:"+ wrkMast.getSourceLocNo());
- }
- locMast.setLocSts("O");
- locMast.setModiTime(now);
- locMast.setModiUser(userId);
- locMastService.updateById(locMast);
- }
- } else {
- throw new CoolException("褰撳墠宸ヤ綔鐘舵�佹棤娉曞彇娑�");
- }
-
- //鍙栨秷鍏ュ簱宸ヤ綔妗ｆ椂锛屾煡璇㈢粍鎵樿〃锛屽鏋滄湁灏嗙姸鎬佹敼涓哄緟澶勭悊
- if(wrkMast.getIoType() == 1) {
- List<WaitPakin> waitPakins = waitPakinService.selectList(new EntityWrapper<WaitPakin>().eq("zpallet", wrkMast.getBarcode()));
- for (WaitPakin waitPakin:waitPakins){
- if (!Cools.isEmpty(waitPakin)) {
- waitPakin.setIoStatus("N");
- waitPakin.setLocNo("");
- waitPakinService.update(waitPakin, new EntityWrapper<WaitPakin>()
- .eq("order_no", waitPakin.getOrderNo())
- .eq("matnr", waitPakin.getMatnr())
- .eq("batch", waitPakin.getBatch()));
- }
- }
- }
-
- // 鍙栨秷鎿嶄綔浜哄憳璁板綍
- wrkMast.setManuType("鎵嬪姩鍙栨秷");
- wrkMast.setModiUser(userId);
- wrkMast.setModiTime(now);
- if (!wrkMastService.updateById(wrkMast)) {
- throw new CoolException("鍙栨秷浠诲姟澶辫触");
- }
-
- wmsWrk.setWmsStatus(WmsWrkStatusType.CANCEL.id);
- wmsWrk.setModiUser(userId);
- wmsWrk.setModiTime(now);
- wmsWrk.setEndTime(now);
- if (!wmsWrkService.updateById(wmsWrk)) {
- throw new CoolException("鍙栨秷浠诲姟澶辫触");
- }
-
- // 淇濆瓨宸ヤ綔涓绘。鍘嗗彶妗�
- if (!wrkMastLogService.save(wrkMast.getWrkNo())) {
- throw new CoolException("淇濆瓨浠诲姟鍘嗗彶妗ｅけ璐�, workNo = " + wrkMast.getWrkNo());
- }
- // 鍒犻櫎宸ヤ綔涓绘。
- boolean wrkMastRes = wrkMastService.deleteById(wrkMast);
-
- // 淇敼搴撲綅鐘舵��
- LocMast locMast = locMastService.selectById(locNo);
- if (Cools.isEmpty(locMast)) {
- throw new CoolException("鍙栨秷浠诲姟澶辫触锛屽簱浣嶄笉瀛樺湪:"+ locNo);
- }
- locMast.setLocSts(locSts);
- locMast.setModiTime(now);
- locMast.setModiUser(userId);
- boolean locMastRes = locMastService.updateById(locMast);
- if (!wrkMastRes || !locMastRes) {
- throw new CoolException("淇濆瓨鏁版嵁澶辫触");
- }
+// Date now = new Date();
+// WrkMast wrkMast = wrkMastService.selectById(workNo);
+// WmsWrk wmsWrk = wmsWrkService.selectByWmsWrkNo(wrkMast.getWmsWrkNo());
+// if (Cools.isEmpty(wrkMast, wmsWrk)) {
+// throw new CoolException(workNo + "浠诲姟涓嶅瓨鍦�");
+// }
+//
+// String locNo = ""; // 寰呬慨鏀圭洰鏍囧簱浣�
+// String locSts = ""; // 寰呬慨鏀圭洰鏍囧簱浣嶇姸鎬�
+// // 鍏ュ簱鍙栨秷锛堜慨鏀圭洰鏍囧簱浣嶏級
+// if (wrkMast.getWrkSts() < 4) {
+// locNo = wrkMast.getLocNo();
+// locSts = "O";
+//
+// // 搴撲綅杞Щ
+// if (wrkMast.getIoType() == 11) {
+// // 搴撲綅杞Щ锛氭簮搴撲綅
+// LocMast locMast = locMastService.selectById(wrkMast.getSourceLocNo());
+// if (Cools.isEmpty(locMast)) {
+// throw new CoolException("鍙栨秷搴撲綅杞Щ澶辫触锛屾簮搴撲綅涓嶅瓨鍦�:"+ wrkMast.getSourceLocNo());
+// }
+// locMast.setLocSts(wrkMast.getFullPlt().equalsIgnoreCase("N")?"D":"F");
+// locMast.setModiTime(now);
+// locMast.setModiUser(userId);
+// locMastService.updateById(locMast);
+// }
+// // 鍑哄簱鍙栨秷锛堜慨鏀规簮搴撲綅锛�
+// } else if (wrkMast.getWrkSts() > 10 && wrkMast.getWrkSts() != 14) {
+// locNo = wrkMast.getSourceLocNo();
+// // 鍑哄簱 ===>> F.鍦ㄥ簱
+// if (wrkMast.getIoType() > 100 && wrkMast.getIoType() != 110) {
+// locSts = "F";
+// // 绌烘澘鍑哄簱 ===>> D.绌烘《/绌烘爤鏉�
+// } else if (wrkMast.getIoType() == 110) {
+// locSts = "D";
+// // 搴撲綅杞Щ ===>> D.绌烘《/绌烘爤鏉�
+// } else if (wrkMast.getIoType() == 11) {
+// locSts = wrkMast.getFullPlt().equalsIgnoreCase("N")?"D":"F";
+// // 搴撲綅杞Щ锛氱洰鏍囧簱浣�
+// LocMast locMast = locMastService.selectById(wrkMast.getLocNo());
+// if (Cools.isEmpty(locMast)) {
+// throw new CoolException("鍙栨秷搴撲綅杞Щ澶辫触锛岀洰鏍囧簱浣嶄笉瀛樺湪:"+ wrkMast.getSourceLocNo());
+// }
+// locMast.setLocSts("O");
+// locMast.setModiTime(now);
+// locMast.setModiUser(userId);
+// locMastService.updateById(locMast);
+// }
+// } else {
+// throw new CoolException("褰撳墠宸ヤ綔鐘舵�佹棤娉曞彇娑�");
+// }
+//
+// //鍙栨秷鍏ュ簱宸ヤ綔妗ｆ椂锛屾煡璇㈢粍鎵樿〃锛屽鏋滄湁灏嗙姸鎬佹敼涓哄緟澶勭悊
+// if(wrkMast.getIoType() == 1) {
+// List<WaitPakin> waitPakins = waitPakinService.selectList(new EntityWrapper<WaitPakin>().eq("zpallet", wrkMast.getBarcode()));
+// for (WaitPakin waitPakin:waitPakins){
+// if (!Cools.isEmpty(waitPakin)) {
+// waitPakin.setIoStatus("N");
+// waitPakin.setLocNo("");
+// waitPakinService.update(waitPakin, new EntityWrapper<WaitPakin>()
+// .eq("order_no", waitPakin.getOrderNo())
+// .eq("matnr", waitPakin.getMatnr())
+// .eq("batch", waitPakin.getBatch()));
+// }
+// }
+// }
+//
+// // 鍙栨秷鎿嶄綔浜哄憳璁板綍
+// wrkMast.setManuType("鎵嬪姩鍙栨秷");
+// wrkMast.setModiUser(userId);
+// wrkMast.setModiTime(now);
+// if (!wrkMastService.updateById(wrkMast)) {
+// throw new CoolException("鍙栨秷浠诲姟澶辫触");
+// }
+//
+// wmsWrk.setStatus(WmsStatusType.CANCEL.id);
+// wmsWrk.setModiUser(userId);
+// wmsWrk.setModiTime(now);
+// wmsWrk.setCancelTime(now);
+// if (!wmsWrkService.updateById(wmsWrk)) {
+// throw new CoolException("鍙栨秷浠诲姟澶辫触");
+// }
+//
+// // 淇濆瓨宸ヤ綔涓绘。鍘嗗彶妗�
+// if (!wrkMastLogService.save(wrkMast.getWrkNo())) {
+// throw new CoolException("淇濆瓨浠诲姟鍘嗗彶妗ｅけ璐�, workNo = " + wrkMast.getWrkNo());
+// }
+// // 鍒犻櫎宸ヤ綔涓绘。
+// boolean wrkMastRes = wrkMastService.deleteById(wrkMast);
+//
+// // 淇敼搴撲綅鐘舵��
+// LocMast locMast = locMastService.selectById(locNo);
+// if (Cools.isEmpty(locMast)) {
+// throw new CoolException("鍙栨秷浠诲姟澶辫触锛屽簱浣嶄笉瀛樺湪:"+ locNo);
+// }
+// locMast.setLocSts(locSts);
+// locMast.setModiTime(now);
+// locMast.setModiUser(userId);
+// boolean locMastRes = locMastService.updateById(locMast);
+// if (!wrkMastRes || !locMastRes) {
+// throw new CoolException("淇濆瓨鏁版嵁澶辫触");
+// }
}
}
diff --git a/src/main/java/com/zy/asrs/task/WmsWrkLogScheduler.java b/src/main/java/com/zy/asrs/task/WmsWrkLogScheduler.java
index a2be235..14cd36e 100644
--- a/src/main/java/com/zy/asrs/task/WmsWrkLogScheduler.java
+++ b/src/main/java/com/zy/asrs/task/WmsWrkLogScheduler.java
@@ -2,9 +2,6 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
-import com.zy.asrs.entity.WmsWrk;
-import com.zy.asrs.service.WmsWrkLogService;
-import com.zy.asrs.service.WmsWrkService;
import com.zy.common.utils.HttpHandler;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -19,43 +16,38 @@
@Component
public class WmsWrkLogScheduler {
- @Autowired
- private WmsWrkService wmsWrkService;
- @Autowired
- private WmsWrkLogService wmsWrkLogService;
-
@Value("${wms.url}")
private String wmsUrl;
@Scheduled(cron = "0/3 * * * * ? ")
public void execute() {
- for (WmsWrk wmsWrk : wmsWrkService.selectToBeHistoryData()) {
- boolean save = wmsWrkLogService.save(wmsWrk.getWmsWrkNo());
- boolean delete = wmsWrkService.deleteById(wmsWrk.getWmsWrkNo());
- if (!save || !delete) {
- log.error("浠诲姟[wmsWrkNo={}]鍘嗗彶澶勭悊澶辫触", wmsWrk.getWmsWrkNo());
- }
-
- try {
- //浠诲姟涓婃姤
- String response = new HttpHandler.Builder()
- .setUri(wmsUrl)
- .setPath("/wmsWrk/test")
- .setJson(JSON.toJSONString(wmsWrk))
- .build()
- .doPost();
- JSONObject jsonObject = JSON.parseObject(response);
- if (jsonObject.getInteger("code").equals(200)) {
- //todo
-// StartupDto dto = jsonObject.getObject("data", StartupDto.class);
-
- } else {
- log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", wmsUrl + "/wmsWrk/test", JSON.toJSONString(wmsWrk), response);
- }
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
+// for (WmsWrk wmsWrk : wmsWrkService.selectToBeHistoryData()) {
+// boolean save = wmsWrkLogService.save(wmsWrk.getWmsWrkNo());
+// boolean delete = wmsWrkService.deleteById(wmsWrk.getWmsWrkNo());
+// if (!save || !delete) {
+// log.error("浠诲姟[wmsWrkNo={}]鍘嗗彶澶勭悊澶辫触", wmsWrk.getWmsWrkNo());
+// }
+//
+// try {
+// //浠诲姟涓婃姤
+// String response = new HttpHandler.Builder()
+// .setUri(wmsUrl)
+// .setPath("/wmsWrk/test")
+// .setJson(JSON.toJSONString(wmsWrk))
+// .build()
+// .doPost();
+// JSONObject jsonObject = JSON.parseObject(response);
+// if (jsonObject.getInteger("code").equals(200)) {
+// //todo
+//// StartupDto dto = jsonObject.getObject("data", StartupDto.class);
+//
+// } else {
+// log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", wmsUrl + "/wmsWrk/test", JSON.toJSONString(wmsWrk), response);
+// }
+// } catch (Exception e) {
+// e.printStackTrace();
+// }
+// }
}
}
diff --git a/src/main/java/com/zy/asrs/utils/CommandUtils.java b/src/main/java/com/zy/asrs/utils/CommandUtils.java
index fae90db..2fad65c 100644
--- a/src/main/java/com/zy/asrs/utils/CommandUtils.java
+++ b/src/main/java/com/zy/asrs/utils/CommandUtils.java
@@ -29,20 +29,20 @@
CommandInfo commandInfo = null;
WrkMast wrkMast = null;
- int taskNo = 0;
- int wmsWrkNo = 0;
+ int wrkNo = 0;
+ String taskNo = null;
switch (type) {
case Crn:
CrnCommand command = (CrnCommand) task.getData();
- taskNo = command.getTaskNo();
- if (taskNo != 0) {
- wrkMast = wrkMastService.selectById(taskNo);
- wmsWrkNo = wrkMast.getWmsWrkNo();
+ wrkNo = command.getTaskNo();
+ if (wrkNo != 0) {
+ wrkMast = wrkMastService.selectById(wrkNo);
+ taskNo = wrkMast.getTaskNo();
}
commandInfo = new CommandInfo();
- commandInfo.setWrkNo(taskNo);
- commandInfo.setWmsWrkNo(wmsWrkNo);
+ commandInfo.setWrkNo(wrkNo);
+ commandInfo.setTaskNo(taskNo);
commandInfo.setCommandStatus(1);
commandInfo.setStartTime(new Date());
commandInfo.setDevice("crn");
@@ -53,15 +53,15 @@
break;
case Devp:
StaProtocol staProtocol = (StaProtocol) task.getData();
- taskNo = staProtocol.getWorkNo();
- if (taskNo != 0) {
- wrkMast = wrkMastService.selectById(taskNo);
- wmsWrkNo = wrkMast.getWmsWrkNo();
+ wrkNo = staProtocol.getWorkNo();
+ if (wrkNo != 0) {
+ wrkMast = wrkMastService.selectById(wrkNo);
+ taskNo = wrkMast.getTaskNo();
}
commandInfo = new CommandInfo();
- commandInfo.setWrkNo(taskNo);
- commandInfo.setWmsWrkNo(wmsWrkNo);
+ commandInfo.setWrkNo(wrkNo);
+ commandInfo.setTaskNo(taskNo);
commandInfo.setCommandStatus(1);
commandInfo.setStartTime(new Date());
commandInfo.setDevice("devp");
@@ -73,15 +73,15 @@
case Led:
List<LedCommand> data = (List<LedCommand>) task.getData();
for (LedCommand ledCommand : data) {
- taskNo = ledCommand.getWorkNo();
- if (taskNo != 0) {
- wrkMast = wrkMastService.selectById(taskNo);
- wmsWrkNo = wrkMast.getWmsWrkNo();
+ wrkNo = ledCommand.getWorkNo();
+ if (wrkNo != 0) {
+ wrkMast = wrkMastService.selectById(wrkNo);
+ taskNo = wrkMast.getTaskNo();
}
commandInfo = new CommandInfo();
commandInfo.setWrkNo(ledCommand.getWorkNo());
- commandInfo.setWmsWrkNo(wmsWrkNo);
+ commandInfo.setTaskNo(taskNo);
commandInfo.setCommandStatus(1);
commandInfo.setStartTime(new Date());
commandInfo.setDevice("led");
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index 5ce8a83..ea237b8 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -30,7 +30,7 @@
public class CommonService {
@Autowired
- private WrkMastService wrkMastService;
+ private TaskWrkService taskWrkService;
@Autowired
private WrkLastnoService wrkLastnoService;
@Autowired
@@ -63,8 +63,8 @@
int eNo = wrkLastno.getENo();
workNo = workNo>=eNo ? sNo : workNo+1;
while (true) {
- WrkMast wrkMast = wrkMastService.selectById(workNo);
- if (null != wrkMast) {
+ TaskWrk taskWrk = taskWrkService.selectByWrkNo(workNo);
+ if (null != taskWrk) {
workNo = workNo>=eNo ? sNo : workNo+1;
} else {
break;
@@ -79,7 +79,7 @@
if (workNo == 0) {
throw new CoolException("鐢熸垚宸ヤ綔鍙峰け璐ワ紝璇疯仈绯荤鐞嗗憳");
} else {
- if (wrkMastService.selectById(workNo)!=null) {
+ if (taskWrkService.selectByWrkNo(workNo)!=null) {
throw new CoolException("鐢熸垚宸ヤ綔鍙�" + workNo + "鍦ㄥ伐浣滄。涓凡瀛樺湪");
}
}
diff --git a/src/main/resources/mapper/CommandInfoMapper.xml b/src/main/resources/mapper/CommandInfoMapper.xml
index 67e7bc6..84f6f52 100644
--- a/src/main/resources/mapper/CommandInfoMapper.xml
+++ b/src/main/resources/mapper/CommandInfoMapper.xml
@@ -6,7 +6,7 @@
<resultMap id="BaseResultMap" type="com.zy.asrs.entity.CommandInfo">
<id column="id" property="id" />
<result column="wrk_no" property="wrkNo" />
- <result column="wms_wrk_no" property="wmsWrkNo" />
+ <result column="task_no" property="taskNo" />
<result column="command_status" property="commandStatus" />
<result column="start_time" property="startTime" />
<result column="end_time" property="endTime" />
@@ -17,10 +17,10 @@
</resultMap>
- <select id="selectByWmsWrkNoAndWrkNo" resultMap="BaseResultMap">
+ <select id="selectByTaskNoAndWrkNo" resultMap="BaseResultMap">
select * from wcs_command_info
where wrk_no = #{wrkNo}
- and wms_wrk_no = #{wmsWrkNo}
+ and task_no = #{taskNo}
</select>
</mapper>
diff --git a/src/main/resources/mapper/TaskWrkMapper.xml b/src/main/resources/mapper/TaskWrkMapper.xml
new file mode 100644
index 0000000..09643c5
--- /dev/null
+++ b/src/main/resources/mapper/TaskWrkMapper.xml
@@ -0,0 +1,40 @@
+<?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.TaskWrkMapper">
+
+ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+ <resultMap id="BaseResultMap" type="com.zy.asrs.entity.TaskWrk">
+ <result column="task_no" property="taskNo" />
+ <result column="status" property="status" />
+ <result column="wrk_no" property="wrkNo" />
+ <result column="create_time" property="createTime" />
+ <result column="io_type" property="ioType" />
+ <result column="io_pri" property="ioPri" />
+ <result column="start_point" property="startPoint" />
+ <result column="target_point" property="targetPoint" />
+ <result column="modi_user" property="modiUser" />
+ <result column="modi_time" property="modiTime" />
+ <result column="memo" property="memo" />
+ <result column="barcode" property="barcode" />
+ <result column="assign_time" property="assignTime" />
+ <result column="execute_time" property="executeTime" />
+ <result column="complete_time" property="completeTime" />
+ <result column="cancel_time" property="cancelTime" />
+ <result column="wrk_sts" property="wrkSts" />
+
+ </resultMap>
+
+ <select id="selectByTaskNo" resultMap="BaseResultMap">
+ select top 1 * from wcs_task_wrk
+ where 1=1
+ and task_no = #{taskNo}
+ </select>
+
+ <select id="selectByWrkNo" resultMap="BaseResultMap">
+ select top 1 * from wcs_task_wrk
+ where 1=1
+ and wrk_no = #{wrkNo}
+ </select>
+
+
+</mapper>
diff --git a/src/main/resources/mapper/WmsWrkLogMapper.xml b/src/main/resources/mapper/WmsWrkLogMapper.xml
deleted file mode 100644
index ef2c48f..0000000
--- a/src/main/resources/mapper/WmsWrkLogMapper.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?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.WmsWrkLogMapper">
-
- <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
- <resultMap id="BaseResultMap" type="com.zy.asrs.entity.WmsWrkLog">
- <id column="id" property="id" />
- <result column="wms_wrk_no" property="wmsWrkNo" />
- <result column="wms_status" property="wmsStatus" />
- <result column="wrk_no" property="wrkNo" />
- <result column="create_time" property="createTime" />
- <result column="io_type" property="ioType" />
- <result column="io_pri" property="ioPri" />
- <result column="loc_no" property="locNo" />
- <result column="sta_no" property="staNo" />
- <result column="source_sta_no" property="sourceStaNo" />
- <result column="source_loc_no" property="sourceLocNo" />
- <result column="modi_user" property="modiUser" />
- <result column="modi_time" property="modiTime" />
- <result column="appe_user" property="appeUser" />
- <result column="appe_time" property="appeTime" />
- <result column="memo" property="memo" />
- <result column="barcode" property="barcode" />
- <result column="end_time" property="endTime" />
-
-
- </resultMap>
-
-</mapper>
diff --git a/src/main/resources/mapper/WmsWrkMapper.xml b/src/main/resources/mapper/WmsWrkMapper.xml
deleted file mode 100644
index 5933adb..0000000
--- a/src/main/resources/mapper/WmsWrkMapper.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?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.WmsWrkMapper">
-
- <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
- <resultMap id="BaseResultMap" type="com.zy.asrs.entity.WmsWrk">
- <result column="wms_wrk_no" property="wmsWrkNo" />
- <result column="wms_status" property="wmsStatus" />
- <result column="wrk_no" property="wrkNo" />
- <result column="create_time" property="createTime" />
- <result column="io_type" property="ioType" />
- <result column="io_pri" property="ioPri" />
- <result column="loc_no" property="locNo" />
- <result column="sta_no" property="staNo" />
- <result column="source_sta_no" property="sourceStaNo" />
- <result column="source_loc_no" property="sourceLocNo" />
- <result column="modi_user" property="modiUser" />
- <result column="modi_time" property="modiTime" />
- <result column="appe_user" property="appeUser" />
- <result column="appe_time" property="appeTime" />
- <result column="memo" property="memo" />
- <result column="barcode" property="barcode" />
- <result column="end_time" property="endTime" />
-
- </resultMap>
-
- <select id="selectByWmsWrkNo" resultMap="BaseResultMap">
- select * from wcs_wms_wrk
- where wms_wrk_no = #{wmsWrkNo}
- </select>
-
- <select id="selectToBeHistoryData" resultMap="BaseResultMap">
- select * from wcs_wms_wrk
- where wms_status in (4,5)
- </select>
-
-</mapper>
diff --git a/src/main/webapp/static/wcs/js/common.js b/src/main/webapp/static/wcs/js/common.js
index 3779158..dd0efd0 100644
--- a/src/main/webapp/static/wcs/js/common.js
+++ b/src/main/webapp/static/wcs/js/common.js
@@ -281,4 +281,15 @@
,{field: 'source$', align: 'center',title: '鍒惰喘', hide: true}
,{field: 'check$', align: 'center',title: '瑕佹眰妫�楠�', hide: true}
,{field: 'danger$', align: 'center',title: '鍗遍櫓鍝�', hide: true}
-]
\ No newline at end of file
+]
+
+function getQueryVariable(variable)
+{
+ var query = window.location.search.substring(1);
+ var vars = query.split("&");
+ for (var i=0;i<vars.length;i++) {
+ var pair = vars[i].split("=");
+ if(pair[0] == variable){return pair[1];}
+ }
+ return(false);
+}
\ No newline at end of file
diff --git a/src/main/webapp/static/wms/js/wmsWrk/wmsWrk.js b/src/main/webapp/static/wms/js/wmsWrk/wmsWrk.js
index 0c74e4e..f035c9e 100644
--- a/src/main/webapp/static/wms/js/wmsWrk/wmsWrk.js
+++ b/src/main/webapp/static/wms/js/wmsWrk/wmsWrk.js
@@ -25,26 +25,21 @@
cellMinWidth: 50,
height: 'full-120',
cols: [[
- {type: 'checkbox'}
- ,{field: 'wmsWrkNo', align: 'center',title: 'WMS浠诲姟鍙�',width: 110}
- ,{field: 'wmsStatus$', align: 'center',title: 'WMS浠诲姟鐘舵��',width: 130}
+ {title:'鎿嶄綔', align: 'center', toolbar: '#operate', width: 110}
+ ,{field: 'taskNo', align: 'center',title: 'WMS浠诲姟鍙�',width: 110}
+ ,{field: 'status$', align: 'center',title: '浠诲姟鐘舵��',width: 130}
,{field: 'wrkNo', align: 'center',title: '浠诲姟鍙�'}
,{field: 'createTime$', align: 'center',title: '浠诲姟鏃堕棿',width: 170}
,{field: 'durationTime', align: 'center',title: '鎸佺画鏃堕暱',width: 150}
,{field: 'ioType$', align: 'center',title: '浠诲姟绫诲瀷'}
,{field: 'ioPri', align: 'center',title: '浼樺厛绾�'}
- ,{field: 'sourceStaNo$', align: 'center',title: '婧愮珯'}
- ,{field: 'staNo$', align: 'center',title: '鐩爣绔�'}
- ,{field: 'sourceLocNo', align: 'center',title: '婧愬簱浣�'}
- ,{field: 'locNo', align: 'center',title: '鐩爣搴撲綅'}
- ,{field: 'barcode', align: 'center',title: '鏉＄爜'}
- // ,{field: 'modiUser$', align: 'center',title: '淇敼浜哄憳'}
- // ,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿'}
- // ,{field: 'appeUser$', align: 'center',title: '鍒涘缓鑰�'}
- // ,{field: 'appeTime$', align: 'center',title: '娣诲姞鏃堕棿'}
+ ,{field: 'startPoint', align: 'center',title: '璧风偣'}
+ ,{field: 'targetPoint', align: 'center',title: '缁堢偣'}
,{field: 'memo', align: 'center',title: '澶囨敞'}
-
- ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width: 110}
+ // ,{field: 'assignTime$', align: 'center',title: '娲惧彂鏃堕棿',width: 170}
+ // ,{field: 'executeTime$', align: 'center',title: '鎵ц鏃堕棿',width: 170}
+ // ,{field: 'completeTime$', align: 'center',title: '瀹岀粨鏃堕棿',width: 170}
+ // ,{field: 'cancelTime$', align: 'center',title: '鍙栨秷鏃堕棿',width: 170}
]],
request: {
pageName: 'curr',
@@ -205,12 +200,12 @@
var data = obj.data;
switch (obj.event) {
case 'distribute'://娲惧彂
- layer.confirm('纭娲惧彂璇ョ瑪浠诲姟锛�', {title: 'WMS浠诲姟鍙凤細' + data.wmsWrkNo, shadeClose: true}, function () {
+ layer.confirm('纭娲惧彂璇ョ瑪浠诲姟锛�', {title: 'WMS浠诲姟鍙凤細' + data.taskNo, shadeClose: true}, function () {
$.ajax({
url: baseUrl + "/wmsWrk/distribute/auth",
headers: {'token': localStorage.getItem('token')},
data: {
- wmsWrkNo: data.wmsWrkNo
+ taskNo: data.taskNo
},
method: 'POST',
success: function (res) {
diff --git a/src/main/webapp/views/commandManage/commandManage.html b/src/main/webapp/views/commandManage/commandManage.html
index 19e67fc..b5d5949 100644
--- a/src/main/webapp/views/commandManage/commandManage.html
+++ b/src/main/webapp/views/commandManage/commandManage.html
@@ -1,63 +1,194 @@
<!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/cool.css" media="all">
- <link rel="stylesheet" href="../../static/wms/css/common.css" media="all">
-</head>
-<body>
-<!-- 鎼滅储鏍� -->
-<div id="search-box" class="layui-form layui-card-header">
- <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">
- <div class="layui-input-inline">
- <input class="layui-input" type="text" name="wrk_no" id="wrkNo" placeholder="浠诲姟鍙�" autocomplete="off">
- </div>
- </div>
- <div class="layui-inline">
- <div class="layui-input-inline">
- <input class="layui-input" type="text" name="wms_wrk_no" id="wmsWrkNo" placeholder="WMS浠诲姟鍙�" autocomplete="off">
- </div>
- </div>
- <!-- 寰呮坊鍔� -->
- <div id="data-search-btn" class="layui-btn-container layui-form-item">
- <button id="search" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="search">鎼滅储</button>
- <button id="reset" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="reset">閲嶇疆</button>
- </div>
-</div>
+ <head>
+ <meta charset="UTF-8">
+ <title>鎸囦护绠＄悊</title>
+ <link rel="stylesheet" href="../../static/wcs/css/element.css">
+ <script type="text/javascript" src="../../static/wcs/js/jquery/jquery-3.3.1.min.js"></script>
+ <script type="text/javascript" src="../../static/wms/layui/layui.js"></script>
+ <script type="text/javascript" src="../../static/wcs/js/common.js"></script>
+ <script type="text/javascript" src="../../static/wcs/js/vue.min.js"></script>
+ <script type="text/javascript" src="../../static/wcs/js/element.js"></script>
+ </head>
-<!-- 琛ㄦ牸 -->
-<div class="layui-form">
- <table class="layui-hide" id="commandManage" lay-filter="commandManage"></table>
-</div>
-<script type="text/html" id="toolbar">
- <div class="layui-btn-container">
- <button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData" style="margin-top: 10px">瀵煎嚭</button>
- </div>
-</script>
+ <body>
+ <div id="app" style="display: flex;justify-content: center;flex-wrap: wrap;">
+ <div style="width: 100%;">
+ <el-card class="box-card">
+ <el-form :inline="true" :model="tableSearchParam" class="demo-form-inline">
+ <el-form-item label="">
+ <el-input v-model="tableSearchParam.task_no" placeholder="浠诲姟鍙�"></el-input>
+ </el-form-item>
+ <el-form-item label="">
+ <el-select v-model="tableSearchParam.command_status" placeholder="鎸囦护鐘舵��">
+ <el-option label="鍒涘缓" value="1"></el-option>
+ <el-option label="鎵ц" value="2"></el-option>
+ <el-option label="瀹屾垚" value="3"></el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="">
+ <el-input v-model="tableSearchParam.wrk_no" placeholder="宸ヤ綔鍙�"></el-input>
+ </el-form-item>
+ <el-form-item>
+ <el-button type="primary" @click="getTableData">鏌ヨ</el-button>
+ <el-button type="primary" @click="resetParam">閲嶇疆</el-button>
+ </el-form-item>
+ </el-form>
+ <el-table ref="singleTable" :data="tableData" style="width: 100%;">
+ <el-table-column label="鎿嶄綔" width="100">
+ <template slot-scope="scope">
+ <el-dropdown @command="(command)=>{handleCommand(command, scope.row)}">
+ <el-button icon="el-icon-more" size="mini" type="primary"></el-button>
+ <el-dropdown-menu slot="dropdown">
+ <el-dropdown-item command="showTask">鏌ョ湅浠诲姟</el-dropdown-item>
+ </el-dropdown-menu>
+ </el-dropdown>
+ </template>
+ </el-table-column>
+ <el-table-column property="id" label="鎸囦护缂栧彿">
+ </el-table-column>
+ <el-table-column property="wrkNo" label="宸ヤ綔鍙�">
+ </el-table-column>
+ <el-table-column property="taskNo" label="浠诲姟鍙�">
+ </el-table-column>
+ <el-table-column property="commandStatus$" label="鎸囦护鐘舵��">
+ </el-table-column>
+ <el-table-column show-overflow-tooltip property="durationTime" label="鎸佺画鏃堕暱">
+ </el-table-column>
+ <el-table-column property="commandType" label="鎸囦护绫诲瀷">
+ </el-table-column>
+ <el-table-column property="device" label="璁惧">
+ </el-table-column>
+ <el-table-column property="deviceLog" label="璁惧鎵ц淇℃伅">
+ </el-table-column>
+ <el-table-column property="commandDesc" label="鍛戒护鎻忚堪">
+ </el-table-column>
+ <el-table-column show-overflow-tooltip property="startTime$" label="寮�濮嬫椂闂�">
+ </el-table-column>
+ <el-table-column show-overflow-tooltip property="endTime$" label="缁撴潫鏃堕棿">
+ </el-table-column>
+ <el-table-column show-overflow-tooltip property="command" label="鍛戒护鎶ユ枃">
+ </el-table-column>
+ </el-table>
-<script type="text/html" id="operate">
- <a class="layui-btn layui-btn-xs btn-detlShow" id="btn-wrkMastShow" lay-event="wrkMastShow">浠诲姟</a>
-</script>
+ <div style="margin-top: 10px;">
+ <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
+ :current-page="currentPage" :page-sizes="pageSizes" :page-size="pageSize"
+ layout="total, sizes, prev, pager, next, jumper" :total="pageTotal">
+ </el-pagination>
+ </div>
+ </el-card>
+ </div>
+ </div>
+ <script>
+ var $layui = layui.config({
+ base: baseUrl + "/static/wms/layui/lay/modules/"
+ }).use(['layer', 'form'], function() {})
-<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/commandManage/commandManage.js" charset="utf-8"></script>
+ var app = new Vue({
+ el: '#app',
+ data: {
+ tableData: [],
+ currentPage: 1,
+ pageSizes: [16, 30, 50, 100, 150, 200],
+ pageSize: 16,
+ pageTotal: 0,
+ tableSearchParam: {
+ task_no: null,
+ status: null,
+ wrk_no: null
+ }
+ },
+ created() {
+ this.init()
+ },
+ watch: {
-<iframe id="detail-iframe" scrolling="auto" style="display:none;"></iframe>
+ },
+ methods: {
+ init() {
+ let taskNo = getQueryVariable('taskNo')
+ let wrkNo = getQueryVariable('wrkNo')
+ if (taskNo != false) {
+ this.tableSearchParam.task_no = taskNo
+ }
+ if (wrkNo != false) {
+ this.tableSearchParam.wrk_no = wrkNo
+ }
-</body>
+ this.getTableData()
+ },
+ getTableData() {
+ let that = this;
+ let data = this.tableSearchParam
+ data.curr = this.currentPage
+ data.limit = this.pageSize
+ $.ajax({
+ url: baseUrl + "/commandInfo/list/auth",
+ headers: {
+ 'token': localStorage.getItem('token')
+ },
+ data: data,
+ dataType: 'json',
+ contentType: 'application/json;charset=UTF-8',
+ method: 'GET',
+ success: function(res) {
+ if (res.code == 200) {
+ that.tableData = res.data.records
+ that.pageTotal = res.data.total
+ } else if (res.code === 403) {
+ top.location.href = baseUrl + "/";
+ } else {
+ that.$message({
+ message: res.msg,
+ type: 'error'
+ });
+ }
+ }
+ });
+ },
+ handleSizeChange(val) {
+ console.log(`姣忛〉 ${val} 鏉);
+ this.pageSize = val
+ this.getTableData()
+ },
+ handleCurrentChange(val) {
+ console.log(`褰撳墠椤�: ${val}`);
+ this.currentPage = val
+ this.getTableData()
+ },
+ resetParam() {
+ this.tableSearchParam = {
+ task_no: null,
+ status: null,
+ wrk_no: null
+ }
+ this.getTableData()
+ },
+ handleCommand(command, row) {
+ switch (command) {
+ case "showTask":
+ //鏌ョ湅浠诲姟
+ this.showTask(row)
+ break;
+ }
+ },
+ showTask(row) {
+ //鏌ョ湅浠诲姟
+ $layui.layer.open({
+ type: 2,
+ title: '浠诲姟绠＄悊',
+ maxmin: true,
+ area: [top.detailWidth, top.detailHeight],
+ shadeClose: true,
+ content: '../taskWrk/taskWrk.html?taskNo=' + row.taskNo + "&wrkNo=" + row.wrkNo,
+ success: function(layero, index) {}
+ });
+ }
+ }
+ })
+ </script>
+ </body>
+
</html>
-
diff --git a/src/main/webapp/views/taskWrk/taskWrk.html b/src/main/webapp/views/taskWrk/taskWrk.html
new file mode 100644
index 0000000..2647811
--- /dev/null
+++ b/src/main/webapp/views/taskWrk/taskWrk.html
@@ -0,0 +1,295 @@
+<!DOCTYPE html>
+<html lang="en">
+
+ <head>
+ <meta charset="UTF-8">
+ <title>浠诲姟绠＄悊</title>
+ <link rel="stylesheet" href="../../static/wcs/css/element.css">
+ <script type="text/javascript" src="../../static/wcs/js/jquery/jquery-3.3.1.min.js"></script>
+ <script type="text/javascript" src="../../static/wms/layui/layui.js"></script>
+ <script type="text/javascript" src="../../static/wcs/js/common.js"></script>
+ <script type="text/javascript" src="../../static/wcs/js/vue.min.js"></script>
+ <script type="text/javascript" src="../../static/wcs/js/element.js"></script>
+ </head>
+
+ <body>
+ <div id="app" style="display: flex;justify-content: center;flex-wrap: wrap;">
+ <div style="width: 100%;">
+ <el-card class="box-card">
+ <el-form :inline="true" :model="tableSearchParam" class="demo-form-inline">
+ <el-form-item label="">
+ <el-input v-model="tableSearchParam.task_no" placeholder="浠诲姟鍙�"></el-input>
+ </el-form-item>
+ <el-form-item label="">
+ <el-select v-model="tableSearchParam.status" placeholder="浠诲姟鐘舵��">
+ <el-option label="鎺ユ敹" value="1"></el-option>
+ <el-option label="娲惧彂" value="2"></el-option>
+ <el-option label="瀹岀粨" value="3"></el-option>
+ <el-option label="鍙栨秷" value="4"></el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="">
+ <el-input v-model="tableSearchParam.wrk_no" placeholder="宸ヤ綔鍙�"></el-input>
+ </el-form-item>
+ <el-form-item>
+ <el-button type="primary" @click="getTableData">鏌ヨ</el-button>
+ <el-button type="primary" @click="resetParam">閲嶇疆</el-button>
+ </el-form-item>
+ </el-form>
+ <el-table ref="singleTable" :data="tableData" style="width: 100%;">
+ <el-table-column label="鎿嶄綔" width="100">
+ <template slot-scope="scope">
+ <el-dropdown @command="(command)=>{handleCommand(command, scope.row)}">
+ <el-button icon="el-icon-more" size="mini" type="primary"></el-button>
+ <el-dropdown-menu slot="dropdown">
+ <el-dropdown-item command="showCommand">鏌ョ湅鎸囦护</el-dropdown-item>
+ <el-dropdown-item command="assign">娲惧彂</el-dropdown-item>
+ <el-dropdown-item command="complete">瀹岀粨</el-dropdown-item>
+ <el-dropdown-item command="cancel">鍙栨秷</el-dropdown-item>
+ </el-dropdown-menu>
+ </el-dropdown>
+ </template>
+ </el-table-column>
+ <el-table-column property="taskNo" label="浠诲姟鍙�">
+ </el-table-column>
+ <el-table-column property="status$" label="浠诲姟鐘舵��">
+ </el-table-column>
+ <el-table-column property="wrkNo" label="宸ヤ綔鍙�">
+ </el-table-column>
+ <el-table-column property="createTime$" label="浠诲姟鏃堕棿">
+ </el-table-column>
+ <el-table-column property="durationTime" label="鎸佺画鏃堕暱">
+ </el-table-column>
+ <el-table-column property="ioType$" label="浠诲姟绫诲瀷">
+ </el-table-column>
+ <el-table-column property="startPoint" label="璧风偣浣嶇疆">
+ </el-table-column>
+ <el-table-column property="targetPoint" label="缁堢偣浣嶇疆">
+ </el-table-column>
+ <el-table-column property="wrkSts$" label="宸ヤ綔鐘舵��">
+ </el-table-column>
+ </el-table>
+
+ <div style="margin-top: 10px;">
+ <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
+ :current-page="currentPage" :page-sizes="pageSizes" :page-size="pageSize"
+ layout="total, sizes, prev, pager, next, jumper" :total="pageTotal">
+ </el-pagination>
+ </div>
+ </el-card>
+ </div>
+ </div>
+ <script>
+ var $layui = layui.config({
+ base: baseUrl + "/static/wms/layui/lay/modules/"
+ }).use(['layer', 'form'], function() {})
+
+ var app = new Vue({
+ el: '#app',
+ data: {
+ tableData: [],
+ currentPage: 1,
+ pageSizes: [16, 30, 50, 100, 150, 200],
+ pageSize: 16,
+ pageTotal: 0,
+ tableSearchParam: {
+ task_no: null,
+ status: null,
+ wrk_no: null
+ }
+ },
+ created() {
+ this.init()
+ },
+ watch: {
+
+ },
+ methods: {
+ init() {
+ let taskNo = getQueryVariable('taskNo')
+ let wrkNo = getQueryVariable('wrkNo')
+ if (taskNo != false) {
+ this.tableSearchParam.task_no = taskNo
+ }
+ if (wrkNo != false) {
+ this.tableSearchParam.wrk_no = wrkNo
+ }
+
+ this.getTableData()
+ },
+ getTableData() {
+ let that = this;
+ let data = this.tableSearchParam
+ data.curr = this.currentPage
+ data.limit = this.pageSize
+ $.ajax({
+ url: baseUrl + "/taskWrk/list/auth",
+ headers: {
+ 'token': localStorage.getItem('token')
+ },
+ data: data,
+ dataType: 'json',
+ contentType: 'application/json;charset=UTF-8',
+ method: 'GET',
+ success: function(res) {
+ if (res.code == 200) {
+ that.tableData = res.data.records
+ that.pageTotal = res.data.total
+ } else if (res.code === 403) {
+ top.location.href = baseUrl + "/";
+ } else {
+ that.$message({
+ message: res.msg,
+ type: 'error'
+ });
+ }
+ }
+ });
+ },
+ handleSizeChange(val) {
+ console.log(`姣忛〉 ${val} 鏉);
+ this.pageSize = val
+ this.getTableData()
+ },
+ handleCurrentChange(val) {
+ console.log(`褰撳墠椤�: ${val}`);
+ this.currentPage = val
+ this.getTableData()
+ },
+ resetParam() {
+ this.tableSearchParam = {
+ task_no: null,
+ status: null,
+ wrk_no: null
+ }
+ this.getTableData()
+ },
+ handleCommand(command, row) {
+ switch (command) {
+ case "showCommand":
+ //鏌ョ湅鎸囦护
+ this.showCommand(row)
+ break;
+ case "assign":
+ //娲惧彂浠诲姟
+ this.assginWrk(row)
+ break;
+ case "complete":
+ //瀹岀粨浠诲姟
+ this.completeWrk(row)
+ break;
+ case "cancel":
+ //鍙栨秷浠诲姟
+ this.cancelWrk(row)
+ break;
+ }
+ },
+ showCommand(row) {
+ let wrkNo = row.wrkNo == null ? "" : row.wrkNo
+ //鏌ョ湅鎸囦护
+ $layui.layer.open({
+ type: 2,
+ title: '鎸囦护绠＄悊',
+ maxmin: true,
+ area: [top.detailWidth, top.detailHeight],
+ shadeClose: true,
+ content: '../commandManage/commandManage.html?taskNo=' + row.taskNo + "&wrkNo=" + wrkNo,
+ success: function(layero, index) {}
+ });
+ },
+ assginWrk(row){
+ //娲惧彂浠诲姟
+ let that = this
+ $.ajax({
+ url: baseUrl + "/taskWrk/distribute/auth",
+ headers: {
+ 'token': localStorage.getItem('token')
+ },
+ data: {
+ taskNo: row.taskNo
+ },
+ method: 'POST',
+ success: function(res) {
+ if (res.code == 200) {
+ that.$message({
+ message: "娲惧彂鎴愬姛",
+ type: 'success'
+ });
+ that.getTableData()
+ } else if (res.code === 403) {
+ top.location.href = baseUrl + "/";
+ } else {
+ that.$message({
+ message: res.msg,
+ type: 'error'
+ });
+ }
+ }
+ });
+ },
+ completeWrk(row){
+ //娲惧彂浠诲姟
+ let that = this
+ $.ajax({
+ url: baseUrl + "/taskWrk/complete/auth",
+ headers: {
+ 'token': localStorage.getItem('token')
+ },
+ data: {
+ taskNo: row.taskNo
+ },
+ method: 'POST',
+ success: function(res) {
+ if (res.code == 200) {
+ that.$message({
+ message: "瀹岀粨鎴愬姛",
+ type: 'success'
+ });
+ that.getTableData()
+ } else if (res.code === 403) {
+ top.location.href = baseUrl + "/";
+ } else {
+ that.$message({
+ message: res.msg,
+ type: 'error'
+ });
+ }
+ }
+ });
+ },
+ cancelWrk(row){
+ //鍙栨秷浠诲姟
+ let that = this
+ $.ajax({
+ url: baseUrl + "/taskWrk/cancel/auth",
+ headers: {
+ 'token': localStorage.getItem('token')
+ },
+ data: {
+ taskNo: row.taskNo
+ },
+ method: 'POST',
+ success: function(res) {
+ if (res.code == 200) {
+ that.$message({
+ message: "鍙栨秷鎴愬姛",
+ type: 'success'
+ });
+ that.getTableData()
+ } else if (res.code === 403) {
+ top.location.href = baseUrl + "/";
+ } else {
+ that.$message({
+ message: res.msg,
+ type: 'error'
+ });
+ }
+ }
+ });
+ }
+ }
+ })
+ </script>
+ </body>
+
+</html>
diff --git a/src/main/webapp/views/wmsWrk/wmsWrk.html b/src/main/webapp/views/wmsWrk/wmsWrk.html
deleted file mode 100644
index c01ca7e..0000000
--- a/src/main/webapp/views/wmsWrk/wmsWrk.html
+++ /dev/null
@@ -1,255 +0,0 @@
-<!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="wms_wrk_no" placeholder="WMS浠诲姟鍙�" autocomplete="off">
- </div>
- </div>
- <div class="layui-inline">
- <div class="layui-input-inline">
- <input class="layui-input" type="text" name="wrk_no" 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="wmsWrk" lay-filter="wmsWrk"></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-normal" id="btn-pri-add" lay-event="priAdd"><i class="layui-icon"></i>澧炲姞浼樺厛绾�</button>
- <button class="layui-btn layui-btn-normal" id="btn-pri-red" lay-event="priRed"><i class="layui-icon"></i>闄嶄綆浼樺厛绾�</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">
- <!-- 鍟嗗搧/鐗╂枡 鏁版嵁涓績 -->
- <div class="dropdown-menu">
- <button class="layui-btn layui-btn-primary layui-border-black icon-btn layui-btn-sm"><i class="layui-icon layui-icon-shrink-right"></i></button>
- <ul class="dropdown-menu-nav" style="margin-left: -35px">
- {{#if (d.wmsStatus === 1 || d.wmsStatus === 0) { }}
- <li><a id="btn-distribute" lay-event="distribute">娲惧彂</a></li>
- {{# } }}
- <li><a id="btn-wrkMastShow" lay-event="wrkMastShow">鏌ョ湅浠诲姟</a></li>
- <li><a id="btn-complete" lay-event="complete">瀹岀粨</a></li>
- <li><a id="btn-cancel" lay-event="cancel">鍙栨秷</a></li>
- </ul>
- </div>
-</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/wmsWrk/wmsWrk.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="wmsWrkNo" placeholder="璇疯緭鍏MS浠诲姟鍙�" lay-vertype="tips" lay-verify="required">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">WMS浠诲姟鐘舵��: </label>
- <div class="layui-input-block">
- <select name="wmsStatus">
- <option value="">璇烽�夋嫨WMS浠诲姟鐘舵��</option>
- <option value="0">鍒涘缓</option>
- <option value="1">鎺ユ敹</option>
- <option value="2">娲惧彂</option>
- <option value="3">瀹岀粨</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="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="createTime" id="createTime$" 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="ioType" placeholder="璇疯緭鍏ュ叆鍑哄簱绫诲瀷" style="display: none">
- <input id="ioType$" 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="basWrkIotypeQueryByioType" onkeyup="autoLoad(this.getAttribute('data-key'))">
- <select class="cool-auto-complete-window-select" data-key="basWrkIotypeQueryByioTypeSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
- </select>
- </div>
- </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="crnNo" placeholder="璇疯緭鍏ュ爢鍨涙満" style="display: none">
- <input id="crnNo$" 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="basCrnpQueryBycrnNo" onkeyup="autoLoad(this.getAttribute('data-key'))">
- <select class="cool-auto-complete-window-select" data-key="basCrnpQueryBycrnNoSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
- </select>
- </div>
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">浼樺厛绾�: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="ioPri" 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="locNo" placeholder="璇疯緭鍏ョ洰鏍囧簱浣�" style="display: none">
- <input id="locNo$" 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="locMastQueryBylocNo" onkeyup="autoLoad(this.getAttribute('data-key'))">
- <select class="cool-auto-complete-window-select" data-key="locMastQueryBylocNoSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
- </select>
- </div>
- </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="staNo" placeholder="璇疯緭鍏ョ洰鏍囩珯" style="display: none">
- <input id="staNo$" 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="basDevpQueryBystaNo" onkeyup="autoLoad(this.getAttribute('data-key'))">
- <select class="cool-auto-complete-window-select" data-key="basDevpQueryBystaNoSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
- </select>
- </div>
- </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="sourceStaNo" placeholder="璇疯緭鍏ユ簮绔�" style="display: none">
- <input id="sourceStaNo$" 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="basDevpQueryBysourceStaNo" onkeyup="autoLoad(this.getAttribute('data-key'))">
- <select class="cool-auto-complete-window-select" data-key="basDevpQueryBysourceStaNoSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
- </select>
- </div>
- </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="sourceLocNo" placeholder="璇疯緭鍏ユ簮搴撲綅" style="display: none">
- <input id="sourceLocNo$" 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="locMastQueryBysourceLocNo" onkeyup="autoLoad(this.getAttribute('data-key'))">
- <select class="cool-auto-complete-window-select" data-key="locMastQueryBysourceLocNoSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
- </select>
- </div>
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">搴撲綅鐘舵��: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="locSts" placeholder="璇疯緭鍏ュ簱浣嶇姸鎬�">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">鎷ｆ枡(checkBox): </label>
- <div class="layui-input-block">
- <input class="layui-input" name="picking" placeholder="璇疯緭鍏ユ嫞鏂�(checkBox)">
- </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$" 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 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="appeUser" placeholder="璇疯緭鍏ュ垱寤鸿��" style="display: none">
- <input id="appeUser$" 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="userQueryByappeUser" onkeyup="autoLoad(this.getAttribute('data-key'))">
- <select class="cool-auto-complete-window-select" data-key="userQueryByappeUserSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
- </select>
- </div>
- </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="memo" placeholder="璇疯緭鍏ュ娉�">
- </div>
- </div>
-
- </div>
- </div>
- <hr class="layui-bg-gray">
- <div class="layui-form-item text-right">
- <button class="layui-btn" lay-filter="editSubmit" lay-submit="">淇濆瓨</button>
- <button class="layui-btn layui-btn-primary" type="button" ew-event="closeDialog">鍙栨秷</button>
- </div>
- </form>
-</script>
-</html>
-
diff --git a/src/main/webapp/views/wmsWrkLog/wmsWrkLog.html b/src/main/webapp/views/wmsWrkLog/wmsWrkLog.html
deleted file mode 100644
index aae28fb..0000000
--- a/src/main/webapp/views/wmsWrkLog/wmsWrkLog.html
+++ /dev/null
@@ -1,69 +0,0 @@
-<!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="id" placeholder="缂栧彿" autocomplete="off">
- </div>
- </div>
- <div class="layui-inline">
- <div class="layui-input-inline">
- <input class="layui-input" type="text" name="wms_wrk_no" placeholder="WMS浠诲姟鍙�" autocomplete="off">
- </div>
- </div>
- <div class="layui-inline">
- <div class="layui-input-inline">
- <input class="layui-input" type="text" name="wrk_no" 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="wmsWrkLog" lay-filter="wmsWrkLog"></table>
- </div>
- </div>
-</div>
-
-<script type="text/html" id="toolbar">
- <div class="layui-btn-container">
-<!-- <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/wmsWrkLog/wmsWrkLog.js" charset="utf-8"></script>
-</body>
-</html>
-
--
Gitblit v1.9.1