From af7b9db27bf72c92108329815ec771fb46e5b877 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期五, 31 十月 2025 16:09:20 +0800
Subject: [PATCH] Merge branch 'jsxswms' into integrationWms
---
src/main/java/com/zy/system/service/impl/ConfigServiceImpl.java | 33
src/main/webapp/static/js/taskLog/taskLog.js | 578 ++--
src/main/java/com/zy/common/config/AdminInterceptor.java | 5
src/main/java/com/zy/asrs/entity/Task.java | 484 ++++
src/main/java/com/zy/asrs/entity/param/AgvCallParams.java | 3
src/main/java/com/zy/system/timer/TokenTimer.java | 50
src/main/resources/application-prod.yml | 125 +
src/main/webapp/static/js/wrkMast/wrkMast.js | 65
src/main/java/com/zy/asrs/controller/BasStationController.java | 44
src/main/java/com/zy/common/web/AuthController.java | 94
src/main/java/com/zy/asrs/service/impl/TaskServiceImpl.java | 279 ++
src/main/java/com/zy/asrs/service/impl/TaskLogServiceImpl.java | 37
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 4
src/main/java/com/zy/asrs/service/impl/BasContainerServiceImpl.java | 71
src/main/webapp/static/js/task/task.js | 187 +
src/main/java/com/zy/asrs/entity/Mat.java | 28
src/main/resources/application-dev.yml | 112
src/main/java/com/zy/asrs/controller/MatController.java | 68
src/main/java/com/zy/asrs/service/TaskLogService.java | 1
src/main/webapp/static/js/common.js | 6
src/main/java/com/zy/asrs/mapper/BasContainerMapper.java | 4
src/main/java/com/zy/asrs/service/MatService.java | 3
src/main/webapp/views/wrkMast/wrkMast_detail2.html | 53
src/main/java/com/zy/asrs/controller/BasLocStsController.java | 2
src/main/webapp/views/wrkMast/wrkMast.html | 1
src/main/java/com/zy/asrs/entity/param/PakinMatsByQRParams.java | 17
src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java | 908 ++++---
src/main/java/com/zy/asrs/entity/param/ContainerParams.java | 30
src/main/java/com/zy/system/service/ConfigService.java | 2
src/main/java/com/zy/asrs/controller/TaskController.java | 62
src/main/java/com/zy/asrs/task/WorkMastScheduler.java | 23
src/main/webapp/static/js/locCache/locCache.js | 81
src/main/java/com/zy/asrs/task/OrderSyncScheduler.java | 4
src/main/java/com/zy/asrs/entity/TaskDetl.java | 3
src/main/java/com/zy/asrs/enums/MatTagType.java | 20
src/main/java/com/zy/common/CodeBuilder.java | 2
src/main/java/com/zy/asrs/controller/BasWrkIotypeController.java | 2
src/main/java/com/zy/asrs/controller/BasCrnStatusController.java | 2
src/main/webapp/views/taskLog/taskLog.html | 542 ---
src/main/webapp/views/taskLog/taskLog_detail.html | 196 +
src/main/java/com/zy/asrs/controller/BasContainerController.java | 136 +
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 2
src/main/java/com/zy/system/controller/LicenseCreatorController.java | 7
src/main/java/com/zy/asrs/utils/MatExcelListener.java | 1
src/main/java/com/zy/asrs/service/impl/TaskDetlLogServiceImpl.java | 35
src/main/webapp/static/js/mat/mat.js | 197 +
src/main/webapp/views/mat/mat.html | 52
pom.xml | 11
src/main/java/com/zy/asrs/controller/BasWrkStatusController.java | 2
src/main/java/com/zy/asrs/service/impl/MatServiceImpl.java | 26
src/main/webapp/static/js/basContainer/basContainer.js | 309 ++
src/main/java/com/zy/asrs/service/TaskDetlLogService.java | 1
src/main/webapp/static/js/wrkMastLog/wrkMastLog.js | 4
src/main/java/com/zy/asrs/entity/BasStation.java | 30
src/main/java/com/zy/asrs/enums/CommonEnum.java | 25
src/main/java/com/zy/system/timer/LoadingConfigTimer.java | 44
src/main/webapp/views/.DS_Store | 0
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 302 ++
src/main/java/com/zy/asrs/service/BasContainerService.java | 17
src/main/java/com/zy/common/model/DetlDto.java | 2
src/main/java/com/zy/asrs/service/MobileService.java | 16
src/main/java/com/zy/asrs/mapper/TaskMapper.java | 3
src/main/webapp/views/basContainer/initContainer.html | 164 +
src/main/webapp/static/js/basStation/basStation.js | 131
src/main/java/com/zy/asrs/task/AutoLocMoveScheduler.java | 3
src/main/webapp/views/task/task.html | 54
src/main/resources/mapper/BasContainerMapper.xml | 12
src/main/resources/mapper/TaskMapper.xml | 3
src/main/webapp/views/locCache/locCache.html | 66
src/main/java/com/zy/asrs/controller/MobileController.java | 19
src/main/java/com/zy/asrs/entity/BasContainer.java | 90
src/main/webapp/views/locCache/locDetail.html | 1
src/main/java/com/zy/asrs/controller/PackController.java | 1
src/main/java/basContainer.sql | 18
src/main/webapp/views/basStation/basStation.html | 234 -
src/main/webapp/views/basContainer/basContainer.html | 148 +
src/main/webapp/views/task/taskDetl.html | 93
/dev/null | 391 ---
src/main/java/com/zy/asrs/enums/ContainerType.java | 27
src/main/java/com/zy/asrs/entity/param/BatchMatsUpdateParam.java | 24
src/main/java/com/zy/asrs/service/TaskService.java | 9
src/main/resources/application.yml | 134 -
src/main/java/com/zy/asrs/task/handler/OverYearLogHandler.java | 18
83 files changed, 4,666 insertions(+), 2,427 deletions(-)
diff --git a/license.lic b/license.lic
deleted file mode 100644
index 22364dc..0000000
--- a/license.lic
+++ /dev/null
@@ -1 +0,0 @@
-�!�;蓧嚡页僶}>菥m熂l簝 �&蹻摜ズャDYw漛�<
烻-唖賳3鬕J 辴迟*疀専el龍魌�6�+�"徥H釛H|�観J_ �7 i瓋I%欑�"閑�'6_堜r%�9蠤奇A疡p�鎟�眙�/讧� 頺�)�hb@s蜉C_:4驦5嶥詥嬋Yd靪齐CJ澩g厛oV�#硫?�茞f滂k齠%跏#m 梲rD菰:�z啥炣蕶& 槺�$\嶋d閧'&昬7卶縎�p渓罷��cu3*崌U丫x窜鞓�3胅渆]K�&匤h烷a3GL�暼蠖伜堩{崸]r2羮�v�P湧|棖話g^�佾��?z 秚井7嬇!恀�!齤-F.玬{��+纁0齇xM胡S蟱tK錺�8-z(�;J贿@lvE8逯~xЬ糍�喎潵R虷覹q閧瑾I]熧鞲| 唼 D钥` 輂齱⒔嗢�2纐5鎸+�
�+vt姰�罹访!栿襁场済L殞搃��\LG誒峮_厸肭�f艟�nx� 硯咧w蘼唌�"]}簟5嗳o梋a� 処P�%檞l+� C绚v3鈔闞3�繎 飇�)粓篍屉蘻]綨/図gCbm�8��D/�浈豗舕酵羣�0胆臚〆�珪&ヒR弌�:@颶�兂誙綽R:g
DV3P偭U=嵆镣!�f隧�7àdrd舷[4烿凞 `F酞`I彫椱柤籒r郯嵑PqE霮?Y1/!�9陔k$0an哲也嵍樗妍5譛紁驭3圢�<�(揍鬞#�掺镧翄$眕V�<霄6�?I卬��悕x �:lLm鍭�9� 荳 ��
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index df3a7df..9a4e10f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,11 +30,15 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-tomcat</artifactId>
-<!-- <scope>provided</scope>-->
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-redis</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-aop</artifactId>
</dependency>
<dependency>
<groupId>cn.cool</groupId>
@@ -42,8 +46,9 @@
<version>${cool.version}</version>
</dependency>
<dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-aop</artifactId>
+ <groupId>org.apache.tika</groupId>
+ <artifactId>tika-core</artifactId>
+ <version>2.1.0</version>
</dependency>
<dependency>
<groupId>mysql</groupId>
diff --git a/src/main/java/basAreas.sql b/src/main/java/basAreas.sql
deleted file mode 100644
index 3204d1b..0000000
--- a/src/main/java/basAreas.sql
+++ /dev/null
@@ -1,18 +0,0 @@
--- save basAreas record
--- mysql
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'basAreas/basAreas.html', 'basAreas绠＄悊', null , '2', null , '1');
-
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'basAreas#view', '鏌ヨ', '', '3', '0', '1');
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'basAreas#btn-add', '鏂板', '', '3', '1', '1');
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'basAreas#btn-edit', '缂栬緫', '', '3', '2', '1');
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'basAreas#btn-delete', '鍒犻櫎', '', '3', '3', '1');
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'basAreas#btn-export', '瀵煎嚭', '', '3', '4', '1');
-
--- sqlserver
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basAreas/basAreas.html', N'basAreas绠＄悊', null, '2', null, '1');
-
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basAreas#view', N'鏌ヨ', '', '3', '0', '1');
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basAreas#btn-add', N'鏂板', '', '3', '1', '1');
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basAreas#btn-edit', N'缂栬緫', '', '3', '2', '1');
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basAreas#btn-delete', N'鍒犻櫎', '', '3', '3', '1');
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basAreas#btn-export', N'瀵煎嚭', '', '3', '4', '1');
diff --git a/src/main/java/basContainer.sql b/src/main/java/basContainer.sql
new file mode 100644
index 0000000..e1cd330
--- /dev/null
+++ b/src/main/java/basContainer.sql
@@ -0,0 +1,18 @@
+-- save basContainer record
+-- mysql
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'basContainer/basContainer.html', 'basContainer绠＄悊', null , '2', null , '1');
+
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'basContainer#view', '鏌ヨ', '', '3', '0', '1');
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'basContainer#btn-add', '鏂板', '', '3', '1', '1');
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'basContainer#btn-edit', '缂栬緫', '', '3', '2', '1');
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'basContainer#btn-delete', '鍒犻櫎', '', '3', '3', '1');
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'basContainer#btn-export', '瀵煎嚭', '', '3', '4', '1');
+
+-- sqlserver
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basContainer/basContainer.html', N'basContainer绠＄悊', null, '2', null, '1');
+
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basContainer#view', N'鏌ヨ', '90623', '3', '0', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basContainer#btn-add', N'鏂板', '90623', '3', '1', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basContainer#btn-edit', N'缂栬緫', '90623', '3', '2', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basContainer#btn-delete', N'鍒犻櫎', '90623', '3', '3', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basContainer#btn-export', N'瀵煎嚭', '90623', '3', '4', '1');
diff --git a/src/main/java/com/zy/asrs/controller/AutoMoveController.java b/src/main/java/com/zy/asrs/controller/AutoMoveController.java
deleted file mode 100644
index 1a9b6f7..0000000
--- a/src/main/java/com/zy/asrs/controller/AutoMoveController.java
+++ /dev/null
@@ -1,125 +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.AutoMove;
-import com.zy.asrs.service.AutoMoveService;
-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 AutoMoveController extends BaseController {
-
- @Autowired
- private AutoMoveService autoMoveService;
-
- @RequestMapping(value = "/autoMove/{id}/auth")
- @ManagerAuth
- public R get(@PathVariable("id") String id) {
- return R.ok(autoMoveService.selectById(String.valueOf(id)));
- }
-
- @RequestMapping(value = "/autoMove/list/auth")
- @ManagerAuth
- public R list(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam(required = false)String orderByField,
- @RequestParam(required = false)String orderByType,
- @RequestParam(required = false)String condition,
- @RequestParam Map<String, Object> param){
- EntityWrapper<AutoMove> wrapper = new EntityWrapper<>();
- excludeTrash(param);
- convert(param, wrapper);
- allLike(AutoMove.class, param.keySet(), wrapper, condition);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
- return R.ok(autoMoveService.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 = "/autoMove/add/auth")
- @ManagerAuth
- public R add(AutoMove autoMove) {
- autoMoveService.insert(autoMove);
- return R.ok();
- }
-
- @RequestMapping(value = "/autoMove/update/auth")
- @ManagerAuth
- public R update(AutoMove autoMove){
- if (Cools.isEmpty(autoMove) || null==autoMove.getId()){
- return R.error();
- }
- autoMoveService.updateById(autoMove);
- return R.ok();
- }
-
- @RequestMapping(value = "/autoMove/delete/auth")
- @ManagerAuth
- public R delete(@RequestParam(value="ids[]") Long[] ids){
- for (Long id : ids){
- autoMoveService.deleteById(id);
- }
- return R.ok();
- }
-
- @RequestMapping(value = "/autoMove/export/auth")
- @ManagerAuth
- public R export(@RequestBody JSONObject param){
- EntityWrapper<AutoMove> wrapper = new EntityWrapper<>();
- List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
- Map<String, Object> map = excludeTrash(param.getJSONObject("autoMove"));
- convert(map, wrapper);
- List<AutoMove> list = autoMoveService.selectList(wrapper);
- return R.ok(exportSupport(list, fields));
- }
-
- @RequestMapping(value = "/autoMoveQuery/auth")
- @ManagerAuth
- public R query(String condition) {
- EntityWrapper<AutoMove> wrapper = new EntityWrapper<>();
- wrapper.like("id", condition);
- Page<AutoMove> page = autoMoveService.selectPage(new Page<>(0, 10), wrapper);
- List<Map<String, Object>> result = new ArrayList<>();
- for (AutoMove autoMove : page.getRecords()){
- Map<String, Object> map = new HashMap<>();
- map.put("id", autoMove.getId());
- map.put("value", autoMove.getId());
- result.add(map);
- }
- return R.ok(result);
- }
-
- @RequestMapping(value = "/autoMove/check/column/auth")
- @ManagerAuth
- public R query(@RequestBody JSONObject param) {
- Wrapper<AutoMove> wrapper = new EntityWrapper<AutoMove>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
- if (null != autoMoveService.selectOne(wrapper)){
- return R.parse(BaseRes.REPEAT).add(getComment(AutoMove.class, String.valueOf(param.get("key"))));
- }
- return R.ok();
- }
-
-}
diff --git a/src/main/java/com/zy/asrs/controller/BasContainerController.java b/src/main/java/com/zy/asrs/controller/BasContainerController.java
new file mode 100644
index 0000000..74d91ec
--- /dev/null
+++ b/src/main/java/com/zy/asrs/controller/BasContainerController.java
@@ -0,0 +1,136 @@
+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.BasContainer;
+import com.zy.asrs.entity.param.ContainerParams;
+import com.zy.asrs.service.BasContainerService;
+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 BasContainerController extends BaseController {
+
+ @Autowired
+ private BasContainerService basContainerService;
+
+ @RequestMapping(value = "/basContainer/{id}/auth")
+ @ManagerAuth
+ public R get(@PathVariable("id") String id) {
+ return R.ok(basContainerService.selectById(String.valueOf(id)));
+ }
+
+ @RequestMapping(value = "/basContainer/list/auth")
+ @ManagerAuth
+ public R list(@RequestParam(defaultValue = "1")Integer curr,
+ @RequestParam(defaultValue = "10")Integer limit,
+ @RequestParam(required = false)String orderByField,
+ @RequestParam(required = false)String orderByType,
+ @RequestParam(required = false)String condition,
+ @RequestParam Map<String, Object> param){
+ EntityWrapper<BasContainer> wrapper = new EntityWrapper<>();
+ excludeTrash(param);
+ convert(param, wrapper);
+ allLike(BasContainer.class, param.keySet(), wrapper, condition);
+ if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ return R.ok(basContainerService.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 = "/basContainer/add/auth")
+ @ManagerAuth
+ public R add(BasContainer basContainer) {
+ basContainerService.insert(basContainer);
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/basContainer/init/auth")
+ @ManagerAuth
+ public R init(@RequestBody ContainerParams container) {
+ if (Objects.isNull(container)) {
+ throw new RuntimeException("鑳芥暟涓嶈兘涓虹┖锛侊紒");
+ }
+ return basContainerService.init(container);
+ }
+
+
+ @RequestMapping(value = "/basContainer/update/auth")
+ @ManagerAuth
+ public R update(BasContainer basContainer){
+ if (Cools.isEmpty(basContainer) || null==basContainer.getId()){
+ return R.error();
+ }
+ basContainerService.updateById(basContainer);
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/basContainer/delete/auth")
+ @ManagerAuth
+ public R delete(@RequestParam(value="ids[]") Long[] ids){
+ for (Long id : ids){
+ basContainerService.deleteById(id);
+ }
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/basContainer/export/auth")
+ @ManagerAuth
+ public R export(@RequestBody JSONObject param){
+ EntityWrapper<BasContainer> wrapper = new EntityWrapper<>();
+ List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
+ Map<String, Object> map = excludeTrash(param.getJSONObject("basContainer"));
+ convert(map, wrapper);
+ List<BasContainer> list = basContainerService.selectList(wrapper);
+ return R.ok(exportSupport(list, fields));
+ }
+
+ @RequestMapping(value = "/basContainerQuery/auth")
+ @ManagerAuth
+ public R query(String condition) {
+ EntityWrapper<BasContainer> wrapper = new EntityWrapper<>();
+ wrapper.like("_id", condition);
+ Page<BasContainer> page = basContainerService.selectPage(new Page<>(0, 10), wrapper);
+ List<Map<String, Object>> result = new ArrayList<>();
+ for (BasContainer basContainer : page.getRecords()){
+ Map<String, Object> map = new HashMap<>();
+ map.put("id", basContainer.getId());
+ map.put("value", basContainer.getId());
+ result.add(map);
+ }
+ return R.ok(result);
+ }
+
+ @RequestMapping(value = "/basContainer/check/column/auth")
+ @ManagerAuth
+ public R query(@RequestBody JSONObject param) {
+ Wrapper<BasContainer> wrapper = new EntityWrapper<BasContainer>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
+ if (null != basContainerService.selectOne(wrapper)){
+ return R.parse(BaseRes.REPEAT).add(getComment(BasContainer.class, String.valueOf(param.get("key"))));
+ }
+ return R.ok();
+ }
+
+}
diff --git a/src/main/java/com/zy/asrs/controller/BasCrnStatusController.java b/src/main/java/com/zy/asrs/controller/BasCrnStatusController.java
index d1a65dd..f167ccf 100644
--- a/src/main/java/com/zy/asrs/controller/BasCrnStatusController.java
+++ b/src/main/java/com/zy/asrs/controller/BasCrnStatusController.java
@@ -111,7 +111,7 @@
public R query(String condition) {
EntityWrapper<BasCrnStatus> wrapper = new EntityWrapper<>();
wrapper.like("sts_desc", condition);
- Page<BasCrnStatus> page = basCrnStatusService.selectPage(new Page<>(0, 10), wrapper);
+ Page<BasCrnStatus> page = basCrnStatusService.selectPage(new Page<>(0, 100), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
for (BasCrnStatus basCrnStatus : page.getRecords()){
Map<String, Object> map = new HashMap<>();
diff --git a/src/main/java/com/zy/asrs/controller/BasLocStsController.java b/src/main/java/com/zy/asrs/controller/BasLocStsController.java
index 42c0978..e78a215 100644
--- a/src/main/java/com/zy/asrs/controller/BasLocStsController.java
+++ b/src/main/java/com/zy/asrs/controller/BasLocStsController.java
@@ -123,7 +123,7 @@
public R query(String condition) {
EntityWrapper<BasLocSts> wrapper = new EntityWrapper<>();
wrapper.like("loc_desc", condition);
- Page<BasLocSts> page = basLocStsService.selectPage(new Page<>(0, 32), wrapper);
+ Page<BasLocSts> page = basLocStsService.selectPage(new Page<>(0, 100), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
for (BasLocSts basLocSts : page.getRecords()){
Map<String, Object> map = new HashMap<>();
diff --git a/src/main/java/com/zy/asrs/controller/BasStationController.java b/src/main/java/com/zy/asrs/controller/BasStationController.java
index da29fd5..6badd52 100644
--- a/src/main/java/com/zy/asrs/controller/BasStationController.java
+++ b/src/main/java/com/zy/asrs/controller/BasStationController.java
@@ -32,24 +32,26 @@
@RequestMapping(value = "/basStation/list/auth")
@ManagerAuth
- public R list(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam(required = false)String orderByField,
- @RequestParam(required = false)String orderByType,
- @RequestParam(required = false)String condition,
- @RequestParam Map<String, Object> param){
+ public R list(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam(required = false) String orderByField,
+ @RequestParam(required = false) String orderByType,
+ @RequestParam(required = false) String condition,
+ @RequestParam Map<String, Object> param) {
EntityWrapper<BasStation> wrapper = new EntityWrapper<>();
excludeTrash(param);
convert(param, wrapper);
allLike(BasStation.class, param.keySet(), wrapper, condition);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ if (!Cools.isEmpty(orderByField)) {
+ wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
+ }
return R.ok(basStationService.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()){
+ 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)){
+ 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]));
@@ -62,14 +64,18 @@
@RequestMapping(value = "/basStation/add/auth")
@ManagerAuth
public R add(BasStation basStation) {
+ basStation.setAppeUser(getUserId());
+ basStation.setModiUser(getUserId());
+ basStation.setIoTime(new Date());
+ basStation.setId(null);
basStationService.insert(basStation);
return R.ok();
}
- @RequestMapping(value = "/basStation/update/auth")
- @ManagerAuth
- public R update(BasStation basStation){
- if (Cools.isEmpty(basStation) || null==basStation.getId()){
+ @RequestMapping(value = "/basStation/update/auth")
+ @ManagerAuth
+ public R update(BasStation basStation) {
+ if (Cools.isEmpty(basStation) || null == basStation.getId()) {
return R.error();
}
basStationService.updateById(basStation);
@@ -78,8 +84,8 @@
@RequestMapping(value = "/basStation/delete/auth")
@ManagerAuth
- public R delete(@RequestParam(value="ids[]") Long[] ids){
- for (Long id : ids){
+ public R delete(@RequestParam(value = "ids[]") Long[] ids) {
+ for (Long id : ids) {
basStationService.deleteById(id);
}
return R.ok();
@@ -87,7 +93,7 @@
@RequestMapping(value = "/basStation/export/auth")
@ManagerAuth
- public R export(@RequestBody JSONObject param){
+ public R export(@RequestBody JSONObject param) {
EntityWrapper<BasStation> wrapper = new EntityWrapper<>();
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
Map<String, Object> map = excludeTrash(param.getJSONObject("basStation"));
@@ -103,7 +109,7 @@
wrapper.like("dev_no", condition);
Page<BasStation> page = basStationService.selectPage(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
- for (BasStation basStation : page.getRecords()){
+ for (BasStation basStation : page.getRecords()) {
Map<String, Object> map = new HashMap<>();
map.put("id", basStation.getId());
map.put("value", basStation.getId());
@@ -116,7 +122,7 @@
@ManagerAuth
public R query(@RequestBody JSONObject param) {
Wrapper<BasStation> wrapper = new EntityWrapper<BasStation>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
- if (null != basStationService.selectOne(wrapper)){
+ if (null != basStationService.selectOne(wrapper)) {
return R.parse(BaseRes.REPEAT).add(getComment(BasStation.class, String.valueOf(param.get("key"))));
}
return R.ok();
diff --git a/src/main/java/com/zy/asrs/controller/BasWrkIotypeController.java b/src/main/java/com/zy/asrs/controller/BasWrkIotypeController.java
index 2232210..9da0854 100644
--- a/src/main/java/com/zy/asrs/controller/BasWrkIotypeController.java
+++ b/src/main/java/com/zy/asrs/controller/BasWrkIotypeController.java
@@ -123,7 +123,7 @@
public R query(String condition) {
EntityWrapper<BasWrkIotype> wrapper = new EntityWrapper<>();
wrapper.like("io_desc", condition);
- Page<BasWrkIotype> page = basWrkIotypeService.selectPage(new Page<>(0, 20), wrapper);
+ Page<BasWrkIotype> page = basWrkIotypeService.selectPage(new Page<>(0, 100), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
for (BasWrkIotype basWrkIotype : page.getRecords()){
Map<String, Object> map = new HashMap<>();
diff --git a/src/main/java/com/zy/asrs/controller/BasWrkStatusController.java b/src/main/java/com/zy/asrs/controller/BasWrkStatusController.java
index ad1eff4..fd70009 100644
--- a/src/main/java/com/zy/asrs/controller/BasWrkStatusController.java
+++ b/src/main/java/com/zy/asrs/controller/BasWrkStatusController.java
@@ -123,7 +123,7 @@
public R query(String condition) {
EntityWrapper<BasWrkStatus> wrapper = new EntityWrapper<>();
wrapper.like("wrk_desc", condition);
- Page<BasWrkStatus> page = basWrkStatusService.selectPage(new Page<>(0, 20), wrapper);
+ Page<BasWrkStatus> page = basWrkStatusService.selectPage(new Page<>(0, 100), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
for (BasWrkStatus basWrkStatus : page.getRecords()){
Map<String, Object> map = new HashMap<>();
diff --git a/src/main/java/com/zy/asrs/controller/MatController.java b/src/main/java/com/zy/asrs/controller/MatController.java
index 53e9135..04785d0 100644
--- a/src/main/java/com/zy/asrs/controller/MatController.java
+++ b/src/main/java/com/zy/asrs/controller/MatController.java
@@ -13,6 +13,7 @@
import com.zy.asrs.entity.Mat;
import com.zy.asrs.entity.MatPrint;
import com.zy.asrs.entity.OrderDetl;
+import com.zy.asrs.entity.param.BatchMatsUpdateParam;
import com.zy.asrs.entity.param.EmptyPlateOutParam;
import com.zy.asrs.entity.result.KeyValueVo;
import com.zy.asrs.service.MatService;
@@ -44,13 +45,13 @@
private SnowflakeIdWorker snowflakeIdWorker;
@RequestMapping(value = "/mat/auto/matnr/auth")
- public R autoMatnr(){
+ public R autoMatnr() {
return R.ok().add("YJ" + DateUtils.convert(new Date(), DateUtils.yyyyMMddHHmmsssss).substring(0, 16));
}
@RequestMapping(value = "/mat/list/pda/auth")
@ManagerAuth
- public R pdaList(@RequestParam(required = true)Long tagId){
+ public R pdaList(@RequestParam(required = true) Long tagId) {
EntityWrapper<Mat> wrapper = new EntityWrapper<>();
wrapper.eq("tag_id", tagId);
wrapper.orderBy("create_time", false);
@@ -60,7 +61,7 @@
@RequestMapping(value = "/mat/search/pda/auth")
@ManagerAuth
- public R pdaSearch(@RequestParam(required = false)String condition){
+ public R pdaSearch(@RequestParam(required = false) String condition) {
EntityWrapper<Mat> wrapper = new EntityWrapper<>();
if (!Cools.isEmpty(condition)) {
// wrapper.like("matnr", condition).or().like("maktx", condition);
@@ -85,11 +86,11 @@
@RequestMapping(value = "/mat/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){
+ 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) {
Object tagId = param.get("tag_id");
if (Cools.isEmpty(tagId)) {
tagId = getOriginTag().getId();
@@ -103,10 +104,10 @@
}
- private void convert(Map<String, Object> map, EntityWrapper wrapper){
- for (Map.Entry<String, Object> entry : map.entrySet()){
+ private void convert(Map<String, Object> map, EntityWrapper wrapper) {
+ for (Map.Entry<String, Object> entry : map.entrySet()) {
String val = String.valueOf(entry.getValue());
- if (val.contains(RANGE_TIME_LINK)){
+ 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]));
@@ -127,6 +128,7 @@
mat.setCreateTime(now);
mat.setUpdateBy(getUserId());
mat.setUpdateTime(now);
+ mat.setLocType(mat.getTagId());
mat.setStatus(1);
if (!matService.insert(mat)) {
throw new CoolException("娣诲姞澶辫触锛岃鑱旂郴绠＄悊鍛�");
@@ -134,26 +136,34 @@
return R.ok();
}
- @RequestMapping(value = "/mat/update/auth")
- @ManagerAuth
- public R update(Mat mat){
- if (Cools.isEmpty(mat) || null==mat.getId()){
+ @RequestMapping(value = "/mat/update/auth")
+ @ManagerAuth
+ public R update(Mat mat) {
+ if (Cools.isEmpty(mat) || null == mat.getId()) {
return R.error();
}
mat.setUpdateBy(getUserId());
+ mat.setLocType(mat.getTagId());
mat.setUpdateTime(new Date());
matService.updateById(mat);
return R.ok();
}
+ @PostMapping("mat/batch/auth")
+ @ManagerAuth
+ public R batchUpdate(@RequestBody BatchMatsUpdateParam params) {
+
+ return matService.batchInfo(params);
+ }
+
@RequestMapping(value = "/mat/delete/auth")
@ManagerAuth
- public R delete(@RequestParam String param){
+ public R delete(@RequestParam String param) {
List<Mat> list = JSONArray.parseArray(param, Mat.class);
- if (Cools.isEmpty(list)){
+ if (Cools.isEmpty(list)) {
return R.error();
}
- for (Mat entity : list){
+ for (Mat entity : list) {
if (!matService.delete(new EntityWrapper<>(entity))) {
throw new CoolException("鍒犻櫎澶辫触锛岃鑱旂郴绠＄悊鍛�");
}
@@ -163,15 +173,15 @@
@RequestMapping(value = "/mat/turn/over/list/auth")
@ManagerAuth
- public R turnOverList(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam Map<String, Object> param){
+ public R turnOverList(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam Map<String, Object> param) {
return R.ok(matService.getMatTurnPage(toPage(curr, limit, param, Mat.class)));
}
@RequestMapping("/mat/turn/over/take/site")
@ManagerAuth()
- public R availableTakeSite(@RequestParam(required = false) String matnr){
+ public R availableTakeSite(@RequestParam(required = false) String matnr) {
List<Map<String, Object>> result = new ArrayList<>();
List<Mat> mats = matService.selectByMatnrLink(matnr);
for (Mat mat : mats) {
@@ -185,7 +195,7 @@
@RequestMapping(value = "/mat/export/auth")
@ManagerAuth
- public R export(@RequestBody JSONObject param){
+ public R export(@RequestBody JSONObject param) {
EntityWrapper<Mat> wrapper = new EntityWrapper<>();
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
Map<String, Object> map = excludeTrash(param.getJSONObject("mat"));
@@ -201,7 +211,7 @@
wrapper.like("matnr", condition).or().like("maktx", condition);
Page<Mat> page = matService.selectPage(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
- for (Mat mat : page.getRecords()){
+ for (Mat mat : page.getRecords()) {
Map<String, Object> map = new HashMap<>();
map.put("id", mat.getId());
map.put("value", mat.getMatnr() + "(" + mat.getMaktx() + ")");
@@ -214,7 +224,7 @@
@ManagerAuth
public R query(@RequestBody JSONObject param) {
Wrapper<Mat> wrapper = new EntityWrapper<Mat>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
- if (null != matService.selectOne(wrapper)){
+ if (null != matService.selectOne(wrapper)) {
return R.parse(BaseRes.REPEAT).add(getComment(Mat.class, String.valueOf(param.get("key"))));
}
return R.ok();
@@ -241,7 +251,7 @@
, @RequestParam String param
, HttpServletResponse response) throws Exception {
AdminInterceptor.cors(response);
- if (Cools.isEmpty(param)){
+ if (Cools.isEmpty(param)) {
return R.parse(BaseRes.EMPTY);
}
BufferedImage img;
@@ -262,11 +272,11 @@
@RequestMapping(value = "/mat/print/auth")
@ManagerAuth(memo = "鍟嗗搧缂栫爜鎵撳嵃")
public R matCodePrint(@RequestParam(value = "param[]") String[] param) {
- if(Cools.isEmpty(param)) {
+ if (Cools.isEmpty(param)) {
return R.parse(CodeRes.EMPTY);
}
List<MatPrint> res = new ArrayList<>();
- for (String matnr : param){
+ for (String matnr : param) {
Mat mat = matService.selectByMatnr(matnr);
// 鎵撳嵃鏁版嵁娉ㄥ叆
MatPrint print = new MatPrint();
@@ -307,7 +317,7 @@
public R matExcelImport(MultipartFile file) throws IOException {
MatExcelListener listener = new MatExcelListener(getUserId());
EasyExcel.read(file.getInputStream(), MatExcel.class, listener).sheet().doRead();
- return R.ok("鎴愬姛鍚屾"+listener.getTotal()+"鏉″晢鍝佹暟鎹�");
+ return R.ok("鎴愬姛鍚屾" + listener.getTotal() + "鏉″晢鍝佹暟鎹�");
}
/*************************************** xm-select ***********************************************/
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index 50b43af..95e7cda 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -123,6 +123,15 @@
return mobileService.pickMats(matnr, orderNo);
}
+ @PostMapping("/scan/order/mats")
+ @ManagerAuth(memo = "鎵爜鑾峰彇缁勬墭鐗╂枡")
+ public R scanMats(@RequestBody PakinMatsByQRParams params) {
+ if (Objects.isNull(params)) {
+ return R.parse("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ return mobileService.getMatsByQRcode(params);
+ }
+
// 鍟嗗搧涓婃灦
@RequestMapping("/mat/onSale/auth")
@ManagerAuth
@@ -158,6 +167,16 @@
}
+ @PostMapping("/cache/out/call")
+ @ApiOperation("鍛煎彨AGV鎼繍")
+ @ManagerAuth
+ public R OutCallAgv(@RequestBody AgvCallParams params) {
+ if (Objects.isNull(params)) {
+ return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ return mobileService.OutCallAgv(params, getUserId());
+ }
+
// 缁勬墭 ----------------------------------------------------------------------------------------------------
diff --git a/src/main/java/com/zy/asrs/controller/PackController.java b/src/main/java/com/zy/asrs/controller/PackController.java
index 542d0a8..20b7b5a 100644
--- a/src/main/java/com/zy/asrs/controller/PackController.java
+++ b/src/main/java/com/zy/asrs/controller/PackController.java
@@ -83,6 +83,7 @@
}
Mat mat = new Mat();
mat.setTagId(tagService.getTop().getId());
+ mat.setLocType(tagService.getTop().getId());
mat.setMatnr(barcode);
mat.setMaktx(barcode);
mat.setStatus(1);
diff --git a/src/main/java/com/zy/asrs/controller/TaskController.java b/src/main/java/com/zy/asrs/controller/TaskController.java
index ba0b172..b453629 100644
--- a/src/main/java/com/zy/asrs/controller/TaskController.java
+++ b/src/main/java/com/zy/asrs/controller/TaskController.java
@@ -32,24 +32,29 @@
@RequestMapping(value = "/task/list/auth")
@ManagerAuth
- public R list(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam(required = false)String orderByField,
- @RequestParam(required = false)String orderByType,
- @RequestParam(required = false)String condition,
- @RequestParam Map<String, Object> param){
+ public R list(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam(required = false) String orderByField,
+ @RequestParam(required = false) String orderByType,
+ @RequestParam(required = false) String condition,
+ @RequestParam Map<String, Object> param) {
EntityWrapper<Task> wrapper = new EntityWrapper<>();
excludeTrash(param);
convert(param, wrapper);
allLike(Task.class, param.keySet(), wrapper, condition);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ if (!Cools.isEmpty(orderByField)) {
+ wrapper.orderBy(humpToLine(orderByField), "desc".equals(orderByType));
+ }
+ if (Cools.isEmpty(orderByField)) {
+ wrapper.orderDesc(Arrays.asList("wrk_no"));
+ }
return R.ok(taskService.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()){
+ 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)){
+ 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]));
@@ -66,10 +71,10 @@
return R.ok();
}
- @RequestMapping(value = "/task/update/auth")
- @ManagerAuth
- public R update(Task task){
- if (Cools.isEmpty(task) || null==task.getId()){
+ @RequestMapping(value = "/task/update/auth")
+ @ManagerAuth
+ public R update(Task task) {
+ if (Cools.isEmpty(task) || null == task.getId()) {
return R.error();
}
taskService.updateById(task);
@@ -78,16 +83,35 @@
@RequestMapping(value = "/task/delete/auth")
@ManagerAuth
- public R delete(@RequestParam(value="ids[]") Long[] ids){
- for (Long id : ids){
+ public R delete(@RequestParam(value = "ids[]") Long[] ids) {
+ for (Long id : ids) {
taskService.deleteById(id);
}
return R.ok();
}
+
+ @RequestMapping("/task/control")
+ @ManagerAuth(memo = "鎵嬪姩澶勭悊宸ヤ綔妗�")
+ public R handControlWrkMast(@RequestParam String workNo,
+ @RequestParam Integer type) {
+ if (type == 1) {
+ taskService.completeWrkMast(workNo, getUserId());
+ return R.ok("宸ヤ綔妗ｅ凡瀹屾垚");
+ } else if (type == 2) {
+ taskService.cancelWrkMast(workNo, getUserId());
+ return R.ok("宸ヤ綔妗ｅ凡鍙栨秷");
+ } else if (type == 3) {
+ taskService.pickWrkMast(workNo, getUserId());
+ return R.ok("宸ヤ綔妗ｅ凡鎷ｆ枡");
+ }
+ return R.ok();
+ }
+
+
@RequestMapping(value = "/task/export/auth")
@ManagerAuth
- public R export(@RequestBody JSONObject param){
+ public R export(@RequestBody JSONObject param) {
EntityWrapper<Task> wrapper = new EntityWrapper<>();
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
Map<String, Object> map = excludeTrash(param.getJSONObject("task"));
@@ -103,7 +127,7 @@
wrapper.like("id", condition);
Page<Task> page = taskService.selectPage(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
- for (Task task : page.getRecords()){
+ for (Task task : page.getRecords()) {
Map<String, Object> map = new HashMap<>();
map.put("id", task.getId());
map.put("value", task.getId());
@@ -116,7 +140,7 @@
@ManagerAuth
public R query(@RequestBody JSONObject param) {
Wrapper<Task> wrapper = new EntityWrapper<Task>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
- if (null != taskService.selectOne(wrapper)){
+ if (null != taskService.selectOne(wrapper)) {
return R.parse(BaseRes.REPEAT).add(getComment(Task.class, String.valueOf(param.get("key"))));
}
return R.ok();
diff --git a/src/main/java/com/zy/asrs/controller/WrkMastExecuteController.java b/src/main/java/com/zy/asrs/controller/WrkMastExecuteController.java
deleted file mode 100644
index 5b15e25..0000000
--- a/src/main/java/com/zy/asrs/controller/WrkMastExecuteController.java
+++ /dev/null
@@ -1,125 +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.WrkMastExecute;
-import com.zy.asrs.service.WrkMastExecuteService;
-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 WrkMastExecuteController extends BaseController {
-
- @Autowired
- private WrkMastExecuteService wrkMastExecuteService;
-
- @RequestMapping(value = "/wrkMastExecute/{id}/auth")
- @ManagerAuth
- public R get(@PathVariable("id") String id) {
- return R.ok(wrkMastExecuteService.selectById(String.valueOf(id)));
- }
-
- @RequestMapping(value = "/wrkMastExecute/list/auth")
- @ManagerAuth
- public R list(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam(required = false)String orderByField,
- @RequestParam(required = false)String orderByType,
- @RequestParam(required = false)String condition,
- @RequestParam Map<String, Object> param){
- EntityWrapper<WrkMastExecute> wrapper = new EntityWrapper<>();
- excludeTrash(param);
- convert(param, wrapper);
- allLike(WrkMastExecute.class, param.keySet(), wrapper, condition);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
- return R.ok(wrkMastExecuteService.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 = "/wrkMastExecute/add/auth")
- @ManagerAuth
- public R add(WrkMastExecute wrkMastExecute) {
- wrkMastExecuteService.insert(wrkMastExecute);
- return R.ok();
- }
-
- @RequestMapping(value = "/wrkMastExecute/update/auth")
- @ManagerAuth
- public R update(WrkMastExecute wrkMastExecute){
- if (Cools.isEmpty(wrkMastExecute) || null==wrkMastExecute.getWrkNo()){
- return R.error();
- }
- wrkMastExecuteService.updateById(wrkMastExecute);
- return R.ok();
- }
-
- @RequestMapping(value = "/wrkMastExecute/delete/auth")
- @ManagerAuth
- public R delete(@RequestParam(value="ids[]") Long[] ids){
- for (Long id : ids){
- wrkMastExecuteService.deleteById(id);
- }
- return R.ok();
- }
-
- @RequestMapping(value = "/wrkMastExecute/export/auth")
- @ManagerAuth
- public R export(@RequestBody JSONObject param){
- EntityWrapper<WrkMastExecute> wrapper = new EntityWrapper<>();
- List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
- Map<String, Object> map = excludeTrash(param.getJSONObject("wrkMastExecute"));
- convert(map, wrapper);
- List<WrkMastExecute> list = wrkMastExecuteService.selectList(wrapper);
- return R.ok(exportSupport(list, fields));
- }
-
- @RequestMapping(value = "/wrkMastExecuteQuery/auth")
- @ManagerAuth
- public R query(String condition) {
- EntityWrapper<WrkMastExecute> wrapper = new EntityWrapper<>();
- wrapper.like("id", condition);
- Page<WrkMastExecute> page = wrkMastExecuteService.selectPage(new Page<>(0, 10), wrapper);
- List<Map<String, Object>> result = new ArrayList<>();
- for (WrkMastExecute wrkMastExecute : page.getRecords()){
- Map<String, Object> map = new HashMap<>();
- map.put("id", wrkMastExecute.getWrkNo());
- map.put("value", wrkMastExecute.getWrkNo());
- result.add(map);
- }
- return R.ok(result);
- }
-
- @RequestMapping(value = "/wrkMastExecute/check/column/auth")
- @ManagerAuth
- public R query(@RequestBody JSONObject param) {
- Wrapper<WrkMastExecute> wrapper = new EntityWrapper<WrkMastExecute>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
- if (null != wrkMastExecuteService.selectOne(wrapper)){
- return R.parse(BaseRes.REPEAT).add(getComment(WrkMastExecute.class, String.valueOf(param.get("key"))));
- }
- return R.ok();
- }
-
-}
diff --git a/src/main/java/com/zy/asrs/controller/WrkMastExecuteLogController.java b/src/main/java/com/zy/asrs/controller/WrkMastExecuteLogController.java
deleted file mode 100644
index cbaa129..0000000
--- a/src/main/java/com/zy/asrs/controller/WrkMastExecuteLogController.java
+++ /dev/null
@@ -1,125 +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.WrkMastExecuteLog;
-import com.zy.asrs.service.WrkMastExecuteLogService;
-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 WrkMastExecuteLogController extends BaseController {
-
- @Autowired
- private WrkMastExecuteLogService wrkMastExecuteLogService;
-
- @RequestMapping(value = "/wrkMastExecuteLog/{id}/auth")
- @ManagerAuth
- public R get(@PathVariable("id") String id) {
- return R.ok(wrkMastExecuteLogService.selectById(String.valueOf(id)));
- }
-
- @RequestMapping(value = "/wrkMastExecuteLog/list/auth")
- @ManagerAuth
- public R list(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam(required = false)String orderByField,
- @RequestParam(required = false)String orderByType,
- @RequestParam(required = false)String condition,
- @RequestParam Map<String, Object> param){
- EntityWrapper<WrkMastExecuteLog> wrapper = new EntityWrapper<>();
- excludeTrash(param);
- convert(param, wrapper);
- allLike(WrkMastExecuteLog.class, param.keySet(), wrapper, condition);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
- return R.ok(wrkMastExecuteLogService.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 = "/wrkMastExecuteLog/add/auth")
- @ManagerAuth
- public R add(WrkMastExecuteLog wrkMastExecuteLog) {
- wrkMastExecuteLogService.insert(wrkMastExecuteLog);
- return R.ok();
- }
-
- @RequestMapping(value = "/wrkMastExecuteLog/update/auth")
- @ManagerAuth
- public R update(WrkMastExecuteLog wrkMastExecuteLog){
- if (Cools.isEmpty(wrkMastExecuteLog) || null==wrkMastExecuteLog.getWrkNo()){
- return R.error();
- }
- wrkMastExecuteLogService.updateById(wrkMastExecuteLog);
- return R.ok();
- }
-
- @RequestMapping(value = "/wrkMastExecuteLog/delete/auth")
- @ManagerAuth
- public R delete(@RequestParam(value="ids[]") Long[] ids){
- for (Long id : ids){
- wrkMastExecuteLogService.deleteById(id);
- }
- return R.ok();
- }
-
- @RequestMapping(value = "/wrkMastExecuteLog/export/auth")
- @ManagerAuth
- public R export(@RequestBody JSONObject param){
- EntityWrapper<WrkMastExecuteLog> wrapper = new EntityWrapper<>();
- List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
- Map<String, Object> map = excludeTrash(param.getJSONObject("wrkMastExecuteLog"));
- convert(map, wrapper);
- List<WrkMastExecuteLog> list = wrkMastExecuteLogService.selectList(wrapper);
- return R.ok(exportSupport(list, fields));
- }
-
- @RequestMapping(value = "/wrkMastExecuteLogQuery/auth")
- @ManagerAuth
- public R query(String condition) {
- EntityWrapper<WrkMastExecuteLog> wrapper = new EntityWrapper<>();
- wrapper.like("id", condition);
- Page<WrkMastExecuteLog> page = wrkMastExecuteLogService.selectPage(new Page<>(0, 10), wrapper);
- List<Map<String, Object>> result = new ArrayList<>();
- for (WrkMastExecuteLog wrkMastExecuteLog : page.getRecords()){
- Map<String, Object> map = new HashMap<>();
- map.put("id", wrkMastExecuteLog.getWrkNo());
- map.put("value", wrkMastExecuteLog.getWrkNo());
- result.add(map);
- }
- return R.ok(result);
- }
-
- @RequestMapping(value = "/wrkMastExecuteLog/check/column/auth")
- @ManagerAuth
- public R query(@RequestBody JSONObject param) {
- Wrapper<WrkMastExecuteLog> wrapper = new EntityWrapper<WrkMastExecuteLog>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
- if (null != wrkMastExecuteLogService.selectOne(wrapper)){
- return R.parse(BaseRes.REPEAT).add(getComment(WrkMastExecuteLog.class, String.valueOf(param.get("key"))));
- }
- return R.ok();
- }
-
-}
diff --git a/src/main/java/com/zy/asrs/controller/WrkMastFourWarVehicleController.java b/src/main/java/com/zy/asrs/controller/WrkMastFourWarVehicleController.java
deleted file mode 100644
index e4a946c..0000000
--- a/src/main/java/com/zy/asrs/controller/WrkMastFourWarVehicleController.java
+++ /dev/null
@@ -1,125 +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.WrkMastFourWarVehicle;
-import com.zy.asrs.service.WrkMastFourWarVehicleService;
-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 WrkMastFourWarVehicleController extends BaseController {
-
- @Autowired
- private WrkMastFourWarVehicleService wrkMastFourWarVehicleService;
-
- @RequestMapping(value = "/wrkMastFourWarVehicle/{id}/auth")
- @ManagerAuth
- public R get(@PathVariable("id") String id) {
- return R.ok(wrkMastFourWarVehicleService.selectById(String.valueOf(id)));
- }
-
- @RequestMapping(value = "/wrkMastFourWarVehicle/list/auth")
- @ManagerAuth
- public R list(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam(required = false)String orderByField,
- @RequestParam(required = false)String orderByType,
- @RequestParam(required = false)String condition,
- @RequestParam Map<String, Object> param){
- EntityWrapper<WrkMastFourWarVehicle> wrapper = new EntityWrapper<>();
- excludeTrash(param);
- convert(param, wrapper);
- allLike(WrkMastFourWarVehicle.class, param.keySet(), wrapper, condition);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
- return R.ok(wrkMastFourWarVehicleService.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 = "/wrkMastFourWarVehicle/add/auth")
- @ManagerAuth
- public R add(WrkMastFourWarVehicle wrkMastFourWarVehicle) {
- wrkMastFourWarVehicleService.insert(wrkMastFourWarVehicle);
- return R.ok();
- }
-
- @RequestMapping(value = "/wrkMastFourWarVehicle/update/auth")
- @ManagerAuth
- public R update(WrkMastFourWarVehicle wrkMastFourWarVehicle){
- if (Cools.isEmpty(wrkMastFourWarVehicle) || null==wrkMastFourWarVehicle.getId()){
- return R.error();
- }
- wrkMastFourWarVehicleService.updateById(wrkMastFourWarVehicle);
- return R.ok();
- }
-
- @RequestMapping(value = "/wrkMastFourWarVehicle/delete/auth")
- @ManagerAuth
- public R delete(@RequestParam(value="ids[]") Long[] ids){
- for (Long id : ids){
- wrkMastFourWarVehicleService.deleteById(id);
- }
- return R.ok();
- }
-
- @RequestMapping(value = "/wrkMastFourWarVehicle/export/auth")
- @ManagerAuth
- public R export(@RequestBody JSONObject param){
- EntityWrapper<WrkMastFourWarVehicle> wrapper = new EntityWrapper<>();
- List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
- Map<String, Object> map = excludeTrash(param.getJSONObject("wrkMastFourWarVehicle"));
- convert(map, wrapper);
- List<WrkMastFourWarVehicle> list = wrkMastFourWarVehicleService.selectList(wrapper);
- return R.ok(exportSupport(list, fields));
- }
-
- @RequestMapping(value = "/wrkMastFourWarVehicleQuery/auth")
- @ManagerAuth
- public R query(String condition) {
- EntityWrapper<WrkMastFourWarVehicle> wrapper = new EntityWrapper<>();
- wrapper.like("id", condition);
- Page<WrkMastFourWarVehicle> page = wrkMastFourWarVehicleService.selectPage(new Page<>(0, 10), wrapper);
- List<Map<String, Object>> result = new ArrayList<>();
- for (WrkMastFourWarVehicle wrkMastFourWarVehicle : page.getRecords()){
- Map<String, Object> map = new HashMap<>();
- map.put("id", wrkMastFourWarVehicle.getId());
- map.put("value", wrkMastFourWarVehicle.getId());
- result.add(map);
- }
- return R.ok(result);
- }
-
- @RequestMapping(value = "/wrkMastFourWarVehicle/check/column/auth")
- @ManagerAuth
- public R query(@RequestBody JSONObject param) {
- Wrapper<WrkMastFourWarVehicle> wrapper = new EntityWrapper<WrkMastFourWarVehicle>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
- if (null != wrkMastFourWarVehicleService.selectOne(wrapper)){
- return R.parse(BaseRes.REPEAT).add(getComment(WrkMastFourWarVehicle.class, String.valueOf(param.get("key"))));
- }
- return R.ok();
- }
-
-}
diff --git a/src/main/java/com/zy/asrs/controller/WrkMastFourWarVehicleLogController.java b/src/main/java/com/zy/asrs/controller/WrkMastFourWarVehicleLogController.java
deleted file mode 100644
index 739e028..0000000
--- a/src/main/java/com/zy/asrs/controller/WrkMastFourWarVehicleLogController.java
+++ /dev/null
@@ -1,125 +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.WrkMastFourWarVehicleLog;
-import com.zy.asrs.service.WrkMastFourWarVehicleLogService;
-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 WrkMastFourWarVehicleLogController extends BaseController {
-
- @Autowired
- private WrkMastFourWarVehicleLogService wrkMastFourWarVehicleLogService;
-
- @RequestMapping(value = "/wrkMastFourWarVehicleLog/{id}/auth")
- @ManagerAuth
- public R get(@PathVariable("id") String id) {
- return R.ok(wrkMastFourWarVehicleLogService.selectById(String.valueOf(id)));
- }
-
- @RequestMapping(value = "/wrkMastFourWarVehicleLog/list/auth")
- @ManagerAuth
- public R list(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam(required = false)String orderByField,
- @RequestParam(required = false)String orderByType,
- @RequestParam(required = false)String condition,
- @RequestParam Map<String, Object> param){
- EntityWrapper<WrkMastFourWarVehicleLog> wrapper = new EntityWrapper<>();
- excludeTrash(param);
- convert(param, wrapper);
- allLike(WrkMastFourWarVehicleLog.class, param.keySet(), wrapper, condition);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
- return R.ok(wrkMastFourWarVehicleLogService.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 = "/wrkMastFourWarVehicleLog/add/auth")
- @ManagerAuth
- public R add(WrkMastFourWarVehicleLog wrkMastFourWarVehicleLog) {
- wrkMastFourWarVehicleLogService.insert(wrkMastFourWarVehicleLog);
- return R.ok();
- }
-
- @RequestMapping(value = "/wrkMastFourWarVehicleLog/update/auth")
- @ManagerAuth
- public R update(WrkMastFourWarVehicleLog wrkMastFourWarVehicleLog){
- if (Cools.isEmpty(wrkMastFourWarVehicleLog) || null==wrkMastFourWarVehicleLog.getId()){
- return R.error();
- }
- wrkMastFourWarVehicleLogService.updateById(wrkMastFourWarVehicleLog);
- return R.ok();
- }
-
- @RequestMapping(value = "/wrkMastFourWarVehicleLog/delete/auth")
- @ManagerAuth
- public R delete(@RequestParam(value="ids[]") Long[] ids){
- for (Long id : ids){
- wrkMastFourWarVehicleLogService.deleteById(id);
- }
- return R.ok();
- }
-
- @RequestMapping(value = "/wrkMastFourWarVehicleLog/export/auth")
- @ManagerAuth
- public R export(@RequestBody JSONObject param){
- EntityWrapper<WrkMastFourWarVehicleLog> wrapper = new EntityWrapper<>();
- List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
- Map<String, Object> map = excludeTrash(param.getJSONObject("wrkMastFourWarVehicleLog"));
- convert(map, wrapper);
- List<WrkMastFourWarVehicleLog> list = wrkMastFourWarVehicleLogService.selectList(wrapper);
- return R.ok(exportSupport(list, fields));
- }
-
- @RequestMapping(value = "/wrkMastFourWarVehicleLogQuery/auth")
- @ManagerAuth
- public R query(String condition) {
- EntityWrapper<WrkMastFourWarVehicleLog> wrapper = new EntityWrapper<>();
- wrapper.like("id", condition);
- Page<WrkMastFourWarVehicleLog> page = wrkMastFourWarVehicleLogService.selectPage(new Page<>(0, 10), wrapper);
- List<Map<String, Object>> result = new ArrayList<>();
- for (WrkMastFourWarVehicleLog wrkMastFourWarVehicleLog : page.getRecords()){
- Map<String, Object> map = new HashMap<>();
- map.put("id", wrkMastFourWarVehicleLog.getId());
- map.put("value", wrkMastFourWarVehicleLog.getId());
- result.add(map);
- }
- return R.ok(result);
- }
-
- @RequestMapping(value = "/wrkMastFourWarVehicleLog/check/column/auth")
- @ManagerAuth
- public R query(@RequestBody JSONObject param) {
- Wrapper<WrkMastFourWarVehicleLog> wrapper = new EntityWrapper<WrkMastFourWarVehicleLog>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
- if (null != wrkMastFourWarVehicleLogService.selectOne(wrapper)){
- return R.parse(BaseRes.REPEAT).add(getComment(WrkMastFourWarVehicleLog.class, String.valueOf(param.get("key"))));
- }
- return R.ok();
- }
-
-}
diff --git a/src/main/java/com/zy/asrs/entity/AutoMove.java b/src/main/java/com/zy/asrs/entity/AutoMove.java
deleted file mode 100644
index bd8efbb..0000000
--- a/src/main/java/com/zy/asrs/entity/AutoMove.java
+++ /dev/null
@@ -1,116 +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 org.springframework.format.annotation.DateTimeFormat;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import com.baomidou.mybatisplus.annotations.TableName;
-import java.io.Serializable;
-
-@Data
-@TableName("man_auto_move")
-public class AutoMove implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * 缂栧彿
- */
- @ApiModelProperty(value= "缂栧彿")
- @TableId(value = "id", type = IdType.AUTO)
- private Long id;
-
- /**
- * 鐘舵�� 1: 姝ｅ父 0: 绂佺敤
- */
- @ApiModelProperty(value= "鐘舵�� 1: 姝ｅ父 0: 绂佺敤 ")
- private Short status;
-
- @ApiModelProperty(value= "")
- @TableField("line_number")
- private Long lineNumber;
-
- @ApiModelProperty(value= "")
- @TableField("loc_no")
- private String locNo;
-
- @ApiModelProperty(value= "")
- @TableField("row_priority")
- private Integer rowPriority;
-
- @ApiModelProperty(value= "")
- @TableField("order_no")
- private String orderNo;
-
- @ApiModelProperty(value= "")
- @TableField("create_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private Date createTime;
-
- @ApiModelProperty(value= "")
- @TableField("update_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private Date updateTime;
-
- @ApiModelProperty(value= "")
- private Integer uuid;
-
- public AutoMove() {}
-
- public AutoMove(Short status,Long lineNumber,String locNo,Integer rowPriority,String orderNo,Date createTime,Date updateTime,Integer uuid) {
- this.status = status;
- this.lineNumber = lineNumber;
- this.locNo = locNo;
- this.rowPriority = rowPriority;
- this.orderNo = orderNo;
- this.createTime = createTime;
- this.updateTime = updateTime;
- this.uuid = uuid;
- }
-
-// AutoMove autoMove = new AutoMove(
-// null, // 鐘舵��
-// null, //
-// null, //
-// null, //
-// null, //
-// null, //
-// null, //
-// null //
-// );
-
- public String getStatus$(){
- if (null == this.status){ return null; }
- switch (this.status){
- case 1:
- return "姝ｅ父";
- case 0:
- return "绂佺敤";
- default:
- return String.valueOf(this.status);
- }
- }
-
- public String getCreateTime$(){
- if (Cools.isEmpty(this.createTime)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
- }
-
- public String getUpdateTime$(){
- if (Cools.isEmpty(this.updateTime)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
- }
-
-
-}
diff --git a/src/main/java/com/zy/asrs/entity/BasContainer.java b/src/main/java/com/zy/asrs/entity/BasContainer.java
new file mode 100644
index 0000000..71aa45d
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/BasContainer.java
@@ -0,0 +1,90 @@
+package com.zy.asrs.entity;
+
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.core.common.Cools;import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.enums.IdType;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.zy.asrs.enums.CommonEnum;
+import com.zy.asrs.enums.ContainerType;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import com.baomidou.mybatisplus.annotations.TableName;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+@Accessors(chain = true)
+@TableName("asr_bas_container")
+public class BasContainer implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+ /**
+ * 涓婚敭
+ */
+ @ApiModelProperty(value= "涓婚敭")
+ @TableId(value = "id", type = IdType.AUTO)
+ private Long id;
+ /**
+ * 瀹瑰櫒缂栫爜
+ */
+ @ApiModelProperty(value= "瀹瑰櫒缂栫爜")
+ private String barcode;
+
+ @ApiModelProperty("瀹瑰櫒绫诲瀷")
+ private Long type;
+
+ @ApiModelProperty("鏄惁娣锋斁")
+ @TableField("flag_mix")
+ private Integer flagMix;
+
+ @ApiModelProperty("鏈�澶ф贩鏀剧绫�")
+ private Integer mixMax;
+
+ @ApiModelProperty("鍒涘缓鏃堕棿")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date createTime;
+
+ @ApiModelProperty("淇敼鏃堕棿")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date updateTime;
+
+ public BasContainer() {}
+
+ public BasContainer(String barcode) {
+ this.barcode = barcode;
+ }
+
+
+ public String getType$() {
+ if (Cools.isEmpty(type)) {
+ return "鏂欑";
+ }
+ if (type.equals(ContainerType.CONTAINER_TYPE_BOX.type)) {
+ return ContainerType.CONTAINER_TYPE_BOX.desc;
+ } else if (type.equals(ContainerType.CONTAINER_TYPE_SALVER.type)) {
+ return ContainerType.CONTAINER_TYPE_SALVER.desc;
+ } else if (type.equals(ContainerType.CONTAINER_TYPE_CAGE.type)) {
+ return ContainerType.CONTAINER_TYPE_CAGE.desc;
+ }
+ return null;
+ }
+
+ public String getFlagMix$() {
+ if (Cools.isEmpty(flagMix)) {
+ return null;
+ }
+ if (flagMix.equals(CommonEnum.COMMON_ENUM_N.type)) {
+ return CommonEnum.COMMON_ENUM_N.desc;
+ } else if (flagMix.equals(CommonEnum.COMMON_ENUM_Y.type)) {
+ return CommonEnum.COMMON_ENUM_Y.desc;
+ }
+ return null;
+ }
+
+}
diff --git a/src/main/java/com/zy/asrs/entity/BasStation.java b/src/main/java/com/zy/asrs/entity/BasStation.java
index fc6a71e..f2f4b9d 100644
--- a/src/main/java/com/zy/asrs/entity/BasStation.java
+++ b/src/main/java/com/zy/asrs/entity/BasStation.java
@@ -5,6 +5,8 @@
import com.baomidou.mybatisplus.annotations.TableField;
import java.text.SimpleDateFormat;
import java.util.Date;
+
+import com.zy.asrs.enums.LocStsType;
import org.springframework.format.annotation.DateTimeFormat;
import com.core.common.SpringUtils;
import com.zy.system.service.UserService;
@@ -40,7 +42,7 @@
*/
@ApiModelProperty(value= "缂栧彿")
@TableField("dev_no")
- private Integer devNo;
+ private String devNo;
/**
* 璁惧鎻忚堪
@@ -145,6 +147,10 @@
@ApiModelProperty(value= "")
private String area;
+ @ApiModelProperty("搴撳尯ID")
+ @TableField("area_id")
+ private String areaId;
+
@ApiModelProperty(value= "")
@TableField("in_ok")
private String inOk;
@@ -221,7 +227,7 @@
public BasStation() {}
- public BasStation(Integer devNo,String decDesc,String devMk,String inEnable,String outEnable,String autoing,String loading,String locSts,String canining,String canouting,String fronting,String rearing,String uping,String downing,Integer wrkNo,Integer ctnType,String barcode,Integer inQty,Integer row1,Date ioTime,String area,String inOk,String outOk,Short locType1,Short locType2,Short locType3,Long modiUser,Date modiTime,Long appeUser,Date appeTime,Double stdQty,Double minWt,Double grossWt) {
+ public BasStation(String devNo,String decDesc,String devMk,String inEnable,String outEnable,String autoing,String loading,String locSts,String canining,String canouting,String fronting,String rearing,String uping,String downing,Integer wrkNo,Integer ctnType,String barcode,Integer inQty,Integer row1,Date ioTime,String area,String inOk,String outOk,Short locType1,Short locType2,Short locType3,Long modiUser,Date modiTime,Long appeUser,Date appeTime,Double stdQty,Double minWt,Double grossWt) {
this.devNo = devNo;
this.decDesc = decDesc;
this.devMk = devMk;
@@ -300,6 +306,26 @@
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.ioTime);
}
+ public String getLocSts$() {
+ if (Cools.isEmpty(this.locSts)){
+ return null;
+ }
+ if (this.locSts.equals(LocStsType.LOC_STS_TYPE_O.type)) {
+ return LocStsType.LOC_STS_TYPE_O.type + "." + LocStsType.LOC_STS_TYPE_O.desc;
+ } else if (this.locSts.equals(LocStsType.LOC_STS_TYPE_R.type)) {
+ return LocStsType.LOC_STS_TYPE_R.type + "." + LocStsType.LOC_STS_TYPE_R.desc;
+ } else if (this.locSts.equals(LocStsType.LOC_STS_TYPE_S.type)) {
+ return LocStsType.LOC_STS_TYPE_S.type + "." + LocStsType.LOC_STS_TYPE_S.desc;
+ } else if (this.locSts.equals(LocStsType.LOC_STS_TYPE_F.type)) {
+ return LocStsType.LOC_STS_TYPE_F.type + "." + LocStsType.LOC_STS_TYPE_F.desc;
+ } else if (this.locSts.equals(LocStsType.LOC_STS_TYPE_X.type)) {
+ return LocStsType.LOC_STS_TYPE_X.type + "." + LocStsType.LOC_STS_TYPE_X.desc;
+ } else if (this.locSts.equals(LocStsType.LOC_STS_TYPE_D.type)) {
+ return LocStsType.LOC_STS_TYPE_D.type + "." + LocStsType.LOC_STS_TYPE_D.desc;
+ }
+ return null;
+ }
+
public String getLocType1$(){
if (null == this.locType1){ return null; }
switch (this.locType1){
diff --git a/src/main/java/com/zy/asrs/entity/Mat.java b/src/main/java/com/zy/asrs/entity/Mat.java
index f666131..1ccd199 100644
--- a/src/main/java/com/zy/asrs/entity/Mat.java
+++ b/src/main/java/com/zy/asrs/entity/Mat.java
@@ -7,6 +7,8 @@
import com.baomidou.mybatisplus.enums.IdType;
import com.core.common.Cools;
import com.core.common.SpringUtils;
+import com.zy.asrs.enums.ContainerType;
+import com.zy.asrs.service.BasContainerService;
import com.zy.asrs.service.TagService;
import com.zy.common.utils.Synchro;
import com.zy.system.entity.User;
@@ -164,7 +166,7 @@
private String manuDate;
/**
- * 鍝侀」鏁�
+ * 鍝侀」鏁�/鏈�澶х粍鎵樻暟閲�
*/
@ApiModelProperty(value= "鍝侀」鏁�")
@ExcelProperty(value = "鍝侀」鏁�")
@@ -185,6 +187,11 @@
@ApiModelProperty(value= "閲嶉噺")
@ExcelProperty(value = "閲嶉噺")
private Double weight;
+
+ @ApiModelProperty(value= "鏈�澶х粍鎵樹笂闄�")
+ @ExcelProperty(value = "鏈�澶х粍鎵樹笂闄�")
+ @TableField("up_qty")
+ private Double upQty;
/**
* 闀垮害
@@ -300,6 +307,11 @@
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date updateTime;
+ @ApiModelProperty("搴撲綅绫诲瀷")
+ @TableField("loc_type")
+ @ExcelProperty(value = "搴撲綅绫诲瀷")
+ private Long locType;
+
/**
* 澶囨敞
*/
@@ -416,6 +428,20 @@
return null;
}
+ public String getLocType$(){
+ if (Cools.isEmpty(locType)) {
+ return "鏂欑";
+ }
+ if (locType.equals(ContainerType.CONTAINER_TYPE_BOX.type)) {
+ return ContainerType.CONTAINER_TYPE_BOX.desc;
+ } else if (locType.equals(ContainerType.CONTAINER_TYPE_SALVER.type)) {
+ return ContainerType.CONTAINER_TYPE_SALVER.desc;
+ } else if (locType.equals(ContainerType.CONTAINER_TYPE_CAGE.type)) {
+ return ContainerType.CONTAINER_TYPE_CAGE.desc;
+ }
+ return null;
+ }
+
public String getBeBatch$(){
if (null == this.beBatch){ return null; }
switch (this.beBatch){
diff --git a/src/main/java/com/zy/asrs/entity/Task.java b/src/main/java/com/zy/asrs/entity/Task.java
index 25536fb..79496f2 100644
--- a/src/main/java/com/zy/asrs/entity/Task.java
+++ b/src/main/java/com/zy/asrs/entity/Task.java
@@ -1,16 +1,26 @@
package com.zy.asrs.entity;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.enums.IdType;
import com.baomidou.mybatisplus.annotations.TableField;
+import com.core.common.SpringUtils;
+import com.zy.asrs.service.*;
+import com.zy.system.entity.User;
+import com.zy.system.service.UserService;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import com.baomidou.mybatisplus.annotations.TableName;
+import lombok.experimental.Accessors;
+
import java.io.Serializable;
+import java.text.SimpleDateFormat;
+import java.util.Date;
@Data
@TableName("agv_task")
+@Accessors(chain = true)
public class Task implements Serializable {
private static final long serialVersionUID = 1L;
@@ -26,15 +36,479 @@
@TableField("task_type")
private String taskType;
+ /**
+ * 宸ヤ綔鍙�
+ */
+ @ApiModelProperty(value= "宸ヤ綔鍙�")
+ @TableField("wrk_no")
+ private Integer wrkNo;
+
+ @ApiModelProperty(value= "")
+ @TableField("inv_wh")
+ private String invWh;
+
+ @ApiModelProperty(value= "")
+ private Date ymd;
+
+ @ApiModelProperty(value= "")
+ private String mk;
+
+ @ApiModelProperty(value= "")
+ @TableField("whs_type")
+ private Integer whsType;
+
+ /**
+ * 宸ヤ綔鐘舵��
+ */
+ @ApiModelProperty(value= "宸ヤ綔鐘舵��")
+ @TableField("wrk_sts")
+ private Long wrkSts;
+
+ /**
+ * 鍏ュ嚭搴撶被鍨�
+ */
+ @ApiModelProperty(value= "鍏ュ嚭搴撶被鍨�")
+ @TableField("io_type")
+ private Integer ioType;
+
+ /**
+ * 鍫嗗灈鏈�
+ */
+ @ApiModelProperty(value= "鍫嗗灈鏈�")
+ @TableField("crn_no")
+ private Integer crnNo;
+
+ @ApiModelProperty(value= "")
+ @TableField("sheet_no")
+ private String sheetNo;
+
+ /**
+ * 浼樺厛绾�
+ */
+ @ApiModelProperty(value= "浼樺厛绾�")
+ @TableField("io_pri")
+ private Double ioPri;
+
+ @ApiModelProperty(value= "")
+ @TableField("wrk_date")
+ private Date wrkDate;
+
+ /**
+ * 鐩爣搴撲綅
+ */
+ @ApiModelProperty(value= "鐩爣搴撲綅")
+ @TableField("loc_no")
+ private String locNo;
+
+ /**
+ * 鐩爣绔�
+ */
+ @ApiModelProperty(value= "鐩爣绔�")
+ @TableField("sta_no")
+ private String staNo;
+
+ /**
+ * 婧愮珯
+ */
+ @ApiModelProperty(value= "婧愮珯")
+ @TableField("source_sta_no")
+ private String sourceStaNo;
+
+ /**
+ * 婧愬簱浣�
+ */
+ @ApiModelProperty(value= "婧愬簱浣�")
+ @TableField("source_loc_no")
+ private String sourceLocNo;
+
+ @ApiModelProperty(value= "")
+ @TableField("loc_sts")
+ private String locSts;
+
+ /**
+ * 鎷ｆ枡
+ */
+ @ApiModelProperty(value= "鎷ｆ枡")
+ private String picking;
+
+ @ApiModelProperty(value= "")
+ @TableField("link_mis")
+ private String linkMis;
+
+ @ApiModelProperty(value= "")
+ @TableField("online_yn")
+ private String onlineYn;
+
+ @ApiModelProperty(value= "")
+ @TableField("upd_mk")
+ private String updMk;
+
+ /**
+ * 閫�鍑�
+ */
+ @ApiModelProperty(value= "閫�鍑�")
+ @TableField("exit_mk")
+ private String exitMk;
+
+ @ApiModelProperty(value= "")
+ @TableField("plt_type")
+ private Integer pltType;
+
+ /**
+ * 绌烘澘
+ */
+ @ApiModelProperty(value= "绌烘澘")
+ @TableField("empty_mk")
+ private String emptyMk;
+
+ /**
+ * 宸ヤ綔鏃堕棿
+ */
+ @ApiModelProperty(value= "宸ヤ綔鏃堕棿")
+ @TableField("io_time")
+ private Date ioTime;
+
+ @ApiModelProperty(value= "")
+ @TableField("ctn_type")
+ private Integer ctnType;
+
+ @ApiModelProperty(value= "")
+ private String packed;
+
+ @ApiModelProperty(value= "")
+ @TableField("ove_mk")
+ private String oveMk;
+
+ @ApiModelProperty(value= "")
+ @TableField("mtn_type")
+ private Double mtnType;
+
+ @ApiModelProperty(value= "")
+ @TableField("user_no")
+ private String userNo;
+
+ /**
+ * 鍫嗗灈鏈哄惎鍔ㄦ椂闂�
+ */
+ @ApiModelProperty(value= "鍫嗗灈鏈哄惎鍔ㄦ椂闂�")
+ @TableField("crn_str_time")
+ private Date crnStrTime;
+
+ /**
+ * 鍫嗗灈鏈哄仠姝㈡椂闂�
+ */
+ @ApiModelProperty(value= "鍫嗗灈鏈哄仠姝㈡椂闂�")
+ @TableField("crn_end_time")
+ private Date crnEndTime;
+
+ @ApiModelProperty(value= "")
+ @TableField("plc_str_time")
+ private Date plcStrTime;
+
+ @ApiModelProperty(value= "")
+ @TableField("crn_pos_time")
+ private Date crnPosTime;
+
+ @ApiModelProperty(value= "")
+ @TableField("load_time")
+ private Double loadTime;
+
+ @ApiModelProperty(value= "")
+ @TableField("exp_time")
+ private Double expTime;
+
+ @ApiModelProperty(value= "")
+ @TableField("ref_wrkno")
+ private Double refWrkno;
+
+ /**
+ * 鎷ｆ枡鏃堕棿
+ */
+ @ApiModelProperty(value= "鎷ｆ枡鏃堕棿")
+ @TableField("ref_iotime")
+ private Date refIotime;
+
+ /**
+ * 淇敼浜哄憳
+ */
+ @ApiModelProperty(value= "淇敼浜哄憳")
+ @TableField("modi_user")
+ private Long modiUser;
+
+ /**
+ * 淇敼鏃堕棿
+ */
+ @ApiModelProperty(value= "淇敼鏃堕棿")
+ @TableField("modi_time")
+ private Date modiTime;
+
+ /**
+ * 鍒涘缓鑰�
+ */
+ @ApiModelProperty(value= "鍒涘缓鑰�")
+ @TableField("appe_user")
+ private Long appeUser;
+
+ /**
+ * 娣诲姞鏃堕棿
+ */
+ @ApiModelProperty(value= "娣诲姞鏃堕棿")
+ @TableField("appe_time")
+ private Date appeTime;
+
+ @ApiModelProperty(value= "")
+ @TableField("pause_mk")
+ private String pauseMk;
+
+ @ApiModelProperty(value= "")
+ @TableField("error_time")
+ private Date errorTime;
+
+ @ApiModelProperty(value= "")
+ @TableField("error_memo")
+ private String errorMemo;
+
+ @ApiModelProperty(value= "")
+ @TableField("ctn_kind")
+ private Integer ctnKind;
+
+ @ApiModelProperty(value= "")
+ @TableField("manu_type")
+ private String manuType;
+
+ /**
+ * 澶囨敞
+ */
+ @ApiModelProperty(value= "澶囨敞")
+ private String memo;
+
+ @ApiModelProperty(value= "")
+ @TableField("sc_weight")
+ private Double scWeight;
+
+ @ApiModelProperty(value= "")
+ @TableField("log_mk")
+ private String logMk;
+
+ @ApiModelProperty(value= "")
+ @TableField("log_err_time")
+ private Date logErrTime;
+
+ @ApiModelProperty(value= "")
+ @TableField("log_err_memo")
+ private String logErrMemo;
+
+ /**
+ * 鏉＄爜
+ */
+ @ApiModelProperty(value= "鏉＄爜")
+ private String barcode;
+
+ // Y:閿�鍞鍗曞嚭搴撲换鍔�
+ @ApiModelProperty(value= "")
+ @TableField("Pdc_type")
+ private String PdcType;
+
+ @ApiModelProperty(value= "")
+ @TableField("ctn_no")
+ private String ctnNo;
+
+ /**
+ * 婊℃澘
+ */
+ @ApiModelProperty(value= "婊℃澘")
+ @TableField("full_plt")
+ private String fullPlt;
+
+ /**
+ * 鍏堝叆鍝� / 鍙岄噸鍏ュ簱
+ */
+ @ApiModelProperty(value= "鍏堝叆鍝�")
+ @TableField("pre_have")
+ private String preHave;
+
+ /**
+ * 绌烘搷浣� / 鍙栬揣鏃犵
+ */
+ @ApiModelProperty(value= "绌烘搷浣�")
+ @TableField("take_none")
+ private String takeNone;
+
public Task() {}
- public Task(String taskType) {
- this.taskType = taskType;
+ public String getYmd$(){
+ if (Cools.isEmpty(this.ymd)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.ymd);
}
-// Task task = new Task(
-// null // 浠诲姟绫诲瀷锛� agv , crn
-// );
+ 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 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 getCrnNo$(){
+ BasCrnpService service = SpringUtils.getBean(BasCrnpService.class);
+ BasCrnp basCrnp = service.selectById(this.crnNo);
+ if (!Cools.isEmpty(basCrnp)){
+ return String.valueOf(basCrnp.getCrnNo());
+ }
+ return null;
+ }
+
+ public String getWrkDate$(){
+ if (Cools.isEmpty(this.wrkDate)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.wrkDate);
+ }
+
+ 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 getTaskType$(){
+ if (Cools.isEmpty(this.taskType)){return null;}
+ if (taskType.equals("agv")) {
+ return "AGV浠诲姟";
+ } else {
+ return "鍫嗗灈鏈轰换鍔�";
+ }
+ }
+ public String getStaNo$(){
+ BasStationService service = SpringUtils.getBean(BasStationService.class);
+ BasStation basDevp = service.selectOne(new EntityWrapper<BasStation>().eq("dev_no", this.staNo));
+ if (!Cools.isEmpty(basDevp)){
+ return String.valueOf(basDevp.getDevNo());
+ }
+ return null;
+ }
+
+ public String getSourceStaNo$(){
+ BasStationService service = SpringUtils.getBean(BasStationService.class);
+ BasStation basDevp = service.selectOne(new EntityWrapper<BasStation>().eq("dev_no", 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 getIoTime$(){
+ if (Cools.isEmpty(this.ioTime)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.ioTime);
+ }
+
+ public String getCrnStrTime$(){
+ if (Cools.isEmpty(this.crnStrTime)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.crnStrTime);
+ }
+
+ public String getCrnEndTime$(){
+ if (Cools.isEmpty(this.crnEndTime)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.crnEndTime);
+ }
+
+ public String getPlcStrTime$(){
+ if (Cools.isEmpty(this.plcStrTime)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.plcStrTime);
+ }
+
+ public String getCrnPosTime$(){
+ if (Cools.isEmpty(this.crnPosTime)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.crnPosTime);
+ }
+
+ public String getRefIotime$(){
+ if (Cools.isEmpty(this.refIotime)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.refIotime);
+ }
+
+ 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 getErrorTime$(){
+ if (Cools.isEmpty(this.errorTime)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.errorTime);
+ }
+
+
+ public String getLogErrTime$(){
+ if (Cools.isEmpty(this.logErrTime)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.logErrTime);
+ }
}
diff --git a/src/main/java/com/zy/asrs/entity/TaskDetl.java b/src/main/java/com/zy/asrs/entity/TaskDetl.java
index cde2747..2467477 100644
--- a/src/main/java/com/zy/asrs/entity/TaskDetl.java
+++ b/src/main/java/com/zy/asrs/entity/TaskDetl.java
@@ -4,6 +4,8 @@
import com.core.common.Cools;import com.baomidou.mybatisplus.annotations.TableField;
import java.text.SimpleDateFormat;
import java.util.Date;
+
+import lombok.experimental.Accessors;
import org.springframework.format.annotation.DateTimeFormat;
import com.core.common.SpringUtils;
import com.zy.system.service.UserService;
@@ -22,6 +24,7 @@
import java.io.Serializable;
@Data
+@Accessors(chain = true)
@TableName("agv_task_detl")
public class TaskDetl implements Serializable {
diff --git a/src/main/java/com/zy/asrs/entity/WrkMastExecute.java b/src/main/java/com/zy/asrs/entity/WrkMastExecute.java
deleted file mode 100644
index 80451ba..0000000
--- a/src/main/java/com/zy/asrs/entity/WrkMastExecute.java
+++ /dev/null
@@ -1,244 +0,0 @@
-package com.zy.asrs.entity;
-
-import com.core.common.Cools;import com.baomidou.mybatisplus.annotations.TableField;
-import com.core.common.SpringUtils;
-import com.zy.asrs.service.BasWrkIotypeService;
-import com.zy.asrs.entity.BasWrkIotype;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import org.springframework.format.annotation.DateTimeFormat;
-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 com.core.common.SpringUtils;
-import com.zy.system.service.UserService;
-import com.zy.system.entity.User;
-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("asr_wrk_mast_execute")
-public class WrkMastExecute implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * 婧愬簱浣�
- */
- @ApiModelProperty(value= "婧愬簱浣�")
- @TableField("sou_loc_no")
- private String souLocNo;
-
- /**
- * 鐩爣搴撲綅
- */
- @ApiModelProperty(value= "鐩爣搴撲綅")
- @TableField("end_loc_no")
- private String endLocNo;
-
- /**
- * 鍘熸ゼ灞�
- */
- @ApiModelProperty(value= "鍘熸ゼ灞�")
- @TableField("sou_floor")
- private Integer souFloor;
-
- /**
- * 鐩爣妤煎眰
- */
- @ApiModelProperty(value= "鐩爣妤煎眰")
- @TableField("end_floor")
- private Integer endFloor;
-
- /**
- * 婧愮珯鐐�
- */
- @ApiModelProperty(value= "婧愮珯鐐�")
- @TableField("sou_sta_no")
- private String souStaNo;
-
- /**
- * 鐩爣绔欑偣
- */
- @ApiModelProperty(value= "鐩爣绔欑偣")
- @TableField("end_sta_no")
- private String endStaNo;
-
- /**
- * 褰撳墠鑺傜偣
- */
- @ApiModelProperty(value= "褰撳墠鑺傜偣")
- @TableField("now_position")
- private Integer nowPosition;
-
- /**
- * 鐩爣鑺傜偣
- */
- @ApiModelProperty(value= "鐩爣鑺傜偣")
- @TableField("end_position")
- private Integer endPosition;
-
- /**
- * 浠诲姟绫诲瀷
- */
- @ApiModelProperty(value= "浠诲姟绫诲瀷")
- @TableField("io_type")
- private Integer ioType;
-
- /**
- * 宸ヤ綔鐘舵��
- */
- @ApiModelProperty(value= "宸ヤ綔鐘舵��")
- @TableField("wrk_sts")
- private Long wrkSts;
-
- /**
- * 宸ヤ綔鏃堕棿
- */
- @ApiModelProperty(value= "宸ヤ綔鏃堕棿")
- @TableField("io_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private Date ioTime;
-
- /**
- * 淇敼鏃堕棿
- */
- @ApiModelProperty(value= "淇敼鏃堕棿")
- @TableField("modi_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private Date modiTime;
-
- /**
- * 淇敼浜哄憳
- */
- @ApiModelProperty(value= "淇敼浜哄憳")
- @TableField("modi_user")
- private String modiUser;
-
- /**
- * 娣诲姞鏃堕棿
- */
- @ApiModelProperty(value= "娣诲姞鏃堕棿")
- @TableField("appe_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private Date appeTime;
-
- /**
- * 鍒涘缓鑰�
- */
- @ApiModelProperty(value= "鍒涘缓鑰�")
- @TableField("appe_user")
- private String appeUser;
-
- /**
- * 浠诲姟鐘舵��
- */
- @ApiModelProperty(value= "浠诲姟鐘舵��")
- private Integer status;
-
- @ApiModelProperty(value= "")
- @TableId(value = "wrk_no", type = IdType.INPUT)
- @TableField("wrk_no")
- private Long wrkNo;
-
- public WrkMastExecute() {}
-
- public WrkMastExecute(String souLocNo,String endLocNo,Integer souFloor,Integer endFloor,String souStaNo,String endStaNo,Integer nowPosition,Integer endPosition,Integer ioType,Long wrkSts,Date ioTime,Date modiTime,String modiUser,Date appeTime,String appeUser,Integer status,Long wrkNo) {
- this.souLocNo = souLocNo;
- this.endLocNo = endLocNo;
- this.souFloor = souFloor;
- this.endFloor = endFloor;
- this.souStaNo = souStaNo;
- this.endStaNo = endStaNo;
- this.nowPosition = nowPosition;
- this.endPosition = endPosition;
- this.ioType = ioType;
- this.wrkSts = wrkSts;
- this.ioTime = ioTime;
- this.modiTime = modiTime;
- this.modiUser = modiUser;
- this.appeTime = appeTime;
- this.appeUser = appeUser;
- this.status = status;
- this.wrkNo = wrkNo;
- }
-
-// WrkMastExecute wrkMastExecute = new WrkMastExecute(
-// null, // 婧愬簱浣�
-// null, // 鐩爣搴撲綅
-// null, // 鍘熸ゼ灞�
-// null, // 鐩爣妤煎眰
-// null, // 婧愮珯鐐�
-// null, // 鐩爣绔欑偣
-// null, // 褰撳墠鑺傜偣
-// null, // 鐩爣鑺傜偣
-// null, // 浠诲姟绫诲瀷
-// null, // 宸ヤ綔鐘舵��
-// null, // 宸ヤ綔鏃堕棿
-// null, // 淇敼鏃堕棿
-// null, // 淇敼浜哄憳
-// null, // 娣诲姞鏃堕棿
-// null, // 鍒涘缓鑰�
-// null, // 浠诲姟鐘舵��
-// null // [闈炵┖]
-// );
-
- 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 getIoTime$(){
- if (Cools.isEmpty(this.ioTime)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.ioTime);
- }
-
- public String getModiTime$(){
- if (Cools.isEmpty(this.modiTime)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.modiTime);
- }
-
- public String getModiUser$(){
- UserService service = SpringUtils.getBean(UserService.class);
- User user = service.selectById(this.modiUser);
- if (!Cools.isEmpty(user)){
- return String.valueOf(user.getNickname());
- }
- 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 getAppeUser$(){
- UserService service = SpringUtils.getBean(UserService.class);
- User user = service.selectById(this.appeUser);
- if (!Cools.isEmpty(user)){
- return String.valueOf(user.getNickname());
- }
- return null;
- }
-
-
-}
diff --git a/src/main/java/com/zy/asrs/entity/WrkMastExecuteLog.java b/src/main/java/com/zy/asrs/entity/WrkMastExecuteLog.java
deleted file mode 100644
index c80d1ae..0000000
--- a/src/main/java/com/zy/asrs/entity/WrkMastExecuteLog.java
+++ /dev/null
@@ -1,241 +0,0 @@
-package com.zy.asrs.entity;
-
-import com.core.common.Cools;import com.baomidou.mybatisplus.annotations.TableField;
-import com.core.common.SpringUtils;
-import com.zy.asrs.service.BasWrkIotypeService;
-import com.zy.asrs.entity.BasWrkIotype;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import org.springframework.format.annotation.DateTimeFormat;
-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 com.core.common.SpringUtils;
-import com.zy.system.service.UserService;
-import com.zy.system.entity.User;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import com.baomidou.mybatisplus.annotations.TableName;
-import java.io.Serializable;
-
-@Data
-@TableName("asr_wrk_mast_execute_log")
-public class WrkMastExecuteLog implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * 婧愬簱浣�
- */
- @ApiModelProperty(value= "婧愬簱浣�")
- @TableField("sou_loc_no")
- private String souLocNo;
-
- /**
- * 鐩爣搴撲綅
- */
- @ApiModelProperty(value= "鐩爣搴撲綅")
- @TableField("end_loc_no")
- private String endLocNo;
-
- /**
- * 鍘熸ゼ灞�
- */
- @ApiModelProperty(value= "鍘熸ゼ灞�")
- @TableField("sou_floor")
- private Integer souFloor;
-
- /**
- * 鐩爣妤煎眰
- */
- @ApiModelProperty(value= "鐩爣妤煎眰")
- @TableField("end_floor")
- private Integer endFloor;
-
- /**
- * 婧愮珯鐐�
- */
- @ApiModelProperty(value= "婧愮珯鐐�")
- @TableField("sou_sta_no")
- private String souStaNo;
-
- /**
- * 鐩爣绔欑偣
- */
- @ApiModelProperty(value= "鐩爣绔欑偣")
- @TableField("end_sta_no")
- private String endStaNo;
-
- /**
- * 褰撳墠鑺傜偣
- */
- @ApiModelProperty(value= "褰撳墠鑺傜偣")
- @TableField("now_position")
- private Integer nowPosition;
-
- /**
- * 鐩爣鑺傜偣
- */
- @ApiModelProperty(value= "鐩爣鑺傜偣")
- @TableField("end_position")
- private Integer endPosition;
-
- /**
- * 浠诲姟绫诲瀷
- */
- @ApiModelProperty(value= "浠诲姟绫诲瀷")
- @TableField("io_type")
- private Integer ioType;
-
- /**
- * 宸ヤ綔鐘舵��
- */
- @ApiModelProperty(value= "宸ヤ綔鐘舵��")
- @TableField("wrk_sts")
- private Long wrkSts;
-
- /**
- * 宸ヤ綔鏃堕棿
- */
- @ApiModelProperty(value= "宸ヤ綔鏃堕棿")
- @TableField("io_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private Date ioTime;
-
- /**
- * 淇敼鏃堕棿
- */
- @ApiModelProperty(value= "淇敼鏃堕棿")
- @TableField("modi_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private Date modiTime;
-
- /**
- * 淇敼浜哄憳
- */
- @ApiModelProperty(value= "淇敼浜哄憳")
- @TableField("modi_user")
- private String modiUser;
-
- /**
- * 娣诲姞鏃堕棿
- */
- @ApiModelProperty(value= "娣诲姞鏃堕棿")
- @TableField("appe_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private Date appeTime;
-
- /**
- * 鍒涘缓鑰�
- */
- @ApiModelProperty(value= "鍒涘缓鑰�")
- @TableField("appe_user")
- private String appeUser;
-
- /**
- * 浠诲姟鐘舵��
- */
- @ApiModelProperty(value= "浠诲姟鐘舵��")
- private Integer status;
-
- @ApiModelProperty(value= "")
- @TableField("wrk_no")
- private Long wrkNo;
-
- public WrkMastExecuteLog() {}
-
- public WrkMastExecuteLog(String souLocNo,String endLocNo,Integer souFloor,Integer endFloor,String souStaNo,String endStaNo,Integer nowPosition,Integer endPosition,Integer ioType,Long wrkSts,Date ioTime,Date modiTime,String modiUser,Date appeTime,String appeUser,Integer status,Long wrkNo) {
- this.souLocNo = souLocNo;
- this.endLocNo = endLocNo;
- this.souFloor = souFloor;
- this.endFloor = endFloor;
- this.souStaNo = souStaNo;
- this.endStaNo = endStaNo;
- this.nowPosition = nowPosition;
- this.endPosition = endPosition;
- this.ioType = ioType;
- this.wrkSts = wrkSts;
- this.ioTime = ioTime;
- this.modiTime = modiTime;
- this.modiUser = modiUser;
- this.appeTime = appeTime;
- this.appeUser = appeUser;
- this.status = status;
- this.wrkNo = wrkNo;
- }
-
-// WrkMastExecuteLog wrkMastExecuteLog = new WrkMastExecuteLog(
-// null, // 婧愬簱浣�
-// null, // 鐩爣搴撲綅
-// null, // 鍘熸ゼ灞�
-// null, // 鐩爣妤煎眰
-// null, // 婧愮珯鐐�
-// null, // 鐩爣绔欑偣
-// null, // 褰撳墠鑺傜偣
-// null, // 鐩爣鑺傜偣
-// null, // 浠诲姟绫诲瀷
-// null, // 宸ヤ綔鐘舵��
-// null, // 宸ヤ綔鏃堕棿
-// null, // 淇敼鏃堕棿
-// null, // 淇敼浜哄憳
-// null, // 娣诲姞鏃堕棿
-// null, // 鍒涘缓鑰�
-// null, // 浠诲姟鐘舵��
-// null // [闈炵┖]
-// );
-
- 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 getIoTime$(){
- if (Cools.isEmpty(this.ioTime)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.ioTime);
- }
-
- public String getModiTime$(){
- if (Cools.isEmpty(this.modiTime)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.modiTime);
- }
-
- public String getModiUser$(){
- UserService service = SpringUtils.getBean(UserService.class);
- User user = service.selectById(this.modiUser);
- if (!Cools.isEmpty(user)){
- return String.valueOf(user.getNickname());
- }
- 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 getAppeUser$(){
- UserService service = SpringUtils.getBean(UserService.class);
- User user = service.selectById(this.appeUser);
- if (!Cools.isEmpty(user)){
- return String.valueOf(user.getNickname());
- }
- return null;
- }
-
-
-}
diff --git a/src/main/java/com/zy/asrs/entity/WrkMastFourWarVehicle.java b/src/main/java/com/zy/asrs/entity/WrkMastFourWarVehicle.java
deleted file mode 100644
index a4d26c3..0000000
--- a/src/main/java/com/zy/asrs/entity/WrkMastFourWarVehicle.java
+++ /dev/null
@@ -1,178 +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 org.springframework.format.annotation.DateTimeFormat;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import com.baomidou.mybatisplus.annotations.TableName;
-import java.io.Serializable;
-
-@Data
-@TableName("asr_wrk_mast_four_war_vehicle")
-public class WrkMastFourWarVehicle implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * ID
- */
- @ApiModelProperty(value= "ID")
- @TableId(value = "id", type = IdType.AUTO)
- private Long id;
-
- /**
- * 宸ヤ綔鍙�
- */
- @ApiModelProperty(value= "宸ヤ綔鍙�")
- @TableField("wrk_no")
- private Long wrkNo;
-
- /**
- * 宸ヤ綔妗ｅ紑濮嬩綅缃�
- */
- @ApiModelProperty(value= "宸ヤ綔妗ｅ紑濮嬩綅缃�")
- @TableField("wrk_start")
- private Integer wrkStart;
-
- /**
- * 宸ヤ綔妗ｇ粨鏉熶綅缃�
- */
- @ApiModelProperty(value= "宸ヤ綔妗ｇ粨鏉熶綅缃�")
- @TableField("wrk_end")
- private Integer wrkEnd;
-
- /**
- * 鍥涘悜杞︽帴璐т綅缃�
- */
- @ApiModelProperty(value= "鍥涘悜杞︽帴璐т綅缃�")
- @TableField("sta_start")
- private Integer staStart;
-
- /**
- * 鍥涘悜杞︽斁璐т綅缃�
- */
- @ApiModelProperty(value= "鍥涘悜杞︽斁璐т綅缃�")
- @TableField("sta_end")
- private Integer staEnd;
-
- /**
- * 娣诲姞鏃堕棿
- */
- @ApiModelProperty(value= "娣诲姞鏃堕棿")
- @TableField("create_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private Date createTime;
-
- /**
- * 淇敼鏃堕棿
- */
- @ApiModelProperty(value= "淇敼鏃堕棿")
- @TableField("update_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private Date updateTime;
-
- /**
- * 绫诲瀷 0:婊＄増 1:绌烘澘
- */
- @ApiModelProperty(value= "绫诲瀷 0:婊＄増 1:绌烘澘")
- private Integer type;
-
- /**
- * 宸ヤ綔鐘舵�� 0锛氬垵濮� 1锛氬叆搴撲腑 2锛氬嚭搴撲腑 3锛氬畬鎴�
- */
- @ApiModelProperty(value= "宸ヤ綔鐘舵�� 0锛氬垵濮� 1锛氬叆搴撲腑 2锛氬嚭搴撲腑 3锛氬畬鎴�")
- @TableField("wrk_sts")
- private Integer wrkSts;
-
- /**
- * 琛屽彿
- */
- @ApiModelProperty(value= "琛屽彿")
- @TableField("line_number")
- private Long lineNumber;
-
- /**
- * 宸ヤ綔绫诲瀷 绫诲瀷 1:鍏ュ簱 2锛氬嚭搴�
- */
- @ApiModelProperty(value= "宸ヤ綔绫诲瀷 绫诲瀷 1:鍏ュ簱 2锛氬嚭搴�")
- @TableField("wrk_type")
- private Integer wrkType;
-
- /**
- * 鏍囪鏃堕棿
- */
- @ApiModelProperty(value= "鏍囪鏃堕棿")
- @TableField("bign_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private Date bignTime;
-
- @ApiModelProperty(value= "")
- @TableField("wrk_crn")
- private Integer wrkCrn;
-
- public WrkMastFourWarVehicle() {}
-
- public WrkMastFourWarVehicle(Long wrkNo,Integer wrkStart,Integer wrkEnd,Integer staStart,Integer staEnd,Date createTime,Date updateTime,Integer type,Integer wrkSts,Long lineNumber,Integer wrkType,Date bignTime,Integer wrkCrn) {
- this.wrkNo = wrkNo;
- this.wrkStart = wrkStart;
- this.wrkEnd = wrkEnd;
- this.staStart = staStart;
- this.staEnd = staEnd;
- this.createTime = createTime;
- this.updateTime = updateTime;
- this.type = type;
- this.wrkSts = wrkSts;
- this.lineNumber = lineNumber;
- this.wrkType = wrkType;
- this.bignTime = bignTime;
- this.wrkCrn = wrkCrn;
- }
-
-// WrkMastFourWarVehicle wrkMastFourWarVehicle = new WrkMastFourWarVehicle(
-// null, // 宸ヤ綔鍙穂闈炵┖]
-// null, // 宸ヤ綔妗ｅ紑濮嬩綅缃甗闈炵┖]
-// null, // 宸ヤ綔妗ｇ粨鏉熶綅缃甗闈炵┖]
-// null, // 鍥涘悜杞︽帴璐т綅缃甗闈炵┖]
-// null, // 鍥涘悜杞︽斁璐т綅缃甗闈炵┖]
-// null, // 娣诲姞鏃堕棿
-// null, // 淇敼鏃堕棿
-// null, // 绫诲瀷 0:婊＄増 1:绌烘澘[闈炵┖]
-// null, // 宸ヤ綔鐘舵�� 0锛氬垵濮� 1锛氬叆搴撲腑 2锛氬嚭搴撲腑 3锛氬畬鎴怺闈炵┖]
-// null, // 琛屽彿[闈炵┖]
-// null, // 宸ヤ綔绫诲瀷 绫诲瀷 1:鍏ュ簱 2锛氬嚭搴揫闈炵┖]
-// null, // 鏍囪鏃堕棿
-// null //
-// );
-
- public String getCreateTime$(){
- if (Cools.isEmpty(this.createTime)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
- }
-
- public String getUpdateTime$(){
- if (Cools.isEmpty(this.updateTime)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
- }
-
- public String getBignTime$(){
- if (Cools.isEmpty(this.bignTime)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.bignTime);
- }
-
-
-}
diff --git a/src/main/java/com/zy/asrs/entity/WrkMastFourWarVehicleLog.java b/src/main/java/com/zy/asrs/entity/WrkMastFourWarVehicleLog.java
deleted file mode 100644
index 8584d59..0000000
--- a/src/main/java/com/zy/asrs/entity/WrkMastFourWarVehicleLog.java
+++ /dev/null
@@ -1,178 +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 org.springframework.format.annotation.DateTimeFormat;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import com.baomidou.mybatisplus.annotations.TableName;
-import java.io.Serializable;
-
-@Data
-@TableName("asr_wrk_mast_four_war_vehicle_log")
-public class WrkMastFourWarVehicleLog implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * ID
- */
- @ApiModelProperty(value= "ID")
- @TableId(value = "id", type = IdType.AUTO)
- private Long id;
-
- /**
- * 宸ヤ綔鍙�
- */
- @ApiModelProperty(value= "宸ヤ綔鍙�")
- @TableField("wrk_no")
- private Long wrkNo;
-
- /**
- * 宸ヤ綔妗ｅ紑濮嬩綅缃�
- */
- @ApiModelProperty(value= "宸ヤ綔妗ｅ紑濮嬩綅缃�")
- @TableField("wrk_start")
- private Integer wrkStart;
-
- /**
- * 宸ヤ綔妗ｇ粨鏉熶綅缃�
- */
- @ApiModelProperty(value= "宸ヤ綔妗ｇ粨鏉熶綅缃�")
- @TableField("wrk_end")
- private Integer wrkEnd;
-
- /**
- * 鍥涘悜杞︽帴璐т綅缃�
- */
- @ApiModelProperty(value= "鍥涘悜杞︽帴璐т綅缃�")
- @TableField("sta_start")
- private Integer staStart;
-
- /**
- * 鍥涘悜杞︽斁璐т綅缃�
- */
- @ApiModelProperty(value= "鍥涘悜杞︽斁璐т綅缃�")
- @TableField("sta_end")
- private Integer staEnd;
-
- /**
- * 娣诲姞鏃堕棿
- */
- @ApiModelProperty(value= "娣诲姞鏃堕棿")
- @TableField("create_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private Date createTime;
-
- /**
- * 淇敼鏃堕棿
- */
- @ApiModelProperty(value= "淇敼鏃堕棿")
- @TableField("update_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private Date updateTime;
-
- /**
- * 绫诲瀷 0:婊＄増 1:绌烘澘
- */
- @ApiModelProperty(value= "绫诲瀷 0:婊＄増 1:绌烘澘")
- private Integer type;
-
- /**
- * 宸ヤ綔鐘舵�� 0锛氬垵濮� 1锛氬叆搴撲腑 2锛氬嚭搴撲腑 3锛氬畬鎴�
- */
- @ApiModelProperty(value= "宸ヤ綔鐘舵�� 0锛氬垵濮� 1锛氬叆搴撲腑 2锛氬嚭搴撲腑 3锛氬畬鎴�")
- @TableField("wrk_sts")
- private Integer wrkSts;
-
- /**
- * 琛屽彿
- */
- @ApiModelProperty(value= "琛屽彿")
- @TableField("line_number")
- private Long lineNumber;
-
- /**
- * 宸ヤ綔绫诲瀷 绫诲瀷 1:鍏ュ簱 2锛氬嚭搴�
- */
- @ApiModelProperty(value= "宸ヤ綔绫诲瀷 绫诲瀷 1:鍏ュ簱 2锛氬嚭搴�")
- @TableField("wrk_type")
- private Integer wrkType;
-
- /**
- * 鏍囪鏃堕棿
- */
- @ApiModelProperty(value= "鏍囪鏃堕棿")
- @TableField("bign_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private Date bignTime;
-
- @ApiModelProperty(value= "")
- @TableField("wrk_crn")
- private Integer wrkCrn;
-
- public WrkMastFourWarVehicleLog() {}
-
- public WrkMastFourWarVehicleLog(Long wrkNo,Integer wrkStart,Integer wrkEnd,Integer staStart,Integer staEnd,Date createTime,Date updateTime,Integer type,Integer wrkSts,Long lineNumber,Integer wrkType,Date bignTime,Integer wrkCrn) {
- this.wrkNo = wrkNo;
- this.wrkStart = wrkStart;
- this.wrkEnd = wrkEnd;
- this.staStart = staStart;
- this.staEnd = staEnd;
- this.createTime = createTime;
- this.updateTime = updateTime;
- this.type = type;
- this.wrkSts = wrkSts;
- this.lineNumber = lineNumber;
- this.wrkType = wrkType;
- this.bignTime = bignTime;
- this.wrkCrn = wrkCrn;
- }
-
-// WrkMastFourWarVehicleLog wrkMastFourWarVehicleLog = new WrkMastFourWarVehicleLog(
-// null, // 宸ヤ綔鍙穂闈炵┖]
-// null, // 宸ヤ綔妗ｅ紑濮嬩綅缃甗闈炵┖]
-// null, // 宸ヤ綔妗ｇ粨鏉熶綅缃甗闈炵┖]
-// null, // 鍥涘悜杞︽帴璐т綅缃甗闈炵┖]
-// null, // 鍥涘悜杞︽斁璐т綅缃甗闈炵┖]
-// null, // 娣诲姞鏃堕棿
-// null, // 淇敼鏃堕棿
-// null, // 绫诲瀷 0:婊＄増 1:绌烘澘[闈炵┖]
-// null, // 宸ヤ綔鐘舵�� 0锛氬垵濮� 1锛氬叆搴撲腑 2锛氬嚭搴撲腑 3锛氬畬鎴怺闈炵┖]
-// null, // 琛屽彿[闈炵┖]
-// null, // 宸ヤ綔绫诲瀷 绫诲瀷 1:鍏ュ簱 2锛氬嚭搴揫闈炵┖]
-// null, // 鏍囪鏃堕棿
-// null //
-// );
-
- public String getCreateTime$(){
- if (Cools.isEmpty(this.createTime)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
- }
-
- public String getUpdateTime$(){
- if (Cools.isEmpty(this.updateTime)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
- }
-
- public String getBignTime$(){
- if (Cools.isEmpty(this.bignTime)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.bignTime);
- }
-
-
-}
diff --git a/src/main/java/com/zy/asrs/entity/param/AgvCallParams.java b/src/main/java/com/zy/asrs/entity/param/AgvCallParams.java
index 62886aa..7fc4bc4 100644
--- a/src/main/java/com/zy/asrs/entity/param/AgvCallParams.java
+++ b/src/main/java/com/zy/asrs/entity/param/AgvCallParams.java
@@ -14,6 +14,9 @@
@ApiModelProperty("璧峰浣嶇疆")
private String orgSite;
+ @ApiModelProperty("婧愬簱浣�")
+ private String orgLoc;
+
@ApiModelProperty("缁堢偣浣嶇疆")
private String tarSite;
diff --git a/src/main/java/com/zy/asrs/entity/param/BatchMatsUpdateParam.java b/src/main/java/com/zy/asrs/entity/param/BatchMatsUpdateParam.java
new file mode 100644
index 0000000..1b24b8e
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/param/BatchMatsUpdateParam.java
@@ -0,0 +1,24 @@
+package com.zy.asrs.entity.param;
+
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.util.List;
+
+@Data
+@Accessors(chain = true)
+@ApiModel(value = "BatchMatsUpdateParam", description = "鎵归噺淇敼鍙傛暟")
+public class BatchMatsUpdateParam {
+
+ @ApiModelProperty("ids")
+ private List<Long> ids;
+
+ @ApiModelProperty("搴撲綅绫诲瀷")
+ private Long type;
+
+ @ApiModelProperty("缁勬墭涓婇檺")
+ private Double upQty;
+}
diff --git a/src/main/java/com/zy/asrs/entity/param/ContainerParams.java b/src/main/java/com/zy/asrs/entity/param/ContainerParams.java
new file mode 100644
index 0000000..e1ca331
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/param/ContainerParams.java
@@ -0,0 +1,30 @@
+package com.zy.asrs.entity.param;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+@Data
+@Accessors(chain = true)
+@ApiModel(value = "ContainerParams",description = "瀹瑰櫒鍒濆鍖栧弬鏁�")
+public class ContainerParams implements Serializable {
+
+ @ApiModelProperty("璧风偣")
+ private Integer start;
+
+ @ApiModelProperty("缁堢偣")
+ private Integer end;
+
+ @ApiModelProperty("绫诲瀷")
+ private Long type;
+
+ @ApiModelProperty("鏄惁鍒濆鍖�")
+ private Integer flagInit;
+
+ @ApiModelProperty("闀垮害")
+ private Integer length;
+
+}
diff --git a/src/main/java/com/zy/asrs/entity/param/PakinMatsByQRParams.java b/src/main/java/com/zy/asrs/entity/param/PakinMatsByQRParams.java
new file mode 100644
index 0000000..d2057aa
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/param/PakinMatsByQRParams.java
@@ -0,0 +1,17 @@
+package com.zy.asrs.entity.param;
+
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+@Data
+@Accessors(chain = true)
+public class PakinMatsByQRParams {
+
+ @ApiModelProperty("璁㈠崟鍙�")
+ private String orderNo;
+
+ @ApiModelProperty("鐗╂枡缂栫爜")
+ private String matnr;
+}
diff --git a/src/main/java/com/zy/asrs/enums/CommonEnum.java b/src/main/java/com/zy/asrs/enums/CommonEnum.java
new file mode 100644
index 0000000..e2fcbf9
--- /dev/null
+++ b/src/main/java/com/zy/asrs/enums/CommonEnum.java
@@ -0,0 +1,25 @@
+package com.zy.asrs.enums;
+
+/**
+ * @author Ryan
+ * @date 2025/9/25
+ * @description: 閫氱敤绫诲瀷鏋氫妇
+ * @version 1.0
+ */
+public enum CommonEnum {
+
+ //閫氱敤绫诲瀷
+ COMMON_ENUM_Y(1, "鏄�"),
+ //閫氱敤
+ COMMON_ENUM_N(0, "鍚�");
+
+ public Integer type;
+
+ public String desc;
+
+ CommonEnum(Integer type, String desc) {
+ this.type = type;
+ this.desc = desc;
+ }
+
+}
diff --git a/src/main/java/com/zy/asrs/enums/ContainerType.java b/src/main/java/com/zy/asrs/enums/ContainerType.java
new file mode 100644
index 0000000..379d1aa
--- /dev/null
+++ b/src/main/java/com/zy/asrs/enums/ContainerType.java
@@ -0,0 +1,27 @@
+package com.zy.asrs.enums;
+
+public enum ContainerType {
+
+ //鏂欑
+ CONTAINER_TYPE_BOX("12", "鏂欑"),
+ //鎵樼洏
+ CONTAINER_TYPE_SALVER("14", "鎵樼洏"),
+
+ CONTAINER_TYPE_CAGE("13", "绗兼"),
+
+ CONTAINER_TYPE_CAR("3", "鍙拌溅"),
+ ;
+
+ public Long type;
+
+ public String desc;
+
+ ContainerType(String type, String desc) {
+ this.type = Long.valueOf(type);
+ this.desc = desc;
+ }
+
+
+
+
+}
diff --git a/src/main/java/com/zy/asrs/enums/MatTagType.java b/src/main/java/com/zy/asrs/enums/MatTagType.java
new file mode 100644
index 0000000..dbf9a6d
--- /dev/null
+++ b/src/main/java/com/zy/asrs/enums/MatTagType.java
@@ -0,0 +1,20 @@
+package com.zy.asrs.enums;
+
+public enum MatTagType {
+ //涓欢
+ MAT_TAGT_YPE_MIDDLE("13", "涓欢"),
+ //灏忎欢
+ MAT_TAGT_YPE_SMALL("12", "灏忎欢"),
+ //婊よ姱
+ MAT_TAGT_YPE_XIN("14", "婊よ姱")
+ ;
+
+ public String id;
+
+ public String type;
+
+ MatTagType(String id, String type) {
+ this.type = type;
+ this.id = id;
+ }
+}
diff --git a/src/main/java/com/zy/asrs/mapper/AutoMoveMapper.java b/src/main/java/com/zy/asrs/mapper/BasContainerMapper.java
similarity index 64%
rename from src/main/java/com/zy/asrs/mapper/AutoMoveMapper.java
rename to src/main/java/com/zy/asrs/mapper/BasContainerMapper.java
index 5831cc7..c7b3df9 100644
--- a/src/main/java/com/zy/asrs/mapper/AutoMoveMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/BasContainerMapper.java
@@ -1,12 +1,12 @@
package com.zy.asrs.mapper;
-import com.zy.asrs.entity.AutoMove;
+import com.zy.asrs.entity.BasContainer;
import com.baomidou.mybatisplus.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;
@Mapper
@Repository
-public interface AutoMoveMapper extends BaseMapper<AutoMove> {
+public interface BasContainerMapper extends BaseMapper<BasContainer> {
}
diff --git a/src/main/java/com/zy/asrs/mapper/TaskMapper.java b/src/main/java/com/zy/asrs/mapper/TaskMapper.java
index e3a33bc..1d11dfa 100644
--- a/src/main/java/com/zy/asrs/mapper/TaskMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/TaskMapper.java
@@ -5,8 +5,11 @@
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;
+import java.util.List;
+
@Mapper
@Repository
public interface TaskMapper extends BaseMapper<Task> {
+ List<Task> selectToBeCompleteData();
}
diff --git a/src/main/java/com/zy/asrs/mapper/WrkMastExecuteLogMapper.java b/src/main/java/com/zy/asrs/mapper/WrkMastExecuteLogMapper.java
deleted file mode 100644
index d0e1f05..0000000
--- a/src/main/java/com/zy/asrs/mapper/WrkMastExecuteLogMapper.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.zy.asrs.mapper;
-
-import com.zy.asrs.entity.WrkMastExecuteLog;
-import com.baomidou.mybatisplus.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-import org.springframework.stereotype.Repository;
-
-@Mapper
-@Repository
-public interface WrkMastExecuteLogMapper extends BaseMapper<WrkMastExecuteLog> {
-
-}
diff --git a/src/main/java/com/zy/asrs/mapper/WrkMastExecuteMapper.java b/src/main/java/com/zy/asrs/mapper/WrkMastExecuteMapper.java
deleted file mode 100644
index 53d39fc..0000000
--- a/src/main/java/com/zy/asrs/mapper/WrkMastExecuteMapper.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.zy.asrs.mapper;
-
-import com.zy.asrs.entity.WrkMastExecute;
-import com.baomidou.mybatisplus.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-import org.springframework.stereotype.Repository;
-
-@Mapper
-@Repository
-public interface WrkMastExecuteMapper extends BaseMapper<WrkMastExecute> {
-
-}
diff --git a/src/main/java/com/zy/asrs/mapper/WrkMastFourWarVehicleLogMapper.java b/src/main/java/com/zy/asrs/mapper/WrkMastFourWarVehicleLogMapper.java
deleted file mode 100644
index c2138eb..0000000
--- a/src/main/java/com/zy/asrs/mapper/WrkMastFourWarVehicleLogMapper.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.zy.asrs.mapper;
-
-import com.zy.asrs.entity.WrkMastFourWarVehicleLog;
-import com.baomidou.mybatisplus.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-import org.springframework.stereotype.Repository;
-
-@Mapper
-@Repository
-public interface WrkMastFourWarVehicleLogMapper extends BaseMapper<WrkMastFourWarVehicleLog> {
-
-}
diff --git a/src/main/java/com/zy/asrs/mapper/WrkMastFourWarVehicleMapper.java b/src/main/java/com/zy/asrs/mapper/WrkMastFourWarVehicleMapper.java
deleted file mode 100644
index 2309cc2..0000000
--- a/src/main/java/com/zy/asrs/mapper/WrkMastFourWarVehicleMapper.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.zy.asrs.mapper;
-
-import com.zy.asrs.entity.WrkMastFourWarVehicle;
-import com.baomidou.mybatisplus.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-import org.springframework.stereotype.Repository;
-
-@Mapper
-@Repository
-public interface WrkMastFourWarVehicleMapper extends BaseMapper<WrkMastFourWarVehicle> {
-
-}
diff --git a/src/main/java/com/zy/asrs/service/AutoMoveService.java b/src/main/java/com/zy/asrs/service/AutoMoveService.java
deleted file mode 100644
index 2891d4f..0000000
--- a/src/main/java/com/zy/asrs/service/AutoMoveService.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.zy.asrs.service;
-
-import com.zy.asrs.entity.AutoMove;
-import com.baomidou.mybatisplus.service.IService;
-
-public interface AutoMoveService extends IService<AutoMove> {
-
-}
diff --git a/src/main/java/com/zy/asrs/service/BasContainerService.java b/src/main/java/com/zy/asrs/service/BasContainerService.java
new file mode 100644
index 0000000..ad2f9af
--- /dev/null
+++ b/src/main/java/com/zy/asrs/service/BasContainerService.java
@@ -0,0 +1,17 @@
+package com.zy.asrs.service;
+
+import com.core.common.R;
+import com.zy.asrs.entity.BasContainer;
+import com.baomidou.mybatisplus.service.IService;
+import com.zy.asrs.entity.param.ContainerParams;
+
+public interface BasContainerService extends IService<BasContainer> {
+
+ /**
+ * @author Ryan
+ * @date 2025/9/26
+ * @description: TODO
+ * @version 1.0
+ */
+ R init(ContainerParams container);
+}
diff --git a/src/main/java/com/zy/asrs/service/MatService.java b/src/main/java/com/zy/asrs/service/MatService.java
index dd30afd..dbfd443 100644
--- a/src/main/java/com/zy/asrs/service/MatService.java
+++ b/src/main/java/com/zy/asrs/service/MatService.java
@@ -2,7 +2,9 @@
import com.baomidou.mybatisplus.plugins.Page;
import com.baomidou.mybatisplus.service.IService;
+import com.core.common.R;
import com.zy.asrs.entity.Mat;
+import com.zy.asrs.entity.param.BatchMatsUpdateParam;
import java.util.List;
@@ -18,4 +20,5 @@
Mat selectNewUpdateTime();
+ R batchInfo(BatchMatsUpdateParam params);
}
diff --git a/src/main/java/com/zy/asrs/service/MobileService.java b/src/main/java/com/zy/asrs/service/MobileService.java
index f5288b6..2455c90 100644
--- a/src/main/java/com/zy/asrs/service/MobileService.java
+++ b/src/main/java/com/zy/asrs/service/MobileService.java
@@ -83,4 +83,20 @@
* @version 1.0
*/
R callAgvMove(AgvCallParams params, Long userId);
+
+ /**
+ * @author Ryan
+ * @date 2025/9/24
+ * @description: 鑾峰彇鍗曟嵁鐗╂枡淇℃伅
+ * @version 1.0
+ */
+ R getMatsByQRcode(PakinMatsByQRParams params);
+
+ /**
+ * @author Ryan
+ * @date 2025/9/24
+ * @description: 鍛煎彨AGV鍑哄簱鎼繍
+ * @version 1.0
+ */
+ R OutCallAgv(AgvCallParams params, Long userId);
}
diff --git a/src/main/java/com/zy/asrs/service/TaskDetlLogService.java b/src/main/java/com/zy/asrs/service/TaskDetlLogService.java
index cc7b3cd..5bda2b4 100644
--- a/src/main/java/com/zy/asrs/service/TaskDetlLogService.java
+++ b/src/main/java/com/zy/asrs/service/TaskDetlLogService.java
@@ -5,4 +5,5 @@
public interface TaskDetlLogService extends IService<TaskDetlLog> {
+ boolean save(Integer wrkNo);
}
diff --git a/src/main/java/com/zy/asrs/service/TaskLogService.java b/src/main/java/com/zy/asrs/service/TaskLogService.java
index 124755b..b855a03 100644
--- a/src/main/java/com/zy/asrs/service/TaskLogService.java
+++ b/src/main/java/com/zy/asrs/service/TaskLogService.java
@@ -5,4 +5,5 @@
public interface TaskLogService extends IService<TaskLog> {
+ boolean save(Integer wrkNo);
}
diff --git a/src/main/java/com/zy/asrs/service/TaskService.java b/src/main/java/com/zy/asrs/service/TaskService.java
index 1525d66..e510b48 100644
--- a/src/main/java/com/zy/asrs/service/TaskService.java
+++ b/src/main/java/com/zy/asrs/service/TaskService.java
@@ -3,6 +3,15 @@
import com.zy.asrs.entity.Task;
import com.baomidou.mybatisplus.service.IService;
+import java.util.List;
+
public interface TaskService extends IService<Task> {
+ void completeWrkMast(String workNo, Long userId);
+
+ void cancelWrkMast(String workNo, Long userId);
+
+ void pickWrkMast(String workNo, Long userId);
+
+ List<Task> selectToBeCompleteData();
}
diff --git a/src/main/java/com/zy/asrs/service/WrkMastExecuteLogService.java b/src/main/java/com/zy/asrs/service/WrkMastExecuteLogService.java
deleted file mode 100644
index e191114..0000000
--- a/src/main/java/com/zy/asrs/service/WrkMastExecuteLogService.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.zy.asrs.service;
-
-import com.zy.asrs.entity.WrkMastExecuteLog;
-import com.baomidou.mybatisplus.service.IService;
-
-public interface WrkMastExecuteLogService extends IService<WrkMastExecuteLog> {
-
-}
diff --git a/src/main/java/com/zy/asrs/service/WrkMastExecuteService.java b/src/main/java/com/zy/asrs/service/WrkMastExecuteService.java
deleted file mode 100644
index bca4c26..0000000
--- a/src/main/java/com/zy/asrs/service/WrkMastExecuteService.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.zy.asrs.service;
-
-import com.zy.asrs.entity.WrkMastExecute;
-import com.baomidou.mybatisplus.service.IService;
-
-public interface WrkMastExecuteService extends IService<WrkMastExecute> {
-
-}
diff --git a/src/main/java/com/zy/asrs/service/WrkMastFourWarVehicleLogService.java b/src/main/java/com/zy/asrs/service/WrkMastFourWarVehicleLogService.java
deleted file mode 100644
index 0f5533c..0000000
--- a/src/main/java/com/zy/asrs/service/WrkMastFourWarVehicleLogService.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.zy.asrs.service;
-
-import com.zy.asrs.entity.WrkMastFourWarVehicleLog;
-import com.baomidou.mybatisplus.service.IService;
-
-public interface WrkMastFourWarVehicleLogService extends IService<WrkMastFourWarVehicleLog> {
-
-}
diff --git a/src/main/java/com/zy/asrs/service/WrkMastFourWarVehicleService.java b/src/main/java/com/zy/asrs/service/WrkMastFourWarVehicleService.java
deleted file mode 100644
index 19c99d0..0000000
--- a/src/main/java/com/zy/asrs/service/WrkMastFourWarVehicleService.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.zy.asrs.service;
-
-import com.zy.asrs.entity.WrkMastFourWarVehicle;
-import com.baomidou.mybatisplus.service.IService;
-
-public interface WrkMastFourWarVehicleService extends IService<WrkMastFourWarVehicle> {
-
-}
diff --git a/src/main/java/com/zy/asrs/service/impl/AutoMoveServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/AutoMoveServiceImpl.java
deleted file mode 100644
index 8df738a..0000000
--- a/src/main/java/com/zy/asrs/service/impl/AutoMoveServiceImpl.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.zy.asrs.service.impl;
-
-import com.zy.asrs.mapper.AutoMoveMapper;
-import com.zy.asrs.entity.AutoMove;
-import com.zy.asrs.service.AutoMoveService;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-@Service("autoMoveService")
-public class AutoMoveServiceImpl extends ServiceImpl<AutoMoveMapper, AutoMove> implements AutoMoveService {
-
-}
diff --git a/src/main/java/com/zy/asrs/service/impl/BasContainerServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/BasContainerServiceImpl.java
new file mode 100644
index 0000000..3919e27
--- /dev/null
+++ b/src/main/java/com/zy/asrs/service/impl/BasContainerServiceImpl.java
@@ -0,0 +1,71 @@
+package com.zy.asrs.service.impl;
+
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.core.common.R;
+import com.core.exception.CoolException;
+import com.zy.asrs.entity.param.ContainerParams;
+import com.zy.asrs.enums.CommonEnum;
+import com.zy.asrs.enums.ContainerType;
+import com.zy.asrs.mapper.BasContainerMapper;
+import com.zy.asrs.entity.BasContainer;
+import com.zy.asrs.service.BasContainerService;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.apache.tika.utils.StringUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.awt.*;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Objects;
+
+@Service("basContainerService")
+public class BasContainerServiceImpl extends ServiceImpl<BasContainerMapper, BasContainer> implements BasContainerService {
+
+ /**
+ * @author Ryan
+ * @date 2025/9/26
+ * @description: 瀹瑰櫒鍒濆鍖�
+ * @version 1.0
+ */
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public R init(ContainerParams container) {
+ Integer length = 7;
+ if (Objects.isNull(container.getType())) {
+ throw new CoolException("瀹瑰櫒绫诲瀷涓嶈兘涓虹┖锛�");
+ }
+ if (!Objects.isNull(container.getLength())) {
+ length = container.getLength();
+ }
+ if (!Objects.isNull(container.getFlagInit()) && container.getFlagInit().equals(CommonEnum.COMMON_ENUM_Y.type)) {
+ this.delete(new EntityWrapper<>());
+ }
+ for (int i = container.getStart(); i <= container.getEnd(); i++) {
+ BasContainer basContainer = new BasContainer();
+ String prefix = "", ruleCode = "";
+ if (container.getType().equals(ContainerType.CONTAINER_TYPE_BOX.type)) {
+ prefix = "LX2";
+ basContainer.setMixMax(3);
+ } else if (container.getType().equals(ContainerType.CONTAINER_TYPE_CAGE.type)) {
+ prefix = "LK3";
+ basContainer.setMixMax(2);
+ } else if (container.getType().equals(ContainerType.CONTAINER_TYPE_SALVER.type)) {
+ prefix = "TP4";
+ basContainer.setMixMax(2);
+ }
+ ruleCode = prefix + StringUtils.leftPad(i + "", length, "0");
+ basContainer.setType(container.getType())
+ .setCreateTime(new Date())
+ .setUpdateTime(new Date())
+ .setId(null)
+ .setFlagMix(1)
+ .setBarcode(ruleCode);
+ if (!this.insert(basContainer)) {
+ throw new CoolException("瀹瑰櫒淇濆瓨澶辫触锛侊紒");
+ }
+ }
+ return R.ok();
+ }
+}
diff --git a/src/main/java/com/zy/asrs/service/impl/MatServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MatServiceImpl.java
index 8ab8e75..f2fddbd 100644
--- a/src/main/java/com/zy/asrs/service/impl/MatServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MatServiceImpl.java
@@ -1,11 +1,16 @@
package com.zy.asrs.service.impl;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.core.common.R;
+import com.core.exception.CoolException;
+import com.zy.asrs.entity.param.BatchMatsUpdateParam;
import org.springframework.stereotype.Service;
import com.zy.asrs.entity.Mat;
import com.zy.asrs.mapper.MatMapper;
import com.zy.asrs.service.MatService;
+import org.springframework.transaction.annotation.Transactional;
import java.util.List;
@@ -37,6 +42,27 @@
return this.baseMapper.selectNewUpdateTime();
}
+ /**
+ * @author Ryan
+ * @date 2025/9/26
+ * @description: 鎵归噺淇敼鐗╂枡淇℃伅
+ * @version 1.0
+ */
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public R batchInfo(BatchMatsUpdateParam params) {
+ List<Long> ids = params.getIds();
+ List<Mat> mats = this.baseMapper.selectList(new EntityWrapper<Mat>().in("id", ids));
+ mats.forEach(mat -> {
+ mat.setLocType(params.getType());
+ mat.setUpQty(params.getUpQty());
+ if (this.updateById(mat)) {
+ throw new CoolException("鐗╂枡淇℃伅淇敼澶辫触锛侊紒");
+ }
+ });
+ return R.ok();
+ }
+
@Override
public Page<Mat> getMatTurnPage(Page<Mat> page){
page.setRecords(baseMapper.getMatTurnPage(page.getCondition()));
diff --git a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
index c48df3a..2c9a489 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -8,6 +8,7 @@
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.*;
+import com.zy.asrs.enums.CommonEnum;
import com.zy.asrs.enums.LocStsType;
import com.zy.asrs.mapper.LocMastMapper;
import com.zy.asrs.mapper.ManLocDetlMapper;
@@ -28,7 +29,10 @@
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
import java.util.*;
+import java.util.stream.Collectors;
/**
* 绉诲姩绔湇鍔℃牳蹇冪被
@@ -97,8 +101,19 @@
@Resource
private OrderDetlPakoutService orderDetlPakoutService;
+
@Autowired
private LocCacheService locCacheService;
+
+ @Autowired
+ private TaskService taskService;
+
+ @Autowired
+ private TaskDetlService taskDetlService;
+ @Autowired
+ private BasStationService basStationService;
+ @Autowired
+ private BasContainerService basContainerService;
@Override
@Transactional
@@ -553,7 +568,8 @@
}
// 鍒ゆ柇鏄惁鏈夌浉鍚屾潯鐮佺殑鏁版嵁
if (waitPakinService.selectCount(new EntityWrapper<WaitPakin>().
- eq("zpallet", param.getBarcode()).eq("io_status", "N")) > 0) {
+ eq("zpallet", param.getBarcode())
+ .eq("io_status", "N")) > 0) {
throw new CoolException(param.getBarcode() + "鏁版嵁姝ｅ湪杩涜鍏ュ簱");
}
@@ -569,7 +585,6 @@
}
Date now = new Date();
-
// 鏃犲崟缁勬墭
if (Cools.isEmpty(param.getOrderNo())) {
// 鐢熸垚鍏ュ簱閫氱煡妗�
@@ -586,19 +601,21 @@
}
});
-
for (DetlDto detlDto : detlDtos) {
Mat mat = matService.selectByMatnr(detlDto.getMatnr());
if (Cools.isEmpty(mat)) {
throw new CoolException(detlDto.getMatnr() + "鍟嗗搧妗ｆ涓嶅瓨鍦�");
}
+ if (mat.getUpQty().compareTo(detlDto.getAnfme()) < 0) {
+ throw new CoolException("鐗╂枡锛�" + detlDto.getMatnr() + "鍗曟鏈�澶х粍鎵樹笂闄愪负锛�" + mat.getUpQty());
+ }
WaitPakin waitPakin = new WaitPakin();
BeanUtils.copyProperties(mat, waitPakin);
waitPakin.setBatch(detlDto.getBatch());
- waitPakin.setZpallet(param.getBarcode()); // 鎵樼洏鐮�
- waitPakin.setIoStatus("N"); // 鍏ュ嚭鐘舵��
- waitPakin.setAnfme(detlDto.getAnfme()); // 鏁伴噺
- waitPakin.setStatus("Y"); // 鐘舵��
+ waitPakin.setZpallet(param.getBarcode());
+ waitPakin.setIoStatus("N");
+ waitPakin.setAnfme(detlDto.getAnfme());
+ waitPakin.setStatus("Y");
waitPakin.setAppeUser(userId);
waitPakin.setAppeTime(now);
waitPakin.setModiUser(userId);
@@ -610,13 +627,13 @@
// 鍏宠仈缁勬墭
} else {
// Order order = orderService.selectByNo(param.getOrderNo());
- Order order = OrderInAndOutUtil.selectByNo(Boolean.TRUE, param.getOrderNo());
- if (Cools.isEmpty(order) || order.getSettle() > 2) {
- throw new CoolException("鍗曟嵁缂栧彿宸茶繃鏈�");
- }
// 鐢熸垚鍏ュ簱閫氱煡妗�
List<DetlDto> detlDtos = new ArrayList<>();
param.getCombMats().forEach(elem -> {
+ Order order = OrderInAndOutUtil.selectByNo(Boolean.TRUE, elem.getOrderNo());
+ if (Cools.isEmpty(order) || order.getSettle() > 2) {
+ throw new CoolException("鍗曟嵁缂栧彿宸茶繃鏈�");
+ }
// 璁㈠崟鏄庣粏鏁伴噺鏍￠獙
// OrderDetl orderDetl = OrderInAndOutUtil.selectItem(Boolean.TRUE, order.getId(), elem.getMatnr(), elem.getBatch(), elem.getBrand(), elem.getStandby1(), elem.getStandby2(), elem.getStandby3(),
// elem.getBoxType1(), elem.getBoxType2(), elem.getBoxType3());
@@ -635,6 +652,8 @@
elem.getBoxType1(), elem.getBoxType2(), elem.getBoxType3(), elem.getAnfme());
DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getBrand(), elem.getStandby1(), elem.getStandby2(), elem.getStandby3(),
elem.getBoxType1(), elem.getBoxType2(), elem.getBoxType3(), elem.getAnfme());
+ detlDto.setOrderId(order.getId());
+ detlDto.setOrderNo(order.getOrderNo());
if (DetlDto.has(detlDtos, detlDto)) {
DetlDto one = DetlDto.findDto(detlDtos, detlDto);
assert one != null;
@@ -643,16 +662,45 @@
detlDtos.add(detlDto);
}
});
+
+ BasContainer container = basContainerService.selectOne(new EntityWrapper<BasContainer>().eq("barcode", param.getBarcode()));
+ if (Objects.isNull(container)) {
+ throw new CoolException("鏁版嵁閿欒锛氬鍣ㄧ爜涓嶅瓨鍦紒锛�");
+ }
+ if (container.getMixMax() < detlDtos.size()) {
+ throw new CoolException("瓒呭嚭瀹瑰櫒鏈�澶ф贩瑁呮暟閲忥紝褰撳墠瀹瑰櫒鏈�澶ф暟閲忎负锛�" + container.getMixMax() + "!!");
+ }
+ Set<String> matnrs = detlDtos.stream().map(DetlDto::getMatnr).collect(Collectors.toSet());
+ List<Mat> mats = matService.selectList(new EntityWrapper<Mat>().in("matnr", matnrs));
+ Set<Long> tagIds = mats.stream().map(Mat::getTagId).collect(Collectors.toSet());
+ if (tagIds.size() > 1) {
+ throw new CoolException("缁勬墭鐗╂枡绫诲瀷涓嶄竴鑷达紝鍙湁鐩稿悓鐨勭墿鏂欏垎绫绘墠鍙互缁勬墭锛侊紒");
+ }
+ //杩樺彲浠ユ斁鍏ュ灏戠鐗╂枡
+ Integer suplus = container.getMixMax();
for (DetlDto detlDto : detlDtos) {
Mat mat = matService.selectByMatnr(detlDto.getMatnr());
if (Cools.isEmpty(mat)) {
throw new CoolException(detlDto.getMatnr() + "鍟嗗搧妗ｆ涓嶅瓨鍦�");
}
+ //鏈�澶氬彲鏀炬暟閲�
+ Double singleMax = mat.getUpQty() * suplus;
+ if (singleMax.compareTo(detlDto.getAnfme()) < 0) {
+ throw new CoolException("鐗╂枡锛�" + detlDto.getMatnr() + "鍗曟缁勬墭涓婇檺涓猴細" + mat.getUpQty() + ",褰撳墠鎬婚噺瓒呭嚭鎵樼洏瑁呰浇涓婇檺!!");
+ }
+ BigDecimal decimal = new BigDecimal(detlDto.getAnfme() / mat.getUpQty());
+ //褰撳墠鐗╂枡闇�瑕佸崰鐢ㄦ枡绠辨牸鏁�
+ Integer curr = decimal.setScale(0, RoundingMode.CEILING).intValue();
+ suplus = suplus - curr;
+ if (suplus < 0) {
+ throw new CoolException("鐗╂枡锛�" + detlDto.getMatnr() + ", 瓒呭嚭褰撳墠鎵樼洏瑁呰浇涓婇檺锛侊紒");
+ }
+
WaitPakin waitPakin = new WaitPakin();
BeanUtils.copyProperties(mat, waitPakin);
// waitPakin.sync(mat);
- waitPakin.setOrderNo(order.getOrderNo()); // 鍗曟嵁缂栧彿
- waitPakin.setOrderId(order.getId());
+ waitPakin.setOrderNo(detlDto.getOrderNo()); // 鍗曟嵁缂栧彿
+ waitPakin.setOrderId(detlDto.getOrderId());
waitPakin.setBatch(detlDto.getBatch()); // 搴忓垪鐮�
waitPakin.setZpallet(param.getBarcode()); // 鎵樼洏鐮�
waitPakin.setIoStatus("N"); // 鍏ュ嚭鐘舵��
@@ -666,8 +714,12 @@
throw new CoolException("淇濆瓨鍏ュ簱閫氱煡妗ｅけ璐�");
}
}
-// orderService.updateSettle(order.getId(), 2L, userId);
- OrderInAndOutUtil.updateOrder(Boolean.TRUE, order.getId(), 2L, userId);
+
+ Set<String> stringSet = param.getCombMats().stream().map(CombParam.CombMat::getOrderNo).collect(Collectors.toSet());
+ stringSet.forEach(orderNo -> {
+ Order order = OrderInAndOutUtil.selectByNo(Boolean.TRUE, orderNo);
+ OrderInAndOutUtil.updateOrder(Boolean.TRUE, order.getId(), 2L, userId);
+ });
}
}
@@ -1166,79 +1218,209 @@
/**
* @author Ryan
+ * @date 2025/9/24
+ * @description: 鑾峰彇璁㈠崟鐗╂枡淇℃伅
+ * @version 1.0
+ */
+ @Override
+ public R getMatsByQRcode(PakinMatsByQRParams params) {
+ if (Objects.isNull(params)) {
+ throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ if (Objects.isNull(params.getOrderNo())) {
+ throw new CoolException("鍗曞彿涓嶈兘涓虹┖锛侊紒");
+ }
+ OrderPakin orderPakin = orderPakinService.selectOne(new EntityWrapper<OrderPakin>().eq("order_no", params.getOrderNo()));
+ if (Objects.isNull(orderPakin)) {
+ throw new CoolException("鏁版嵁閿欒锛氬崟鎹笉瀛樺湪锛侊紒");
+ }
+ List<OrderDetlPakin> detlPakins = orderDetlPakinService.selectList(new EntityWrapper<OrderDetlPakin>()
+ .eq(!Cools.isEmpty(params.getMatnr()), "matnr", params.getMatnr())
+ .eq("order_id", orderPakin.getId()));
+ if (Objects.isNull(detlPakins) || detlPakins.isEmpty()) {
+ throw new CoolException("鏁版嵁閿欒锛� 鍗曟嵁鏄庣粏涓嶅瓨鍦紒锛�");
+ }
+
+ return R.ok().add(detlPakins);
+ }
+
+ /**
+ * @author Ryan
+ * @date 2025/9/24
+ * @description: AGV鍛煎彨鎼繍
+ * @version 1.0
+ */
+ @Override
+ public R OutCallAgv(AgvCallParams params, Long userId) {
+ LocCache locCaches = locCacheService.selectOne(new EntityWrapper<LocCache>()
+ .eq("loc_sts", LocStsType.LOC_STS_TYPE_F.type)
+ .eq("frozen", 0)
+ .orderDesc(Arrays.asList("sort", "first_time"))
+ .last("OFFSET 0 ROWS FETCH NEXT 1 ROWS ONLY"));
+ if (Objects.isNull(locCaches)) {
+ throw new CoolException("鏆傛棤婊¤冻闇�姹傚簱浣嶏紒");
+ }
+ BasStation station = basStationService.selectOne(new EntityWrapper<BasStation>()
+ .eq("loc_sts", LocStsType.LOC_STS_TYPE_O.type)
+ .eq("dev_no", params.getTarSite()));
+ if (Objects.isNull(station)) {
+ throw new CoolException("绔欑偣姝ｅ湪鎵ц浠诲姟锛侊紒");
+ }
+
+ generateOutTask(station, locCaches, userId);
+
+ return R.ok();
+ }
+
+ /**
+ * @author Ryan
+ * @date 2025/9/25
+ * @description: 鍛煎彨AGV鐢熸垚鍑哄簱浠诲姟
+ * @version 1.0
+ */
+ @Transactional(rollbackFor = Exception.class)
+ public void generateOutTask(BasStation station, LocCache loc, Long userId) {
+ // 鑾峰彇宸ヤ綔鍙�
+ int workNo = commonService.getWorkNo(WorkNoType.PICK.type);
+ // 淇濆瓨宸ヤ綔妗�
+ Task task = new Task();
+ task.setWrkNo(workNo)
+ .setIoTime(new Date())
+ .setWrkSts(11L) // 宸ヤ綔鐘舵�侊細11.鐢熸垚鍑哄簱ID
+ .setIoType(101) // 鍏ュ嚭搴撶姸鎬侊細 11.搴撴牸绉昏浇
+ .setTaskType("agv")
+ .setIoPri(10D)
+ .setFullPlt("Y") // 婊℃澘锛歒
+ .setPicking("N") // 鎷ｆ枡
+ .setExitMk("N")// 閫�鍑�
+ .setStaNo(station.getDevNo())
+ .setSourceLocNo(loc.getLocNo())
+ .setEmptyMk(loc.getLocSts().equals("D") ? "Y" : "N")// 绌烘澘
+ .setBarcode(loc.getBarcode())// 鎵樼洏鐮�
+ .setLinkMis("N")
+ .setAppeUser(userId)
+ .setAppeTime(new Date())
+ .setModiUser(userId)
+ .setModiTime(new Date());
+ if (!taskService.insert(task)) {
+ throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐�");
+ }
+ List<LocDetl> detls = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("loc_id", loc.getId()));
+ if (Objects.isNull(detls) || detls.isEmpty()) {
+ throw new CoolException("鏁版嵁閿欒锛氬簱浣嶆槑缁嗕负绌猴紒锛�");
+ }
+ List<TaskDetl> taskDetls = new ArrayList<>();
+ detls.forEach(pakin -> {
+ TaskDetl wrkDetl = new TaskDetl();
+ BeanUtils.copyProperties(pakin, wrkDetl);
+ wrkDetl.setWrkNo(workNo)
+ .setIoTime(new Date())
+ .setOrderNo(pakin.getOrderNo())
+ .setAnfme(pakin.getAnfme())
+ .setZpallet(pakin.getZpallet())
+ .setBatch(pakin.getBatch())
+ .setMatnr(pakin.getMatnr())
+ .setMaktx(pakin.getMaktx())
+ .setAppeUser(userId)
+ .setUnit(pakin.getUnit())
+ .setModel(pakin.getModel())
+ .setAppeTime(new Date())
+ .setModiUser(userId);
+ taskDetls.add(wrkDetl);
+ });
+
+ //淇濆瓨宸ヤ綔妗ｆ槑缁�
+ if (!taskDetlService.insertBatch(taskDetls)) {
+ throw new CoolException("淇濆瓨宸ヤ綔妗ｆ槑缁嗗け璐�");
+ }
+
+ loc.setLocSts(LocStsType.LOC_STS_TYPE_R.type);
+ loc.setModiUser(userId);
+ loc.setModiTime(new Date());
+
+ if (!locCacheService.updateById(loc)) {
+ throw new CoolException("鏇存柊搴撲綅鐘舵�佷俊鎭紒锛�");
+ }
+
+ // 淇敼鐩爣绔欑偣淇℃伅
+ if (station.getLocSts().equals("O")) {
+ station.setLocSts("S"); // S.鍏ュ簱棰勭害
+ station.setModiTime(new Date());
+ station.setModiUser(userId);
+ if (!basStationService.updateById(station)) {
+ throw new CoolException("鏇存柊鐩爣搴撲綅鐘舵�佸け璐�");
+ }
+ } else {
+ throw new CoolException("绉昏浆澶辫触锛岀洰鏍囧簱浣嶇姸鎬侊細" + station.getLocSts());
+ }
+ }
+
+ /**
+ * @author Ryan
* @date 2025/9/22
* @description: 鐢熸垚AGV鎼繍浠诲姟
* @version 1.0
*/
@Transactional(rollbackFor = Exception.class)
public void generateAgvTask(String type, LocCache loc, String orgSite, String barcode, Long userId) {
- WaitPakin pakin = waitPakinService.selectOne(new EntityWrapper<WaitPakin>().eq("zpallet", barcode));
- if (Objects.isNull(pakin)) {
+ List<WaitPakin> pakins = waitPakinService.selectList(new EntityWrapper<WaitPakin>().eq("zpallet", barcode));
+ if (Objects.isNull(pakins) || pakins.isEmpty()) {
throw new CoolException("缁勬墭淇℃伅涓嶅瓨鍦紒锛�");
}
- OrderPakin orderPakin = orderPakinService.selectById(pakin.getOrderId());
- if (Objects.isNull(orderPakin)) {
- throw new CoolException("鍗曟嵁涓嶈兘涓虹┖锛侊紒");
- }
-
- List<OrderDetlPakin> detls = orderDetlPakinService.selectList(new EntityWrapper<OrderDetlPakin>().eq("order_id", pakin.getOrderId()));
- if (Objects.isNull(detls) || detls.isEmpty()) {
- throw new CoolException("鏁版嵁閿欒锛氬崟鎹槑缁嗕笉瀛樺湪锛侊紒");
- }
-
- Date now = new Date();
// 鑾峰彇宸ヤ綔鍙�
int workNo = commonService.getWorkNo(WorkNoType.PICK.type);
// 淇濆瓨宸ヤ綔妗�
- WrkMast wrkMast = new WrkMast();
- wrkMast.setWrkNo(workNo);
- wrkMast.setIoTime(now);
- wrkMast.setWrkSts(11L); // 宸ヤ綔鐘舵�侊細11.鐢熸垚鍑哄簱ID
- wrkMast.setIoType(11); // 鍏ュ嚭搴撶姸鎬侊細 11.搴撴牸绉昏浇
- wrkMast.setTaskType("agv");
- wrkMast.setIoPri(10D);
- wrkMast.setLocNo(loc.getLocNo()); // 鐩爣搴撲綅
- wrkMast.setFullPlt("Y"); // 婊℃澘锛歒
- wrkMast.setPicking("N"); // 鎷ｆ枡
- wrkMast.setExitMk("N"); // 閫�鍑�
- wrkMast.setSourceLocNo(orgSite);
- wrkMast.setEmptyMk(loc.getLocSts().equals("D") ? "Y" : "N"); // 绌烘澘
- wrkMast.setBarcode(barcode); // 鎵樼洏鐮�
- wrkMast.setLinkMis("N");
- wrkMast.setAppeUser(userId);
- wrkMast.setAppeTime(now);
- wrkMast.setModiUser(userId);
- wrkMast.setModiTime(now);
- if (!wrkMastService.insert(wrkMast)) {
+ Task task = new Task();
+ task.setWrkNo(workNo)
+ .setIoTime(new Date())
+ .setWrkSts(1L) // 宸ヤ綔鐘舵�侊細11.鐢熸垚鍑哄簱ID
+ .setIoType(1) // 鍏ュ嚭搴撶姸鎬侊細 11.搴撴牸绉昏浇
+ .setTaskType("agv")
+ .setIoPri(10D)
+ .setLocNo(loc.getLocNo()) // 鐩爣搴撲綅
+ .setFullPlt("Y") // 婊℃澘锛歒
+ .setPicking("N") // 鎷ｆ枡
+ .setExitMk("N")// 閫�鍑�
+ .setSourceStaNo(orgSite)
+ .setEmptyMk(loc.getLocSts().equals("D") ? "Y" : "N")// 绌烘澘
+ .setBarcode(barcode)// 鎵樼洏鐮�
+ .setLinkMis("N")
+ .setAppeUser(userId)
+ .setAppeTime(new Date())
+ .setModiUser(userId)
+ .setModiTime(new Date());
+ if (!taskService.insert(task)) {
throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐�");
}
- List<WrkDetl> taskDetls = new ArrayList<>();
- detls.forEach(detl -> {
- WrkDetl wrkDetl = new WrkDetl();
- BeanUtils.copyProperties(detl, wrkDetl);
+ List<TaskDetl> taskDetls = new ArrayList<>();
+ pakins.forEach(pakin -> {
+ TaskDetl wrkDetl = new TaskDetl();
+ BeanUtils.copyProperties(pakin, wrkDetl);
wrkDetl.setWrkNo(workNo)
.setIoTime(new Date())
- .setAnfme(detl.getAnfme())
+ .setOrderNo(pakin.getOrderNo())
+ .setAnfme(pakin.getAnfme())
.setZpallet(pakin.getZpallet())
- .setBatch(detl.getBatch())
- .setMatnr(detl.getMatnr())
- .setMaktx(detl.getMaktx())
+ .setBatch(pakin.getBatch())
+ .setMatnr(pakin.getMatnr())
+ .setMaktx(pakin.getMaktx())
.setAppeUser(userId)
- .setUnit(detl.getUnit())
- .setModel(detl.getModel())
+ .setUnit(pakin.getUnit())
+ .setModel(pakin.getModel())
.setAppeTime(new Date())
.setModiUser(userId);
taskDetls.add(wrkDetl);
});
+
//淇濆瓨宸ヤ綔妗ｆ槑缁�
- if (!wrkDetlService.insertBatch(taskDetls)) {
+ if (!taskDetlService.insertBatch(taskDetls)) {
throw new CoolException("淇濆瓨宸ヤ綔妗ｆ槑缁嗗け璐�");
}
// 淇敼鐩爣搴撲綅鐘舵��
if (loc.getLocSts().equals("O")) {
loc.setLocSts("S"); // S.鍏ュ簱棰勭害
- loc.setModiTime(now);
+ loc.setModiTime(new Date());
loc.setModiUser(userId);
if (!locCacheService.updateById(loc)) {
throw new CoolException("鏇存柊鐩爣搴撲綅鐘舵�佸け璐�");
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 29dfc78..5277f6f 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -465,6 +465,7 @@
tagId = tagService.getTop().getId();
}
mat.setTagId(tagId);
+ mat.setLocType(tagId);
mat.setMatnr(analyse.getMatnr());
mat.setMaktx(param.getMaterialName());
mat.setSpecs(param.getConfigureDesc());
@@ -571,6 +572,7 @@
// mat.setModel(param.getModel());
mat.setTagId(tagId);
+ mat.setLocType(tagId);
mat.setStatus(1);
mat.setCreateTime(now);
mat.setUpdateTime(now);
diff --git a/src/main/java/com/zy/asrs/service/impl/TaskDetlLogServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/TaskDetlLogServiceImpl.java
index 3def8a6..5c2334e 100644
--- a/src/main/java/com/zy/asrs/service/impl/TaskDetlLogServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/TaskDetlLogServiceImpl.java
@@ -1,12 +1,47 @@
package com.zy.asrs.service.impl;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.core.exception.CoolException;
+import com.zy.asrs.entity.Task;
+import com.zy.asrs.entity.TaskDetl;
+import com.zy.asrs.entity.TaskLog;
import com.zy.asrs.mapper.TaskDetlLogMapper;
import com.zy.asrs.entity.TaskDetlLog;
import com.zy.asrs.service.TaskDetlLogService;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.zy.asrs.service.TaskDetlService;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
@Service("taskDetlLogService")
public class TaskDetlLogServiceImpl extends ServiceImpl<TaskDetlLogMapper, TaskDetlLog> implements TaskDetlLogService {
+ @Autowired
+ private TaskDetlService taskDetlService;
+
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public boolean save(Integer wrkNo) {
+ List<TaskDetl> detls = taskDetlService.selectList(new EntityWrapper<TaskDetl>().eq("wrk_no", wrkNo));
+ if (Objects.isNull(detls) || detls.isEmpty()) {
+ throw new CoolException("鏁版嵁閿欒锛氫换鍔′笉瀛樺湪锛侊紒");
+ }
+ detls.forEach(detl -> {
+ TaskDetlLog detlLog = new TaskDetlLog();
+ BeanUtils.copyProperties(detl, detlLog);
+ detlLog.setId(null);
+ detlLog.setLogId(detl.getId());
+ if (!this.insert(detlLog)) {
+ throw new CoolException("宸ヤ綔妗ｆ槑缁嗗巻鍙蹭繚瀛樺け璐ワ紒锛�");
+ }
+ });
+ return false;
+ }
}
diff --git a/src/main/java/com/zy/asrs/service/impl/TaskLogServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/TaskLogServiceImpl.java
index a413b01..cd66568 100644
--- a/src/main/java/com/zy/asrs/service/impl/TaskLogServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/TaskLogServiceImpl.java
@@ -1,12 +1,49 @@
package com.zy.asrs.service.impl;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.core.exception.CoolException;
+import com.zy.asrs.entity.Task;
+import com.zy.asrs.entity.WrkMast;
+import com.zy.asrs.entity.WrkMastLog;
import com.zy.asrs.mapper.TaskLogMapper;
import com.zy.asrs.entity.TaskLog;
import com.zy.asrs.service.TaskLogService;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.zy.asrs.service.TaskService;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Objects;
@Service("taskLogService")
public class TaskLogServiceImpl extends ServiceImpl<TaskLogMapper, TaskLog> implements TaskLogService {
+ @Autowired
+ private TaskService taskService;
+
+ /**
+ * @author Ryan
+ * @date 2025/9/23
+ * @description: 淇濆瓨浠诲姟鏃ュ織
+ * @version 1.0
+ */
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public boolean save(Integer wrkNo) {
+ Task task = taskService.selectOne(new EntityWrapper<Task>().eq("wrk_no", wrkNo));
+ if (Objects.isNull(task)) {
+ throw new CoolException("鏁版嵁閿欒锛氫换鍔′笉瀛樺湪锛侊紒");
+ }
+ TaskLog taskLog = new TaskLog();
+ BeanUtils.copyProperties(task, taskLog);
+ taskLog.setLogId(task.getId());
+
+ if (!this.insert(taskLog)) {
+ throw new CoolException("浠诲姟鏃ュ織淇濆瓨澶辫触锛侊紒");
+ }
+
+ return false;
+ }
}
diff --git a/src/main/java/com/zy/asrs/service/impl/TaskServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/TaskServiceImpl.java
index 68b9ca5..a983123 100644
--- a/src/main/java/com/zy/asrs/service/impl/TaskServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/TaskServiceImpl.java
@@ -1,12 +1,287 @@
package com.zy.asrs.service.impl;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.mapper.Wrapper;
+import com.core.common.Cools;
+import com.core.common.DateUtils;
+import com.core.exception.CoolException;
+import com.zy.asrs.entity.*;
import com.zy.asrs.mapper.TaskMapper;
-import com.zy.asrs.entity.Task;
-import com.zy.asrs.service.TaskService;
+import com.zy.asrs.service.*;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.zy.asrs.utils.OrderInAndOutUtil;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Collections;
+import java.util.Date;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
@Service("taskService")
public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task> implements TaskService {
+ @Autowired
+ private TaskLogService taskLogService;
+ @Autowired
+ private LocCacheService locCacheService;
+ @Autowired
+ private WaitPakinService waitPakinService;
+ @Autowired
+ private TaskDetlService taskDetlService;
+ @Autowired
+ private TaskService taskService;
+ @Autowired
+ private TaskDetlLogService taskDetlLogService;
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void completeWrkMast(String workNo, Long userId) {
+ Task wrkMast = this.selectOne(new EntityWrapper<Task>().eq("wrk_no", workNo));
+ if (Cools.isEmpty(wrkMast)) {
+ 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("鎵嬪姩瀹屾垚");
+ if (!this.updateById(wrkMast)) {
+ throw new CoolException("淇敼宸ヤ綔妗ｅけ璐�");
+ }
+ }
+
+ @Override
+ @Transactional
+ public void pickWrkMast(String workNo, Long userId) {
+ Task wrkMast = this.selectById(workNo);
+ if (Cools.isEmpty(wrkMast)) {
+ throw new CoolException(workNo + "宸ヤ綔妗ｄ笉瀛樺湪");
+ }
+ // 鍏ュ嚭搴撶被鍨嬪垽鏂�
+ if (wrkMast.getIoType() != 103 && wrkMast.getIoType() != 104 && wrkMast.getIoType() != 107) {
+ throw new CoolException("褰撳墠鍏ュ嚭搴撶被鍨嬫棤娉曡繘琛屾搷浣�");
+ }
+ // 宸ヤ綔鐘舵�佸垽鏂�
+ if (wrkMast.getWrkSts() < 11 || wrkMast.getWrkSts() == 15) {
+ throw new CoolException("褰撳墠宸ヤ綔鐘舵�佹棤娉曡繘琛屾搷浣�");
+ }
+ // 淇濆瓨宸ヤ綔鏄庣粏妗ｅ巻鍙叉。
+// if (!wrkDetlLogService.save(wrkMast.getWrkNo())) {
+// throw new CoolException("淇濆瓨宸ヤ綔鏄庣粏妗ｅ巻鍙叉。澶辫触");
+// }
+ // 淇濆瓨宸ヤ綔涓绘。鍘嗗彶妗�
+ if (!taskLogService.save(wrkMast.getWrkNo())) {
+ throw new CoolException("淇濆瓨宸ヤ綔涓绘。鍘嗗彶妗ｅけ璐�");
+ }
+ // 鑾峰彇鐩爣绔�
+// Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>()
+// .eq("type_no", wrkMast.getIoType() - 50)
+// .eq("stn_no", wrkMast.getStaNo()) // 浣滀笟绔欑偣 = 鎷ｆ枡鍑哄簱鐨勭洰鏍囩珯
+// .eq("crn_no", wrkMast.getCrnNo()); // 鍫嗗灈鏈哄彿
+// StaDesc staDesc = staDescService.selectOne(wrapper);
+// if (Cools.isEmpty(staDesc)) {
+// throw new CoolException("鍏ュ簱璺緞涓嶅瓨鍦�");
+// }
+ Date now = new Date();
+ // 鍫嗗灈鏈虹珯鐐�(鐩爣绔�)
+// Integer staNo = staDesc.getCrnStn();
+ // 鏇存柊宸ヤ綔妗ｆ暟鎹姸鎬�
+ wrkMast.setIoType(wrkMast.getIoType() - 50); // 鍏ュ嚭搴撶被鍨�: 103->53,104->54,107->57
+ wrkMast.setWrkSts(2L); // 宸ヤ綔鐘舵��: 2.璁惧涓婅蛋
+ wrkMast.setSourceStaNo(wrkMast.getStaNo()); // 婧愮珯
+// wrkMast.setStaNo(staNo + ""); // 鐩爣绔�
+ wrkMast.setLocNo(wrkMast.getSourceLocNo()); // 鐩爣搴撲綅 = 鍑哄簱鏃剁殑婧愬簱浣�
+ wrkMast.setSourceLocNo(""); // 婧愬簱浣嶆竻绌�
+ wrkMast.setModiTime(now);
+ wrkMast.setModiUser(userId);
+ if (!this.updateById(wrkMast)) {
+ throw new CoolException("鏇存柊宸ヤ綔妗ｆ暟鎹姸鎬佸け璐�");
+ }
+ // 淇敼搴撲綅鐘舵�� Q.鎷ｆ枡/鐩樼偣/骞舵澘鍐嶅叆搴�
+ LocCache locMast = locCacheService.selectOne(new EntityWrapper<LocCache>().eq("loc_no", wrkMast.getLocNo()));
+ locMast.setLocSts("Q");
+ locMast.setModiTime(now);
+ locMast.setModiUser(userId);
+ if (!locCacheService.updateById(locMast)) {
+ throw new CoolException("淇敼搴撲綅鐘舵�佸け璐�");
+ }
+ }
+
+ @Override
+ public List<Task> selectToBeCompleteData() {
+ return this.baseMapper.selectToBeCompleteData();
+ }
+
+
+ @Override
+ @Transactional
+ public void cancelWrkMast(String workNo, Long userId) {
+ Date now = new Date();
+ Task wrkMast = this.selectOne(new EntityWrapper<Task>().eq("wrk_no", workNo));
+ if (Cools.isEmpty(wrkMast)) {
+ throw new CoolException(workNo + "宸ヤ綔妗ｄ笉瀛樺湪");
+ }
+ String locNo = ""; // 寰呬慨鏀圭洰鏍囧簱浣�
+ String locSts = ""; // 寰呬慨鏀圭洰鏍囧簱浣嶇姸鎬�
+ // 鍏ュ簱鍙栨秷锛堜慨鏀圭洰鏍囧簱浣嶏級
+ if (wrkMast.getWrkSts() < 4) {
+ locNo = wrkMast.getLocNo();
+ locSts = "O";
+
+ // 搴撲綅杞Щ
+ if (wrkMast.getIoType() == 11) {
+ // 搴撲綅杞Щ锛氭簮搴撲綅
+ LocCache locMast = locCacheService.selectOne(new EntityWrapper<LocCache>().eq("loc_no", 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);
+ locCacheService.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";
+ // 搴撲綅杞Щ锛氱洰鏍囧簱浣�
+ LocCache locMast = locCacheService.selectOne(new EntityWrapper<LocCache>().eq("loc_no", wrkMast.getLocNo()));
+ if (Cools.isEmpty(locMast)) {
+ throw new CoolException("鍙栨秷搴撲綅杞Щ澶辫触锛岀洰鏍囧簱浣嶄笉瀛樺湪:" + wrkMast.getSourceLocNo());
+ }
+ locMast.setLocSts("O");
+ locMast.setModiTime(now);
+ locMast.setModiUser(userId);
+ locCacheService.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("zpallet", waitPakin.getZpallet())
+ .eq("matnr", waitPakin.getMatnr())
+ .eq("batch", waitPakin.getBatch()));
+ }
+ }
+ }
+
+ //鍙栨秷鍑哄簱宸ヤ綔妗ｆ椂锛屾煡璇㈠崟鎹鐞嗚〃锛屽洖婊氫綔涓氫腑鏁伴噺
+ if (wrkMast.getIoType() == 101 || wrkMast.getIoType() == 103) {
+ List<TaskDetl> wrkDetls = taskDetlService.selectList(new EntityWrapper<TaskDetl>().eq("wrk_no", wrkMast.getWrkNo()));
+ for (TaskDetl wrkDetl : wrkDetls) {
+ if (!Cools.isEmpty(wrkDetl.getOrderNo())) {
+// if (!orderDetlService.decrease(wrkDetl.getOrderNo(), wrkDetl.getMatnr(), wrkDetl.getBatch(), wrkDetl.getAnfme())) {
+// throw new CoolException("璁㈠崟鏁版嵁鍥炴粴澶辫触");
+// }
+ OrderInAndOutUtil.decrease(Boolean.FALSE, wrkDetl.getOrderNo(), wrkDetl.getMatnr(), wrkDetl.getBatch(), wrkDetl.getBrand(),
+ wrkDetl.getStandby1(), wrkDetl.getStandby2(), wrkDetl.getStandby3(),
+ wrkDetl.getBoxType1(), wrkDetl.getBoxType2(), wrkDetl.getBoxType3(), wrkDetl.getAnfme());
+
+ //淇敼璁㈠崟涓昏〃鐘舵��,娌℃湁浣滀笟鏁伴噺鏃舵墠鍙互淇敼
+ boolean flag = true;
+// List<OrderDetl> orderDetls = orderDetlService.selectList(new EntityWrapper<OrderDetl>().eq("order_no",wrkDetl.getOrderNo()));
+ Order order = OrderInAndOutUtil.selectByNo(Boolean.FALSE, wrkDetl.getOrderNo());
+ List<OrderDetl> orderDetls = OrderInAndOutUtil.selectByOrderId(Boolean.FALSE, order.getId());
+ for (OrderDetl orderDetl : orderDetls) {
+ if (orderDetl.getWorkQty() > 0) {
+ flag = false;
+ }
+ }
+ if (flag) {
+// Order order = orderService.selectOne(new EntityWrapper<Order>().eq("order_no",wrkDetl.getOrderNo()));
+ if (!Cools.isEmpty(order) && order.getSettle() == 2) {
+ order.setSettle(1L);
+ order.setUpdateBy(userId);
+ order.setUpdateTime(now);
+ }
+// if(!orderService.update(order,new EntityWrapper<Order>().eq("order_no",wrkDetl.getOrderNo()))){
+// throw new CoolException("淇敼璁㈠崟鐘舵�佸け璐�");
+// }
+ OrderInAndOutUtil.updateOrder(Boolean.FALSE, order.getId(), order.getSettle(), userId);
+ }
+ }
+ }
+
+ }
+
+// // 璁㈠崟鍏宠仈
+// List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
+// for (WrkDetl wrkDetl : wrkDetls) {
+// if (!Cools.isEmpty(wrkDetl.getOrderNo())) {
+// if (!orderDetlService.decrease(wrkDetl.getOrderNo(), wrkDetl.getMatnr(), wrkDetl.getBatch(), wrkDetl.getAnfme())) {
+// throw new CoolException("璁㈠崟鏁版嵁鍥炴粴澶辫触");
+// }
+// // 鐢熸垚鏂扮殑鍑哄簱浣滀笟
+//// stockOutRe(wrkMast, wrkDetls);
+// }
+// }
+
+ // 鍙栨秷鎿嶄綔浜哄憳璁板綍
+ wrkMast.setManuType("鎵嬪姩鍙栨秷");
+ wrkMast.setModiUser(userId);
+ wrkMast.setModiTime(now);
+ if (!taskService.updateById(wrkMast)) {
+ throw new CoolException("鍙栨秷宸ヤ綔妗ｅけ璐�");
+ }
+ // 淇濆瓨宸ヤ綔涓绘。鍘嗗彶妗�
+ if (!taskLogService.save(wrkMast.getWrkNo())) {
+ throw new CoolException("淇濆瓨宸ヤ綔鍘嗗彶妗ｅけ璐�, workNo = " + wrkMast.getWrkNo());
+ }
+ // 鍒犻櫎宸ヤ綔涓绘。
+ boolean wrkMastRes = taskService.deleteById(wrkMast);
+
+ if (wrkMast.getIoType() != 10 && wrkMast.getIoType() != 110) {
+ // 淇濆瓨宸ヤ綔鏄庣粏妗ｅ巻鍙叉。
+ if (!taskDetlLogService.save(wrkMast.getWrkNo())) {
+// throw new CoolException("淇濆瓨宸ヤ綔鏄庣粏鍘嗗彶妗ｅけ璐�, workNo = " + wrkMast.getWrkNo());
+ }
+ // 鍒犻櫎宸ヤ綔妗ｆ槑缁�
+ boolean wrkDetlRes = taskDetlService.delete(new EntityWrapper<TaskDetl>().eq("wrk_no", workNo));
+ }
+
+ // 淇敼搴撲綅鐘舵��
+ LocCache locMast = locCacheService.selectOne(new EntityWrapper<LocCache>().eq("loc_no", locNo));
+ if (Cools.isEmpty(locMast)) {
+ throw new CoolException("鍙栨秷宸ヤ綔妗ｅけ璐ワ紝搴撲綅涓嶅瓨鍦�:" + locNo);
+ }
+ locMast.setLocSts(locSts);
+ locMast.setModiTime(now);
+ locMast.setModiUser(userId);
+ boolean locMastRes = locCacheService.updateById(locMast);
+ if (!wrkMastRes || !locMastRes) {
+ throw new CoolException("淇濆瓨鏁版嵁澶辫触");
+ }
+ }
+
}
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 ede2bb1..86a7212 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -813,11 +813,11 @@
@Override
@Transactional
public void completeWrkMast(String workNo, Long userId) {
- WrkMast wrkMast = wrkMastService.selectById(workNo);
+ WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", workNo));
if (Cools.isEmpty(wrkMast)) {
throw new CoolException(workNo + "宸ヤ綔妗ｄ笉瀛樺湪");
}
- if (wrkMast.getWrkSts() == 4 || wrkMast.getWrkSts() == 14) {
+ if (wrkMast.getWrkSts() == 4 || wrkMast.getWrkSts() == 14 || wrkMast.getWrkSts() == 5 || wrkMast.getWrkSts() == 15) {
throw new CoolException("褰撳墠宸ヤ綔妗ｅ凡瀹屾垚");
}
// 鍏ュ簱 + 搴撲綅杞Щ
diff --git a/src/main/java/com/zy/asrs/service/impl/WrkMastExecuteLogServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WrkMastExecuteLogServiceImpl.java
deleted file mode 100644
index abbd9e1..0000000
--- a/src/main/java/com/zy/asrs/service/impl/WrkMastExecuteLogServiceImpl.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.zy.asrs.service.impl;
-
-import com.zy.asrs.mapper.WrkMastExecuteLogMapper;
-import com.zy.asrs.entity.WrkMastExecuteLog;
-import com.zy.asrs.service.WrkMastExecuteLogService;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-@Service("wrkMastExecuteLogService")
-public class WrkMastExecuteLogServiceImpl extends ServiceImpl<WrkMastExecuteLogMapper, WrkMastExecuteLog> implements WrkMastExecuteLogService {
-
-}
diff --git a/src/main/java/com/zy/asrs/service/impl/WrkMastExecuteServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WrkMastExecuteServiceImpl.java
deleted file mode 100644
index 06f9976..0000000
--- a/src/main/java/com/zy/asrs/service/impl/WrkMastExecuteServiceImpl.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.zy.asrs.service.impl;
-
-import com.zy.asrs.mapper.WrkMastExecuteMapper;
-import com.zy.asrs.entity.WrkMastExecute;
-import com.zy.asrs.service.WrkMastExecuteService;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-@Service("wrkMastExecuteService")
-public class WrkMastExecuteServiceImpl extends ServiceImpl<WrkMastExecuteMapper, WrkMastExecute> implements WrkMastExecuteService {
-
-}
diff --git a/src/main/java/com/zy/asrs/service/impl/WrkMastFourWarVehicleLogServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WrkMastFourWarVehicleLogServiceImpl.java
deleted file mode 100644
index 39e8ea5..0000000
--- a/src/main/java/com/zy/asrs/service/impl/WrkMastFourWarVehicleLogServiceImpl.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.zy.asrs.service.impl;
-
-import com.zy.asrs.mapper.WrkMastFourWarVehicleLogMapper;
-import com.zy.asrs.entity.WrkMastFourWarVehicleLog;
-import com.zy.asrs.service.WrkMastFourWarVehicleLogService;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-@Service("wrkMastFourWarVehicleLogService")
-public class WrkMastFourWarVehicleLogServiceImpl extends ServiceImpl<WrkMastFourWarVehicleLogMapper, WrkMastFourWarVehicleLog> implements WrkMastFourWarVehicleLogService {
-
-}
diff --git a/src/main/java/com/zy/asrs/service/impl/WrkMastFourWarVehicleServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WrkMastFourWarVehicleServiceImpl.java
deleted file mode 100644
index 3c0bacd..0000000
--- a/src/main/java/com/zy/asrs/service/impl/WrkMastFourWarVehicleServiceImpl.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.zy.asrs.service.impl;
-
-import com.zy.asrs.mapper.WrkMastFourWarVehicleMapper;
-import com.zy.asrs.entity.WrkMastFourWarVehicle;
-import com.zy.asrs.service.WrkMastFourWarVehicleService;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-@Service("wrkMastFourWarVehicleService")
-public class WrkMastFourWarVehicleServiceImpl extends ServiceImpl<WrkMastFourWarVehicleMapper, WrkMastFourWarVehicle> implements WrkMastFourWarVehicleService {
-
-}
diff --git a/src/main/java/com/zy/asrs/task/AutoLocMoveScheduler.java b/src/main/java/com/zy/asrs/task/AutoLocMoveScheduler.java
index 698e864..d45fce2 100644
--- a/src/main/java/com/zy/asrs/task/AutoLocMoveScheduler.java
+++ b/src/main/java/com/zy/asrs/task/AutoLocMoveScheduler.java
@@ -37,8 +37,7 @@
private OrderPakoutService orderPakoutService;
@Autowired
private OrderDetlService orderDetlService;
- @Autowired
- private AutoMoveService autoMoveService;
+
//瀹氭椂鍑哄簱 缁忓吀鍙屼几
@Scheduled(cron = "0/3 * * * * ? ")
diff --git a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
index a797915..ef69df3 100644
--- a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
+++ b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
@@ -81,7 +81,7 @@
// }
}
- @Scheduled(cron = "0/5 * * * * ? ")
+// @Scheduled(cron = "0/5 * * * * ? ")
@Async("orderThreadPool")
public void completeAndReportOrderInAndOutUtil() {
// String erpReport = Parameter.get().getErpReport();
@@ -101,7 +101,7 @@
// }
}
- @Scheduled(cron = "0/30 * * * * ? ")
+// @Scheduled(cron = "0/30 * * * * ? ")
@Async("orderThreadPool")
public void completeAndReportOrderReport() {
if (!ErpReportOld){
diff --git a/src/main/java/com/zy/asrs/task/WorkMastScheduler.java b/src/main/java/com/zy/asrs/task/WorkMastScheduler.java
index 10bffd4..0d39e15 100644
--- a/src/main/java/com/zy/asrs/task/WorkMastScheduler.java
+++ b/src/main/java/com/zy/asrs/task/WorkMastScheduler.java
@@ -1,6 +1,8 @@
package com.zy.asrs.task;
+import com.zy.asrs.entity.Task;
import com.zy.asrs.entity.WrkMast;
+import com.zy.asrs.service.TaskService;
import com.zy.asrs.service.WrkMastService;
import com.zy.asrs.task.core.ReturnT;
import com.zy.asrs.task.handler.WorkMastHandler;
@@ -25,6 +27,8 @@
private WrkMastService wrkMastService;
@Autowired
private WorkMastHandler workMastHandler;
+ @Autowired
+ private TaskService taskService;
@Scheduled(cron = "0/3 * * * * ? ")
private void execute(){
@@ -45,4 +49,23 @@
}
}
+ @Scheduled(cron = "0/3 * * * * ? ")
+ private void executeTask(){
+ List<Task> wrkMasts = taskService.selectToBeCompleteData();
+ if (wrkMasts.isEmpty()) {
+ return;
+ }
+ for (Task wrkMast : wrkMasts) {
+ ReturnT<String> returnT = workMastHandler.AgvStart(wrkMast);
+ if (!returnT.isSuccess()) {
+ wrkMast.setUpdMk("X");
+ wrkMast.setErrorMemo(returnT.getMsg());
+ wrkMast.setErrorTime(new Date());
+ if (!taskService.updateById(wrkMast)) {
+ log.error("宸ヤ綔妗workNo={}]鏍囪寰呭鐞嗗け璐�", wrkMast.getWrkNo());
+ }
+ }
+ }
+ }
+
}
diff --git a/src/main/java/com/zy/asrs/task/handler/OverYearLogHandler.java b/src/main/java/com/zy/asrs/task/handler/OverYearLogHandler.java
index ebd2260..2af6104 100644
--- a/src/main/java/com/zy/asrs/task/handler/OverYearLogHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/OverYearLogHandler.java
@@ -2,6 +2,7 @@
import com.zy.asrs.task.AbstractHandler;
import com.zy.asrs.task.core.ReturnT;
+import com.zy.system.timer.LoadingConfigTimer;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.stereotype.Service;
@@ -17,14 +18,22 @@
@Autowired
private JdbcTemplate jdbcTemplate;
+
+
+ @Autowired
+ private LoadingConfigTimer loadingConfigTimer;
+
@Transactional
public ReturnT<String> start() {
+ Integer logDeleteDays = loadingConfigTimer.getLogDeleteDays();
+ if (logDeleteDays == -1) {
+ return SUCCESS;
+ }
try {
// 鍒犻櫎鍗婂勾浠ヤ笂鐨勫巻鍙叉。
- jdbcTemplate.update("delete from asr_stk_hplc where dateadd(day,180,appe_time) <= getdate();");
- jdbcTemplate.update("delete from asr_wrk_detl_log where dateadd(day,1080,appe_time) <= getdate();");
- jdbcTemplate.update("delete from asr_wrk_mast_log where dateadd(day,360,appe_time) <= getdate();");
- jdbcTemplate.update("delete from cust_wait_pakin_log where dateadd(day,1080,appe_time) <= getdate();");
+ jdbcTemplate.update("delete from asr_wrk_detl_log where dateadd(day," + logDeleteDays + ",appe_time) <= getdate();");
+ jdbcTemplate.update("delete from asr_wrk_mast_log where dateadd(day," + logDeleteDays + ",appe_time) <= getdate();");
+ jdbcTemplate.update("delete from cust_wait_pakin_log where dateadd(day," + logDeleteDays + ",appe_time) <= getdate();");
} catch (Exception e) {
e.printStackTrace();
@@ -33,5 +42,4 @@
}
return SUCCESS;
}
-
}
diff --git a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
index 4389d7f..2d3edb0 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
@@ -6,8 +6,10 @@
import com.zy.asrs.entity.*;
import com.zy.asrs.enums.LocStsType;
import com.zy.asrs.service.*;
+import com.zy.asrs.service.impl.BasStationServiceImpl;
import com.zy.asrs.service.impl.LocCacheServiceImpl;
import com.zy.asrs.service.impl.OrderPakinServiceImpl;
+import com.zy.asrs.service.impl.TaskDetlServiceImpl;
import com.zy.asrs.task.AbstractHandler;
import com.zy.asrs.task.core.ReturnT;
import lombok.extern.slf4j.Slf4j;
@@ -48,6 +50,12 @@
private LocCacheService locCacheService;
@Autowired
private OrderPakinService orderPakinService;
+ @Autowired
+ private TaskService taskService;
+ @Autowired
+ private TaskDetlService taskDetlService;
+ @Autowired
+ private BasStationServiceImpl basStationService;
public ReturnT<String> start(WrkMast wrkMast) {
// 4.鍏ュ簱瀹屾垚
@@ -60,432 +68,374 @@
return SUCCESS;
}
+
public ReturnT<String> doIn(WrkMast wrkMast) {
- if (wrkMast.getTaskType().equals("agv")) {
- Date now = new Date();
- LocCache locCache = locCacheService.selectOne(new EntityWrapper<LocCache>().eq("loc_no", wrkMast.getLocNo()));
- if (Objects.isNull(locCache)) {
- throw new CoolException("鏁版嵁閿欒锛屽簱浣嶄笉瀛樺湪锛侊紒");
- }
- List<WaitPakin> apallet = waitPakinService.selectList(new EntityWrapper<WaitPakin>().eq("zpallet", wrkMast.getBarcode()));
- if (Objects.isNull(apallet)) {
- throw new CoolException("鏁版嵁閿欒锛氱粍鎵樻暟鎹笉瀛樺湪锛侊紒");
- }
-
- apallet.forEach(pakin -> {
- LocDetl detl = new LocDetl();
- BeanUtils.copyProperties(pakin, detl);
- detl.setBarcode(pakin.getBarcode())
- .setAnfme(pakin.getAnfme())
- .setBrand(pakin.getBrand())
- .setAppeTime(new Date())
- .setSpecs(pakin.getSpecs())
- .setColor(pakin.getColor())
- .setLocId(locCache.getId())
- .setLocNo(locCache.getLocNo())
- .setAreaId(locCache.getAreaId())
- .setAreaName(locCache.getAreaName())
- .setUnit(pakin.getUnit())
- .setBatch(pakin.getBatch());
-
- if (!locDetlService.insert(detl)) {
- throw new CoolException("搴撲綅鏄庣粏淇濆瓨澶辫触锛侊紒");
- }
- });
-
- locCache.setLocSts(LocStsType.LOC_STS_TYPE_F.type);
- locCache.setModiTime(new Date());
- locCache.setBarcode("");
- locCache.setModiTime(new Date());
- locCache.setIoTime(new Date());
- if (!locCacheService.updateById(locCache)) {
- throw new CoolException("搴撲綅鐘舵�佷慨鏀瑰け璐ワ紒");
- }
- wrkMast.setWrkSts(5L);
- wrkMast.setModiTime(new Date());
- if (!wrkMastService.updateById(wrkMast)) {
- throw new CoolException("浠诲姟鐘舵�佷慨鏀瑰け璐ワ紒锛�");
- }
-
- Set<Long> list = apallet.stream().map(WaitPakin::getOrderId).collect(Collectors.toSet());
- List<OrderPakin> pakins = orderPakinService.selectList(new EntityWrapper<OrderPakin>().in("order_id", list));
- if (Objects.isNull(pakins) || pakins.isEmpty()) {
- throw new CoolException("鍗曟嵁涓嶅瓨鍦紒锛�");
- }
- pakins.forEach(orderPakin -> {
- orderPakin.setSettle(4L);
- if (!orderPakinService.updateById(orderPakin)) {
- throw new CoolException("鍗曟嵁淇敼澶辫触锛侊紒");
- }
- });
- } else {
- Date now = new Date();
- LocMast locMast = locMastService.selectById(wrkMast.getLocNo());
- try {
- if (null == locMast) {
+ Date now = new Date();
+ LocMast locMast = locMastService.selectById(wrkMast.getLocNo());
+ try {
+ if (null == locMast) {
// exceptionHandle("宸ヤ綔妗workNo={0}]搴撲綅鍙烽敊璇痆locNo={1}]", wrkMast.getWrkNo(), wrkMast.getLocNo());
- TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
- return FAIL.setMsg("宸ヤ綔妗workNo=" + wrkMast.getWrkNo() + "]搴撲綅鍙烽敊璇痆locNo=" + wrkMast.getLocNo() + "]");
- }
- assert locMast != null;
- switch (wrkMast.getIoType()) {
- // 绌烘澘鍏ュ簱
- case 10:
- // 淇敼搴撲綅鐘舵��=D
- if (locMast.getLocSts().equals("S") || locMast.getLocSts().equals("Q")) {
- if (!Cools.isEmpty(wrkMast.getBarcode())) {
- locMast.setBarcode(wrkMast.getBarcode());
- }
- locMast.setLocSts("D");
- locMast.setIoTime(now);
- locMast.setModiTime(now);
- if (!locMastService.updateById(locMast)) {
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ return FAIL.setMsg("宸ヤ綔妗workNo=" + wrkMast.getWrkNo() + "]搴撲綅鍙烽敊璇痆locNo=" + wrkMast.getLocNo() + "]");
+ }
+ assert locMast != null;
+ switch (wrkMast.getIoType()) {
+ // 绌烘澘鍏ュ簱
+ case 10:
+ // 淇敼搴撲綅鐘舵��=D
+ if (locMast.getLocSts().equals("S") || locMast.getLocSts().equals("Q")) {
+ if (!Cools.isEmpty(wrkMast.getBarcode())) {
+ locMast.setBarcode(wrkMast.getBarcode());
+ }
+ locMast.setLocSts("D");
+ locMast.setIoTime(now);
+ locMast.setModiTime(now);
+ if (!locMastService.updateById(locMast)) {
// exceptionHandle("绌烘澘鍏ュ簱 ===>> 淇敼搴撲綅鐘舵�佸け璐�;[workNo={0}],[locNo={1}]", wrkMast.getWrkNo(), wrkMast.getLocNo());
- TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
- return FAIL.setMsg("绌烘澘鍏ュ簱 ===>> 淇敼搴撲綅鐘舵�佸け璐�; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getLocNo() + "]");
- }
- }
- break;
- // 鍏ㄦ澘鍏ュ簱
- case 1:
- // 娓呴櫎鎵�灞炲簱浣嶄箣鍓嶇殑搴撳瓨鏄庣粏
- List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("loc_no", wrkMast.getLocNo()));
- if (!locDetls.isEmpty()) {
- locDetlService.delete(new EntityWrapper<LocDetl>().eq("loc_no", wrkMast.getLocNo()));
- }
- // 鏍规嵁宸ヤ綔鍙凤紝鏌ヨ宸ヤ綔鏄庣粏妗�
- List<WrkDetl> wrkDetls = wrkDetlService.selectList(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkMast.getWrkNo()));
- if (wrkDetls.isEmpty()) {
-// exceptionHandle("鍏ㄦ澘鍏ュ簱 ===>> 宸ヤ綔鏄庣粏妗ｄ笉瀛樺湪锛沎workNo={0}]", wrkMast.getWrkNo());
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
- return FAIL.setMsg("鍏ㄦ澘鍏ュ簱 ===>> 宸ヤ綔鏄庣粏妗ｄ笉瀛樺湪; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getLocNo() + "]");
+ return FAIL.setMsg("绌烘澘鍏ュ簱 ===>> 淇敼搴撲綅鐘舵�佸け璐�; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getLocNo() + "]");
}
- // 閬嶅巻宸ヤ綔鏄庣粏锛屾洿鏂板簱瀛樻槑缁嗗拰鍏ュ簱閫氱煡妗�
- for (WrkDetl wrkDetl : wrkDetls) {
+ }
+ break;
+ // 鍏ㄦ澘鍏ュ簱
+ case 1:
+ // 娓呴櫎鎵�灞炲簱浣嶄箣鍓嶇殑搴撳瓨鏄庣粏
+ List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("loc_no", wrkMast.getLocNo()));
+ if (!locDetls.isEmpty()) {
+ locDetlService.delete(new EntityWrapper<LocDetl>().eq("loc_no", wrkMast.getLocNo()));
+ }
+ // 鏍规嵁宸ヤ綔鍙凤紝鏌ヨ宸ヤ綔鏄庣粏妗�
+ List<WrkDetl> wrkDetls = wrkDetlService.selectList(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkMast.getWrkNo()));
+ if (wrkDetls.isEmpty()) {
+// exceptionHandle("鍏ㄦ澘鍏ュ簱 ===>> 宸ヤ綔鏄庣粏妗ｄ笉瀛樺湪锛沎workNo={0}]", wrkMast.getWrkNo());
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ return FAIL.setMsg("鍏ㄦ澘鍏ュ簱 ===>> 宸ヤ綔鏄庣粏妗ｄ笉瀛樺湪; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getLocNo() + "]");
+ }
+ // 閬嶅巻宸ヤ綔鏄庣粏锛屾洿鏂板簱瀛樻槑缁嗗拰鍏ュ簱閫氱煡妗�
+ for (WrkDetl wrkDetl : wrkDetls) {
- LocDetl locDetl = locDetlService.selectItem(locMast.getLocNo(), wrkDetl.getMatnr(), wrkDetl.getBatch(), wrkDetl.getBrand()
- , wrkDetl.getStandby1(), wrkDetl.getStandby2(), wrkDetl.getStandby3(), wrkDetl.getBoxType1(), wrkDetl.getBoxType2(), wrkDetl.getBoxType3());
- if (null != locDetl) {
- if (!locDetlService.updateAnfme(wrkDetl.getAnfme(), wrkMast.getLocNo(), wrkDetl.getMatnr(), wrkDetl.getBatch(), wrkDetl.getBrand(), wrkDetl.getStandby1(), wrkDetl.getStandby2(), wrkDetl.getStandby3()
- , wrkDetl.getBoxType1(), wrkDetl.getBoxType2(), wrkDetl.getBoxType3())) {
+ LocDetl locDetl = locDetlService.selectItem(locMast.getLocNo(), wrkDetl.getMatnr(), wrkDetl.getBatch(), wrkDetl.getBrand()
+ , wrkDetl.getStandby1(), wrkDetl.getStandby2(), wrkDetl.getStandby3(), wrkDetl.getBoxType1(), wrkDetl.getBoxType2(), wrkDetl.getBoxType3());
+ if (null != locDetl) {
+ if (!locDetlService.updateAnfme(wrkDetl.getAnfme(), wrkMast.getLocNo(), wrkDetl.getMatnr(), wrkDetl.getBatch(), wrkDetl.getBrand(), wrkDetl.getStandby1(), wrkDetl.getStandby2(), wrkDetl.getStandby3()
+ , wrkDetl.getBoxType1(), wrkDetl.getBoxType2(), wrkDetl.getBoxType3())) {
// exceptionHandle("鍏ㄦ澘鍏ュ簱 ===>> 鏇存柊搴撳瓨鏄庣粏澶辫触锛沎workNo={0}],[locNo={1}]", wrkMast.getWrkNo(), wrkMast.getLocNo());
- TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
- return FAIL.setMsg("鍏ㄦ澘鍏ュ簱 ===>> 鏇存柊搴撳瓨鏄庣粏澶辫触; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getLocNo() + "]");
- }
- } else {
- locDetl = new LocDetl();
- locDetl.sync(wrkDetl);
- locDetl.setLocNo(wrkMast.getLocNo()); // 搴撲綅鍙�
- locDetl.setAnfme(wrkDetl.getAnfme()); // 鏁伴噺
- locDetl.setZpallet(wrkDetl.getZpallet()); // 鎵樼洏鏉＄爜
- locDetl.setModiTime(now);
- locDetl.setAppeTime(now);
- if (!locDetlService.insert(locDetl)) {
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ return FAIL.setMsg("鍏ㄦ澘鍏ュ簱 ===>> 鏇存柊搴撳瓨鏄庣粏澶辫触; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getLocNo() + "]");
+ }
+ } else {
+ locDetl = new LocDetl();
+ locDetl.sync(wrkDetl);
+ locDetl.setLocNo(wrkMast.getLocNo()); // 搴撲綅鍙�
+ locDetl.setAnfme(wrkDetl.getAnfme()); // 鏁伴噺
+ locDetl.setZpallet(wrkDetl.getZpallet()); // 鎵樼洏鏉＄爜
+ locDetl.setModiTime(now);
+ locDetl.setAppeTime(now);
+ if (!locDetlService.insert(locDetl)) {
// exceptionHandle("鍏ㄦ澘鍏ュ簱 ===>> 娣诲姞搴撳瓨鏄庣粏澶辫触锛沎workNo={0}],[locNo={1}]", wrkMast.getWrkNo(), wrkMast.getLocNo());
- TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
- return FAIL.setMsg("鍏ㄦ澘鍏ュ簱 ===>> 娣诲姞搴撳瓨鏄庣粏澶辫触; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getLocNo() + "]");
- }
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ return FAIL.setMsg("鍏ㄦ澘鍏ュ簱 ===>> 娣诲姞搴撳瓨鏄庣粏澶辫触; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getLocNo() + "]");
}
+ }
- // 鏇存柊璁㈠崟瀹屾垚鏁伴噺
- OrderDetlPakin orderDetlPakin = orderDetlPakinService.selectItem
- (wrkDetl.getOrderNo(), wrkDetl.getMatnr(), wrkDetl.getBatch(), wrkDetl.getBrand(), wrkDetl.getStandby1(), wrkDetl.getStandby2(), wrkDetl.getStandby3(),
+ // 鏇存柊璁㈠崟瀹屾垚鏁伴噺
+ OrderDetlPakin orderDetlPakin = orderDetlPakinService.selectItem
+ (wrkDetl.getOrderNo(), wrkDetl.getMatnr(), wrkDetl.getBatch(), wrkDetl.getBrand(), wrkDetl.getStandby1(), wrkDetl.getStandby2(), wrkDetl.getStandby3(),
+ wrkDetl.getBoxType1(), wrkDetl.getBoxType2(), wrkDetl.getBoxType3());
+ if (orderDetlPakin == null) {
+ orderDetlPakin = orderDetlPakinService.selectItem
+ (wrkDetl.getOrderNo(), wrkDetl.getMatnr(), wrkDetl.getBatch(),
+ wrkDetl.getBrand(), wrkDetl.getStandby1(), wrkDetl.getStandby2(), wrkDetl.getStandby3(),
wrkDetl.getBoxType1(), wrkDetl.getBoxType2(), wrkDetl.getBoxType3());
- if (orderDetlPakin == null) {
- orderDetlPakin = orderDetlPakinService.selectItem
- (wrkDetl.getOrderNo(), wrkDetl.getMatnr(), wrkDetl.getBatch(),
- wrkDetl.getBrand(), wrkDetl.getStandby1(), wrkDetl.getStandby2(), wrkDetl.getStandby3(),
- wrkDetl.getBoxType1(), wrkDetl.getBoxType2(), wrkDetl.getBoxType3());
- }
- try {
- if (!Cools.isEmpty(orderDetlPakin)) {
- if (!orderDetlPakinService.increaseQtyByOrderNo(wrkDetl.getOrderNo(), wrkDetl.getMatnr(),
- orderDetlPakin.getBatch(), wrkDetl.getBrand(), wrkDetl.getStandby1(), wrkDetl.getStandby2(), wrkDetl.getStandby3(),
- wrkDetl.getBoxType1(), wrkDetl.getBoxType2(), wrkDetl.getBoxType3(), wrkDetl.getAnfme())) {
+ }
+ try {
+ if (!Cools.isEmpty(orderDetlPakin)) {
+ if (!orderDetlPakinService.increaseQtyByOrderNo(wrkDetl.getOrderNo(), wrkDetl.getMatnr(),
+ orderDetlPakin.getBatch(), wrkDetl.getBrand(), wrkDetl.getStandby1(), wrkDetl.getStandby2(), wrkDetl.getStandby3(),
+ wrkDetl.getBoxType1(), wrkDetl.getBoxType2(), wrkDetl.getBoxType3(), wrkDetl.getAnfme())) {
// exceptionHandle("鍏ㄦ澘鍏ュ簱 ===>> 鏇存柊璁㈠崟瀹屾垚鏁伴噺澶辫触锛沎workNo={0}],[locNo={1}]",
// wrkMast.getWrkNo(), wrkMast.getLocNo());
- TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
- return FAIL.setMsg("鍏ㄦ澘鍏ュ簱 ===>> 鏇存柊璁㈠崟瀹屾垚鏁伴噺澶辫触; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getLocNo() + "]");
- }
- }
- } catch (Exception ignore) {
- }
-
- }
- // 淇敼搴撲綅鐘舵�� S ====>> F
- if (locMast.getLocSts().equals("S")) {
- locMast.setLocSts("F");
- locMast.setBarcode(wrkMast.getBarcode());
- locMast.setIoTime(now);
- locMast.setModiTime(now);
- if (!locMastService.updateById(locMast)) {
-// exceptionHandle("鍏ㄦ澘鍏ュ簱 ===>> 淇敼搴撲綅鐘舵�佸け璐ワ紱[workNo={0}],[locNo={1}]", wrkMast.getWrkNo(), wrkMast.getLocNo());
- TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
- return FAIL.setMsg("鍏ㄦ澘鍏ュ簱 ===>> 淇敼搴撲綅鐘舵�佸け璐�; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getLocNo() + "]");
- }
- }
- break;
- // 鎷ｆ枡閫斾腑骞舵澘
- case 8:
- // 鏍规嵁宸ヤ綔鍙凤紝鏌ヨ宸ヤ綔鏄庣粏妗�
- List<WrkDetl> wrkDetls8 = wrkDetlService.selectList(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkMast.getWrkNo()));
- if (wrkDetls8.isEmpty()) {
- TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
- return FAIL.setMsg("鎷ｆ枡閫斾腑骞舵澘 ===>> 宸ヤ綔鏄庣粏妗ｄ笉瀛樺湪; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getLocNo() + "]");
- }
- // 閬嶅巻宸ヤ綔鏄庣粏锛屾洿鏂板簱瀛樻槑缁嗗拰鍏ュ簱閫氱煡妗�
- for (WrkDetl wrkDetl : wrkDetls8) {
-
- LocDetl locDetl = locDetlService.selectItem(locMast.getLocNo(), wrkDetl.getMatnr(), wrkDetl.getBatch(), wrkDetl.getBrand()
- , wrkDetl.getStandby1(), wrkDetl.getStandby2(), wrkDetl.getStandby3(), wrkDetl.getBoxType1(), wrkDetl.getBoxType2(), wrkDetl.getBoxType3());
- if (null != locDetl) {
- if (!locDetlService.updateAnfme(wrkDetl.getAnfme() + locDetl.getAnfme(), wrkMast.getLocNo(), wrkDetl.getMatnr(), wrkDetl.getBatch(), wrkDetl.getBrand(), wrkDetl.getStandby1(), wrkDetl.getStandby2(), wrkDetl.getStandby3()
- , wrkDetl.getBoxType1(), wrkDetl.getBoxType2(), wrkDetl.getBoxType3())) {
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
- return FAIL.setMsg("鎷ｆ枡閫斾腑骞舵澘 ===>> 鏇存柊搴撳瓨鏄庣粏澶辫触; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getLocNo() + "]");
- }
- } else {
- locDetl = new LocDetl();
- locDetl.sync(wrkDetl);
- locDetl.setLocNo(wrkMast.getLocNo()); // 搴撲綅鍙�
- locDetl.setAnfme(wrkDetl.getAnfme()); // 鏁伴噺
- locDetl.setZpallet(wrkDetl.getZpallet()); // 鎵樼洏鏉＄爜
- locDetl.setModiTime(now);
- locDetl.setAppeTime(now);
- if (!locDetlService.insert(locDetl)) {
- TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
- return FAIL.setMsg("鎷ｆ枡閫斾腑骞舵澘 ===>> 娣诲姞搴撳瓨鏄庣粏澶辫触; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getLocNo() + "]");
+ return FAIL.setMsg("鍏ㄦ澘鍏ュ簱 ===>> 鏇存柊璁㈠崟瀹屾垚鏁伴噺澶辫触; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getLocNo() + "]");
}
}
+ } catch (Exception ignore) {
+ }
- if (!Cools.isEmpty(wrkDetl.getOrderNo())) {
- // 鏇存柊璁㈠崟瀹屾垚鏁伴噺
- if (!orderDetlPakinService.increaseQtyByOrderNo(wrkDetl.getOrderNo(), wrkDetl.getMatnr(),
- wrkDetl.getBatch(), wrkDetl.getBrand(), wrkDetl.getStandby1(), wrkDetl.getStandby2(), wrkDetl.getStandby3(),
- wrkDetl.getBoxType1(), wrkDetl.getBoxType2(), wrkDetl.getBoxType3(), wrkDetl.getAnfme())) {
- TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
- return FAIL.setMsg("鎷ｆ枡閫斾腑骞舵澘 ===>> 鏇存柊璁㈠崟瀹屾垚鏁伴噺澶辫触; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getLocNo() + "]");
- }
- }
- }
- break;
- // 鎷ｆ枡鍏ュ簱
- case 53:
- // 鏍规嵁宸ヤ綔鍙凤紝鏌ヨ宸ヤ綔鏄庣粏妗�
- List<WrkDetl> wrkDetls53 = wrkDetlService.selectList(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkMast.getWrkNo()));
- if (wrkDetls53.isEmpty()) {
-// exceptionHandle("鎷ｆ枡鍏ュ簱 ===>> 宸ヤ綔鏄庣粏妗ｄ负绌猴紱[workNo={0}]", wrkMast.getWrkNo());
- TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
- return FAIL.setMsg("鎷ｆ枡鍏ュ簱 ===>> 宸ヤ綔鏄庣粏妗ｄ负绌�; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getLocNo() + "]");
- }
- for (WrkDetl wrkDetl : wrkDetls53) {
-
- LocDetl locDetl = locDetlService.selectItem(locMast.getLocNo(), wrkDetl.getMatnr(), wrkDetl.getBatch(), wrkDetl.getBrand()
- , wrkDetl.getStandby1(), wrkDetl.getStandby2(), wrkDetl.getStandby3(), wrkDetl.getBoxType1(), wrkDetl.getBoxType2(), wrkDetl.getBoxType3());
- if (null != locDetl) {
- if (!locDetlService.updateAnfme(locDetl.getAnfme() - wrkDetl.getAnfme(), locMast.getLocNo(), wrkDetl.getMatnr(), wrkDetl.getBatch(), wrkDetl.getBrand(), wrkDetl.getStandby1(), wrkDetl.getStandby2(), wrkDetl.getStandby3()
- , wrkDetl.getBoxType1(), wrkDetl.getBoxType2(), wrkDetl.getBoxType3())) {
-// exceptionHandle("鎷ｆ枡鍏ュ簱 ===>> 淇敼搴撳瓨鏄庣粏鏁伴噺澶辫触锛沎workNo={0}],[locNo={1}]", wrkMast.getWrkNo(), wrkMast.getLocNo());
- TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
- return FAIL.setMsg("鎷ｆ枡鍏ュ簱 ===>> 淇敼搴撳瓨鏄庣粏鏁伴噺澶辫触; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getLocNo() + "]");
- }
- }
-
- // 鏇存柊璁㈠崟瀹屾垚鏁伴噺
- OrderDetlPakin orderDetlPakin = orderDetlPakinService.selectItem
- (wrkDetl.getOrderNo(), wrkDetl.getMatnr(), wrkDetl.getBatch(), wrkDetl.getBrand(),
- wrkDetl.getStandby1(), wrkDetl.getStandby2(), wrkDetl.getStandby3(),
- wrkDetl.getBoxType1(), wrkDetl.getBoxType2(), wrkDetl.getBoxType3());
- if (orderDetlPakin == null) {
- orderDetlPakin = orderDetlPakinService.selectItem
- (wrkDetl.getOrderNo(), wrkDetl.getMatnr(), wrkDetl.getBatch(), wrkDetl.getBrand(), wrkDetl.getStandby1(), wrkDetl.getStandby2(), wrkDetl.getStandby3(),
- wrkDetl.getBoxType1(), wrkDetl.getBoxType2(), wrkDetl.getBoxType3());
- }
- try {
- if (!Cools.isEmpty(orderDetlPakin)) {
- if (!orderDetlPakinService.increaseQtyByOrderNo(wrkDetl.getOrderNo(), wrkDetl.getMatnr(),
- orderDetlPakin.getBatch(), wrkDetl.getBrand(), wrkDetl.getStandby1(), wrkDetl.getStandby2(), wrkDetl.getStandby3(),
- wrkDetl.getBoxType1(), wrkDetl.getBoxType2(), wrkDetl.getBoxType3(), wrkDetl.getAnfme())) {
-// exceptionHandle("鎷ｆ枡鍏ュ簱 ===>> 鏇存柊璁㈠崟瀹屾垚鏁伴噺澶辫触锛沎workNo={0}],[locNo={1}]",
-// wrkMast.getWrkNo(), wrkMast.getLocNo());
- TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
- return FAIL.setMsg("鎷ｆ枡鍏ュ簱 ===>> 鏇存柊璁㈠崟瀹屾垚鏁伴噺澶辫触; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getLocNo() + "]");
- }
- }
- } catch (Exception ignore) {
- }
-
- }
- // 淇敼搴撲綅鐘舵�� Q ====>> F
- if (locMast.getLocSts().equals("Q")) {
- locMast.setLocSts("F");
- locMast.setBarcode(wrkMast.getBarcode());
- locMast.setIoTime(now);
- locMast.setModiTime(now);
- if (!locMastService.updateById(locMast)) {
-// exceptionHandle("鎷ｆ枡鍏ュ簱 ===>> 淇敼搴撲綅鐘舵�佸け璐ワ紱[workNo={0}],[locNo={1}]", wrkMast.getWrkNo(), wrkMast.getLocNo());
- TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
- return FAIL.setMsg("鎷ｆ枡鍏ュ簱 ===>> 淇敼搴撲綅鐘舵�佸け璐�; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getLocNo() + "]");
- }
- }
- break;
- // 骞舵澘鍏ュ簱
- case 54:
- // 鏍规嵁宸ヤ綔鍙凤紝鏌ヨ宸ヤ綔鏄庣粏妗�
- List<WrkDetl> wrkDetls54 = wrkDetlService.selectList(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkMast.getWrkNo()));
- if (wrkDetls54.isEmpty()) {
-// exceptionHandle("骞舵澘鍏ュ簱 ===>> 宸ヤ綔鏄庣粏妗ｄ负绌猴紱[workNo={0}]", wrkMast.getWrkNo());
- TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
- return FAIL.setMsg("骞舵澘鍏ュ簱 ===>> 宸ヤ綔鏄庣粏妗ｄ负绌�; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getLocNo() + "]");
- }
- // 淇敼搴撳瓨鏄庣粏鏁伴噺锛屽鏃犲簱瀛橈紝鏇炬柊澧�
- for (WrkDetl wrkDetl : wrkDetls54) {
-
- LocDetl locDetl = locDetlService.selectItem(locMast.getLocNo(), wrkDetl.getMatnr(), wrkDetl.getBatch(), wrkDetl.getBrand()
- , wrkDetl.getStandby1(), wrkDetl.getStandby2(), wrkDetl.getStandby3(), wrkDetl.getBoxType1(), wrkDetl.getBoxType2(), wrkDetl.getBoxType3());
- if (null != locDetl) {
- if (!locDetlService.updateAnfme(wrkDetl.getAnfme(), locMast.getLocNo(), wrkDetl.getMatnr(), wrkDetl.getBatch(), wrkDetl.getBrand(), wrkDetl.getStandby1(), wrkDetl.getStandby2(), wrkDetl.getStandby3()
- , wrkDetl.getBoxType1(), wrkDetl.getBoxType2(), wrkDetl.getBoxType3())) {
-// exceptionHandle("骞舵澘鍏ュ簱 ===>> 淇敼搴撳瓨鏄庣粏鏁伴噺澶辫触锛沎workNo={0}],[matnr={1}]", wrkMast.getWrkNo(), wrkDetl.getMatnr());
- TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
- return FAIL.setMsg("骞舵澘鍏ュ簱 ===>> 淇敼搴撳瓨鏄庣粏鏁伴噺澶辫触; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getLocNo() + "]");
- }
- } else {
- locDetl = new LocDetl();
- locDetl.sync(wrkDetl);
- locDetl.setLocNo(wrkMast.getLocNo()); // 搴撲綅鍙�
- locDetl.setAnfme(wrkDetl.getAnfme()); // 鏁伴噺
- locDetl.setZpallet(wrkDetl.getZpallet()); // 鎵樼洏鏉＄爜
- locDetl.setModiTime(now);
- locDetl.setAppeTime(now);
- if (!locDetlService.insert(locDetl)) {
- TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
- return FAIL.setMsg("骞舵澘鍏ュ簱 ===>> 鏂板搴撳瓨鏄庣粏澶辫触; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getLocNo() + "]");
- }
- }
-
- // 鏇存柊璁㈠崟瀹屾垚鏁伴噺
- OrderDetlPakin orderDetlPakin = orderDetlPakinService.selectItem(wrkDetl.getOrderNo(), wrkDetl.getMatnr(), wrkDetl.getBatch(), wrkDetl.getBrand(), wrkDetl.getStandby1(), wrkDetl.getStandby2(), wrkDetl.getStandby3(), wrkDetl.getBoxType1(), wrkDetl.getBoxType2(), wrkDetl.getBoxType3());
- try {
- if (!Cools.isEmpty(orderDetlPakin)) {
- if (!orderDetlPakinService.increaseQtyByOrderNo(wrkDetl.getOrderNo(), wrkDetl.getMatnr(),
- orderDetlPakin.getBatch(), wrkDetl.getBrand(), wrkDetl.getStandby1(), wrkDetl.getStandby2(), wrkDetl.getStandby3(),
- wrkDetl.getBoxType1(), wrkDetl.getBoxType2(), wrkDetl.getBoxType3(), wrkDetl.getAnfme())) {
- TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
- return FAIL.setMsg("骞舵澘鍏ュ簱 ===>> 鏇存柊璁㈠崟瀹屾垚鏁伴噺澶辫触; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getLocNo() + "]");
- }
- }
- } catch (Exception ignore) {
-
- }
-
- }
- // 淇敼搴撲綅鐘舵�� Q ====>> F
- if (locMast.getLocSts().equals("Q")) {
- locMast.setLocSts("F");
- locMast.setBarcode(wrkMast.getBarcode());
- locMast.setIoTime(now);
- locMast.setModiTime(now);
- if (!locMastService.updateById(locMast)) {
-// exceptionHandle("骞舵澘鍏ュ簱 ===>> 淇敼搴撲綅鐘舵�佸け璐ワ紱[workNo={0}],[locNo={1}]", wrkMast.getWrkNo(), wrkMast.getLocNo());
- TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
- return FAIL.setMsg("骞舵澘鍏ュ簱 ===>> 淇敼搴撲綅鐘舵�佸け璐�; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getLocNo() + "]");
- }
- }
- break;
- // 鐩樼偣鍏ュ簱
- case 57:
- // 鏍规嵁宸ヤ綔鍙凤紝鏌ヨ宸ヤ綔鏄庣粏妗�
- List<WrkDetl> wrkDetls57 = wrkDetlService.selectList(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkMast.getWrkNo()));
- if (wrkDetls57.isEmpty()) {
-// exceptionHandle("鐩樼偣鍏ュ簱 ===>> 宸ヤ綔鏄庣粏妗ｄ负绌猴紱[workNo={0}]", wrkMast.getWrkNo());
- TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
- return FAIL.setMsg("鐩樼偣鍏ュ簱 ===>> 宸ヤ綔鏄庣粏妗ｄ负绌�; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getLocNo() + "]");
- }
- for (WrkDetl wrkDetl : wrkDetls57) {
- if (!Cools.isEmpty(wrkDetl.getOrderNo())) {
- // 鏇存柊璁㈠崟瀹屾垚鏁伴噺
- OrderDetlPakout orderDetlPakout = orderDetlPakoutService.selectItem(wrkDetl.getOrderNo(), wrkDetl.getMatnr(), wrkDetl.getBatch(), wrkDetl.getBrand(), wrkDetl.getStandby1(), wrkDetl.getStandby2(), wrkDetl.getStandby3(),
- wrkDetl.getBoxType1(), wrkDetl.getBoxType2(), wrkDetl.getBoxType3());
- if (!Cools.isEmpty(orderDetlPakout)) {
- if (!orderDetlPakoutService.increaseQtyByOrderNo(wrkDetl.getOrderNo(), wrkDetl.getMatnr(),
- orderDetlPakout.getBatch(), wrkDetl.getBrand(), wrkDetl.getStandby1(), wrkDetl.getStandby2(), wrkDetl.getStandby3(),
- wrkDetl.getBoxType1(), wrkDetl.getBoxType2(), wrkDetl.getBoxType3(), wrkDetl.getAnfme())) {
- TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
- return FAIL.setMsg("鐩樼偣鍏ュ簱 ===>> 鏇存柊璁㈠崟瀹屾垚鏁伴噺澶辫触; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getSourceLocNo() + "]");
- }
- }
- }
- }
- // 淇敼搴撲綅鐘舵�� Q ====>> F
- if (locMast.getLocSts().equals("Q")) {
- locMast.setLocSts(wrkMast.getFullPlt().equals("Y") ? "F" : "D");
- locMast.setBarcode(wrkMast.getBarcode());
- locMast.setIoTime(now);
- locMast.setModiTime(now);
- if (!locMastService.updateById(locMast)) {
-// exceptionHandle("鐩樼偣鍏ュ簱 ===>> 淇敼搴撲綅鐘舵�佸け璐ワ紱[workNo={0}],[locNo={1}]", wrkMast.getWrkNo(), wrkMast.getLocNo());
- TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
- return FAIL.setMsg("鐩樼偣鍏ュ簱 ===>> 淇敼搴撲綅鐘舵�佸け璐�; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getLocNo() + "]");
- }
- }
- break;
- // 搴撲綅绉昏浆
- case 11:
- // 榛樿鐩爣搴撲綅鏄┖鏉�
- String locSts = "D";
- // 搴撲綅绉昏浆鍒ゆ柇鏄惁涓虹┖鏉跨Щ杞�
- if (wrkMast.getEmptyMk().equals("N")) {
- locSts = "F";
- // 杞Щ搴撳瓨鏄庣粏鏁版嵁: 搴撳瓨鍙� 鐢卞伐浣滄。婧愬簱浣嶅彉涓虹洰鏍囧簱浣�
- if (!locDetlService.updateLocNo(wrkMast.getLocNo(), wrkMast.getSourceLocNo())) {
-// exceptionHandle("搴撲綅绉昏浆 ===>> 杞Щ搴撳瓨鏄庣粏鏁版嵁澶辫触锛沎婧愬簱浣�={0}],[鐩爣搴撲綅={1}]", wrkMast.getSourceLocNo(), wrkMast.getLocNo());
- TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
- return FAIL.setMsg("搴撲綅绉昏浆 ===>> 杞Щ搴撳瓨鏄庣粏鏁版嵁澶辫触; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getLocNo() + "]");
- }
- }
- // 淇敼婧愬簱浣嶇姸鎬� ==> O
- LocMast sourceLoc = locMastService.selectById(wrkMast.getSourceLocNo());
- if (null != sourceLoc) {
- sourceLoc.setBarcode("");
- sourceLoc.setLocSts("O");
- sourceLoc.setModiTime(now);
- sourceLoc.setIoTime(now);
- if (!locMastService.updateById(sourceLoc)) {
-// exceptionHandle("搴撲綅绉昏浆 ===>> 淇敼婧愬簱浣嶇姸鎬佸け璐ワ紱[workNo={0}],[sourceLoc={1}]", wrkMast.getWrkNo(), wrkMast.getSourceLocNo());
- TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
- return FAIL.setMsg("搴撲綅绉昏浆 ===>> 淇敼婧愬簱浣嶇姸鎬佸け璐�; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getLocNo() + "]");
- }
- }
- // 淇敼鐩爣搴撲綅鐘舵�� ==> .locSts
- locMast.setLocSts(locSts);
+ }
+ // 淇敼搴撲綅鐘舵�� S ====>> F
+ if (locMast.getLocSts().equals("S")) {
+ locMast.setLocSts("F");
locMast.setBarcode(wrkMast.getBarcode());
locMast.setIoTime(now);
locMast.setModiTime(now);
if (!locMastService.updateById(locMast)) {
-// exceptionHandle("搴撲綅绉昏浆 ===>> 淇敼鐩爣搴撲綅鐘舵�佸け璐ワ紱[workNo={0}],[locNo={1}]", wrkMast.getWrkNo(), wrkMast.getLocNo());
+// exceptionHandle("鍏ㄦ澘鍏ュ簱 ===>> 淇敼搴撲綅鐘舵�佸け璐ワ紱[workNo={0}],[locNo={1}]", wrkMast.getWrkNo(), wrkMast.getLocNo());
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
- return FAIL.setMsg("搴撲綅绉昏浆 ===>> 淇敼鐩爣搴撲綅鐘舵�佸け璐�; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getLocNo() + "]");
+ return FAIL.setMsg("鍏ㄦ澘鍏ュ簱 ===>> 淇敼搴撲綅鐘舵�佸け璐�; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getLocNo() + "]");
}
- break;
- default:
- break;
- }
- // 淇敼宸ヤ綔涓绘。鐘舵��
- wrkMast.setWrkSts(5L);
- wrkMast.setModiTime(now);
- if (!wrkMastService.updateById(wrkMast)) {
-// exceptionHandle("鏇存柊鍏ュ簱瀹屾垚鐘舵�佸け璐�;[workNo={0}]", wrkMast.getWrkNo());
- TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
- return FAIL.setMsg("鏇存柊鍏ュ簱瀹屾垚鐘舵�佸け璐�; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getLocNo() + "]");
- }
- } catch (Exception e) {
- log.error("fail", e);
- e.printStackTrace();
- TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
- return FAIL.setMsg(e.getMessage());
+ }
+ break;
+ // 鎷ｆ枡閫斾腑骞舵澘
+ case 8:
+ // 鏍规嵁宸ヤ綔鍙凤紝鏌ヨ宸ヤ綔鏄庣粏妗�
+ List<WrkDetl> wrkDetls8 = wrkDetlService.selectList(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkMast.getWrkNo()));
+ if (wrkDetls8.isEmpty()) {
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ return FAIL.setMsg("鎷ｆ枡閫斾腑骞舵澘 ===>> 宸ヤ綔鏄庣粏妗ｄ笉瀛樺湪; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getLocNo() + "]");
+ }
+ // 閬嶅巻宸ヤ綔鏄庣粏锛屾洿鏂板簱瀛樻槑缁嗗拰鍏ュ簱閫氱煡妗�
+ for (WrkDetl wrkDetl : wrkDetls8) {
+ LocDetl locDetl = locDetlService.selectItem(locMast.getLocNo(), wrkDetl.getMatnr(), wrkDetl.getBatch(), wrkDetl.getBrand()
+ , wrkDetl.getStandby1(), wrkDetl.getStandby2(), wrkDetl.getStandby3(), wrkDetl.getBoxType1(), wrkDetl.getBoxType2(), wrkDetl.getBoxType3());
+ if (null != locDetl) {
+ if (!locDetlService.updateAnfme(wrkDetl.getAnfme() + locDetl.getAnfme(), wrkMast.getLocNo(), wrkDetl.getMatnr(), wrkDetl.getBatch(), wrkDetl.getBrand(), wrkDetl.getStandby1(), wrkDetl.getStandby2(), wrkDetl.getStandby3()
+ , wrkDetl.getBoxType1(), wrkDetl.getBoxType2(), wrkDetl.getBoxType3())) {
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ return FAIL.setMsg("鎷ｆ枡閫斾腑骞舵澘 ===>> 鏇存柊搴撳瓨鏄庣粏澶辫触; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getLocNo() + "]");
+ }
+ } else {
+ locDetl = new LocDetl();
+ locDetl.sync(wrkDetl);
+ locDetl.setLocNo(wrkMast.getLocNo()); // 搴撲綅鍙�
+ locDetl.setAnfme(wrkDetl.getAnfme()); // 鏁伴噺
+ locDetl.setZpallet(wrkDetl.getZpallet()); // 鎵樼洏鏉＄爜
+ locDetl.setModiTime(now);
+ locDetl.setAppeTime(now);
+ if (!locDetlService.insert(locDetl)) {
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ return FAIL.setMsg("鎷ｆ枡閫斾腑骞舵澘 ===>> 娣诲姞搴撳瓨鏄庣粏澶辫触; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getLocNo() + "]");
+ }
+ }
+
+ if (!Cools.isEmpty(wrkDetl.getOrderNo())) {
+ // 鏇存柊璁㈠崟瀹屾垚鏁伴噺
+ if (!orderDetlPakinService.increaseQtyByOrderNo(wrkDetl.getOrderNo(), wrkDetl.getMatnr(),
+ wrkDetl.getBatch(), wrkDetl.getBrand(), wrkDetl.getStandby1(), wrkDetl.getStandby2(), wrkDetl.getStandby3(),
+ wrkDetl.getBoxType1(), wrkDetl.getBoxType2(), wrkDetl.getBoxType3(), wrkDetl.getAnfme())) {
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ return FAIL.setMsg("鎷ｆ枡閫斾腑骞舵澘 ===>> 鏇存柊璁㈠崟瀹屾垚鏁伴噺澶辫触; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getLocNo() + "]");
+ }
+ }
+ }
+ break;
+ // 鎷ｆ枡鍏ュ簱
+ case 53:
+ // 鏍规嵁宸ヤ綔鍙凤紝鏌ヨ宸ヤ綔鏄庣粏妗�
+ List<WrkDetl> wrkDetls53 = wrkDetlService.selectList(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkMast.getWrkNo()));
+ if (wrkDetls53.isEmpty()) {
+// exceptionHandle("鎷ｆ枡鍏ュ簱 ===>> 宸ヤ綔鏄庣粏妗ｄ负绌猴紱[workNo={0}]", wrkMast.getWrkNo());
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ return FAIL.setMsg("鎷ｆ枡鍏ュ簱 ===>> 宸ヤ綔鏄庣粏妗ｄ负绌�; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getLocNo() + "]");
+ }
+ for (WrkDetl wrkDetl : wrkDetls53) {
+
+ LocDetl locDetl = locDetlService.selectItem(locMast.getLocNo(), wrkDetl.getMatnr(), wrkDetl.getBatch(), wrkDetl.getBrand()
+ , wrkDetl.getStandby1(), wrkDetl.getStandby2(), wrkDetl.getStandby3(), wrkDetl.getBoxType1(), wrkDetl.getBoxType2(), wrkDetl.getBoxType3());
+ if (null != locDetl) {
+ if (!locDetlService.updateAnfme(locDetl.getAnfme() - wrkDetl.getAnfme(), locMast.getLocNo(), wrkDetl.getMatnr(), wrkDetl.getBatch(), wrkDetl.getBrand(), wrkDetl.getStandby1(), wrkDetl.getStandby2(), wrkDetl.getStandby3()
+ , wrkDetl.getBoxType1(), wrkDetl.getBoxType2(), wrkDetl.getBoxType3())) {
+// exceptionHandle("鎷ｆ枡鍏ュ簱 ===>> 淇敼搴撳瓨鏄庣粏鏁伴噺澶辫触锛沎workNo={0}],[locNo={1}]", wrkMast.getWrkNo(), wrkMast.getLocNo());
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ return FAIL.setMsg("鎷ｆ枡鍏ュ簱 ===>> 淇敼搴撳瓨鏄庣粏鏁伴噺澶辫触; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getLocNo() + "]");
+ }
+ }
+
+ // 鏇存柊璁㈠崟瀹屾垚鏁伴噺
+ OrderDetlPakin orderDetlPakin = orderDetlPakinService.selectItem
+ (wrkDetl.getOrderNo(), wrkDetl.getMatnr(), wrkDetl.getBatch(), wrkDetl.getBrand(),
+ wrkDetl.getStandby1(), wrkDetl.getStandby2(), wrkDetl.getStandby3(),
+ wrkDetl.getBoxType1(), wrkDetl.getBoxType2(), wrkDetl.getBoxType3());
+ if (orderDetlPakin == null) {
+ orderDetlPakin = orderDetlPakinService.selectItem
+ (wrkDetl.getOrderNo(), wrkDetl.getMatnr(), wrkDetl.getBatch(), wrkDetl.getBrand(), wrkDetl.getStandby1(), wrkDetl.getStandby2(), wrkDetl.getStandby3(),
+ wrkDetl.getBoxType1(), wrkDetl.getBoxType2(), wrkDetl.getBoxType3());
+ }
+ try {
+ if (!Cools.isEmpty(orderDetlPakin)) {
+ if (!orderDetlPakinService.increaseQtyByOrderNo(wrkDetl.getOrderNo(), wrkDetl.getMatnr(),
+ orderDetlPakin.getBatch(), wrkDetl.getBrand(), wrkDetl.getStandby1(), wrkDetl.getStandby2(), wrkDetl.getStandby3(),
+ wrkDetl.getBoxType1(), wrkDetl.getBoxType2(), wrkDetl.getBoxType3(), wrkDetl.getAnfme())) {
+// exceptionHandle("鎷ｆ枡鍏ュ簱 ===>> 鏇存柊璁㈠崟瀹屾垚鏁伴噺澶辫触锛沎workNo={0}],[locNo={1}]",
+// wrkMast.getWrkNo(), wrkMast.getLocNo());
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ return FAIL.setMsg("鎷ｆ枡鍏ュ簱 ===>> 鏇存柊璁㈠崟瀹屾垚鏁伴噺澶辫触; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getLocNo() + "]");
+ }
+ }
+ } catch (Exception ignore) {
+ }
+
+ }
+ // 淇敼搴撲綅鐘舵�� Q ====>> F
+ if (locMast.getLocSts().equals("Q")) {
+ locMast.setLocSts("F");
+ locMast.setBarcode(wrkMast.getBarcode());
+ locMast.setIoTime(now);
+ locMast.setModiTime(now);
+ if (!locMastService.updateById(locMast)) {
+// exceptionHandle("鎷ｆ枡鍏ュ簱 ===>> 淇敼搴撲綅鐘舵�佸け璐ワ紱[workNo={0}],[locNo={1}]", wrkMast.getWrkNo(), wrkMast.getLocNo());
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ return FAIL.setMsg("鎷ｆ枡鍏ュ簱 ===>> 淇敼搴撲綅鐘舵�佸け璐�; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getLocNo() + "]");
+ }
+ }
+ break;
+ // 骞舵澘鍏ュ簱
+ case 54:
+ // 鏍规嵁宸ヤ綔鍙凤紝鏌ヨ宸ヤ綔鏄庣粏妗�
+ List<WrkDetl> wrkDetls54 = wrkDetlService.selectList(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkMast.getWrkNo()));
+ if (wrkDetls54.isEmpty()) {
+// exceptionHandle("骞舵澘鍏ュ簱 ===>> 宸ヤ綔鏄庣粏妗ｄ负绌猴紱[workNo={0}]", wrkMast.getWrkNo());
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ return FAIL.setMsg("骞舵澘鍏ュ簱 ===>> 宸ヤ綔鏄庣粏妗ｄ负绌�; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getLocNo() + "]");
+ }
+ // 淇敼搴撳瓨鏄庣粏鏁伴噺锛屽鏃犲簱瀛橈紝鏇炬柊澧�
+ for (WrkDetl wrkDetl : wrkDetls54) {
+
+ LocDetl locDetl = locDetlService.selectItem(locMast.getLocNo(), wrkDetl.getMatnr(), wrkDetl.getBatch(), wrkDetl.getBrand()
+ , wrkDetl.getStandby1(), wrkDetl.getStandby2(), wrkDetl.getStandby3(), wrkDetl.getBoxType1(), wrkDetl.getBoxType2(), wrkDetl.getBoxType3());
+ if (null != locDetl) {
+ if (!locDetlService.updateAnfme(wrkDetl.getAnfme(), locMast.getLocNo(), wrkDetl.getMatnr(), wrkDetl.getBatch(), wrkDetl.getBrand(), wrkDetl.getStandby1(), wrkDetl.getStandby2(), wrkDetl.getStandby3()
+ , wrkDetl.getBoxType1(), wrkDetl.getBoxType2(), wrkDetl.getBoxType3())) {
+// exceptionHandle("骞舵澘鍏ュ簱 ===>> 淇敼搴撳瓨鏄庣粏鏁伴噺澶辫触锛沎workNo={0}],[matnr={1}]", wrkMast.getWrkNo(), wrkDetl.getMatnr());
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ return FAIL.setMsg("骞舵澘鍏ュ簱 ===>> 淇敼搴撳瓨鏄庣粏鏁伴噺澶辫触; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getLocNo() + "]");
+ }
+ } else {
+ locDetl = new LocDetl();
+ locDetl.sync(wrkDetl);
+ locDetl.setLocNo(wrkMast.getLocNo()); // 搴撲綅鍙�
+ locDetl.setAnfme(wrkDetl.getAnfme()); // 鏁伴噺
+ locDetl.setZpallet(wrkDetl.getZpallet()); // 鎵樼洏鏉＄爜
+ locDetl.setModiTime(now);
+ locDetl.setAppeTime(now);
+ if (!locDetlService.insert(locDetl)) {
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ return FAIL.setMsg("骞舵澘鍏ュ簱 ===>> 鏂板搴撳瓨鏄庣粏澶辫触; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getLocNo() + "]");
+ }
+ }
+
+ // 鏇存柊璁㈠崟瀹屾垚鏁伴噺
+ OrderDetlPakin orderDetlPakin = orderDetlPakinService.selectItem(wrkDetl.getOrderNo(), wrkDetl.getMatnr(), wrkDetl.getBatch(), wrkDetl.getBrand(), wrkDetl.getStandby1(), wrkDetl.getStandby2(), wrkDetl.getStandby3(), wrkDetl.getBoxType1(), wrkDetl.getBoxType2(), wrkDetl.getBoxType3());
+ try {
+ if (!Cools.isEmpty(orderDetlPakin)) {
+ if (!orderDetlPakinService.increaseQtyByOrderNo(wrkDetl.getOrderNo(), wrkDetl.getMatnr(),
+ orderDetlPakin.getBatch(), wrkDetl.getBrand(), wrkDetl.getStandby1(), wrkDetl.getStandby2(), wrkDetl.getStandby3(),
+ wrkDetl.getBoxType1(), wrkDetl.getBoxType2(), wrkDetl.getBoxType3(), wrkDetl.getAnfme())) {
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ return FAIL.setMsg("骞舵澘鍏ュ簱 ===>> 鏇存柊璁㈠崟瀹屾垚鏁伴噺澶辫触; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getLocNo() + "]");
+ }
+ }
+ } catch (Exception ignore) {
+
+ }
+
+ }
+ // 淇敼搴撲綅鐘舵�� Q ====>> F
+ if (locMast.getLocSts().equals("Q")) {
+ locMast.setLocSts("F");
+ locMast.setBarcode(wrkMast.getBarcode());
+ locMast.setIoTime(now);
+ locMast.setModiTime(now);
+ if (!locMastService.updateById(locMast)) {
+// exceptionHandle("骞舵澘鍏ュ簱 ===>> 淇敼搴撲綅鐘舵�佸け璐ワ紱[workNo={0}],[locNo={1}]", wrkMast.getWrkNo(), wrkMast.getLocNo());
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ return FAIL.setMsg("骞舵澘鍏ュ簱 ===>> 淇敼搴撲綅鐘舵�佸け璐�; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getLocNo() + "]");
+ }
+ }
+ break;
+ // 鐩樼偣鍏ュ簱
+ case 57:
+ // 鏍规嵁宸ヤ綔鍙凤紝鏌ヨ宸ヤ綔鏄庣粏妗�
+ List<WrkDetl> wrkDetls57 = wrkDetlService.selectList(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkMast.getWrkNo()));
+ if (wrkDetls57.isEmpty()) {
+// exceptionHandle("鐩樼偣鍏ュ簱 ===>> 宸ヤ綔鏄庣粏妗ｄ负绌猴紱[workNo={0}]", wrkMast.getWrkNo());
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ return FAIL.setMsg("鐩樼偣鍏ュ簱 ===>> 宸ヤ綔鏄庣粏妗ｄ负绌�; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getLocNo() + "]");
+ }
+ for (WrkDetl wrkDetl : wrkDetls57) {
+ if (!Cools.isEmpty(wrkDetl.getOrderNo())) {
+ // 鏇存柊璁㈠崟瀹屾垚鏁伴噺
+ OrderDetlPakout orderDetlPakout = orderDetlPakoutService.selectItem(wrkDetl.getOrderNo(), wrkDetl.getMatnr(), wrkDetl.getBatch(), wrkDetl.getBrand(), wrkDetl.getStandby1(), wrkDetl.getStandby2(), wrkDetl.getStandby3(),
+ wrkDetl.getBoxType1(), wrkDetl.getBoxType2(), wrkDetl.getBoxType3());
+ if (!Cools.isEmpty(orderDetlPakout)) {
+ if (!orderDetlPakoutService.increaseQtyByOrderNo(wrkDetl.getOrderNo(), wrkDetl.getMatnr(),
+ orderDetlPakout.getBatch(), wrkDetl.getBrand(), wrkDetl.getStandby1(), wrkDetl.getStandby2(), wrkDetl.getStandby3(),
+ wrkDetl.getBoxType1(), wrkDetl.getBoxType2(), wrkDetl.getBoxType3(), wrkDetl.getAnfme())) {
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ return FAIL.setMsg("鐩樼偣鍏ュ簱 ===>> 鏇存柊璁㈠崟瀹屾垚鏁伴噺澶辫触; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getSourceLocNo() + "]");
+ }
+ }
+ }
+ }
+ // 淇敼搴撲綅鐘舵�� Q ====>> F
+ if (locMast.getLocSts().equals("Q")) {
+ locMast.setLocSts(wrkMast.getFullPlt().equals("Y") ? "F" : "D");
+ locMast.setBarcode(wrkMast.getBarcode());
+ locMast.setIoTime(now);
+ locMast.setModiTime(now);
+ if (!locMastService.updateById(locMast)) {
+// exceptionHandle("鐩樼偣鍏ュ簱 ===>> 淇敼搴撲綅鐘舵�佸け璐ワ紱[workNo={0}],[locNo={1}]", wrkMast.getWrkNo(), wrkMast.getLocNo());
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ return FAIL.setMsg("鐩樼偣鍏ュ簱 ===>> 淇敼搴撲綅鐘舵�佸け璐�; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getLocNo() + "]");
+ }
+ }
+ break;
+ // 搴撲綅绉昏浆
+ case 11:
+ // 榛樿鐩爣搴撲綅鏄┖鏉�
+ String locSts = "D";
+ // 搴撲綅绉昏浆鍒ゆ柇鏄惁涓虹┖鏉跨Щ杞�
+ if (wrkMast.getEmptyMk().equals("N")) {
+ locSts = "F";
+ // 杞Щ搴撳瓨鏄庣粏鏁版嵁: 搴撳瓨鍙� 鐢卞伐浣滄。婧愬簱浣嶅彉涓虹洰鏍囧簱浣�
+ if (!locDetlService.updateLocNo(wrkMast.getLocNo(), wrkMast.getSourceLocNo())) {
+// exceptionHandle("搴撲綅绉昏浆 ===>> 杞Щ搴撳瓨鏄庣粏鏁版嵁澶辫触锛沎婧愬簱浣�={0}],[鐩爣搴撲綅={1}]", wrkMast.getSourceLocNo(), wrkMast.getLocNo());
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ return FAIL.setMsg("搴撲綅绉昏浆 ===>> 杞Щ搴撳瓨鏄庣粏鏁版嵁澶辫触; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getLocNo() + "]");
+ }
+ }
+ // 淇敼婧愬簱浣嶇姸鎬� ==> O
+ LocMast sourceLoc = locMastService.selectById(wrkMast.getSourceLocNo());
+ if (null != sourceLoc) {
+ sourceLoc.setBarcode("");
+ sourceLoc.setLocSts("O");
+ sourceLoc.setModiTime(now);
+ sourceLoc.setIoTime(now);
+ if (!locMastService.updateById(sourceLoc)) {
+// exceptionHandle("搴撲綅绉昏浆 ===>> 淇敼婧愬簱浣嶇姸鎬佸け璐ワ紱[workNo={0}],[sourceLoc={1}]", wrkMast.getWrkNo(), wrkMast.getSourceLocNo());
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ return FAIL.setMsg("搴撲綅绉昏浆 ===>> 淇敼婧愬簱浣嶇姸鎬佸け璐�; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getLocNo() + "]");
+ }
+ }
+ // 淇敼鐩爣搴撲綅鐘舵�� ==> .locSts
+ locMast.setLocSts(locSts);
+ locMast.setBarcode(wrkMast.getBarcode());
+ locMast.setIoTime(now);
+ locMast.setModiTime(now);
+ if (!locMastService.updateById(locMast)) {
+// exceptionHandle("搴撲綅绉昏浆 ===>> 淇敼鐩爣搴撲綅鐘舵�佸け璐ワ紱[workNo={0}],[locNo={1}]", wrkMast.getWrkNo(), wrkMast.getLocNo());
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ return FAIL.setMsg("搴撲綅绉昏浆 ===>> 淇敼鐩爣搴撲綅鐘舵�佸け璐�; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getLocNo() + "]");
+ }
+ break;
+ default:
+ break;
}
+ // 淇敼宸ヤ綔涓绘。鐘舵��
+ wrkMast.setWrkSts(5L);
+ wrkMast.setModiTime(now);
+ if (!wrkMastService.updateById(wrkMast)) {
+// exceptionHandle("鏇存柊鍏ュ簱瀹屾垚鐘舵�佸け璐�;[workNo={0}]", wrkMast.getWrkNo());
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ return FAIL.setMsg("鏇存柊鍏ュ簱瀹屾垚鐘舵�佸け璐�; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getLocNo() + "]");
+ }
+ } catch (Exception e) {
+ log.error("fail", e);
+ e.printStackTrace();
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ return FAIL.setMsg(e.getMessage());
}
+
return SUCCESS;
}
@@ -526,18 +476,16 @@
if (!orderDetlPakoutService.increaseQtyByOrderNo(wrkDetl.getOrderNo(), wrkDetl.getMatnr(),
orderDetlPakout.getBatch(), wrkDetl.getBrand(), wrkDetl.getStandby1(), wrkDetl.getStandby2(), wrkDetl.getStandby3(),
wrkDetl.getBoxType1(), wrkDetl.getBoxType2(), wrkDetl.getBoxType3(), wrkDetl.getAnfme())) {
-// exceptionHandle("鍏ㄦ澘鍑哄簱 ===>> 鏇存柊璁㈠崟瀹屾垚鏁伴噺澶辫触锛沎workNo={0}],[locNo={1}]",
-// wrkMast.getWrkNo(), wrkMast.getLocNo());
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
return FAIL.setMsg("鍏ㄦ澘鍑哄簱 ===>> 鏇存柊璁㈠崟瀹屾垚鏁伴噺澶辫触; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getSourceLocNo() + "]");
}
}
} catch (Exception ignore) {
+
}
}
// 鍒犻櫎宸ヤ綔妗ｆ簮搴撲綅鐨勫簱瀛樻槑缁�
if (!locDetlService.delete(new EntityWrapper<LocDetl>().eq("loc_no", wrkMast.getSourceLocNo()))) {
-// exceptionHandle("鍏ㄦ澘鍑哄簱 ===>> 鍒犻櫎搴撳瓨鏄庣粏澶辫触锛沎workNo={0}],[sourceLocNo={1}]", wrkMast.getWrkNo(), wrkMast.getSourceLocNo());
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
return FAIL.setMsg("鍏ㄦ澘鍑哄簱 ===>> 鍒犻櫎搴撳瓨鏄庣粏澶辫触; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getSourceLocNo() + "]");
}
@@ -548,7 +496,6 @@
locMast.setModiTime(now);
locMast.setIoTime(now);
if (!locMastService.updateById(locMast)) {
-// exceptionHandle("鍏ㄦ澘鍑哄簱 ===>> 淇敼婧愬簱浣嶇姸鎬佸け璐ワ紱[workNo={0}],[sourceLocNo={1}]", wrkMast.getWrkNo(), wrkMast.getSourceLocNo());
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
return FAIL.setMsg("鍏ㄦ澘鍑哄簱 ===>> 淇敼婧愬簱浣嶇姸鎬佸け璐�; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getSourceLocNo() + "]");
}
@@ -623,4 +570,155 @@
return SUCCESS;
}
+ /**
+ * @author Ryan
+ * @date 2025/9/23
+ * @description: AGV浠诲姟瀹屾垚鍔犲叆鍘嗗彶妗�
+ * @version 1.0
+ */
+ @Transactional(rollbackFor = Exception.class)
+ public ReturnT<String> AgvStart(Task task) {
+ // 4.鍏ュ簱瀹屾垚
+ if (task.getWrkSts() == 4) {
+ return agvDoIn(task);
+ // 14.鍑哄簱瀹屾垚
+ } else if (task.getWrkSts() == 14) {
+ return agvDoOut(task);
+ }
+ return SUCCESS;
+ }
+
+
+ /**
+ * @author Ryan
+ * @date 2025/9/25
+ * @description: AGV鍑哄簱浠诲姟
+ * @version 1.0
+ */
+ public ReturnT<String> agvDoOut(Task task) {
+ if (task.getIoType().equals(101)) {
+ Date now = new Date();
+ LocCache locMast = locCacheService.selectOne(new EntityWrapper<LocCache>().eq("loc_no" ,task.getSourceLocNo()));
+ if (Objects.isNull(locMast)) {
+ throw new RuntimeException("鏁版嵁閿欒锛氬簱浣嶄俊鎭笉鑳戒负绌猴紒锛�");
+ }
+ List<TaskDetl> wrkDetls101 = taskDetlService.selectList(new EntityWrapper<TaskDetl>().eq("wrk_no", task.getWrkNo()));
+ if (wrkDetls101.isEmpty()) {
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ return FAIL.setMsg("鍏ㄦ澘鍑哄簱 ===>> 宸ヤ綔鏄庣粏妗ｄ负绌�; [workNo=" + task.getWrkNo() + "],[locNo=" + task.getSourceLocNo() + "]");
+ }
+ for (TaskDetl wrkDetl : wrkDetls101) {
+ // 鏇存柊璁㈠崟瀹屾垚鏁伴噺
+ OrderDetlPakout orderDetlPakout = orderDetlPakoutService.selectItem(wrkDetl.getOrderNo(), wrkDetl.getMatnr(), wrkDetl.getBatch(), wrkDetl.getBrand(), wrkDetl.getStandby1(), wrkDetl.getStandby2(), wrkDetl.getStandby3(),
+ wrkDetl.getBoxType1(), wrkDetl.getBoxType2(), wrkDetl.getBoxType3());
+ if (orderDetlPakout == null) {
+ orderDetlPakout = orderDetlPakoutService.selectItem(wrkDetl.getOrderNo(), wrkDetl.getMatnr(), wrkDetl.getBatch(), wrkDetl.getBrand(), wrkDetl.getStandby1(), wrkDetl.getStandby2(), wrkDetl.getStandby3(),
+ wrkDetl.getBoxType1(), wrkDetl.getBoxType2(), wrkDetl.getBoxType3());
+ }
+ try {
+ if (!Cools.isEmpty(orderDetlPakout)) {
+ if (!orderDetlPakoutService.increaseQtyByOrderNo(wrkDetl.getOrderNo(), wrkDetl.getMatnr(),
+ orderDetlPakout.getBatch(), wrkDetl.getBrand(), wrkDetl.getStandby1(), wrkDetl.getStandby2(), wrkDetl.getStandby3(),
+ wrkDetl.getBoxType1(), wrkDetl.getBoxType2(), wrkDetl.getBoxType3(), wrkDetl.getAnfme())) {
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ return FAIL.setMsg("鍏ㄦ澘鍑哄簱 ===>> 鏇存柊璁㈠崟瀹屾垚鏁伴噺澶辫触; [workNo=" + task.getWrkNo() + "],[locNo=" + task.getSourceLocNo() + "]");
+ }
+ }
+ } catch (Exception ignore) {
+ }
+ }
+ // 鍒犻櫎宸ヤ綔妗ｆ簮搴撲綅鐨勫簱瀛樻槑缁�
+ if (!locDetlService.delete(new EntityWrapper<LocDetl>().eq("loc_no", task.getSourceLocNo()))) {
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ return FAIL.setMsg("鍏ㄦ澘鍑哄簱 ===>> 鍒犻櫎搴撳瓨鏄庣粏澶辫触; [workNo=" + task.getWrkNo() + "],[locNo=" + task.getSourceLocNo() + "]");
+ }
+ // 淇敼婧愬簱浣嶇姸鎬� R ===>> O
+ if (locMast.getLocSts().equals(LocStsType.LOC_STS_TYPE_R.type)) {
+ locMast.setLocSts(LocStsType.LOC_STS_TYPE_O.type);
+ locMast.setBarcode("");
+ locMast.setModiTime(now);
+ locMast.setIoTime(now);
+ if (!locCacheService.updateById(locMast)) {
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ return FAIL.setMsg("鍏ㄦ澘鍑哄簱 ===>> 淇敼婧愬簱浣嶇姸鎬佸け璐�; [workNo=" + task.getWrkNo() + "],[locNo=" + task.getSourceLocNo() + "]");
+ }
+ } else {
+ throw new CoolException("褰撳墠搴撲綅鐘舵��" + locMast.getLocSts() + ", 鏃犳硶鎵ц鍑哄簱鎿嶄綔锛侊紒");
+ }
+
+ BasStation devNo = basStationService.selectOne(new EntityWrapper<BasStation>().eq("dev_no", task.getStaNo()));
+ if (Objects.isNull(devNo)) {
+ throw new CoolException("绔欑偣锛�" + task.getSourceStaNo() + ", 涓嶅瓨鍦紒锛�");
+ }
+ devNo.setLocSts(LocStsType.LOC_STS_TYPE_F.type);
+ devNo.setModiTime(new Date());
+ if (!basStationService.updateById(devNo)) {
+ throw new CoolException("绔欑偣淇℃伅淇敼澶辫触锛侊紒");
+ }
+ task.setWrkSts(15L);
+ if (!taskService.updateById(task)) {
+ throw new CoolException("浠诲姟鐘舵�佷慨鏀瑰け璐ワ紒锛�");
+ }
+ } else {
+
+ }
+ return SUCCESS;
+ }
+
+
+ @Transactional(rollbackFor = Exception.class)
+ public ReturnT<String> agvDoIn(Task wrkMast) {
+ LocCache locCache = locCacheService.selectOne(new EntityWrapper<LocCache>().eq("loc_no", wrkMast.getLocNo()));
+ if (Objects.isNull(locCache)) {
+ throw new CoolException("鏁版嵁閿欒锛屽簱浣嶄笉瀛樺湪锛侊紒");
+ }
+ if (!locCache.getLocSts().equals(LocStsType.LOC_STS_TYPE_S.type)) {
+ throw new CoolException("褰撳墠搴撲綅鐘舵�佷负锛�" + LocStsType.LOC_STS_TYPE_S.type + "." + LocStsType.LOC_STS_TYPE_S.desc + "锛屼笉鏄嚭搴撻绾︾姸鎬�");
+ }
+ List<WaitPakin> apallet = waitPakinService.selectList(new EntityWrapper<WaitPakin>().eq("zpallet", wrkMast.getBarcode()));
+ if (Objects.isNull(apallet)) {
+ throw new CoolException("鏁版嵁閿欒锛氱粍鎵樻暟鎹笉瀛樺湪锛侊紒");
+ }
+ apallet.forEach(pakin -> {
+ LocDetl detl = new LocDetl();
+ BeanUtils.copyProperties(pakin, detl);
+ detl.setBarcode(pakin.getBarcode())
+ .setAnfme(pakin.getAnfme())
+ .setBrand(pakin.getBrand())
+ .setAppeTime(new Date())
+ .setSpecs(pakin.getSpecs())
+ .setColor(pakin.getColor())
+ .setLocId(locCache.getId())
+ .setLocNo(locCache.getLocNo())
+ .setAreaId(locCache.getAreaId())
+ .setAreaName(locCache.getAreaName())
+ .setUnit(pakin.getUnit())
+ .setBatch(pakin.getBatch());
+ if (!locDetlService.insert(detl)) {
+ throw new CoolException("搴撲綅鏄庣粏淇濆瓨澶辫触锛侊紒");
+ }
+ });
+
+ locCache.setLocSts(LocStsType.LOC_STS_TYPE_F.type);
+ locCache.setModiTime(new Date());
+ locCache.setBarcode(wrkMast.getBarcode());
+ locCache.setModiTime(new Date());
+ locCache.setIoTime(new Date());
+ if (!locCacheService.updateById(locCache)) {
+ throw new CoolException("搴撲綅鐘舵�佷慨鏀瑰け璐ワ紒");
+ }
+ wrkMast.setWrkSts(5L);
+ wrkMast.setModiTime(new Date());
+ if (!taskService.updateById(wrkMast)) {
+ throw new CoolException("浠诲姟鐘舵�佷慨鏀瑰け璐ワ紒锛�");
+ }
+
+ Set<Long> list = apallet.stream().map(WaitPakin::getOrderId).collect(Collectors.toSet());
+ List<OrderPakin> pakins = orderPakinService.selectList(new EntityWrapper<OrderPakin>().in("id", list));
+ if (Objects.isNull(pakins) || pakins.isEmpty()) {
+ throw new CoolException("鍗曟嵁涓嶅瓨鍦紒锛�");
+ }
+
+ return SUCCESS;
+ }
}
diff --git a/src/main/java/com/zy/asrs/task/kingdee/InboundOrderScheduler.java b/src/main/java/com/zy/asrs/task/kingdee/InboundOrderScheduler.java
deleted file mode 100644
index 1c68d49..0000000
--- a/src/main/java/com/zy/asrs/task/kingdee/InboundOrderScheduler.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.zy.asrs.task.kingdee;
-
-import com.core.common.Cools;
-import com.zy.asrs.task.kingdee.handler.InboundOrderHandler;
-import com.zy.common.entity.Parameter;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.scheduling.annotation.Scheduled;
-import org.springframework.stereotype.Component;
-
-@Slf4j
-@Component
-public class InboundOrderScheduler {
-
- @Autowired
- private InboundOrderHandler inboundOrderHandler;
- @Value("${erp.switch.InboundOrderSwitch}")
- private boolean InboundOrderSwitch;
-
- @Scheduled(cron = "0/3 * * * * ? ")
- void login(){
- if(!InboundOrderSwitch){
- return;
- }
- String erpReport = Parameter.get().getErpReport();
- if (!Cools.isEmpty(erpReport) && erpReport.equals("true")) {
- inboundOrderHandler.start();
- }
- }
-
-}
diff --git a/src/main/java/com/zy/asrs/task/kingdee/LoginAuthenticationScheduler.java b/src/main/java/com/zy/asrs/task/kingdee/LoginAuthenticationScheduler.java
deleted file mode 100644
index c6befac..0000000
--- a/src/main/java/com/zy/asrs/task/kingdee/LoginAuthenticationScheduler.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.zy.asrs.task.kingdee;
-
-import com.core.common.Cools;
-import com.zy.asrs.task.kingdee.handler.LoginAuthenticationHandler;
-import com.zy.common.entity.Parameter;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Component;
-
-@Slf4j
-@Component
-public class LoginAuthenticationScheduler {
-
- @Autowired
- private LoginAuthenticationHandler loginAuthenticationHandler;
- @Value("${erp.switch.LoginAuthenticationSwitch}")
- private boolean LoginAuthenticationSwitch;
-
- //@Scheduled(cron = "0/3 * * * * ? ")
- void login(){
- if(!LoginAuthenticationSwitch){
- return;
- }
- String erpReport = Parameter.get().getErpReport();
- if (!Cools.isEmpty(erpReport) && erpReport.equals("true")) {
- loginAuthenticationHandler.start();
- }
- }
-}
diff --git a/src/main/java/com/zy/asrs/task/kingdee/ReviewOrderSyncScheduler.java b/src/main/java/com/zy/asrs/task/kingdee/ReviewOrderSyncScheduler.java
deleted file mode 100644
index a3c9e16..0000000
--- a/src/main/java/com/zy/asrs/task/kingdee/ReviewOrderSyncScheduler.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package com.zy.asrs.task.kingdee;
-
-import com.core.common.Cools;
-import com.zy.asrs.entity.Order;
-import com.zy.asrs.service.ApiLogService;
-import com.zy.asrs.service.OrderService;
-import com.zy.asrs.task.core.ReturnT;
-import com.zy.asrs.task.kingdee.handler.ReviewOrderSyncHandler;
-import com.zy.asrs.utils.OrderInAndOutUtil;
-import com.zy.common.entity.Parameter;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.scheduling.annotation.Async;
-import org.springframework.scheduling.annotation.Scheduled;
-import org.springframework.stereotype.Component;
-
-import java.util.List;
-
-/**
- * Created by vincent on 2023/10/21
- */
-@Slf4j
-@Component
-public class ReviewOrderSyncScheduler {
-
- @Autowired
- private ReviewOrderSyncHandler reviewOrderSyncHandler;
- @Autowired
- private OrderService orderService;
-
- @Value("${erp.switch.ReviewOrderSwitch}")
- private boolean ReviewOrderSwitch;
-
- @Scheduled(cron = "0/3 * * * * ? ")
- @Async("orderThreadPool")
- public void completeAndReport(){
- if(!ReviewOrderSwitch){
- return;
- }
- String erpReport = Parameter.get().getErpReport();
- if (!Cools.isEmpty(erpReport) && erpReport.equals("true")) {
- // List<Order> orders = orderService.selectComplete();
- List<Order> orders = OrderInAndOutUtil.selectComplete(null);
- for (Order order : orders) {
- ReturnT<String> result = reviewOrderSyncHandler.start(order);
- if (!result.isSuccess()) {
- log.error("鍗曟嵁[orderNo={}]鍚慹rp瀹℃牳澶辫触", order.getOrderNo());
- }
- }
- }
- }
-
-}
diff --git a/src/main/java/com/zy/asrs/task/kingdee/SaveOrderSyncScheduler.java b/src/main/java/com/zy/asrs/task/kingdee/SaveOrderSyncScheduler.java
deleted file mode 100644
index 4fe4f26..0000000
--- a/src/main/java/com/zy/asrs/task/kingdee/SaveOrderSyncScheduler.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package com.zy.asrs.task.kingdee;
-
-import com.core.common.Cools;
-import com.zy.asrs.entity.Order;
-import com.zy.asrs.service.OrderService;
-import com.zy.asrs.task.core.ReturnT;
-import com.zy.asrs.task.kingdee.handler.SubmitOrderSyncHandler;
-import com.zy.asrs.utils.OrderInAndOutUtil;
-import com.zy.common.entity.Parameter;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.scheduling.annotation.Async;
-import org.springframework.scheduling.annotation.Scheduled;
-import org.springframework.stereotype.Component;
-
-import java.util.List;
-
-/**
- * Created by Monkey D. Luffy on 2023.10.21
- */
-@Slf4j
-@Component
-public class SaveOrderSyncScheduler {
-
- @Autowired
- private SubmitOrderSyncHandler submitOrderSyncHandler;
- @Autowired
- private OrderService orderService;
-
- @Value("${erp.switch.ReviewOrderSwitch}")
- private boolean ReviewOrderSwitch;
-
-// @Scheduled(cron = "0/3 * * * * ? ")
- @Async("orderThreadPool")
- public void completeAndReport(){
- if (1==1) return;
- if(!ReviewOrderSwitch){
- return;
- }
- String erpReport = Parameter.get().getErpReport();
- if (!Cools.isEmpty(erpReport) && erpReport.equals("true")) {
- // List<Order> orders = orderService.selectComplete8();
- List<Order> orders = OrderInAndOutUtil.selectComplete8(null);
- for (Order order : orders) {
- ReturnT<String> result = submitOrderSyncHandler.start(order);
- if (!result.isSuccess()) {
- log.error("鍗曟嵁[orderNo={}]鎻愪氦鑷砮rp澶辫触", order.getOrderNo());
- }
- }
- }
- }
-
-}
diff --git a/src/main/java/com/zy/asrs/task/kingdee/SubmitOrderSyncScheduler.java b/src/main/java/com/zy/asrs/task/kingdee/SubmitOrderSyncScheduler.java
deleted file mode 100644
index e35710e..0000000
--- a/src/main/java/com/zy/asrs/task/kingdee/SubmitOrderSyncScheduler.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package com.zy.asrs.task.kingdee;
-
-import com.core.common.Cools;
-import com.zy.asrs.entity.Order;
-import com.zy.asrs.service.ApiLogService;
-import com.zy.asrs.service.OrderService;
-import com.zy.asrs.task.core.ReturnT;
-import com.zy.asrs.task.kingdee.handler.ReviewOrderSyncHandler;
-import com.zy.asrs.task.kingdee.handler.SaveOrderSyncHandler;
-import com.zy.asrs.task.kingdee.handler.SubmitOrderSyncHandler;
-import com.zy.asrs.utils.OrderInAndOutUtil;
-import com.zy.common.entity.Parameter;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.scheduling.annotation.Async;
-import org.springframework.scheduling.annotation.Scheduled;
-import org.springframework.stereotype.Component;
-
-import java.util.List;
-
-/**
- * Created by Monkey D. Luffy on 2023.10.21
- */
-@Slf4j
-@Component
-public class SubmitOrderSyncScheduler {
-
- @Autowired
- private SaveOrderSyncHandler saveOrderSyncHandler;
- @Autowired
- private OrderService orderService;
-
- @Value("${erp.switch.ReviewOrderSwitch}")
- private boolean ReviewOrderSwitch;
-
- @Scheduled(cron = "0/3 * * * * ? ")
- @Async("orderThreadPool")
- public void completeAndReport(){
- if(!ReviewOrderSwitch){
- return;
- }
- String erpReport = Parameter.get().getErpReport();
- if (!Cools.isEmpty(erpReport) && erpReport.equals("true")) {
- // List<Order> orders = orderService.selectComplete8();
- List<Order> orders = OrderInAndOutUtil.selectComplete8(null);
- for (Order order : orders) {
- ReturnT<String> result = saveOrderSyncHandler.start(order);
- if (!result.isSuccess()) {
- log.error("鍗曟嵁[orderNo={}]淇濆瓨鑷砮rp澶辫触", order.getOrderNo());
- }
- }
- }
- }
-
-}
diff --git a/src/main/java/com/zy/asrs/task/kingdee/handler/InboundOrderHandler.java b/src/main/java/com/zy/asrs/task/kingdee/handler/InboundOrderHandler.java
deleted file mode 100644
index 6443a4b..0000000
--- a/src/main/java/com/zy/asrs/task/kingdee/handler/InboundOrderHandler.java
+++ /dev/null
@@ -1,307 +0,0 @@
-package com.zy.asrs.task.kingdee.handler;
-
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.core.common.Cools;
-import com.core.common.DateUtils;
-import com.core.common.SnowflakeIdWorker;
-import com.core.exception.CoolException;
-import com.zy.asrs.entity.*;
-import com.zy.asrs.service.*;
-import com.zy.asrs.task.AbstractHandler;
-import com.zy.asrs.task.core.ReturnT;
-import com.zy.asrs.utils.OrderInAndOutUtil;
-import com.zy.erp.kingdee.entity.param.InFormIdParam;
-import com.zy.erp.kingdee.enums.KingDeeUtilType;
-import com.zy.common.utils.HttpHandler;
-import com.zy.erp.kingdee.utils.KingDeeUtil;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-
-@Service
-@Slf4j
-public class InboundOrderHandler extends AbstractHandler<String> {
- @Value("${erp.address.URL}")
- //绔彛
- private String URL;
-
- @Value("${erp.address.inaddress}")
- //鍗曟嵁锛屽晢鍝佹。妗堝湴鍧�
- private String inaddress;
-
- @Autowired
- private ApiLogService apiLogService;
-
- @Autowired
- private LoginAuthenticationHandler loginAuthenticationHandler;
-
- @Autowired
- private MatService matService;
-
- @Autowired
- private TagService tagService;
-
- @Autowired
- private DocTypeService docTypeService;
-
- @Autowired
- private OrderService orderService;
-
- @Autowired
- private OrderDetlService orderDetlService;
-
- @Autowired
- private SnowflakeIdWorker snowflakeIdWorker;
-
- @Transactional
- public synchronized ReturnT<String> start() {
- SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
- //鐧诲綍閲戣澏
- ReturnT<String> start = loginAuthenticationHandler.start();
- for(KingDeeUtilType kingDeeUtilType : KingDeeUtilType.values()) {
- InFormIdParam inFormIdParam = new InFormIdParam();
- DocType docType = docTypeService.selectOne(new EntityWrapper<DocType>().eq("doc_name", kingDeeUtilType.desc));
- if (Cools.isEmpty(docType) && !kingDeeUtilType.formId.equals("BD_MATERIAL")){
- docType = docTypeService.selectOrAdd(kingDeeUtilType.desc, kingDeeUtilType.pakIn.equals(1));
- }
- inFormIdParam.setFormId(kingDeeUtilType.formId);
- inFormIdParam.setLimit(100);
- inFormIdParam.setStartRow("0");
- String FDocumentStatus=null;
-
- //鏉′欢鍜岄渶瑕佽幏寰楃殑缁撴灉鎷兼帴
- JSONObject jsonObject = new JSONObject();
- jsonObject.put("FormId", inFormIdParam.getFormId());
- jsonObject.put("Limit", inFormIdParam.getLimit());
- jsonObject.put("StartRow", inFormIdParam.getStartRow());
- //鐗╂枡妗ｆ鏌ヨ
- if(kingDeeUtilType.formId.equals("BD_MATERIAL")){
- Tag tag = tagService.selectByName("鍏ㄩ儴", 1);
- //鐗╂枡鐘舵�� FUseOrgId .FNumber
- FDocumentStatus="C";
- jsonObject.put("FilterString", "FCreateDate>'"+sdf.format(tag.getUpdateTime())+"' and FDocumentStatus='"+FDocumentStatus+"' and FUseOrgId .FNumber='100'");
- jsonObject.put("FieldKeys", "FName,FNumber,FCreateDate,FSpecification,FDocumentStatus");
- // FName : 鐗╂枡鍚嶇О 锛�
- // FNumber 锛氱墿鏂欑紪鍙凤紱
- // FCreateDate 锛氱墿鏂欏垱寤烘椂闂达紱
- // FSpecification 锛氱墿鏂欒鏍硷紱
- // FDocumentStatus 锛氱墿鏂欑姸鎬�
- }else{
- //鑾峰彇鏈�鏂版椂闂�
- //鍗曟嵁鐘舵��
- FDocumentStatus="B";
- jsonObject.put("FilterString", "FCreateDate>'"+sdf.format(docType.getCreateTime())+"'"+" and FStockId.Fname='绔嬪簱'"+" and FDocumentStatus='"+FDocumentStatus+"'");
- jsonObject.put("FieldKeys", "FBillNo,FCreateDate,FMaterialId.FNumber,FMaterialId.FName,FMaterialId.FSpecification,"+kingDeeUtilType.anfme+",FDocumentStatus");
- // FBillNo :鍗曟嵁缂栧彿锛�
- // FCreateDate 锛氬崟鎹垱寤烘椂闂达紱
- // FMaterialId.FNumber : 鐗╂枡缂栫爜锛�
- // FMaterialName 锛氱墿鏂欏悕绉帮紱
- // FMaterialId.FSpecification锛氱墿鏂欒鏍�
- // anfme : 鐗╂枡鏁伴噺
- // FDocumentStatus 锛氬崟鎹姸鎬侊紱
-
- }
- JSONObject jsonObject1 = new JSONObject();
- jsonObject1.put("data", jsonObject);
- String add = jsonObject1.toJSONString();
- //涓婃姤
- String response = "";
- boolean success = false;
- try {
- //鑾峰彇Cookie鍊�
- HashMap<String, Object> headers = new HashMap<>();
- headers.put("Cookie", start.getContent());
- response = new HttpHandler.Builder()
- .setHeaders(headers)
- .setUri(URL)
- .setPath(inaddress)
- .setJson(add)
- .build()
- .doPost();
- JSONArray data = JSON.parseArray(response);
- if(data.size()<=0) continue;
- if (data.getJSONArray(0).get(0).toString().length()>=20) continue;
- if (kingDeeUtilType.formId.equals("BD_MATERIAL")) {//鐗╂枡妗ｆ
- Tag tag = tagService.selectByName("鍏ㄩ儴", 1);
- for (int j = 0; j < data.size(); j++) {
- JSONArray jsonArray = data.getJSONArray(j);
- //瀵圭編鍥芥椂闂磋繘琛岃浆鎹�
- Date jsonDate = KingDeeUtil.KingDeeDate(jsonArray.get(2).toString());
- //鐢熸垚鍟嗗搧妗ｆ
- //鍟嗗搧缂栧彿
- Mat mat = matService.selectByMatnr(jsonArray.get(1).toString());
- if (mat == null) {
- mat = new Mat();
- mat.setMatnr(jsonArray.get(1).toString());
- mat.setMaktx(jsonArray.get(0).toString());
- mat.setSpecs(jsonArray.get(3).toString());//瑙勬牸
- mat.setTagId(tag.getId());
- mat.setCreateTime(jsonDate);//鍟嗗搧鍒涘缓鏃堕棿
- mat.setUpdateTime(new Date());
- mat.setStatus(1);
- //鏈�鏂版姄鍙栧晢鍝佹椂闂�
- if (!matService.insert(mat)) {
-// throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
- callApiLogSaveMat(mat,kingDeeUtilType, "鍚屾鏂扮墿鏂欏嚭閿欙紒锛侊紒"+mat, false);
- log.info("鍚屾鏂扮墿鏂欏嚭閿欙紒锛侊紒鍙傛暟锛歔{}]銆乕{}]",mat,jsonArray);
- } else {
- callApiLogSaveMat(mat,kingDeeUtilType, "鍚屾鏂扮墿鏂欙紒", true);
-// log.info("鍚屾鏂扮墿鏂橻鍟嗗搧缂栧彿锛歿}]", mat.getMatnr());
- }
- }else {
- if (!jsonDate.equals(tag.getUpdateTime())){
- callApiLogSaveMat(mat,kingDeeUtilType, "鍟嗗搧缂栧彿閲嶅:"+mat.getMatnr(), false);
- log.info("鍚屾鏂扮墿鏂橻鍟嗗搧缂栧彿锛歿}],鍟嗗搧缂栧彿閲嶅锛侊紒锛�", mat.getMatnr());
- }
- }
- tag.setUpdateTime(jsonDate);
- }
- tagService.updateById(tag);
- } else {
- for (int j = 0; j < data.size(); j++) {
- JSONArray jsonArray = data.getJSONArray(j);
- //鏈�鏂版姄鍙栨椂闂�
- Date jsonDate = KingDeeUtil.KingDeeDate(jsonArray.get(1).toString());
- docType.setCreateTime(jsonDate);
- Order order = OrderInAndOutUtil.selectByNo(kingDeeUtilType.pakIn == 1, jsonArray.get(0).toString());
-// Order order = orderService.selectByNo(jsonArray.get(0).toString());
- if (Cools.isEmpty(order)) {
- Date now = new Date();
- // 鍗曟嵁涓绘。
- order = new Order(
- String.valueOf(snowflakeIdWorker.nextId()), // 缂栧彿[闈炵┖]
- jsonArray.get(0).toString(), // 璁㈠崟缂栧彿
- DateUtils.convert(now), // 鍗曟嵁鏃ユ湡
- docType.getDocId(), // 鍗曟嵁绫诲瀷
- null, // 椤圭洰缂栧彿
- null, //
- null, // 璋冩嫧椤圭洰缂栧彿
- null, // 鍒濆绁ㄦ嵁鍙�
- null, // 绁ㄦ嵁鍙�
- null, // 瀹㈡埛缂栧彿
- null, // 瀹㈡埛
- null, // 鑱旂郴鏂瑰紡
- null, // 鎿嶄綔浜哄憳
- null, // 鍚堣閲戦
- null, // 浼樻儬鐜�
- null, // 浼樻儬閲戦
- null, // 閿�鍞垨閲囪喘璐圭敤鍚堣
- null, // 瀹炰粯閲戦
- null, // 浠樻绫诲瀷
- null, // 涓氬姟鍛�
- null, // 缁撶畻澶╂暟
- null, // 閭垂鏀粯绫诲瀷
- null, // 閭垂
- null, // 浠樻鏃堕棿
- null, // 鍙戣揣鏃堕棿
- null, // 鐗╂祦鍚嶇О
- null, // 鐗╂祦鍗曞彿
- 1L, // 璁㈠崟鐘舵��
- 1, // 鐘舵��
- 9527L, // 娣诲姞浜哄憳
- now, // 娣诲姞鏃堕棿
- 9527L, // 淇敼浜哄憳
- now, // 淇敼鏃堕棿
- null // 澶囨敞
- );
- OrderInAndOutUtil.insertOrder(kingDeeUtilType.pakIn == 1, order);
-
-// if (!orderService.insert(order)) {
-// if (!jsonDate.equals(docType.getCreateTime())){
-// callApiLogSaveOrder(order,kingDeeUtilType, "鐢熸垚鍗曟嵁涓绘。澶辫触锛岃鑱旂郴绠＄悊鍛�"+order, false);
-// }
-// continue;
-//// throw new CoolException("鐢熸垚鍗曟嵁涓绘。澶辫触锛岃鑱旂郴绠＄悊鍛�");
-// }
- }
- //鐗╂枡缂栫爜
- Mat mat = matService.selectByMatnr(jsonArray.get(2).toString());
- if (Cools.isEmpty(mat)) {
- if (!jsonDate.equals(docType.getCreateTime())){
- callApiLogSaveOrder(order,kingDeeUtilType, "缂栧彿鍟嗗搧妫�绱㈠け璐ワ紝璇峰厛娣诲姞鍟嗗搧"+jsonArray.get(2).toString(), false);
- }
- continue;
- }
-// OrderDetl orderDetl1 = orderDetlService.selectOne(new EntityWrapper<OrderDetl>().eq("order_no", jsonArray.get(0).toString()).eq("matnr", jsonArray.get(2).toString()));
-// if (!Cools.isEmpty(orderDetl1)) {
-// continue;
-// }
- Order order1 = OrderInAndOutUtil.selectByNo(kingDeeUtilType.pakIn == 1, jsonArray.get(0).toString());
- List<OrderDetl> orderDetls = OrderInAndOutUtil.selectByOrderId(kingDeeUtilType.pakIn == 1, order1.getId());
- boolean sign = false;
- for (OrderDetl orderDetl : orderDetls){
- if (orderDetl.getMatnr().equals( jsonArray.get(2).toString())){
- sign = true;
- break;
- }
- }
- if (sign){
- continue;
- }
- OrderDetl orderDetl = new OrderDetl();
- orderDetl.sync(mat);
- orderDetl.setBatch(null);
- orderDetl.setAnfme(Double.parseDouble(jsonArray.get(5).toString()));
- orderDetl.setOrderId(order.getId());
- orderDetl.setOrderNo(order.getOrderNo());
- orderDetl.setCreateBy(9527L);
- orderDetl.setCreateTime(new Date());
- orderDetl.setUpdateBy(9527L);
- orderDetl.setUpdateTime(new Date());
- orderDetl.setStatus(1);
- orderDetl.setQty(0.0D);
-// if (!orderDetlService.insert(orderDetl)) {
-// callApiLogSaveOrder(order,kingDeeUtilType, "鐢熸垚鍗曟嵁鏄庣粏澶辫触锛岃鑱旂郴绠＄悊鍛�!璁㈠崟鍙凤細"+order.getOrderNo(), false);
-//// throw new CoolException("鐢熸垚鍗曟嵁鏄庣粏澶辫触锛岃鑱旂郴绠＄悊鍛�");
-// }
- OrderInAndOutUtil.insertOrderDetl(kingDeeUtilType.pakIn == 1,order,orderDetl);
- }
- docTypeService.updateById(docType);
- }
- } catch (Exception e) {
- log.error("fail", e);
-// TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
- return FAIL.setMsg(e.getMessage());
- } finally {
-// try {
-// // 淇濆瓨鎺ュ彛鏃ュ織
-// apiLogService.save(
-// "杞鏁版嵁",
-// URL + inaddress,
-// null,
-// "127.0.0.1",
-// add,
-// response,
-// success
-// );
-// } catch (Exception e) {
-// log.error("", e);
-// }
- }
- }
- return SUCCESS;
- }
-
- public void callApiLogSaveMat(Mat mat, KingDeeUtilType kingDeeUtilType, String response, Boolean bool) {
- apiLogService.save("鑾峰彇"+kingDeeUtilType.desc, kingDeeUtilType.formId, "null", URL,
- "鐗╂枡缂栧彿锛�" + mat.getMatnr() + "銆佺墿鏂欏悕绉帮細" + mat.getName() + "銆佺被鍨嬶細" + mat.getTagId$() + "銆佺姸鎬侊細" + mat.getStatus$(),
- response, bool);
- }
-
- public void callApiLogSaveOrder(Order order, KingDeeUtilType kingDeeUtilType, String response, Boolean bool) {
- apiLogService.save("鑾峰彇"+kingDeeUtilType.desc, kingDeeUtilType.formId, "null", URL,
- "鍗曟嵁缂栧彿锛�" + order.getId() + "銆佺姸鎬侊細" + order.getStatus$(),
- response, bool);
- }
-
-}
\ No newline at end of file
diff --git a/src/main/java/com/zy/asrs/task/kingdee/handler/LoginAuthenticationHandler.java b/src/main/java/com/zy/asrs/task/kingdee/handler/LoginAuthenticationHandler.java
deleted file mode 100644
index 3530b48..0000000
--- a/src/main/java/com/zy/asrs/task/kingdee/handler/LoginAuthenticationHandler.java
+++ /dev/null
@@ -1,146 +0,0 @@
-package com.zy.asrs.task.kingdee.handler;
-
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.core.common.Cools;
-import com.core.exception.CoolException;
-import com.zy.asrs.entity.Order;
-import com.zy.asrs.service.ApiLogService;
-import com.zy.asrs.task.AbstractHandler;
-import com.zy.asrs.task.core.ReturnT;
-import com.zy.common.utils.HttpHandler;
-import com.zy.erp.kingdee.entity.param.LoginParam;
-import com.zy.erp.kingdee.enums.KingDeeUtilType;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.Set;
-
-@Service
-@Slf4j
-@Transactional
-public class LoginAuthenticationHandler extends AbstractHandler<String> {
-
- @Value("${erp.address.URL}")
- //绔彛
- private String URL;
-
- @Value("${erp.address.loginaddress}")
- //鐧诲綍鍦板潃
- private String loginaddress;
-
- @Value("${erp.login.acctID}")
- //璐﹀彿ID
- private String acctID;
-
- @Value("${erp.login.username}")
- //璐﹀彿
- private String username;
-
- @Value("${erp.login.password}")
- //瀵嗙爜
- private String password;
-
- @Value("${erp.login.lcid}")
- //
- private Integer lcid;
-
- @Autowired
- private ApiLogService apiLogService;
-
- /**
- * 45鍒嗛挓鐧诲綍涓�娆￠噾铦剁郴缁�
- * @return
- */
- @Transactional
- public synchronized ReturnT<String> start() {
-
- LoginParam loginParam =new LoginParam();
- loginParam.setAcctID(acctID);
- loginParam.setUsername(username);
- loginParam.setPassword(password);
- loginParam.setLcid(lcid);
- //涓婃姤
- String response = "";
- String cookie = "";
- boolean success = false;
- try {
- response = new HttpHandler.Builder()
- .setUri(URL)
- .setPath(loginaddress)
- .setJson(JSON.toJSONString(loginParam))
- .build()
- .doPost();
- JSONObject jsonObject = JSON.parseObject(response);
- Object sessionId = findValueByKey(JSON.parseObject(response), "SessionId");
- cookie="ASP.NET_SessionId="+sessionId+";"+"kdservice-sessionid="+jsonObject.getString("KDSVCSessionId");
- if (Cools.isEmpty(jsonObject.getString("Message"))) {
- success = true;
- } else {
- callApiLogSaveLog(JSON.toJSONString(loginParam),false);
- log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", URL+loginaddress, JSON.toJSONString(loginParam), response);
-// throw new CoolException("鐧诲綍閲戣澏澶辫触");
- }
- } catch (Exception e) {
- log.error("fail", e);
- callApiLogSaveLog(JSON.toJSONString(loginParam),false);
- log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", URL+loginaddress, JSON.toJSONString(loginParam), response);
-// TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
- return FAIL.setMsg(e.getMessage());
- } finally {
-// try {
-// // 淇濆瓨鎺ュ彛鏃ュ織
-// apiLogService.save(
-// "鐧诲綍閲戣澏",
-// URL + loginaddress,
-// null,
-// "127.0.0.1",
-// JSON.toJSONString(loginParam),
-// response,
-// success
-// );
-// } catch (Exception e) { log.error("", e); }
- }
- return SUCCESS.setContent(cookie);
- }
-
-
- public static Object findValueByKey(JSONObject json, String key) {
- Set<String> keySet = json.keySet();
- for (String k : keySet) {
- Object v = json.get(k);
- if (k.equals(key)) {
- return v;
- } else if (v instanceof JSONArray) {
- int size = ((JSONArray) v).size();
- for (int i = 0; i <= size - 1; i++) {
- Object result = findValueByKey((JSONObject) ((JSONArray) v).get(i), key);
- if (result != null){
- return result;
- }
- }
- } else if (v instanceof JSONObject){
- Object result = findValueByKey((JSONObject) v, key);
- if (result != null){
- return result;
- }
- }
- }
- return null;
- }
-
- public void callApiLogSaveLog(String response, Boolean bool) {
- apiLogService.save("鐧诲綍閲戣澏澶辫触", URL, "null", loginaddress,
- "濂楄处ID锛�"+acctID+"銆佽处鍙凤細"+username+"銆佸瘑鐮侊細"+password,
- response, bool);
- }
-
-
-}
-
-
-
diff --git a/src/main/java/com/zy/asrs/task/kingdee/handler/ReviewOrderSyncHandler.java b/src/main/java/com/zy/asrs/task/kingdee/handler/ReviewOrderSyncHandler.java
deleted file mode 100644
index 9b3a0b4..0000000
--- a/src/main/java/com/zy/asrs/task/kingdee/handler/ReviewOrderSyncHandler.java
+++ /dev/null
@@ -1,135 +0,0 @@
-package com.zy.asrs.task.kingdee.handler;
-
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.zy.asrs.entity.DocType;
-import com.zy.asrs.entity.Order;
-import com.zy.asrs.service.ApiLogService;
-import com.zy.asrs.service.DocTypeService;
-import com.zy.asrs.service.OrderService;
-import com.zy.asrs.task.AbstractHandler;
-import com.zy.asrs.task.core.ReturnT;
-import com.zy.asrs.utils.OrderInAndOutUtil;
-import com.zy.common.utils.HttpHandler;
-import com.zy.erp.kingdee.enums.KingDeeUtilType;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.HashMap;
-import java.util.Set;
-
-/**
- * Created by vincent on 2023/10/21
- */
-@Slf4j
-@Service
-public class ReviewOrderSyncHandler extends AbstractHandler<String> {
- @Value("${erp.address.URL}")
- //绔彛
- private String URL;
-
- @Value("${erp.address.outaddressAudit}")
- //瀹℃牳鍦板潃
- private String outaddressAudit;
-
- @Autowired
- private OrderService orderService;
- @Autowired
- private ApiLogService apiLogService;
- @Autowired
- private DocTypeService docTypeService;
- @Autowired
- private LoginAuthenticationHandler loginAuthenticationHandler;
-
- @Transactional
- public ReturnT<String> start(Order order) {
- //鐧诲綍閲戣澏r
- ReturnT<String> start = loginAuthenticationHandler.start();
- DocType docType = docTypeService.selectById(order.getDocType());
- if (null == docType) {
- return SUCCESS;
- }
- KingDeeUtilType kingDeeUtilType = KingDeeUtilType.get(docType.getDocName());
-
- //鏉′欢鎷兼帴
- JSONObject jsonObject = new JSONObject();
- jsonObject.put("Numbers",order.getOrderNo());
- JSONObject jsonObject1 = new JSONObject();
- jsonObject1.put("data", jsonObject);
- jsonObject1.put("FormId",kingDeeUtilType.formId);
- String add = jsonObject1.toJSONString();
- //涓婃姤
- String response = "";
- boolean success = false;
- try {
- //鑾峰彇Cookie鍊�
- HashMap<String, Object> headers = new HashMap<>();
- headers.put("Cookie", start.getContent());
- response = new HttpHandler.Builder()
- .setHeaders(headers)
- .setUri(URL)
- .setPath(outaddressAudit)
- .setJson(add)
- .build()
- .doPost();
- JSONObject data = JSON.parseObject(response);
- Object IsSuccess = findValueByKey(JSON.parseObject(response), "IsSuccess");
- String bool=IsSuccess.toString();
- //瀹℃牳瀹屾垚鍘熻鍗�4杞�8 8.瀹℃牳瀹屾垚
- if(bool.equals("true")){
- success = true;
- order.setSettle(8L);
-// orderService.update(order,new EntityWrapper<Order>().eq("order_no",order.getOrderNo()));
- OrderInAndOutUtil.updateOrder(order.getPakinPakoutStatus$(),order.getId(), 8L, null);
- }
- } catch (Exception e) {
- log.error("fail", e);
-// TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
- return FAIL.setMsg(e.getMessage());
- } finally {
- try {
- // 淇濆瓨鎺ュ彛鏃ュ織
- apiLogService.save(
- "瀹℃牳",
- URL+ outaddressAudit,
- null,
- "127.0.0.1",
- add,
- response,
- success
- );
- } catch (Exception e) {
- log.error("", e);
- }
- }
- return SUCCESS;
- }
- public static Object findValueByKey(JSONObject json, String key) {
- Set<String> keySet = json.keySet();
- for (String k : keySet) {
- Object v = json.get(k);
- if (k.equals(key)) {
- return v;
- } else if (v instanceof JSONArray) {
- int size = ((JSONArray) v).size();
- for (int i = 0; i <= size - 1; i++) {
- Object result = findValueByKey((JSONObject) ((JSONArray) v).get(i), key);
- if (result != null){
- return result;
- }
- }
- } else if (v instanceof JSONObject){
- Object result = findValueByKey((JSONObject) v, key);
- if (result != null){
- return result;
- }
- }
- }
- return null;
- }
-}
diff --git a/src/main/java/com/zy/asrs/task/kingdee/handler/SaveOrderSyncHandler.java b/src/main/java/com/zy/asrs/task/kingdee/handler/SaveOrderSyncHandler.java
deleted file mode 100644
index 65de7a7..0000000
--- a/src/main/java/com/zy/asrs/task/kingdee/handler/SaveOrderSyncHandler.java
+++ /dev/null
@@ -1,136 +0,0 @@
-package com.zy.asrs.task.kingdee.handler;
-
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.zy.asrs.entity.DocType;
-import com.zy.asrs.entity.Order;
-import com.zy.asrs.service.ApiLogService;
-import com.zy.asrs.service.DocTypeService;
-import com.zy.asrs.service.OrderService;
-import com.zy.asrs.task.AbstractHandler;
-import com.zy.asrs.task.core.ReturnT;
-import com.zy.asrs.utils.OrderInAndOutUtil;
-import com.zy.common.utils.HttpHandler;
-import com.zy.erp.kingdee.enums.KingDeeUtilType;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.HashMap;
-import java.util.Set;
-
-/**
- * Created by Monkey D. Luffy on 2023.10.21
- */
-@Slf4j
-@Service
-public class SaveOrderSyncHandler extends AbstractHandler<String> {
- @Value("${erp.address.URL}")
- //绔彛
- private String URL;
-
- @Value("${erp.address.outaddressSave}")
- //瀹℃牳鍦板潃
- private String outaddressSave;
-
- @Autowired
- private OrderService orderService;
- @Autowired
- private ApiLogService apiLogService;
- @Autowired
- private DocTypeService docTypeService;
- @Autowired
- private LoginAuthenticationHandler loginAuthenticationHandler;
-
- @Transactional
- public ReturnT<String> start(Order order) {
- //鐧诲綍閲戣澏r
- ReturnT<String> start = loginAuthenticationHandler.start();
- DocType docType = docTypeService.selectById(order.getDocType());
- if (null == docType) {
- return SUCCESS;
- }
- KingDeeUtilType kingDeeUtilType = KingDeeUtilType.get(docType.getDocName());
-
- //鏉′欢鎷兼帴
- JSONObject jsonObject = new JSONObject();
- jsonObject.put("Numbers",order.getOrderNo());
- JSONObject jsonObject1 = new JSONObject();
- jsonObject1.put("data", jsonObject);
- jsonObject1.put("FormId",kingDeeUtilType.correspondingFormId);
- String add = jsonObject1.toJSONString();
- //涓婃姤
- String response = "";
- boolean success = false;
- try {
- //鑾峰彇Cookie鍊�
- HashMap<String, Object> headers = new HashMap<>();
- headers.put("Cookie", start.getContent());
- response = new HttpHandler.Builder()
- .setHeaders(headers)
- .setUri(URL)
- .setPath(outaddressSave)
- .setJson(add)
- .build()
- .doPost();
- JSONObject data = JSON.parseObject(response);
- Object IsSuccess = findValueByKey(JSON.parseObject(response), "IsSuccess");
- String bool=IsSuccess.toString();
- //淇濆瓨瀹屾垚鍘熻鍗�8杞�6
- if(bool.equals("true")){
- success = true;
- order.setSettle(6L);
-// orderService.update(order,new EntityWrapper<Order>().eq("order_no",order.getOrderNo()));
- OrderInAndOutUtil.updateOrder(order.getPakinPakoutStatus$(),order.getId(), 6L, null);
-
- }
- } catch (Exception e) {
- log.error("fail", e);
-// TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
- return FAIL.setMsg(e.getMessage());
- } finally {
- try {
- // 淇濆瓨鎺ュ彛鏃ュ織
- apiLogService.save(
- "淇濆瓨",
- URL+ outaddressSave,
- null,
- "127.0.0.1",
- add,
- response,
- success
- );
- } catch (Exception e) {
- log.error("", e);
- }
- }
- return SUCCESS;
- }
- public static Object findValueByKey(JSONObject json, String key) {
- Set<String> keySet = json.keySet();
- for (String k : keySet) {
- Object v = json.get(k);
- if (k.equals(key)) {
- return v;
- } else if (v instanceof JSONArray) {
- int size = ((JSONArray) v).size();
- for (int i = 0; i <= size - 1; i++) {
- Object result = findValueByKey((JSONObject) ((JSONArray) v).get(i), key);
- if (result != null){
- return result;
- }
- }
- } else if (v instanceof JSONObject){
- Object result = findValueByKey((JSONObject) v, key);
- if (result != null){
- return result;
- }
- }
- }
- return null;
- }
-}
diff --git a/src/main/java/com/zy/asrs/task/kingdee/handler/SubmitOrderSyncHandler.java b/src/main/java/com/zy/asrs/task/kingdee/handler/SubmitOrderSyncHandler.java
deleted file mode 100644
index 32ead63..0000000
--- a/src/main/java/com/zy/asrs/task/kingdee/handler/SubmitOrderSyncHandler.java
+++ /dev/null
@@ -1,135 +0,0 @@
-package com.zy.asrs.task.kingdee.handler;
-
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.zy.asrs.entity.DocType;
-import com.zy.asrs.entity.Order;
-import com.zy.asrs.service.ApiLogService;
-import com.zy.asrs.service.DocTypeService;
-import com.zy.asrs.service.OrderService;
-import com.zy.asrs.task.AbstractHandler;
-import com.zy.asrs.task.core.ReturnT;
-import com.zy.asrs.utils.OrderInAndOutUtil;
-import com.zy.common.utils.HttpHandler;
-import com.zy.erp.kingdee.enums.KingDeeUtilType;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.HashMap;
-import java.util.Set;
-
-/**
- * Created by Monkey D. Luffy on 2023.10.21
- */
-@Slf4j
-@Service
-public class SubmitOrderSyncHandler extends AbstractHandler<String> {
- @Value("${erp.address.URL}")
- //绔彛
- private String URL;
-
- @Value("${erp.address.outaddressSubmit}")
- //瀹℃牳鍦板潃
- private String outaddressSubmit;
-
- @Autowired
- private OrderService orderService;
- @Autowired
- private ApiLogService apiLogService;
- @Autowired
- private DocTypeService docTypeService;
- @Autowired
- private LoginAuthenticationHandler loginAuthenticationHandler;
-
- @Transactional
- public ReturnT<String> start(Order order) {
- //鐧诲綍閲戣澏r
- ReturnT<String> start = loginAuthenticationHandler.start();
- DocType docType = docTypeService.selectById(order.getDocType());
- if (null == docType) {
- return SUCCESS;
- }
- KingDeeUtilType kingDeeUtilType = KingDeeUtilType.get(docType.getDocName());
-
- //鏉′欢鎷兼帴
- JSONObject jsonObject = new JSONObject();
- jsonObject.put("Numbers",order.getOrderNo());
- JSONObject jsonObject1 = new JSONObject();
- jsonObject1.put("data", jsonObject);
- jsonObject1.put("FormId",kingDeeUtilType.correspondingFormId);
- String add = jsonObject1.toJSONString();
- //涓婃姤
- String response = "";
- boolean success = false;
- try {
- //鑾峰彇Cookie鍊�
- HashMap<String, Object> headers = new HashMap<>();
- headers.put("Cookie", start.getContent());
- response = new HttpHandler.Builder()
- .setHeaders(headers)
- .setUri(URL)
- .setPath(outaddressSubmit)
- .setJson(add)
- .build()
- .doPost();
- JSONObject data = JSON.parseObject(response);
- Object IsSuccess = findValueByKey(JSON.parseObject(response), "IsSuccess");
- String bool=IsSuccess.toString();
- //瀹℃牳瀹屾垚鍘熻鍗�8杞�6
- if(bool.equals("true")){
- success = true;
- order.setSettle(6L);
-// orderService.update(order,new EntityWrapper<Order>().eq("order_no",order.getOrderNo()));
- OrderInAndOutUtil.updateOrder(order.getPakinPakoutStatus$(),order.getId(), 6L, null);
- }
- } catch (Exception e) {
- log.error("fail", e);
-// TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
- return FAIL.setMsg(e.getMessage());
- } finally {
- try {
- // 淇濆瓨鎺ュ彛鏃ュ織
- apiLogService.save(
- "鎻愪氦",
- URL+ outaddressSubmit,
- null,
- "127.0.0.1",
- add,
- response,
- success
- );
- } catch (Exception e) {
- log.error("", e);
- }
- }
- return SUCCESS;
- }
- public static Object findValueByKey(JSONObject json, String key) {
- Set<String> keySet = json.keySet();
- for (String k : keySet) {
- Object v = json.get(k);
- if (k.equals(key)) {
- return v;
- } else if (v instanceof JSONArray) {
- int size = ((JSONArray) v).size();
- for (int i = 0; i <= size - 1; i++) {
- Object result = findValueByKey((JSONObject) ((JSONArray) v).get(i), key);
- if (result != null){
- return result;
- }
- }
- } else if (v instanceof JSONObject){
- Object result = findValueByKey((JSONObject) v, key);
- if (result != null){
- return result;
- }
- }
- }
- return null;
- }
-}
diff --git a/src/main/java/com/zy/asrs/utils/MatExcelListener.java b/src/main/java/com/zy/asrs/utils/MatExcelListener.java
index 0c7ff89..7e53bac 100644
--- a/src/main/java/com/zy/asrs/utils/MatExcelListener.java
+++ b/src/main/java/com/zy/asrs/utils/MatExcelListener.java
@@ -131,6 +131,7 @@
if (mat == null) {
mat = excel;
mat.setTagId(tagId);
+ mat.setLocType(tagId);
if (!matService.insert(mat)) {
throw new CoolException("淇濆瓨鍟嗗搧淇℃伅澶辫触锛屽晢鍝佺紪鐮侊細" + excel.getMatnr());
}
diff --git a/src/main/java/com/zy/common/CodeBuilder.java b/src/main/java/com/zy/common/CodeBuilder.java
index e83f56e..ed14c1d 100644
--- a/src/main/java/com/zy/common/CodeBuilder.java
+++ b/src/main/java/com/zy/common/CodeBuilder.java
@@ -20,7 +20,7 @@
generator.url="127.0.0.1:1433;databasename=jsxswms";
generator.username="sa";
generator.password="Skyouc#23";
- generator.table="agv_task_detl_log";
+ generator.table="asr_bas_container";
generator.packagePath="com.zy.asrs";
generator.build();
}
diff --git a/src/main/java/com/zy/common/config/AdminInterceptor.java b/src/main/java/com/zy/common/config/AdminInterceptor.java
index 547ba96..795e7a1 100644
--- a/src/main/java/com/zy/common/config/AdminInterceptor.java
+++ b/src/main/java/com/zy/common/config/AdminInterceptor.java
@@ -10,6 +10,7 @@
import com.zy.common.utils.Http;
import com.zy.system.entity.*;
import com.zy.system.service.*;
+import com.zy.system.timer.LoadingConfigTimer;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.lang.Nullable;
@@ -41,6 +42,8 @@
private PermissionService permissionService;
@Autowired
private RolePermissionService rolePermissionService;
+ @Autowired
+ private LoadingConfigTimer loadingConfigTimer;
@Override
public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
@@ -55,7 +58,7 @@
if (deToken!=null){
long timestamp = Long.parseLong(deToken.substring(0, 13));
// 1澶╁悗杩囨湡
- if (System.currentTimeMillis() - timestamp > 86400000){
+ if (System.currentTimeMillis() - timestamp > loadingConfigTimer.getTokenExpire()){
Http.response(response, BaseRes.DENIED);
return false;
}
diff --git a/src/main/java/com/zy/common/model/DetlDto.java b/src/main/java/com/zy/common/model/DetlDto.java
index d7168d0..f3e11a4 100644
--- a/src/main/java/com/zy/common/model/DetlDto.java
+++ b/src/main/java/com/zy/common/model/DetlDto.java
@@ -17,6 +17,8 @@
private String orderNo;
+ private Long orderId;
+
private String matnr;
private String batch = "";
diff --git a/src/main/java/com/zy/common/task/ActivateScheduler.java b/src/main/java/com/zy/common/task/ActivateScheduler.java
deleted file mode 100644
index 22b0ff0..0000000
--- a/src/main/java/com/zy/common/task/ActivateScheduler.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package com.zy.common.task;
-
-import com.core.common.AesUtils;
-import com.core.common.Cools;
-import com.core.common.DateUtils;
-import com.zy.common.properties.OSinfo;
-import com.zy.common.properties.SystemProperties;
-import org.springframework.scheduling.annotation.Scheduled;
-import org.springframework.stereotype.Component;
-
-import javax.annotation.PostConstruct;
-import java.util.Date;
-
-/**
- * 绯荤粺婵�娲讳换鍔�
- */
-@Component
-public class ActivateScheduler {
-
-// @Scheduled(cron = "0/1 * 8 * * ? ") // 姣忓ぉ8鐐�
-// @Scheduled(cron = "* 0/1 * * * ? ") // 姣忓垎閽�
-// @PostConstruct
- private void execute(){
- // 鑾峰彇婵�娲荤爜
- String activationCode = SystemProperties.getActivationCode(OSinfo.getOSname().getActivationCodePath());
- if (!Cools.isEmpty(activationCode)) {
- // 鑾峰彇鏈夋晥鏈�
- String timeStr = AesUtils.decrypt(activationCode, SystemProperties.SALT);
- if (null == timeStr) {
- SystemProperties.SYSTEM_ACTIVATION = Boolean.FALSE;
- return;
- }
- Date exprTime = DateUtils.convert(timeStr, DateUtils.yyyyMMddHHmmss);
- if (new Date().getTime() < exprTime.getTime()) {
- SystemProperties.SYSTEM_ACTIVATION = Boolean.TRUE;
- } else {
- SystemProperties.SYSTEM_ACTIVATION = Boolean.FALSE;
- }
- } else {
- SystemProperties.SYSTEM_ACTIVATION = Boolean.FALSE;
- }
- }
-
-}
diff --git a/src/main/java/com/zy/common/web/AuthController.java b/src/main/java/com/zy/common/web/AuthController.java
index 32e4d76..cc00686 100644
--- a/src/main/java/com/zy/common/web/AuthController.java
+++ b/src/main/java/com/zy/common/web/AuthController.java
@@ -17,6 +17,7 @@
import com.zy.system.entity.license.LicenseVerify;
import com.zy.system.service.*;
import com.zy.system.timer.LicenseTimer;
+import com.zy.system.timer.LoadingConfigTimer;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.transaction.annotation.Transactional;
@@ -49,6 +50,8 @@
private RolePermissionService rolePermissionService;
@Autowired
private LicenseTimer licenseTimer;
+ @Autowired
+ private LoadingConfigTimer loadingConfigTimer;
@PostMapping("/login.action")
@ManagerAuth(value = ManagerAuth.Auth.NONE, memo = "鐧诲綍")
@@ -76,8 +79,9 @@
return R.parse(CodeRes.USER_10003);
}
String token = Cools.enToken(System.currentTimeMillis() + param.get("username"), user.getPassword());
- userLoginService.delete(new EntityWrapper<UserLogin>().eq("user_id", user.getId()));
- UserLogin userLogin = new UserLogin();
+ if (loadingConfigTimer.getTokenNumber() == 1) {
+ userLoginService.delete(new EntityWrapper<UserLogin>().eq("user_id", user.getId()).eq("system", "WMS"));
+ } UserLogin userLogin = new UserLogin();
userLogin.setUserId(user.getId());
userLogin.setToken(token);
userLogin.setCreateTime(new Date());
@@ -340,48 +344,48 @@
return R.ok(resources);
}
- @GetMapping(value = "/system/activation/auth")
- public R activation() {
- if (SystemProperties.SYSTEM_ACTIVATION) {
- String activationCode = SystemProperties.getActivationCode(OSinfo.getOSname().getActivationCodePath());
- String timeStr = AesUtils.decrypt(activationCode, SystemProperties.SALT);
- if (null == timeStr) {
- SystemProperties.SYSTEM_ACTIVATION = Boolean.FALSE;
- return R.error();
- }
- Date exprTime = DateUtils.convert(timeStr, DateUtils.yyyyMMddHHmmss);
- if (new Date().getTime() < exprTime.getTime()) {
- return R.ok().add(DateUtils.convert(exprTime));
- } else {
- SystemProperties.SYSTEM_ACTIVATION = Boolean.FALSE;
- return R.error();
- }
- } else {
- return R.error();
- }
- }
-
- @PostMapping(value = "/system/secret/auth")
- @ManagerAuth
- public R systemSecret(@RequestParam(value = "secret") String secret) {
- if (Cools.isEmpty(secret)) {
- return R.error("璇疯緭鍏ユ縺娲荤爜");
- }
- // 楠岃瘉婵�娲荤爜
- String timeStr = AesUtils.decrypt(secret, SystemProperties.SALT);
- if (null == timeStr) {
- return R.error("婵�娲荤爜閿欒");
- }
- Date exprTime = DateUtils.convert(timeStr, DateUtils.yyyyMMddHHmmss);
- if (new Date().getTime() >= exprTime.getTime()) {
- return R.error("婵�娲荤爜宸插け鏁�");
- }
- boolean result = SystemProperties.saveActivationCode(OSinfo.getOSname().getActivationCodePath(), secret);
- if (!result) {
- return R.error("婵�娲诲け璐�");
- }
- SystemProperties.SYSTEM_ACTIVATION = Boolean.TRUE;
- return R.ok("婵�娲绘垚鍔燂紝鏈夋晥鏈熻嚦" + DateUtils.convert(exprTime));
- }
+// @GetMapping(value = "/system/activation/auth")
+// public R activation() {
+// if (SystemProperties.SYSTEM_ACTIVATION) {
+// String activationCode = SystemProperties.getActivationCode(OSinfo.getOSname().getActivationCodePath());
+// String timeStr = AesUtils.decrypt(activationCode, SystemProperties.SALT);
+// if (null == timeStr) {
+// SystemProperties.SYSTEM_ACTIVATION = Boolean.FALSE;
+// return R.error();
+// }
+// Date exprTime = DateUtils.convert(timeStr, DateUtils.yyyyMMddHHmmss);
+// if (new Date().getTime() < exprTime.getTime()) {
+// return R.ok().add(DateUtils.convert(exprTime));
+// } else {
+// SystemProperties.SYSTEM_ACTIVATION = Boolean.FALSE;
+// return R.error();
+// }
+// } else {
+// return R.error();
+// }
+// }
+//
+// @PostMapping(value = "/system/secret/auth")
+// @ManagerAuth
+// public R systemSecret(@RequestParam(value = "secret") String secret) {
+// if (Cools.isEmpty(secret)) {
+// return R.error("璇疯緭鍏ユ縺娲荤爜");
+// }
+// // 楠岃瘉婵�娲荤爜
+// String timeStr = AesUtils.decrypt(secret, SystemProperties.SALT);
+// if (null == timeStr) {
+// return R.error("婵�娲荤爜閿欒");
+// }
+// Date exprTime = DateUtils.convert(timeStr, DateUtils.yyyyMMddHHmmss);
+// if (new Date().getTime() >= exprTime.getTime()) {
+// return R.error("婵�娲荤爜宸插け鏁�");
+// }
+// boolean result = SystemProperties.saveActivationCode(OSinfo.getOSname().getActivationCodePath(), secret);
+// if (!result) {
+// return R.error("婵�娲诲け璐�");
+// }
+// SystemProperties.SYSTEM_ACTIVATION = Boolean.TRUE;
+// return R.ok("婵�娲绘垚鍔燂紝鏈夋晥鏈熻嚦" + DateUtils.convert(exprTime));
+// }
}
diff --git a/src/main/java/com/zy/erp/kingdee/entity/param/InFormIdParam.java b/src/main/java/com/zy/erp/kingdee/entity/param/InFormIdParam.java
deleted file mode 100644
index 89c6f06..0000000
--- a/src/main/java/com/zy/erp/kingdee/entity/param/InFormIdParam.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package com.zy.erp.kingdee.entity.param;
-
-import lombok.Data;
-
-@Data
-public class InFormIdParam {
-
- //鏌ユ壘琛ㄥ崟鍞竴鏍囪瘑
- private String FormId;
-
- //鏈�澶氬厑璁告煡璇㈢殑鏁伴噺锛�0鎴栬�呬笉瑕佹灞炴�ф爣璇嗕笉闄愬埗
- private String TopRowCount;
-
- private Integer Limit;
-
- private String StartRow;
-
- //杩囨护鏉′欢锛坋g:\"FNumber>'0301010120001' and FCreateDate>'2023-07-05' \"锛�
- //1銆丩eft锛氬乏鎷彿
- //3銆丆ompare锛氭瘮杈冭繍绠楃锛屽銆�澶т簬">"銆佸皬浜�"<"銆佺瓑浜�"="銆佸寘鍚�"like"銆佸乏鍖呭惈"llike"銆佸彸鍖呭惈"rlike"
- //4銆乂alue锛氭瘮杈冨��
- //5銆丷ight锛氬彸鎷彿
- //6銆丩ogic锛氶�昏緫杩愮畻绗︼紝濡� "and"銆�"or"
- private Integer Filterstring;
-
- //鎺掑簭鏉′欢
- private Integer OrderString;
-
- //寰呮煡璇㈣〃鍗曠殑瀛楁鍒楋紙鏈熸湜杩斿洖鍊硷級
- private Integer FieldKeys;
-
-
-
-
-
-
-
-}
diff --git a/src/main/java/com/zy/erp/kingdee/entity/param/LoginParam.java b/src/main/java/com/zy/erp/kingdee/entity/param/LoginParam.java
deleted file mode 100644
index 1eb3ee4..0000000
--- a/src/main/java/com/zy/erp/kingdee/entity/param/LoginParam.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.zy.erp.kingdee.entity.param;
-
-import lombok.Data;
-
-@Data
-public class LoginParam {
- //璐﹀彿ID
- private String acctID;
-
- //璐﹀彿
- private String username;
-
- //瀵嗙爜
- private String password;
-
- //
- private Integer lcid;
-
-}
diff --git a/src/main/java/com/zy/erp/kingdee/enums/KingDeeUtilType.java b/src/main/java/com/zy/erp/kingdee/enums/KingDeeUtilType.java
deleted file mode 100644
index 77d827b..0000000
--- a/src/main/java/com/zy/erp/kingdee/enums/KingDeeUtilType.java
+++ /dev/null
@@ -1,80 +0,0 @@
-package com.zy.erp.kingdee.enums;
-
-public enum KingDeeUtilType {
- BD_MATERIAL(0, "鐗╂枡妗ｆ","BD_MATERIAL","","","",1),
-// STK_InStock(1, "閲囪喘鍏ュ簱鍗�","STK_InStock","FRealQty","","",1),
-// PUR_MRB(2, "閲囪喘閫�鏂欏崟","PUR_MRB","FRMREALQTY","","",1),
-// PRD_PickMtrl(3, "鐢熶骇棰嗘枡鍗�","PRD_PickMtrl","FActualQty","","",1),
-// PRD_ReturnMtrl(4, "鐢熶骇閫�鏂欏崟","PRD_ReturnMtrl","FQty","","",1),
-// PRD_FeedMtrl(5, "鐢熶骇琛ユ枡鍗�","PRD_FeedMtrl","FActualQty","","",1),
-// STK_TransferDirect(6, "鐩存帴璋冩嫧鍗�","STK_TransferDirect","","FQty","",1),
-// STK_StockCountGain(7, "鐩樼泩鍗�","STK_StockCountGain","FGainQty","","",1),
-// STK_StockCountLoss(8, "鐩樹簭鍗�","STK_StockCountLoss","FLossQty","","",1),
-// STK_MisDelivery(9, "鍏朵粬鍑哄簱鍗�","STK_MisDelivery","FQty","","",1),
-// SP_PickMtrl(10, "绠�鍗曠敓浜ч鏂欏崟","SP_PickMtrl","FActualQty","","",1),
-// SP_ReturnMtrl(11, "绠�鍗曠敓浜ч��鏂欏崟","SP_ReturnMtrl","FQty","","",1),
-// SAL_OUTSTOCK(12, "閿�鍞嚭搴撳崟","SAL_OUTSTOCK","FRealQty","","",1),
-// SAL_RETURNSTOCK(13, "閿�鍞��璐у崟","SAL_RETURNSTOCK","FRealQty","","",1),
- SAL_DELIVERYNOTICE(14, "鍙戣揣閫氱煡鍗�","SAL_DELIVERYNOTICE","FQty","閿�鍞嚭搴撳崟","SAL_OUTSTOCK",0),
- STK_MISCELLANEOUS(15, "鍏朵粬鍏ュ簱鍗�","STK_MISCELLANEOUS","FQty","鍏朵粬鍏ュ簱鍗�","STK_MISCELLANEOUS",1),
-// BD_Supplier(16, "渚涘簲鍟�","BD_Supplier","","","",1),
- PUR_ReceiveBill(17, "鏀舵枡閫氱煡鍗�","PUR_ReceiveBill","FPOQTY","閲囪喘鍏ュ簱鍗�","STK_InStock",1),
- PRD_MORPT(18, "鐢熶骇姹囨姤鍗�","PRD_MORPT","FFinishQty","鐢熶骇鍏ュ簱鍗�","PRD_INSTOCK",1),
-// PRD_INSTOCK(19, "鐢熶骇鍏ュ簱鍗�","PRD_INSTOCK","","","",1),
- SAL_RETURNNOTICE(20, "閫�璐ч�氱煡鍗�","SAL_RETURNNOTICE","FBaseJunkedQty","閿�鍞��璐у崟","SAL_RETURNSTOCK",1),
- STK_OutStockApply(21, "鍑哄簱鐢宠鍗�","STK_OutStockApply","FTotalSecQty","鍏朵粬鍑哄簱鍗�","STK_MisDelivery",0),
- ;
- public Integer id;
- public String desc;
- public String formId;
- public String anfme;
- public String correspondingName;
- public String correspondingFormId;
- public Integer pakIn;
-
- KingDeeUtilType(Integer id, String desc,String formId,String anfme,String correspondingName,String correspondingFormId,int pakIn){
- this.id = id;
- this.desc = desc;
- this.formId = formId;
- this.anfme = anfme;
- this.correspondingName = correspondingName;
- this.correspondingFormId = correspondingFormId;
- this.pakIn = pakIn; //1鍏ュ簱 0鍑哄簱
- }
-
- public static KingDeeUtilType get(Short id) {
- if (null == id) {
- return null;
- }
- for (KingDeeUtilType type : KingDeeUtilType.values()) {
- if (type.id.equals(id.intValue())) {
- return type;
- }
- }
- return null;
- }
-
- public static KingDeeUtilType get(String desc) {
- if (null == desc) {
- return null;
- }
- for (KingDeeUtilType type : KingDeeUtilType.values()) {
- if (type.desc.equals(desc)) {
- return type;
- }
- }
- return null;
- }
-
- public static KingDeeUtilType get(KingDeeUtilType type) {
- if (null == type) {
- return null;
- }
- for (KingDeeUtilType crnLiftPosType : KingDeeUtilType.values()) {
- if (crnLiftPosType == type) {
- return crnLiftPosType;
- }
- }
- return null;
- }
-}
diff --git a/src/main/java/com/zy/erp/kingdee/utils/KingDeeUtil.java b/src/main/java/com/zy/erp/kingdee/utils/KingDeeUtil.java
deleted file mode 100644
index 3373421..0000000
--- a/src/main/java/com/zy/erp/kingdee/utils/KingDeeUtil.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.zy.erp.kingdee.utils;
-
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
-import java.util.Date;
-
-public class KingDeeUtil {
-
- //瀵圭編鍥芥椂闂磋繘琛岃浆鎹�
- public static Date KingDeeDate(String jsonArrayDate) throws ParseException {
- SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-
- DateTimeFormatter dateFormat = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SSS");
- DateTimeFormatter formatter = DateTimeFormatter.ISO_LOCAL_DATE_TIME;
- LocalDateTime dateTime = LocalDateTime.parse(jsonArrayDate, formatter);
- String format = dateFormat.format(dateTime);
- return sdf.parse(format);
- }
-
-
-
-}
diff --git a/src/main/java/com/zy/erp/kingdee/utils/PostMesDataUtils.java b/src/main/java/com/zy/erp/kingdee/utils/PostMesDataUtils.java
deleted file mode 100644
index 1b89571..0000000
--- a/src/main/java/com/zy/erp/kingdee/utils/PostMesDataUtils.java
+++ /dev/null
@@ -1,119 +0,0 @@
-package com.zy.erp.kingdee.utils;
-
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
-import com.core.common.SpringUtils;
-import com.core.exception.CoolException;
-import com.zy.asrs.service.ApiLogService;
-import com.zy.asrs.task.AbstractHandler;
-import com.zy.asrs.task.core.ReturnT;
-import com.zy.common.utils.HttpHandler;
-import lombok.extern.slf4j.Slf4j;
-
-import java.util.Map;
-
-@Slf4j
-public class PostMesDataUtils extends AbstractHandler<String> {
-
- public ReturnT<String> postMesData(String name, String URL, String mesPath, Object combParam){
-// if (true){
-// System.out.println("name:"+name+",URL:"+URL+",mesPath:"+mesPath+",combParam:"+combParam);
-// return SUCCESS;
-// }
- if(combParam != null){
- String response = "";
- boolean success = false;
- try {
-// Map<String, Object> map = new HashMap<>()
-// map.put("appkey","ea1f0459efc02a79f046f982767939ae");
- response = new HttpHandler.Builder()
-// .setHeaders(map)
- .setUri(URL)
- .setPath(mesPath)
- .setJson(JSON.toJSONString(combParam))
- .build()
- .doPost();
- System.out.println("response:"+response);
- JSONObject jsonObject = JSON.parseObject(response);
-
- if (jsonObject.getInteger("code").equals(200)) {
- success = true;
- } else {
- log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", URL+"/"+mesPath, JSON.toJSONString(combParam), response);
- throw new CoolException("涓婃姤"+name);
- }
- } catch (Exception e) {
- log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", URL+"/"+mesPath, JSON.toJSONString(combParam), response);
-// TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
- return FAIL.setMsg(e.getMessage());
- } finally {
- try {
- // 淇濆瓨鎺ュ彛鏃ュ織
- ApiLogService apiLogService = SpringUtils.getBean(ApiLogService.class);
- apiLogService.save(
- "涓婃姤"+name,
- URL +"/"+ mesPath,
- null,
- "127.0.0.1",
- JSON.toJSONString(combParam),
- response,
- success
- );
- } catch (Exception e) {
- log.error("", e); }
- }
- }
- return SUCCESS;
- }
-
- public ReturnT<String> postMesData(String name, String URL, String mesPath, Object combParam,Map<String, Object> map){
-// if (true){
-// System.out.println("name:"+name+",URL:"+URL+",mesPath:"+mesPath+",combParam:"+combParam);
-// return SUCCESS;
-// }
- if(combParam != null){
- String response = "";
- boolean success = false;
- try {
-// Map<String, Object> map = new HashMap<>();
-// map.put("appkey","ea1f0459efc02a79f046f982767939ae");
- response = new HttpHandler.Builder()
- .setHeaders(map)
- .setUri(URL)
- .setPath(mesPath)
- .setJson(JSON.toJSONString(combParam))
- .build()
- .doPost();
- System.out.println("response:"+response);
- JSONObject jsonObject = JSON.parseObject(response);
-
- if (jsonObject.getInteger("code").equals(200)) {
- success = true;
- } else {
- log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", URL+"/"+mesPath, JSON.toJSONString(combParam), response);
- throw new CoolException("涓婃姤"+name);
- }
- } catch (Exception e) {
- log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", URL+"/"+mesPath, JSON.toJSONString(combParam), response);
-// TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
- return FAIL.setMsg(e.getMessage());
- } finally {
- try {
- // 淇濆瓨鎺ュ彛鏃ュ織
- ApiLogService apiLogService = SpringUtils.getBean(ApiLogService.class);
- apiLogService.save(
- "涓婃姤"+name,
- URL +"/"+ mesPath,
- null,
- "127.0.0.1",
- JSON.toJSONString(combParam),
- response,
- success
- );
- } catch (Exception e) {
- log.error("", e); }
- }
- }
- return SUCCESS;
- }
-}
diff --git a/src/main/java/com/zy/system/controller/LicenseCreatorController.java b/src/main/java/com/zy/system/controller/LicenseCreatorController.java
index 5650623..6da3dde 100644
--- a/src/main/java/com/zy/system/controller/LicenseCreatorController.java
+++ b/src/main/java/com/zy/system/controller/LicenseCreatorController.java
@@ -102,4 +102,11 @@
return R.ok();
}
+
+ @RequestMapping(value = "/activate")
+ public R activate() {
+ licenseTimer.timer();
+ return R.ok();
+ }
+
}
\ No newline at end of file
diff --git a/src/main/java/com/zy/system/service/ConfigService.java b/src/main/java/com/zy/system/service/ConfigService.java
index 6100b23..0c05c61 100644
--- a/src/main/java/com/zy/system/service/ConfigService.java
+++ b/src/main/java/com/zy/system/service/ConfigService.java
@@ -6,4 +6,6 @@
public interface ConfigService extends IService<Config> {
Config selectConfigByCode(String code);
+
+ <T> T getVal(String key, Class<T> clazz, T t);
}
diff --git a/src/main/java/com/zy/system/service/impl/ConfigServiceImpl.java b/src/main/java/com/zy/system/service/impl/ConfigServiceImpl.java
index dc9a0e0..8bb1bf9 100644
--- a/src/main/java/com/zy/system/service/impl/ConfigServiceImpl.java
+++ b/src/main/java/com/zy/system/service/impl/ConfigServiceImpl.java
@@ -1,11 +1,14 @@
package com.zy.system.service.impl;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.core.common.Cools;
import com.zy.system.entity.Config;
import com.zy.system.mapper.ConfigMapper;
import com.zy.system.service.ConfigService;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
+@Slf4j
@Service("configService")
public class ConfigServiceImpl extends ServiceImpl<ConfigMapper, Config> implements ConfigService {
@@ -14,4 +17,34 @@
return this.baseMapper.selectConfigByCode(code);
};
+ @Override
+ @SuppressWarnings("unchecked")
+ public <T> T getVal(String key, Class<T> clazz, T t) {
+ try {
+ Config config = this.baseMapper.selectConfigByCode(key);
+ if (config == null || config.getStatus() != 1 || Cools.isEmpty(config.getValue())) {
+ return t;
+ }
+ String val = config.getValue();
+ if (clazz.equals(Boolean.class)) {
+ if (val.equals("1") || val.trim().equalsIgnoreCase("TRUE")) {
+ return (T) Boolean.TRUE;
+ }
+ return (T) Boolean.FALSE;
+ } else if (clazz.equals(Integer.class)) {
+ return (T) Integer.valueOf(val);
+ } else if (clazz.equals(String.class)) {
+ return (T) val;
+ } else if (clazz.equals(Short.class)) {
+ return (T) Short.valueOf(val);
+ } else if (clazz.equals(Long.class)) {
+ return (T) Long.valueOf(val);
+ } else if (clazz.equals(Double.class)) {
+ return (T) Double.valueOf(val);
+ }
+ } catch (Exception e) {
+ log.error("鍙傛暟鍔犺浇寮傚父,閰嶇疆鍙傛暟={}", key);
+ }
+ return t;
+ }
}
diff --git a/src/main/java/com/zy/system/timer/LoadingConfigTimer.java b/src/main/java/com/zy/system/timer/LoadingConfigTimer.java
new file mode 100644
index 0000000..12e4a0a
--- /dev/null
+++ b/src/main/java/com/zy/system/timer/LoadingConfigTimer.java
@@ -0,0 +1,44 @@
+package com.zy.system.timer;
+
+import com.zy.system.service.ConfigService;
+import lombok.Data;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+/**
+ * 瀹氭椂浠诲姟璇诲彇閰嶇疆淇℃伅
+ */
+@Component
+@Slf4j
+@Data
+public class LoadingConfigTimer {
+
+ /**
+ * token鏈夋晥鏈熸椂闂�
+ */
+ private Integer tokenExpire = 1000 * 30 * 60;
+ /**
+ * token鏁伴噺闄愬埗
+ */
+ private Integer tokenNumber = 1;
+ /**
+ * 鍒犻櫎澶╂暟
+ */
+ private Integer logDeleteDays = 360;
+
+
+
+ @Autowired
+ private ConfigService configService;
+
+ @Scheduled(cron = "0/2 * * * * ? ")
+ public void timer() {
+ tokenExpire = configService.getVal("tokenExpire", Integer.class, tokenExpire);
+ tokenNumber = configService.getVal("tokenNumber", Integer.class, tokenNumber);
+ logDeleteDays = configService.getVal("logDeleteDays", Integer.class, logDeleteDays);
+
+ }
+
+}
diff --git a/src/main/java/com/zy/system/timer/TokenTimer.java b/src/main/java/com/zy/system/timer/TokenTimer.java
new file mode 100644
index 0000000..b44ad2a
--- /dev/null
+++ b/src/main/java/com/zy/system/timer/TokenTimer.java
@@ -0,0 +1,50 @@
+package com.zy.system.timer;
+
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.core.common.Cools;
+import com.zy.system.entity.UserLogin;
+import com.zy.system.service.UserLoginService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * token瀹氭椂浠诲姟,鍒犻櫎杩囨湡鐨則oken
+ */
+@Component
+@Slf4j
+public class TokenTimer {
+
+ @Autowired
+ private UserLoginService userLoginService;
+
+ @Autowired
+ private LoadingConfigTimer loadingConfigTimer;
+
+ @Value("${super.pwd}")
+ private String superPwd;
+
+ @Scheduled(cron = "0/30 * * * * ? ")
+ public void timer() {
+ if (loadingConfigTimer.getTokenNumber() == 1) {
+ return;
+ }
+ List<UserLogin> userLogins = userLoginService.selectList(new EntityWrapper<>());
+ for (UserLogin userLogin : userLogins) {
+ String deToken = Cools.deTokn(userLogin.getToken(), superPwd);
+ if (deToken != null) {
+ long timestamp = Long.parseLong(deToken.substring(0, 13));
+ // 鍗婂皬鏃跺悗杩囨湡
+ if (System.currentTimeMillis() - timestamp > loadingConfigTimer.getTokenExpire()) {
+ userLoginService.deleteById(userLogin.getId());
+ }
+
+ }
+ }
+ }
+
+}
diff --git a/src/main/java/locCache.sql b/src/main/java/locCache.sql
deleted file mode 100644
index ccc54fe..0000000
--- a/src/main/java/locCache.sql
+++ /dev/null
@@ -1,18 +0,0 @@
--- save locCache record
--- mysql
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'locCache/locCache.html', '缂撳瓨搴撳尯', null , '2', null , '1');
-
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'locCache#view', '鏌ヨ', '', '3', '0', '1');
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'locCache#btn-add', '鏂板', '', '3', '1', '1');
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'locCache#btn-edit', '缂栬緫', '', '3', '2', '1');
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'locCache#btn-delete', '鍒犻櫎', '', '3', '3', '1');
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'locCache#btn-export', '瀵煎嚭', '', '3', '4', '1');
-
--- sqlserver
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'locCache/locCache.html', N'缂撳瓨搴撳尯', null, '2', null, '1');
-
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'locCache#view', N'鏌ヨ', '90594', '3', '0', '1');
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'locCache#btn-add', N'鏂板', '90594', '3', '1', '1');
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'locCache#btn-edit', N'缂栬緫', '90594', '3', '2', '1');
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'locCache#btn-delete', N'鍒犻櫎', '90594', '3', '3', '1');
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'locCache#btn-export', N'瀵煎嚭', '90594', '3', '4', '1');
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
new file mode 100644
index 0000000..cd52cb2
--- /dev/null
+++ b/src/main/resources/application-dev.yml
@@ -0,0 +1,112 @@
+server:
+ port: 8080
+ servlet:
+ context-path: /@pom.build.finalName@
+
+spring:
+ application:
+ name: @pom.build.finalName@
+ jmx:
+ enabled: false
+ datasource:
+ driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
+ username: sa
+ password: Skyouc#23
+ url: jdbc:sqlserver://192.168.4.24:1433;databasename=jsxswms
+ mvc:
+ static-path-pattern: /**
+ redis:
+ host: localhost
+ port: 6379
+ database: 0
+ # password: xltys1995
+ servlet:
+ multipart:
+ maxFileSize: 100MB
+ maxRequestSize: 100MB
+
+mybatis-plus:
+ mapper-locations: classpath:mapper/*.xml
+ # global-config:
+ # field-strategy: 0
+ configuration:
+ # log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+ map-underscore-to-camel-case: true
+ cache-enabled: true
+ call-setters-on-nulls: true
+
+logging:
+ file:
+ path: /stock/out/@pom.build.finalName@/logs
+
+super:
+ pwd: asrs2023
+
+swagger:
+ enable: false
+
+#License鐩稿叧閰嶇疆
+license:
+ subject: integrationasrs
+ publicAlias: publicCert
+ storePass: public_zhongyang_123456789
+ licensePath: license.lic
+ publicKeysStorePath: publicCerts.keystore
+
+# 涓嬩綅鏈洪厤缃�
+wcs-slave:
+ # 鍙屾繁
+ doubleDeep: true
+ # 鍙屾繁搴撲綅鎺掑彿
+ doubleLocs: 1,4,5,8,9,12,13,16
+ # 涓�涓爢鍨涙満璐熻矗鐨勮揣鏋舵帓鏁�
+ groupCount: 4
+ # 宸︽繁搴撲綅鎺掑彿
+ doubleLocsLeft: 1,5,9,13
+ # 鍙虫繁搴撲綅鎺掑彿
+ doubleLocsRight: 4,8,12,16
+# wms鍙傛暟閰嶇疆
+wms-parameter:
+ # 鑷姩琛ョ┖鏉垮姛鑳藉紑鍏�
+ automaticFillingBoardStaNosBoolean: false
+ # 鑷姩琛ョ┖鏉跨珯鐐�
+ automaticFillingBoardStaNos: 112,101
+ # 鑷姩绉诲簱鍔熻兘寮�鍏�
+ autoLocMoveBoolean: false
+ # 鑷姩绉诲簱鍔熻兘寮�鍏� 绌挎
+ autoLocMoveUnilateralBoolean: false
+
+comb:
+ limit: 5000
+
+#erp瀵规帴
+erp:
+ # 寮�鍏�
+ switch:
+ #璁℃椂鍣ㄤ笂鎶ュ紑鍏�
+ ErpReportOld: false
+ #鑾峰彇鍗曟嵁寮�鍏�
+ InboundOrderSwitch: false
+ #鐧诲綍鎺ュ彛寮�鍏�
+ LoginAuthenticationSwitch: false
+ #涓婃姤銆佸鏍稿崟鎹紑鍏�
+ ReviewOrderSwitch: false
+ # 鍦板潃
+ address:
+ URL: http://58.210.10.90:28090
+ #鐧诲綍鍦板潃
+ loginaddress: K3CLOUD/Kingdee.BOS.WebApi.ServicesStub.AuthService.ValidateUser.common.kdsvc
+ #鍗曟嵁锛屽晢鍝佹。妗堝湴鍧�
+ inaddress: K3CLOUD/Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.ExecuteBillQuery.common.kdsvc
+ #缁撴灉涓婃姤锛堜繚瀛橈級鍗曞湴鍧�
+ outaddressSave: K3CLOUD/Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Save.common.kdsvc
+ #缁撴灉涓婃姤锛堟彁浜わ級鍗曞湴鍧�
+ outaddressSubmit: K3Cloud/Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Submit.common.kdsvc
+ #缁撴灉涓婃姤锛堝鏍革級鍗曞湴鍧�
+ outaddressAudit: K3CLOUD/Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Audit.common.kdsvc
+ # 鐧诲綍璐﹀彿绠＄悊
+ login :
+ acctID: "647e849ab6fa0f"
+ username: "llw"
+ password: "666666"
+ lcid: 2052
\ No newline at end of file
diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml
new file mode 100644
index 0000000..890bdc6
--- /dev/null
+++ b/src/main/resources/application-prod.yml
@@ -0,0 +1,125 @@
+server:
+ port: 8080
+ servlet:
+ context-path: /@pom.build.finalName@
+
+spring:
+ application:
+ name: @pom.build.finalName@
+ jmx:
+ enabled: false
+ datasource:
+ driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
+# url: jdbc:sqlserver://192.168.4.191:1433;databasename=integrationasrs
+# username: sa
+# password: sa@123
+# url: jdbc:sqlserver://127.0.0.1:1433;databasename=source
+# username: sa
+# password: sa@123
+# url: jdbc:sqlserver://127.0.0.1:51433;databasename=source
+# username: sa
+# password: Zoneyung@zy56$
+# url: jdbc:sqlserver://192.168.4.191:50948;databasename=source
+# username: sa
+# password: sa@123
+# url: jdbc:sqlserver://127.0.0.1:62316;databasename=source
+ username: sa
+ password: Skyouc#23
+ url: jdbc:sqlserver://127.0.0.1:1433;databasename=jsxswms
+ mvc:
+ static-path-pattern: /**
+ redis:
+ host: localhost
+ port: 6379
+ database: 0
+# password: xltys1995
+ servlet:
+ multipart:
+ maxFileSize: 100MB
+ maxRequestSize: 100MB
+
+mybatis-plus:
+ mapper-locations: classpath:mapper/*.xml
+ # global-config:
+ # field-strategy: 0
+ configuration:
+# log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+ map-underscore-to-camel-case: true
+ cache-enabled: true
+ call-setters-on-nulls: true
+
+logging:
+ file:
+ path: /stock/out/@pom.build.finalName@/logs
+
+super:
+ pwd: asrs2023
+
+swagger:
+ enable: false
+
+#License鐩稿叧閰嶇疆
+license:
+ subject: integrationasrs
+ publicAlias: publicCert
+ storePass: public_zhongyang_123456789
+ licensePath: license.lic
+ publicKeysStorePath: publicCerts.keystore
+
+# 涓嬩綅鏈洪厤缃�
+wcs-slave:
+ # 鍙屾繁
+ doubleDeep: true
+ # 鍙屾繁搴撲綅鎺掑彿
+ doubleLocs: 1,4,5,8,9,12,13,16
+ # 涓�涓爢鍨涙満璐熻矗鐨勮揣鏋舵帓鏁�
+ groupCount: 4
+ # 宸︽繁搴撲綅鎺掑彿
+ doubleLocsLeft: 1,5,9,13
+ # 鍙虫繁搴撲綅鎺掑彿
+ doubleLocsRight: 4,8,12,16
+# wms鍙傛暟閰嶇疆
+wms-parameter:
+ # 鑷姩琛ョ┖鏉垮姛鑳藉紑鍏�
+ automaticFillingBoardStaNosBoolean: false
+ # 鑷姩琛ョ┖鏉跨珯鐐�
+ automaticFillingBoardStaNos: 112,101
+ # 鑷姩绉诲簱鍔熻兘寮�鍏�
+ autoLocMoveBoolean: false
+ # 鑷姩绉诲簱鍔熻兘寮�鍏� 绌挎
+ autoLocMoveUnilateralBoolean: false
+
+comb:
+ limit: 5000
+
+#erp瀵规帴
+erp:
+ # 寮�鍏�
+ switch:
+ #璁℃椂鍣ㄤ笂鎶ュ紑鍏�
+ ErpReportOld: false
+ #鑾峰彇鍗曟嵁寮�鍏�
+ InboundOrderSwitch: false
+ #鐧诲綍鎺ュ彛寮�鍏�
+ LoginAuthenticationSwitch: false
+ #涓婃姤銆佸鏍稿崟鎹紑鍏�
+ ReviewOrderSwitch: false
+ # 鍦板潃
+ address:
+ URL: http://58.210.10.90:28090
+ #鐧诲綍鍦板潃
+ loginaddress: K3CLOUD/Kingdee.BOS.WebApi.ServicesStub.AuthService.ValidateUser.common.kdsvc
+ #鍗曟嵁锛屽晢鍝佹。妗堝湴鍧�
+ inaddress: K3CLOUD/Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.ExecuteBillQuery.common.kdsvc
+ #缁撴灉涓婃姤锛堜繚瀛橈級鍗曞湴鍧�
+ outaddressSave: K3CLOUD/Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Save.common.kdsvc
+ #缁撴灉涓婃姤锛堟彁浜わ級鍗曞湴鍧�
+ outaddressSubmit: K3Cloud/Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Submit.common.kdsvc
+ #缁撴灉涓婃姤锛堝鏍革級鍗曞湴鍧�
+ outaddressAudit: K3CLOUD/Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Audit.common.kdsvc
+ # 鐧诲綍璐﹀彿绠＄悊
+ login :
+ acctID: "647e849ab6fa0f"
+ username: "llw"
+ password: "666666"
+ lcid: 2052
\ No newline at end of file
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 7e71005..3d7808a 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,133 +1,3 @@
-server:
- port: 8080
- servlet:
- context-path: /@pom.build.finalName@
-
spring:
- application:
- name: @pom.build.finalName@
- jmx:
- enabled: false
- datasource:
- driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
-# url: jdbc:sqlserver://192.168.4.191:1433;databasename=integrationasrs
-# username: sa
-# password: sa@123
- url: jdbc:sqlserver://localhost:1433;databasename=nbjsasrs
-# username: sa
-# password: sa@123
-# url: jdbc:sqlserver://127.0.0.1:51433;databasename=source
-# username: sa
-# password: Zoneyung@zy56$
-# url: jdbc:sqlserver://192.168.4.191:50948;databasename=source
-# username: sa
-# password: sa@123
-# url: jdbc:sqlserver://127.0.0.1:62316;databasename=source
- username: sa
- password: sa@123
- #password: Skyouc#23
- #url: jdbc:sqlserver://127.0.0.1:1433;databasename=jsxswms
- mvc:
- static-path-pattern: /**
- redis:
- host: localhost
- port: 6379
- database: 0
-# password: xltys1995
- servlet:
- multipart:
- maxFileSize: 100MB
- maxRequestSize: 100MB
-
-mybatis-plus:
- mapper-locations: classpath:mapper/*.xml
- # global-config:
- # field-strategy: 0
- configuration:
- #impl: org.apache.ibatis.logging.stdout.StdOutImpl
- map-underscore-to-camel-case: true
- cache-enabled: true
- call-setters-on-nulls: true
-
-logging:
- file:
- path: /stock/out/@pom.build.finalName@/logs
-
-super:
- pwd: asrs2023
-
-swagger:
- enable: false
-
-#License鐩稿叧閰嶇疆
-license:
- subject: nbjsasrs
- publicAlias: publicCert
- storePass: public_zhongyang_123456789
-# licensePath: license.lic
- publicKeysStorePath: publicCerts.keystore
-
-# 涓嬩綅鏈洪厤缃�
-wcs-slave:
- # 鍙屾繁
- doubleDeep: true
- # 鍙屾繁搴撲綅鎺掑彿
- doubleLocs: 1,4,5,8,9,12,13,16
- # 涓�涓爢鍨涙満璐熻矗鐨勮揣鏋舵帓鏁�
- groupCount: 4
- # 宸︽繁搴撲綅鎺掑彿
- doubleLocsLeft: 1,5,9,13
- # 鍙虫繁搴撲綅鎺掑彿
- doubleLocsRight: 4,8,12,16
-# wms鍙傛暟閰嶇疆
-wms-parameter:
- # 鑷姩琛ョ┖鏉垮姛鑳藉紑鍏�
- automaticFillingBoardStaNosBoolean: false
- # 鑷姩琛ョ┖鏉跨珯鐐�
- automaticFillingBoardStaNos: 112,101
- # 鑷姩绉诲簱鍔熻兘寮�鍏�
- autoLocMoveBoolean: false
- # 鑷姩绉诲簱鍔熻兘寮�鍏� 绌挎
- autoLocMoveUnilateralBoolean: false
-
-comb:
- limit: 5000
-
-#erp瀵规帴
-erp:
- # 寮�鍏�
- switch:
- #璁℃椂鍣ㄤ笂鎶ュ紑鍏�
- ErpReportOld: false
- #鑾峰彇鍗曟嵁寮�鍏�
- InboundOrderSwitch: false
- #鐧诲綍鎺ュ彛寮�鍏�
- LoginAuthenticationSwitch: false
- #涓婃姤銆佸鏍稿崟鎹紑鍏�
- ReviewOrderSwitch: false
- # 鍦板潃
- address:
- URL: http://58.210.10.90:28090
- #鐧诲綍鍦板潃
- loginaddress: K3CLOUD/Kingdee.BOS.WebApi.ServicesStub.AuthService.ValidateUser.common.kdsvc
- #鍗曟嵁锛屽晢鍝佹。妗堝湴鍧�
- inaddress: K3CLOUD/Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.ExecuteBillQuery.common.kdsvc
- #缁撴灉涓婃姤锛堜繚瀛橈級鍗曞湴鍧�
- outaddressSave: K3CLOUD/Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Save.common.kdsvc
- #缁撴灉涓婃姤锛堟彁浜わ級鍗曞湴鍧�
- outaddressSubmit: K3Cloud/Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Submit.common.kdsvc
- #缁撴灉涓婃姤锛堝鏍革級鍗曞湴鍧�
- outaddressAudit: K3CLOUD/Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Audit.common.kdsvc
- # 鐧诲綍璐﹀彿绠＄悊
- login :
- acctID: "647e849ab6fa0f"
- username: "llw"
- password: "666666"
- lcid: 2052
-
-loc-move:
- enable: true
- crn1: true
- crn2: true
- crn3: false
- crn4: false
\ No newline at end of file
+ profiles:
+ active: dev
diff --git a/src/main/resources/mapper/AutoMoveMapper.xml b/src/main/resources/mapper/AutoMoveMapper.xml
deleted file mode 100644
index dfd6bb1..0000000
--- a/src/main/resources/mapper/AutoMoveMapper.xml
+++ /dev/null
@@ -1,19 +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.AutoMoveMapper">
-
- <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
- <resultMap id="BaseResultMap" type="com.zy.asrs.entity.AutoMove">
- <id column="id" property="id" />
- <result column="status" property="status" />
- <result column="line_number" property="lineNumber" />
- <result column="loc_no" property="locNo" />
- <result column="row_priority" property="rowPriority" />
- <result column="order_no" property="orderNo" />
- <result column="create_time" property="createTime" />
- <result column="update_time" property="updateTime" />
- <result column="uuid" property="uuid" />
-
- </resultMap>
-
-</mapper>
diff --git a/src/main/resources/mapper/BasContainerMapper.xml b/src/main/resources/mapper/BasContainerMapper.xml
new file mode 100644
index 0000000..844171a
--- /dev/null
+++ b/src/main/resources/mapper/BasContainerMapper.xml
@@ -0,0 +1,12 @@
+<?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.BasContainerMapper">
+
+ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+ <resultMap id="BaseResultMap" type="com.zy.asrs.entity.BasContainer">
+ <id column="Id" property="Id" />
+ <result column="barcode" property="barcode" />
+
+ </resultMap>
+
+</mapper>
diff --git a/src/main/resources/mapper/TaskMapper.xml b/src/main/resources/mapper/TaskMapper.xml
index edd5bd9..66cbbeb 100644
--- a/src/main/resources/mapper/TaskMapper.xml
+++ b/src/main/resources/mapper/TaskMapper.xml
@@ -8,5 +8,8 @@
<result column="task_type" property="taskType" />
</resultMap>
+ <select id="selectToBeCompleteData" resultType="com.zy.asrs.entity.Task">
+ select * from agv_task where ((wrk_sts = 4 Or wrk_sts = 14 ) and io_type != 103 and io_type != 104 and io_type != 107 ) or (wrk_sts = 2 and io_type=6) order by upd_mk,error_time,io_time,wrk_no
+ </select>
</mapper>
diff --git a/src/main/resources/mapper/WrkMastExecuteLogMapper.xml b/src/main/resources/mapper/WrkMastExecuteLogMapper.xml
deleted file mode 100644
index 4fb4474..0000000
--- a/src/main/resources/mapper/WrkMastExecuteLogMapper.xml
+++ /dev/null
@@ -1,27 +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.WrkMastExecuteLogMapper">
-
- <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
- <resultMap id="BaseResultMap" type="com.zy.asrs.entity.WrkMastExecuteLog">
- <result column="sou_loc_no" property="souLocNo" />
- <result column="end_loc_no" property="endLocNo" />
- <result column="sou_floor" property="souFloor" />
- <result column="end_floor" property="endFloor" />
- <result column="sou_sta_no" property="souStaNo" />
- <result column="end_sta_no" property="endStaNo" />
- <result column="now_position" property="nowPosition" />
- <result column="end_position" property="endPosition" />
- <result column="io_type" property="ioType" />
- <result column="wrk_sts" property="wrkSts" />
- <result column="io_time" property="ioTime" />
- <result column="modi_time" property="modiTime" />
- <result column="modi_user" property="modiUser" />
- <result column="appe_time" property="appeTime" />
- <result column="appe_user" property="appeUser" />
- <result column="status" property="status" />
- <result column="wrk_no" property="wrkNo" />
-
- </resultMap>
-
-</mapper>
diff --git a/src/main/resources/mapper/WrkMastExecuteMapper.xml b/src/main/resources/mapper/WrkMastExecuteMapper.xml
deleted file mode 100644
index b2117ef..0000000
--- a/src/main/resources/mapper/WrkMastExecuteMapper.xml
+++ /dev/null
@@ -1,27 +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.WrkMastExecuteMapper">
-
- <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
- <resultMap id="BaseResultMap" type="com.zy.asrs.entity.WrkMastExecute">
- <result column="sou_loc_no" property="souLocNo" />
- <result column="end_loc_no" property="endLocNo" />
- <result column="sou_floor" property="souFloor" />
- <result column="end_floor" property="endFloor" />
- <result column="sou_sta_no" property="souStaNo" />
- <result column="end_sta_no" property="endStaNo" />
- <result column="now_position" property="nowPosition" />
- <result column="end_position" property="endPosition" />
- <result column="io_type" property="ioType" />
- <result column="wrk_sts" property="wrkSts" />
- <result column="io_time" property="ioTime" />
- <result column="modi_time" property="modiTime" />
- <result column="modi_user" property="modiUser" />
- <result column="appe_time" property="appeTime" />
- <result column="appe_user" property="appeUser" />
- <result column="status" property="status" />
- <result column="wrk_no" property="wrkNo" />
-
- </resultMap>
-
-</mapper>
diff --git a/src/main/resources/mapper/WrkMastFourWarVehicleLogMapper.xml b/src/main/resources/mapper/WrkMastFourWarVehicleLogMapper.xml
deleted file mode 100644
index 2d788ff..0000000
--- a/src/main/resources/mapper/WrkMastFourWarVehicleLogMapper.xml
+++ /dev/null
@@ -1,24 +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.WrkMastFourWarVehicleLogMapper">
-
- <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
- <resultMap id="BaseResultMap" type="com.zy.asrs.entity.WrkMastFourWarVehicleLog">
- <id column="id" property="id" />
- <result column="wrk_no" property="wrkNo" />
- <result column="wrk_start" property="wrkStart" />
- <result column="wrk_end" property="wrkEnd" />
- <result column="sta_start" property="staStart" />
- <result column="sta_end" property="staEnd" />
- <result column="create_time" property="createTime" />
- <result column="update_time" property="updateTime" />
- <result column="type" property="type" />
- <result column="wrk_sts" property="wrkSts" />
- <result column="line_number" property="lineNumber" />
- <result column="wrk_type" property="wrkType" />
- <result column="bign_time" property="bignTime" />
- <result column="wrk_crn" property="wrkCrn" />
-
- </resultMap>
-
-</mapper>
diff --git a/src/main/resources/mapper/WrkMastFourWarVehicleMapper.xml b/src/main/resources/mapper/WrkMastFourWarVehicleMapper.xml
deleted file mode 100644
index 0ee494b..0000000
--- a/src/main/resources/mapper/WrkMastFourWarVehicleMapper.xml
+++ /dev/null
@@ -1,24 +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.WrkMastFourWarVehicleMapper">
-
- <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
- <resultMap id="BaseResultMap" type="com.zy.asrs.entity.WrkMastFourWarVehicle">
- <id column="id" property="id" />
- <result column="wrk_no" property="wrkNo" />
- <result column="wrk_start" property="wrkStart" />
- <result column="wrk_end" property="wrkEnd" />
- <result column="sta_start" property="staStart" />
- <result column="sta_end" property="staEnd" />
- <result column="create_time" property="createTime" />
- <result column="update_time" property="updateTime" />
- <result column="type" property="type" />
- <result column="wrk_sts" property="wrkSts" />
- <result column="line_number" property="lineNumber" />
- <result column="wrk_type" property="wrkType" />
- <result column="bign_time" property="bignTime" />
- <result column="wrk_crn" property="wrkCrn" />
-
- </resultMap>
-
-</mapper>
diff --git a/src/main/webapp/static/js/basContainer/basContainer.js b/src/main/webapp/static/js/basContainer/basContainer.js
new file mode 100644
index 0000000..7a7dc1e
--- /dev/null
+++ b/src/main/webapp/static/js/basContainer/basContainer.js
@@ -0,0 +1,309 @@
+var pageCurr;
+layui.config({
+ base: baseUrl + "/static/layui/lay/modules/"
+}).use(['table', 'laydate', 'form', 'admin'], function () {
+ var table = layui.table;
+ var $ = layui.jquery;
+ var layer = layui.layer;
+ var layDate = layui.laydate;
+ var form = layui.form;
+ var admin = layui.admin;
+
+ // 鏁版嵁娓叉煋
+ tableIns = table.render({
+ elem: '#basContainer',
+ headers: {token: localStorage.getItem('token')},
+ url: baseUrl + '/basContainer/list/auth',
+ page: true,
+ limit: 15,
+ limits: [15, 30, 50, 100, 200, 500],
+ toolbar: '#toolbar',
+ cellMinWidth: 50,
+ height: 'full-120',
+ cols: [[
+ {type: 'checkbox'}
+ , {field: 'barcode', align: 'center', title: '瀹瑰櫒缂栫爜'}
+ , {field: 'type$', align: 'center', title: '瀹瑰櫒绫诲瀷'}
+ , {field: 'flagMix$', align: 'center', title: '鏄惁娣锋斁'}
+ , {field: 'mixMax', align: 'center', title: '娣锋斁绉嶇被'}
+ , {field: 'createTime', align: 'center', title: '鍒涘缓鏃堕棿'}
+ , {field: 'updateTime', align: 'center', title: '淇敼鏃堕棿'}
+ , {fixed: 'right', title: '鎿嶄綔', align: 'center', toolbar: '#operate', width: 120}
+ ]],
+ request: {
+ pageName: 'curr',
+ pageSize: 'limit'
+ },
+ parseData: function (res) {
+ return {
+ 'code': res.code,
+ 'msg': res.msg,
+ 'count': res.data.total,
+ 'data': res.data.records
+ }
+ },
+ response: {
+ statusCode: 200
+ },
+ done: function (res, curr, count) {
+ if (res.code === 403) {
+ top.location.href = baseUrl + "/";
+ }
+ pageCurr = curr;
+ limit();
+ }
+ });
+
+ // 鐩戝惉鎺掑簭浜嬩欢
+ table.on('sort(basContainer)', function (obj) {
+ var searchData = {};
+ $.each($('#search-box [name]').serializeArray(), function () {
+ searchData[this.name] = this.value;
+ });
+ searchData['orderByField'] = obj.field;
+ searchData['orderByType'] = obj.type;
+ tableIns.reload({
+ where: searchData,
+ page: {curr: 1}
+ });
+ });
+
+ // 鐩戝惉澶村伐鍏锋爮浜嬩欢
+ table.on('toolbar(basContainer)', function (obj) {
+ var checkStatus = table.checkStatus(obj.config.id).data;
+ switch (obj.event) {
+ case 'addData':
+ showEditModel();
+ break;
+ case 'deleteData':
+ if (checkStatus.length === 0) {
+ layer.msg('璇烽�夋嫨瑕佸垹闄ょ殑鏁版嵁', {icon: 2});
+ return;
+ }
+ del(checkStatus.map(function (d) {
+ return d.id;
+ }));
+ break;
+ case 'init':
+ initContainer();
+ break;
+ case 'exportData':
+ admin.confirm('纭畾瀵煎嚭Excel鍚�', {shadeClose: true}, function () {
+ var titles = [];
+ var fields = [];
+ obj.config.cols[0].map(function (col) {
+ if (col.type === 'normal' && col.hide === false && col.toolbar == null) {
+ titles.push(col.title);
+ fields.push(col.field);
+ }
+ });
+ var exportData = {};
+ $.each($('#search-box [name]').serializeArray(), function () {
+ exportData[this.name] = this.value;
+ });
+ var param = {
+ 'basContainer': exportData,
+ 'fields': fields
+ };
+ $.ajax({
+ url: baseUrl + "/basContainer/export/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: JSON.stringify(param),
+ dataType: 'json',
+ contentType: 'application/json;charset=UTF-8',
+ method: 'POST',
+ success: function (res) {
+ layer.closeAll();
+ if (res.code === 200) {
+ table.exportFile(titles, res.data, 'xls');
+ } else if (res.code === 403) {
+ top.location.href = baseUrl + "/";
+ } else {
+ layer.msg(res.msg, {icon: 2})
+ }
+ }
+ });
+ });
+ break;
+ }
+ });
+
+ // 鐩戝惉琛屽伐鍏蜂簨浠�
+ table.on('tool(basContainer)', function (obj) {
+ var data = obj.data;
+ switch (obj.event) {
+ case 'edit':
+ showEditModel(data);
+ break;
+ case "del":
+ del([data.id]);
+ break;
+ }
+ });
+
+ function initContainer() {
+ admin.open({
+ type: 1,
+ area: '600px',
+ title: '鍒濆鍖�',
+ content: $('#initContainer').html(),
+ success: function (layero, dIndex) {
+ form.on('submit(initDo)', function (data) {
+ var loadIndex = layer.load(2);
+ $.ajax({
+ url: baseUrl + "/basContainer/init/auth",
+ headers: {'token': localStorage.getItem('token'), 'Content-Type': 'application/json'},
+ data: JSON.stringify(data.field),
+ method: 'POST',
+ success: function (res) {
+ layer.close(loadIndex);
+ if (res.code === 200) {
+ layer.close(dIndex);
+ layer.msg(res.msg, {icon: 1});
+ tableReload();
+ } else if (res.code === 403) {
+ top.location.href = baseUrl + "/";
+ } else {
+ layer.msg(res.msg, {icon: 2});
+ }
+ }
+ })
+ return false;
+ });
+ $(layero).children('.layui-layer-content').css('overflow', 'visible');
+ layui.form.render('select');
+ }
+ });
+ }
+
+ /* 寮圭獥 - 鏂板銆佷慨鏀� */
+ function showEditModel(mData) {
+ admin.open({
+ type: 1,
+ area: '600px',
+ title: (mData ? '淇敼' : '娣诲姞') + '璁㈠崟鐘舵��',
+ content: $('#editDialog').html(),
+ success: function (layero, dIndex) {
+ layDateRender(mData);
+ form.val('detail', mData);
+ form.on('submit(editSubmit)', function (data) {
+ var loadIndex = layer.load(2);
+ $.ajax({
+ url: baseUrl + "/basContainer/" + (mData ? 'update' : 'add') + "/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: data.field,
+ method: 'POST',
+ success: function (res) {
+ layer.close(loadIndex);
+ if (res.code === 200) {
+ layer.close(dIndex);
+ layer.msg(res.msg, {icon: 1});
+ tableReload();
+ } else if (res.code === 403) {
+ top.location.href = baseUrl + "/";
+ } else {
+ layer.msg(res.msg, {icon: 2});
+ }
+ }
+ })
+ return false;
+ });
+ $(layero).children('.layui-layer-content').css('overflow', 'visible');
+ layui.form.render('select');
+ }
+ });
+ }
+
+ /* 鍒犻櫎 */
+ function del(ids) {
+ layer.confirm('纭畾瑕佸垹闄ら�変腑鏁版嵁鍚楋紵', {
+ skin: 'layui-layer-admin',
+ shade: .1
+ }, function (i) {
+ layer.close(i);
+ var loadIndex = layer.load(2);
+ $.ajax({
+ url: baseUrl + "/basContainer/delete/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: {ids: ids},
+ method: 'POST',
+ success: function (res) {
+ layer.close(loadIndex);
+ if (res.code === 200) {
+ layer.msg(res.msg, {icon: 1});
+ tableReload();
+ } else if (res.code === 403) {
+ top.location.href = baseUrl + "/";
+ } else {
+ layer.msg(res.msg, {icon: 2});
+ }
+ }
+ })
+ });
+ }
+
+ // 鎼滅储
+ form.on('submit(search)', function (data) {
+ pageCurr = 1;
+ tableReload(false);
+ });
+
+ // 閲嶇疆
+ form.on('submit(reset)', function (data) {
+ pageCurr = 1;
+ clearFormVal($('#search-box'));
+ tableReload(false);
+ });
+
+ form.on('submit(init)', function (data) {
+ $.ajax({
+ url: baseUrl + "/basContainer/init/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: data.field,
+ method: 'POST',
+ async: false,
+ success: function (res) {
+ if (res.code === 200) {
+ layer.msg(res.msg);
+ layer.closeAll();
+ tableReload(false);
+ } else if (res.code === 403) {
+ parent.location.href = "/";
+ } else {
+ layer.msg(res.msg)
+ }
+ }
+ })
+ });
+
+ // 鏃堕棿閫夋嫨鍣�
+ function layDateRender(data) {
+ setTimeout(function () {
+ layDate.render({
+ elem: '.layui-laydate-range'
+ , type: 'datetime'
+ , range: true
+ });
+
+ }, 300);
+ }
+
+ layDateRender();
+
+});
+
+// 鍏抽棴鍔ㄤ綔
+$(document).on('click', '#data-detail-close', function () {
+ parent.layer.closeAll();
+});
+
+function tableReload(child) {
+ var searchData = {};
+ $.each($('#search-box [name]').serializeArray(), function () {
+ searchData[this.name] = this.value;
+ });
+ tableIns.reload({
+ where: searchData,
+ page: {curr: pageCurr}
+ });
+}
diff --git a/src/main/webapp/static/js/basStation/basStation.js b/src/main/webapp/static/js/basStation/basStation.js
index f3f84cf..8a05d33 100644
--- a/src/main/webapp/static/js/basStation/basStation.js
+++ b/src/main/webapp/static/js/basStation/basStation.js
@@ -1,7 +1,7 @@
var pageCurr;
layui.config({
base: baseUrl + "/static/layui/lay/modules/"
-}).use(['table','laydate', 'form', 'admin'], function(){
+}).use(['table', 'laydate', 'form', 'admin'], function () {
var table = layui.table;
var $ = layui.jquery;
var layer = layui.layer;
@@ -13,7 +13,7 @@
tableIns = table.render({
elem: '#basStation',
headers: {token: localStorage.getItem('token')},
- url: baseUrl+'/basStation/list/auth',
+ url: baseUrl + '/basStation/list/auth',
page: true,
limit: 15,
limits: [15, 30, 50, 100, 200, 500],
@@ -22,42 +22,16 @@
height: 'full-120',
cols: [[
{type: 'checkbox'}
- ,{field: 'id', align: 'center',title: '涓婚敭'}
- ,{field: 'devNo', align: 'center',title: '缂栧彿'}
- ,{field: 'decDesc', align: 'center',title: '璁惧鎻忚堪'}
- ,{field: 'devMk', align: 'center',title: '澶囨敞'}
- ,{field: 'inEnable', align: 'center',title: '鍙叆(checkBox)'}
- ,{field: 'outEnable', align: 'center',title: '鍙嚭(checkBox)'}
- ,{field: 'autoing', align: 'center',title: '鑷姩(checkBox)'}
- ,{field: 'loading', align: 'center',title: '鏈夌墿(checkBox)'}
- ,{field: 'locSts', align: 'center',title: ''}
- ,{field: 'canining', align: 'center',title: '鑳藉叆(checkBox)'}
- ,{field: 'canouting', align: 'center',title: '鑳藉嚭(checkBox)'}
- ,{field: 'fronting', align: 'center',title: ''}
- ,{field: 'rearing', align: 'center',title: ''}
- ,{field: 'uping', align: 'center',title: ''}
- ,{field: 'downing', align: 'center',title: ''}
- ,{field: 'wrkNo', align: 'center',title: '宸ヤ綔鍙�'}
- ,{field: 'ctnType', align: 'center',title: '瀹瑰櫒绫诲瀷'}
- ,{field: 'barcode', align: 'center',title: '鏉″舰鐮�'}
- ,{field: 'inQty', align: 'center',title: ''}
- ,{field: 'row1', align: 'center',title: ''}
- ,{field: 'ioTime$', align: 'center',title: ''}
- ,{field: 'area', align: 'center',title: ''}
- ,{field: 'inOk', align: 'center',title: ''}
- ,{field: 'outOk', align: 'center',title: ''}
- ,{field: 'locType1$', align: 'center',title: '楂樹綆绫诲瀷'}
- ,{field: 'locType2$', align: 'center',title: '瀹界獎绫诲瀷'}
- ,{field: 'locType3$', align: 'center',title: '杞婚噸绫诲瀷'}
- ,{field: 'modiUser$', align: 'center',title: '淇敼浜哄憳'}
- ,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿'}
- ,{field: 'appeUser$', align: 'center',title: '鍒涘缓鑰�'}
- ,{field: 'appeTime$', align: 'center',title: '娣诲姞鏃堕棿'}
- ,{field: 'stdQty', align: 'center',title: ''}
- ,{field: 'minWt', align: 'center',title: ''}
- ,{field: 'grossWt', align: 'center',title: '閲嶉噺'}
-
- ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:120}
+ , {field: 'devNo', align: 'center', title: '绔欑偣鍙板彿'}
+ , {field: 'decDesc', align: 'center', title: '璁惧鎻忚堪'}
+ , {field: 'area', align: 'center', title: '鍖哄煙'}
+ , {field: 'locSts$', align: 'center', title: '鐘舵��'}
+ , {field: 'ioTime', align: 'center', title: '鍏ュ嚭搴撴椂闂�'}
+ , {field: 'modiUser$', align: 'center', title: '淇敼浜哄憳'}
+ , {field: 'modiTime$', align: 'center', title: '淇敼鏃堕棿'}
+ , {field: 'appeUser$', align: 'center', title: '鍒涘缓鑰�'}
+ , {field: 'appeTime$', align: 'center', title: '娣诲姞鏃堕棿'}
+ , {fixed: 'right', title: '鎿嶄綔', align: 'center', toolbar: '#operate', width: 120}
]],
request: {
pageName: 'curr',
@@ -74,11 +48,11 @@
response: {
statusCode: 200
},
- done: function(res, curr, count) {
+ done: function (res, curr, count) {
if (res.code === 403) {
- top.location.href = baseUrl+"/";
+ top.location.href = baseUrl + "/";
}
- pageCurr=curr;
+ pageCurr = curr;
limit();
}
});
@@ -86,7 +60,7 @@
// 鐩戝惉鎺掑簭浜嬩欢
table.on('sort(basStation)', function (obj) {
var searchData = {};
- $.each($('#search-box [name]').serializeArray(), function() {
+ $.each($('#search-box [name]').serializeArray(), function () {
searchData[this.name] = this.value;
});
searchData['orderByField'] = obj.field;
@@ -100,23 +74,23 @@
// 鐩戝惉澶村伐鍏锋爮浜嬩欢
table.on('toolbar(basStation)', function (obj) {
var checkStatus = table.checkStatus(obj.config.id).data;
- switch(obj.event) {
+ switch (obj.event) {
case 'addData':
showEditModel();
break;
case 'deleteData':
- if (checkStatus.length === 0) {
- layer.msg('璇烽�夋嫨瑕佸垹闄ょ殑鏁版嵁', {icon: 2});
- return;
- }
- del(checkStatus.map(function (d) {
- return d.id;
- }));
- break;
+ if (checkStatus.length === 0) {
+ layer.msg('璇烽�夋嫨瑕佸垹闄ょ殑鏁版嵁', {icon: 2});
+ return;
+ }
+ del(checkStatus.map(function (d) {
+ return d.id;
+ }));
+ break;
case 'exportData':
- admin.confirm('纭畾瀵煎嚭Excel鍚�', {shadeClose: true}, function(){
- var titles=[];
- var fields=[];
+ admin.confirm('纭畾瀵煎嚭Excel鍚�', {shadeClose: true}, function () {
+ var titles = [];
+ var fields = [];
obj.config.cols[0].map(function (col) {
if (col.type === 'normal' && col.hide === false && col.toolbar == null) {
titles.push(col.title);
@@ -124,7 +98,7 @@
}
});
var exportData = {};
- $.each($('#search-box [name]').serializeArray(), function() {
+ $.each($('#search-box [name]').serializeArray(), function () {
exportData[this.name] = this.value;
});
var param = {
@@ -132,18 +106,18 @@
'fields': fields
};
$.ajax({
- url: baseUrl+"/basStation/export/auth",
+ url: baseUrl + "/basStation/export/auth",
headers: {'token': localStorage.getItem('token')},
data: JSON.stringify(param),
- dataType:'json',
- contentType:'application/json;charset=UTF-8',
+ dataType: 'json',
+ contentType: 'application/json;charset=UTF-8',
method: 'POST',
success: function (res) {
layer.closeAll();
if (res.code === 200) {
- table.exportFile(titles,res.data,'xls');
+ table.exportFile(titles, res.data, 'xls');
} else if (res.code === 403) {
- top.location.href = baseUrl+"/";
+ top.location.href = baseUrl + "/";
} else {
layer.msg(res.msg, {icon: 2})
}
@@ -155,7 +129,7 @@
});
// 鐩戝惉琛屽伐鍏蜂簨浠�
- table.on('tool(basStation)', function(obj){
+ table.on('tool(basStation)', function (obj) {
var data = obj.data;
switch (obj.event) {
case 'edit':
@@ -180,19 +154,19 @@
form.on('submit(editSubmit)', function (data) {
var loadIndex = layer.load(2);
$.ajax({
- url: baseUrl+"/basStation/"+(mData?'update':'add')+"/auth",
+ url: baseUrl + "/basStation/" + (mData ? 'update' : 'add') + "/auth",
headers: {'token': localStorage.getItem('token')},
data: data.field,
method: 'POST',
success: function (res) {
layer.close(loadIndex);
- if (res.code === 200){
+ if (res.code === 200) {
layer.close(dIndex);
layer.msg(res.msg, {icon: 1});
tableReload();
- } else if (res.code === 403){
- top.location.href = baseUrl+"/";
- }else {
+ } else if (res.code === 403) {
+ top.location.href = baseUrl + "/";
+ } else {
layer.msg(res.msg, {icon: 2});
}
}
@@ -214,17 +188,17 @@
layer.close(i);
var loadIndex = layer.load(2);
$.ajax({
- url: baseUrl+"/basStation/delete/auth",
+ url: baseUrl + "/basStation/delete/auth",
headers: {'token': localStorage.getItem('token')},
data: {ids: ids},
method: 'POST',
success: function (res) {
layer.close(loadIndex);
- if (res.code === 200){
+ if (res.code === 200) {
layer.msg(res.msg, {icon: 1});
tableReload();
- } else if (res.code === 403){
- top.location.href = baseUrl+"/";
+ } else if (res.code === 403) {
+ top.location.href = baseUrl + "/";
} else {
layer.msg(res.msg, {icon: 2});
}
@@ -251,43 +225,44 @@
setTimeout(function () {
layDate.render({
elem: '.layui-laydate-range'
- ,type: 'datetime'
- ,range: true
+ , type: 'datetime'
+ , range: true
});
layDate.render({
elem: '#ioTime\\$',
type: 'datetime',
- value: data!==undefined?data['ioTime\\$']:null
+ value: data !== undefined ? data['ioTime\\$'] : null
});
layDate.render({
elem: '#modiTime\\$',
type: 'datetime',
- value: data!==undefined?data['modiTime\\$']:null
+ value: data !== undefined ? data['modiTime\\$'] : null
});
layDate.render({
elem: '#appeTime\\$',
type: 'datetime',
- value: data!==undefined?data['appeTime\\$']:null
+ value: data !== undefined ? data['appeTime\\$'] : null
});
}, 300);
}
+
layDateRender();
});
// 鍏抽棴鍔ㄤ綔
-$(document).on('click','#data-detail-close', function () {
+$(document).on('click', '#data-detail-close', function () {
parent.layer.closeAll();
});
function tableReload(child) {
var searchData = {};
- $.each($('#search-box [name]').serializeArray(), function() {
+ $.each($('#search-box [name]').serializeArray(), function () {
searchData[this.name] = this.value;
});
tableIns.reload({
where: searchData,
page: {curr: pageCurr}
- });
+ });
}
diff --git a/src/main/webapp/static/js/common.js b/src/main/webapp/static/js/common.js
index a6cda0d..4d9623f 100644
--- a/src/main/webapp/static/js/common.js
+++ b/src/main/webapp/static/js/common.js
@@ -183,13 +183,12 @@
{field: 'matnr', align: 'center',title: '鍟嗗搧缂栧彿锛堝搧鍙凤級', width: 180}
// {field: 'id', align: 'center',title: 'ID'}
// ,{field: 'uuid', align: 'center',title: '缂栧彿'}
- // ,{field: 'tagId$', align: 'center',title: '鎵�灞炲綊绫�'}
,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О锛堝搧鍚嶏級', width: 200}
- // ,{field: 'name', align: 'center',title: '鍒悕'}
,{field: 'specs', align: 'center',title: '瑙勬牸'}
,{field: 'model', align: 'center',title: '浠ｇ爜', hide: true}
,{field: 'color', align: 'center',title: '棰滆壊', hide: true}
,{field: 'brand', align: 'center',title: '鍝佺墝', hide: true}
+ ,{field: 'upQty', align: 'center',title: '缁勬墭涓婇檺'}
,{field: 'unit', align: 'center',title: '鍗曚綅', hide: false}
,{field: 'price', align: 'center',title: '鍗曚环', hide: true}
,{field: 'sku', align: 'center',title: 'sku', hide: true}
@@ -224,13 +223,13 @@
var cacheCols = [
{field: 'matnr', align: 'center',title: '鍟嗗搧缂栧彿锛堝搧鍙凤級', sort:true}
,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О锛堝搧鍚嶏級', sort:true}
- ,{field: 'batch', align: 'center',title: '璐у搧鐗瑰緛', sort:true}
,{field: 'anfme', align: 'center',title: '鏁伴噺', hide: false}
,{field: 'specs', align: 'center',title: '瑙勬牸', hide: false}
,{field: 'model', align: 'center',title: '浠ｇ爜', hide: true}
,{field: 'color', align: 'center',title: '棰滆壊', hide: true}
,{field: 'brand', align: 'center',title: '鍝佺墝', hide: true}
,{field: 'unit', align: 'center',title: '鍗曚綅', hide: false}
+ ,{field: 'batch', align: 'center',title: '璐у搧鐗瑰緛', sort:true}
,{field: 'frozen$', align: 'center',title: '鍐荤粨鍚�',hide: true,
templet: function(d) {
// 鏍规嵁鏉′欢鍒ゆ柇瀛椾綋棰滆壊
@@ -249,7 +248,6 @@
,{field: 'batch', align: 'center',title: '璐у搧鐗瑰緛', sort:true}
,{field: 'anfme', align: 'center',title: '鏁伴噺', hide: false}
,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉＄爜', hide: false}
-
,{field: 'specs', align: 'center',title: '瑙勬牸', hide: false}
,{field: 'model', align: 'center',title: '浠ｇ爜', hide: true}
,{field: 'color', align: 'center',title: '棰滆壊', hide: true}
diff --git a/src/main/webapp/static/js/locCache/locCache.js b/src/main/webapp/static/js/locCache/locCache.js
index c2e12b0..938cf5c 100644
--- a/src/main/webapp/static/js/locCache/locCache.js
+++ b/src/main/webapp/static/js/locCache/locCache.js
@@ -18,43 +18,26 @@
limit: 15,
limits: [15, 30, 50, 100, 200, 500],
toolbar: '#toolbar',
- cellMinWidth: 50,
+ cellMinWidth: 80,
height: 'full-120',
- cols: [[{type: 'checkbox'}, {field: 'locNo', align: 'center', title: '搴撲綅鍙�'}, {
- field: 'barcode',
- align: 'center',
- title: '鎵樼洏鐮�'
- }, {field: 'areaName', align: 'center', title: '搴撳尯鍚嶇О'}, {
- field: 'whsType$',
- align: 'center',
- title: '搴撲綅绫诲瀷'
- }, {field: 'locSts', align: 'center', title: '搴撲綅鐘舵��'}, {
- field: 'row1',
- align: 'center',
- title: '鎺�'
- }, {field: 'bay1', align: 'center', title: '鍒�'}, {
- field: 'lev1',
- align: 'center',
- title: '灞�'
- }, {field: 'locType', align: 'center', title: '搴撲綅绫诲瀷'}
- ,{field: 'sort', align: 'center', title: '浼樺厛绾�'}
- ,{field: 'modiUser$', align: 'center', title: '淇敼浜哄憳'
- }, {field: 'modiTime$', align: 'center', title: '淇敼鏃堕棿'}, {
- field: 'appeUser$',
- align: 'center',
- title: '鍒涘缓鑰�'
- }, {field: 'appeTime$', align: 'center', title: '娣诲姞鏃堕棿'}, {
- field: 'frozen',
- align: 'center',
- title: '鏄惁鍐荤粨,0.鏈喕缁擄紝1.宸插喕缁�',
- hide: true
- }, {field: 'frozenMemo', align: 'center', title: '鍐荤粨澶囨敞', hide: true}, {
- fixed: 'right',
- title: '鎿嶄綔',
- align: 'center',
- toolbar: '#operate',
- width: 120
- }]],
+ cols: [[{type: 'checkbox'}, {field: 'locNo', align: 'center', title: '搴撲綅鍙�', width: 120}
+ , {field: 'barcode', align: 'center', title: '鎵樼洏鐮�'}
+ , {field: 'areaName', align: 'center', title: '搴撳尯鍚嶇О'}
+ // , {field: 'whsType$', align: 'center', title: '搴撲綅绫诲瀷'}
+ , {field: 'locSts', align: 'center', title: '搴撲綅鐘舵��'}
+ , {field: 'row1', align: 'center', title: '鎺�'}
+ , {field: 'bay1', align: 'center', title: '鍒�'}
+ , {field: 'lev1', align: 'center', title: '灞�'}
+ // , {field: 'locType', align: 'center', title: '搴撲綅绫诲瀷'}
+ , {field: 'sort', align: 'center', title: '浼樺厛绾�'}
+ , {field: 'modiUser$', align: 'center', title: '淇敼浜哄憳'}
+ , {field: 'modiTime$', align: 'center', title: '淇敼鏃堕棿'}
+ , {field: 'appeUser$', align: 'center', title: '鍒涘缓鑰�'}
+ , {field: 'appeTime$', align: 'center', title: '娣诲姞鏃堕棿'}
+ , {field: 'frozen', align: 'center', title: '鏄惁鍐荤粨,0.鏈喕缁擄紝1.宸插喕缁�', hide: true}
+ , {field: 'frozenMemo', align: 'center', title: '鍐荤粨澶囨敞', hide: true}
+ , {fixed: 'right', title: '鎿嶄綔', align: 'center', toolbar: '#operate', width: 160}]
+ ],
request: {
pageName: 'curr', pageSize: 'limit'
},
@@ -95,6 +78,13 @@
case 'addData':
showEditModel();
break;
+ case 'batchModifties':
+ if (checkStatus.length === 0) {
+ layer.msg('璇烽�夋嫨闇�瑕佷慨鏀圭殑鏁版嵁淇℃伅', {icon: 2});
+ return;
+ }
+ batchModifies();
+ break;
case 'deleteData':
if (checkStatus.length === 0) {
layer.msg('璇烽�夋嫨瑕佸垹闄ょ殑鏁版嵁', {icon: 2});
@@ -129,10 +119,11 @@
}
});
+
+
// 鐩戝惉琛屽伐鍏蜂簨浠�
table.on('tool(locCache)', function (obj) {
var data = obj.data;
- console.log(data)
switch (obj.event) {
case 'showDetl':
locNo = data?.locNo;
@@ -144,7 +135,7 @@
area: [top.detailWidth, top.detailHeight],
shadeClose: true,
content: 'locDetail.html',
- success: function(layero, index){
+ success: function (layero, index) {
}
});
break;
@@ -180,6 +171,19 @@
})
});
+ function batchModifies() {
+ layer.open({
+ type: 1,
+ title: '鎵归噺淇敼',
+ maxmin: true,
+ area: ["400px"],
+ shadeClose: true,
+ content: $('#batchModify'),
+ success: function (layero, index) {
+
+ }
+ });
+ }
/* 寮圭獥 - 鏂板銆佷慨鏀� */
function showEditModel(mData) {
@@ -221,7 +225,6 @@
/* 鍒犻櫎 */
function del(ids) {
- console.log(ids)
layer.confirm('纭畾瑕佸垹闄ら�変腑鏁版嵁鍚楋紵', {
skin: 'layui-layer-admin', shade: .1
}, function (i) {
diff --git a/src/main/webapp/static/js/mat/mat.js b/src/main/webapp/static/js/mat/mat.js
index 2805440..777cab7 100644
--- a/src/main/webapp/static/js/mat/mat.js
+++ b/src/main/webapp/static/js/mat/mat.js
@@ -1,17 +1,19 @@
var pageCurr;
var printMatCodeNos = [];
var admin;
+
function getCol() {
var cols = [
{type: 'checkbox'}
- ,{field: 'tagId$', align: 'center',title: '褰掔被', templet: '#tagTpl'}
- ,{field: 'store_max', align: 'center',title: '搴撳瓨涓婇檺'}
- ,{field: 'store_min', align: 'center',title: '搴撳瓨涓嬮檺'}
- ,{field: 'store_max_date', align: 'center',title: '搴撻緞涓婇檺(澶�)'}
+ , {field: 'tagId$', align: 'center', title: '褰掔被', templet: '#tagTpl'}
+ , {field: 'locType$', align: 'center', title: '搴撲綅绫诲瀷'}
+ // ,{field: 'store_max', align: 'center',title: '搴撳瓨涓婇檺'}
+ // ,{field: 'store_min', align: 'center',title: '搴撳瓨涓嬮檺'}
+ // ,{field: 'store_max_date', align: 'center',title: '搴撻緞涓婇檺(澶�)'}
];
cols.push.apply(cols, matCols);
cols.push(
- {fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:150}
+ {fixed: 'right', title: '鎿嶄綔', align: 'center', toolbar: '#operate', width: 150}
)
return cols;
}
@@ -20,7 +22,7 @@
base: baseUrl + "/static/layui/lay/modules/"
}).extend({
dropdown: 'dropdown/dropdown',
-}).use(['table','laydate', 'form', 'treeTable', 'admin', 'xmSelect', 'dropdown', 'element'], function(){
+}).use(['table', 'laydate', 'form', 'treeTable', 'admin', 'xmSelect', 'dropdown', 'element'], function () {
var table = layui.table;
var $ = layui.jquery;
var layer = layui.layer;
@@ -33,7 +35,7 @@
// 鍟嗗搧鍒嗙被鏁版嵁
var insTb = treeTable.render({
elem: '#tag',
- url: baseUrl+'/tag/list/auth',
+ url: baseUrl + '/tag/list/auth',
headers: {token: localStorage.getItem('token')},
tree: {
iconIndex: 2, // 鎶樺彔鍥炬爣鏄剧ず鍦ㄧ鍑犲垪
@@ -52,7 +54,7 @@
tableIns = table.render({
elem: '#mat',
headers: {token: localStorage.getItem('token')},
- url: baseUrl+'/mat/list/auth',
+ url: baseUrl + '/mat/list/auth',
page: true,
limit: 16,
limits: [16, 30, 50, 100, 200, 500],
@@ -75,17 +77,17 @@
response: {
statusCode: 200
},
- done: function(res, curr, count) {
+ done: function (res, curr, count) {
if (res.code === 403) {
- top.location.href = baseUrl+"/";
+ top.location.href = baseUrl + "/";
}
- pageCurr=curr;
+ pageCurr = curr;
limit();
form.on('checkbox(tableCheckbox)', function (data) {
- var _index = $(data.elem).attr('table-index')||0;
- if(data.elem.checked){
+ var _index = $(data.elem).attr('table-index') || 0;
+ if (data.elem.checked) {
res.data[_index][data.value] = 'Y';
- }else{
+ } else {
res.data[_index][data.value] = 'N';
}
});
@@ -95,7 +97,7 @@
// 鐩戝惉鎺掑簭浜嬩欢
table.on('sort(locMast)', function (obj) {
var searchData = {};
- $.each($('#search-box [name]').serializeArray(), function() {
+ $.each($('#search-box [name]').serializeArray(), function () {
searchData[this.name] = this.value;
});
searchData['orderByField'] = obj.field;
@@ -107,9 +109,9 @@
},
done: function (res, curr, count) {
if (res.code === 403) {
- top.location.href = baseUrl+"/";
+ top.location.href = baseUrl + "/";
}
- pageCurr=curr;
+ pageCurr = curr;
limit();
}
});
@@ -118,28 +120,28 @@
// 鐩戝惉澶村伐鍏锋爮浜嬩欢
table.on('toolbar(mat)', function (obj) {
var checkStatus = table.checkStatus(obj.config.id);
- switch(obj.event) {
+ switch (obj.event) {
case 'addData':
showEditModel()
break;
case 'deleteData':
var data = checkStatus.data;
- if (data.length === 0){
+ if (data.length === 0) {
layer.msg('璇烽�夋嫨鏁版嵁');
} else {
- layer.confirm('纭畾鍒犻櫎'+(data.length===1?'姝�':data.length)+'鏉℃暟鎹悧', function(){
+ layer.confirm('纭畾鍒犻櫎' + (data.length === 1 ? '姝�' : data.length) + '鏉℃暟鎹悧', function () {
$.ajax({
- url: baseUrl+"/mat/delete/auth",
+ url: baseUrl + "/mat/delete/auth",
headers: {'token': localStorage.getItem('token')},
data: {param: JSON.stringify(data)},
method: 'POST',
- traditional:true,
+ traditional: true,
success: function (res) {
- if (res.code === 200){
+ if (res.code === 200) {
layer.closeAll();
tableReload(false);
- } else if (res.code === 403){
- top.location.href = baseUrl+"/";
+ } else if (res.code === 403) {
+ top.location.href = baseUrl + "/";
} else {
layer.msg(res.msg)
}
@@ -149,9 +151,9 @@
}
break;
case 'exportData':
- layer.confirm('纭畾瀵煎嚭Excel鍚�', {shadeClose: true}, function(){
- var titles=[];
- var fields=[];
+ layer.confirm('纭畾瀵煎嚭Excel鍚�', {shadeClose: true}, function () {
+ var titles = [];
+ var fields = [];
obj.config.cols[0].map(function (col) {
if (col.type === 'normal' && col.hide === false && col.toolbar == null) {
titles.push(col.title);
@@ -159,7 +161,7 @@
}
});
var exportData = {};
- $.each($('#search-box [name]').serializeArray(), function() {
+ $.each($('#search-box [name]').serializeArray(), function () {
exportData[this.name] = this.value;
});
var param = {
@@ -167,18 +169,18 @@
'fields': fields
};
$.ajax({
- url: baseUrl+"/mat/export/auth",
+ url: baseUrl + "/mat/export/auth",
headers: {'token': localStorage.getItem('token')},
data: JSON.stringify(param),
- dataType:'json',
- contentType:'application/json;charset=UTF-8',
+ dataType: 'json',
+ contentType: 'application/json;charset=UTF-8',
method: 'POST',
success: function (res) {
layer.closeAll();
if (res.code === 200) {
- table.exportFile(titles,res.data,'xls');
+ table.exportFile(titles, res.data, 'xls');
} else if (res.code === 403) {
- top.location.href = baseUrl+"/";
+ top.location.href = baseUrl + "/";
} else {
layer.msg(res.msg)
}
@@ -190,17 +192,17 @@
case "btnPrintBatch":
printMatCodeNos = [];
var data = checkStatus.data;
- if (data.length === 0){
+ if (data.length === 0) {
layer.msg('璇烽�夋嫨鎵撳嵃鏁版嵁');
} else {
layer.open({
type: 1,
- title: '鎵归噺鎵撳嵃 [鏁伴噺'+ data.length +']',
+ title: '鎵归噺鎵撳嵃 [鏁伴噺' + data.length + ']',
area: ['500px'],
shadeClose: true,
content: $('#printDataDiv'),
- success: function(layero, index){
- for (var i = 0; i<data.length;i++) {
+ success: function (layero, index) {
+ for (var i = 0; i < data.length; i++) {
printMatCodeNos.push(data[i].matnr);
}
},
@@ -209,11 +211,59 @@
});
}
break;
+ case "batchModifties":
+ var selected = checkStatus.data;
+ if (selected.length === 0) {
+ layer.msg('璇烽�夋嫨淇敼鏁版嵁');
+ } else {
+ let selIds = selected.map(item => {
+ return item.id
+ });
+ layer.open({
+ type: 1,
+ title: '鎵归噺淇敼',
+ area: ['500px'],
+ shadeClose: true,
+ content: $('#batchModifties'),
+ success: function (layero, index) {
+ layer.iframeAuto(index);
+ form.on('submit(batchModify)', function (data) {
+ let params = {...data?.field}
+ params.id = selIds
+ $.ajax({
+ url: baseUrl + "/mat/batch/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: JSON.stringify(params),
+ dataType: 'json',
+ contentType: 'application/json;charset=UTF-8',
+ method: 'POST',
+ success: function (res) {
+ layer.closeAll();
+ if (res.code === 200) {
+
+ } else if (res.code === 403) {
+ top.location.href = baseUrl + "/";
+ } else {
+ layer.msg(res.msg)
+ }
+ }
+ });
+ layer.closeAll();
+ });
+ },
+ end: function () {
+
+ }
+ });
+ }
+ break;
+ default:
+ break;
}
});
// 鐩戝惉琛屽伐鍏蜂簨浠�
- table.on('tool(mat)', function(obj){
+ table.on('tool(mat)', function (obj) {
var data = obj.data;
switch (obj.event) {
// 鎵撳嵃
@@ -225,7 +275,7 @@
area: ['500px'],
shadeClose: true,
content: $('#printDataDiv'),
- success: function(layero, index){
+ success: function (layero, index) {
layer.iframeAuto(index);
printMatCodeNos.push(data.matnr);
},
@@ -258,7 +308,6 @@
}
// 琛ㄥ崟鎻愪氦浜嬩欢
form.on('submit(editSubmit)', function (data) {
- console.log(data)
data.field.tagId = insXmSel.getValue('valueStr');
if (isEmpty(data.field.tagId)) {
layer.msg('鍒嗙被涓嶈兘涓虹┖', {icon: 2});
@@ -266,19 +315,19 @@
}
var loadIndex = layer.load(2);
$.ajax({
- url: baseUrl+"/mat/"+(mData?'update':'add')+"/auth",
+ url: baseUrl + "/mat/" + (mData ? 'update' : 'add') + "/auth",
headers: {'token': localStorage.getItem('token')},
data: data.field,
method: 'POST',
success: function (res) {
layer.close(loadIndex);
- if (res.code === 200){
+ if (res.code === 200) {
layer.close(dIndex);
layer.msg(res.msg, {icon: 1});
$(".layui-laypage-btn")[0].click();
- } else if (res.code === 403){
- top.location.href = baseUrl+"/";
- }else {
+ } else if (res.code === 403) {
+ top.location.href = baseUrl + "/";
+ } else {
layer.msg(res.msg, {icon: 2});
}
}
@@ -315,40 +364,41 @@
// 妯℃澘閫夋嫨
form.on('radio(selectTemplateRadio)', function (data) {
$('.template-preview').hide();
- $('#template-preview-'+data.value).show();
+ $('#template-preview-' + data.value).show();
});
// 寮�濮嬫墦鍗�
form.on('submit(doPrint)', function (data) {
var templateNo = data.field.selectTemplate;
$.ajax({
- url: baseUrl+"/mat/print/auth",
+ url: baseUrl + "/mat/print/auth",
headers: {'token': localStorage.getItem('token')},
data: {param: printMatCodeNos},
method: 'POST',
async: false,
success: function (res) {
- if (res.code === 200){
+ if (res.code === 200) {
layer.closeAll();
- for (let i=0;i<res.data.length;i++){
- var templateDom = $("#templatePreview"+templateNo);
+ for (let i = 0; i < res.data.length; i++) {
+ var templateDom = $("#templatePreview" + templateNo);
var className = templateDom.attr("class");
if (className === 'template-barcode') {
- res.data[i]["barcodeUrl"]=baseUrl+"/mac/code/auth?type=1¶m="+res.data[i].matnr;
+ res.data[i]["barcodeUrl"] = baseUrl + "/mac/code/auth?type=1¶m=" + res.data[i].matnr;
} else {
- res.data[i]["barcodeUrl"]=baseUrl+"/mac/code/auth?type=2¶m="+res.data[i].matnr;
+ res.data[i]["barcodeUrl"] = baseUrl + "/mac/code/auth?type=2¶m=" + res.data[i].matnr;
}
}
var tpl = templateDom.html();
var template = Handlebars.compile(tpl);
var html = template(res);
var box = $("#box");
- box.html(html);box.show();
- box.print({mediaPrint:true});
+ box.html(html);
+ box.show();
+ box.print({mediaPrint: true});
box.hide();
- } else if (res.code === 403){
- top.location.href = baseUrl+"/";
- }else {
+ } else if (res.code === 403) {
+ top.location.href = baseUrl + "/";
+ } else {
layer.msg(res.msg)
}
}
@@ -382,8 +432,8 @@
});
// excel瀵煎叆妯℃澘涓嬭浇
-function excelMouldDownload(){
- layer.load(1, {shade: [0.1,'#fff']});
+function excelMouldDownload() {
+ layer.load(1, {shade: [0.1, '#fff']});
location.href = baseUrl + "/mat/excel/import/mould";
layer.closeAll('loading');
}
@@ -392,13 +442,14 @@
function importExcel() {
$("#importExcel").trigger("click");
}
-function upload(obj){
- if(!obj.files) {
+
+function upload(obj) {
+ if (!obj.files) {
return;
}
var file = obj.files[0];
- admin.confirm('纭鍚屾 [' + file.name +'] 鏂囦欢鍚楋紵', function (index) {
- layer.load(1, {shade: [0.1,'#fff']});
+ admin.confirm('纭鍚屾 [' + file.name + '] 鏂囦欢鍚楋紵', function (index) {
+ layer.load(1, {shade: [0.1, '#fff']});
var url = baseUrl + "/mat/excel/import/auth";
var form = new FormData();
form.append("file", file);
@@ -406,30 +457,32 @@
xhr.open("post", url, true); //post鏂瑰紡锛寀rl涓烘湇鍔″櫒璇锋眰鍦板潃锛宼rue 璇ュ弬鏁拌瀹氳姹傛槸鍚﹀紓姝ュ鐞嗐��
xhr.setRequestHeader('token', localStorage.getItem('token'));
xhr.onload = uploadComplete; //璇锋眰瀹屾垚
- xhr.onerror = uploadFailed; //璇锋眰澶辫触
+ xhr.onerror = uploadFailed; //璇锋眰澶辫触
xhr.onloadend = function () { // // 涓婁紶瀹屾垚閲嶇疆鏂囦欢娴�
layer.closeAll('loading');
$("#importExcel").val("");
};
// xhr.upload.onprogress = progressFunction;//銆愪笂浼犺繘搴﹁皟鐢ㄦ柟娉曞疄鐜般��
- xhr.upload.onloadstart = function(){//涓婁紶寮�濮嬫墽琛屾柟娉�
+ xhr.upload.onloadstart = function () {//涓婁紶寮�濮嬫墽琛屾柟娉�
ot = new Date().getTime(); //璁剧疆涓婁紶寮�濮嬫椂闂�
oloaded = 0;//璁剧疆涓婁紶寮�濮嬫椂锛屼互涓婁紶鐨勬枃浠跺ぇ灏忎负0
};
xhr.send(form);
- }, function(index){
+ }, function (index) {
$("#importExcel").val("");
});
}
+
function uploadComplete(evt) {
var res = JSON.parse(evt.target.responseText);
- if(res.code === 200) {
+ if (res.code === 200) {
layer.msg(res.msg, {icon: 1});
loadTree("");
} else {
layer.msg(res.msg, {icon: 2});
}
}
+
function uploadFailed(evt) {
var res = JSON.parse(evt.target.responseText);
layer.msg(res.msg, {icon: 2});
@@ -443,7 +496,7 @@
function tableReload(child) {
var searchData = {};
- $.each($('#search-box [name]').serializeArray(), function() {
+ $.each($('#search-box [name]').serializeArray(), function () {
searchData[this.name] = this.value;
});
(child ? parent.tableIns : tableIns).reload({
@@ -453,14 +506,14 @@
},
done: function (res, curr, count) {
if (res.code === 403) {
- top.location.href = baseUrl+"/";
+ top.location.href = baseUrl + "/";
}
- pageCurr=curr;
+ pageCurr = curr;
if (res.data.length === 0 && count !== 0) {
tableIns.reload({
where: searchData,
page: {
- curr: pageCurr-1
+ curr: pageCurr - 1
}
});
pageCurr -= 1;
diff --git a/src/main/webapp/static/js/task/task.js b/src/main/webapp/static/js/task/task.js
index ff17d6e..6235ea8 100644
--- a/src/main/webapp/static/js/task/task.js
+++ b/src/main/webapp/static/js/task/task.js
@@ -1,7 +1,7 @@
var pageCurr;
layui.config({
base: baseUrl + "/static/layui/lay/modules/"
-}).use(['table','laydate', 'form', 'admin'], function(){
+}).use(['table', 'laydate', 'form', 'admin'], function () {
var table = layui.table;
var $ = layui.jquery;
var layer = layui.layer;
@@ -13,7 +13,7 @@
tableIns = table.render({
elem: '#task',
headers: {token: localStorage.getItem('token')},
- url: baseUrl+'/task/list/auth',
+ url: baseUrl + '/task/list/auth',
page: true,
limit: 15,
limits: [15, 30, 50, 100, 200, 500],
@@ -22,10 +22,23 @@
height: 'full-120',
cols: [[
{type: 'checkbox'}
- ,{field: 'id', align: 'center',title: ''}
- ,{field: 'taskType', align: 'center',title: '浠诲姟绫诲瀷锛� agv , crn'}
-
- ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:120}
+ , {field: 'wrkNo', align: 'center', title: '宸ヤ綔鍙�', sort: true, width: 105}
+ , {field: 'ioTime$', align: 'center', title: '宸ヤ綔鏃堕棿', width: 160}
+ , {field: 'wrkSts$', align: 'center', title: '宸ヤ綔鐘舵��', width: 150}
+ , {field: 'ioType$', align: 'center', title: '鍏ュ嚭搴撶被鍨�', width: 150}
+ , {field: 'ioPri', align: 'center', title: '浼樺厛绾�', width: 80}
+ , {field: 'taskType$', align: 'center', title: '浠诲姟绫诲瀷'}
+ , {field: 'crnNo$', align: 'center', title: '鍫嗗灈鏈�', hide: true}
+ , {field: 'sourceStaNo$', align: 'center', title: '婧愮珯'}
+ , {field: 'staNo$', align: 'center', title: '鐩爣绔�', width: 120}
+ , {field: 'sourceLocNo', align: 'center', title: '婧愬簱浣�', width: 120}
+ , {field: 'locNo', align: 'center', title: '鐩爣搴撲綅', width: 120}
+ , {field: 'barcode', align: 'center', title: '鏉＄爜', width: 110}
+ , {field: 'preHave', align: 'center', title: '鍏堝叆鍝�', hide: true}
+ , {field: 'takeNone', align: 'center', title: '绌烘搷浣�', hide: true}
+ , {field: 'modiUser$', align: 'center', title: '淇敼浜哄憳', hide: true}
+ , {field: 'modiTime$', align: 'center', title: '淇敼鏃堕棿', hide: true, width: 160}
+ , {fixed: 'right', title: '鎿嶄綔', align: 'center', toolbar: '#operate', width: 200}
]],
request: {
pageName: 'curr',
@@ -42,11 +55,11 @@
response: {
statusCode: 200
},
- done: function(res, curr, count) {
+ done: function (res, curr, count) {
if (res.code === 403) {
- top.location.href = baseUrl+"/";
+ top.location.href = baseUrl + "/";
}
- pageCurr=curr;
+ pageCurr = curr;
limit();
}
});
@@ -54,7 +67,7 @@
// 鐩戝惉鎺掑簭浜嬩欢
table.on('sort(task)', function (obj) {
var searchData = {};
- $.each($('#search-box [name]').serializeArray(), function() {
+ $.each($('#search-box [name]').serializeArray(), function () {
searchData[this.name] = this.value;
});
searchData['orderByField'] = obj.field;
@@ -68,23 +81,23 @@
// 鐩戝惉澶村伐鍏锋爮浜嬩欢
table.on('toolbar(task)', function (obj) {
var checkStatus = table.checkStatus(obj.config.id).data;
- switch(obj.event) {
+ switch (obj.event) {
case 'addData':
showEditModel();
break;
case 'deleteData':
- if (checkStatus.length === 0) {
- layer.msg('璇烽�夋嫨瑕佸垹闄ょ殑鏁版嵁', {icon: 2});
- return;
- }
- del(checkStatus.map(function (d) {
- return d.id;
- }));
- break;
+ if (checkStatus.length === 0) {
+ layer.msg('璇烽�夋嫨瑕佸垹闄ょ殑鏁版嵁', {icon: 2});
+ return;
+ }
+ del(checkStatus.map(function (d) {
+ return d.id;
+ }));
+ break;
case 'exportData':
- admin.confirm('纭畾瀵煎嚭Excel鍚�', {shadeClose: true}, function(){
- var titles=[];
- var fields=[];
+ admin.confirm('纭畾瀵煎嚭Excel鍚�', {shadeClose: true}, function () {
+ var titles = [];
+ var fields = [];
obj.config.cols[0].map(function (col) {
if (col.type === 'normal' && col.hide === false && col.toolbar == null) {
titles.push(col.title);
@@ -92,7 +105,7 @@
}
});
var exportData = {};
- $.each($('#search-box [name]').serializeArray(), function() {
+ $.each($('#search-box [name]').serializeArray(), function () {
exportData[this.name] = this.value;
});
var param = {
@@ -100,18 +113,18 @@
'fields': fields
};
$.ajax({
- url: baseUrl+"/task/export/auth",
+ url: baseUrl + "/task/export/auth",
headers: {'token': localStorage.getItem('token')},
data: JSON.stringify(param),
- dataType:'json',
- contentType:'application/json;charset=UTF-8',
+ dataType: 'json',
+ contentType: 'application/json;charset=UTF-8',
method: 'POST',
success: function (res) {
layer.closeAll();
if (res.code === 200) {
- table.exportFile(titles,res.data,'xls');
+ table.exportFile(titles, res.data, 'xls');
} else if (res.code === 403) {
- top.location.href = baseUrl+"/";
+ top.location.href = baseUrl + "/";
} else {
layer.msg(res.msg, {icon: 2})
}
@@ -123,17 +136,94 @@
});
// 鐩戝惉琛屽伐鍏蜂簨浠�
- table.on('tool(task)', function(obj){
- var data = obj.data;
+ table.on('tool(task)', function (obj) {
+ let data = obj.data;
switch (obj.event) {
- case 'edit':
- showEditModel(data);
+ // 鏄庣粏灞曠ず
+ case 'detlShow':
+ wrkNo = data.wrkNo;
+ // 寮瑰眰鏄剧ず
+ layer.open({
+ type: 2,
+ title: '宸ヤ綔妗ｆ槑缁�',
+ maxmin: true,
+ area: [top.detailWidth, top.detailHeight],
+ shadeClose: true,
+ content: 'taskDetl.html',
+ success: function (layero, index) {
+ }
+ });
break;
- case "del":
- del([data.id]);
+ // 瀹屾垚
+ case 'complete':
+ layer.confirm('纭瀹屾垚璇ョ瑪宸ヤ綔妗ｏ紵', {title: '宸ヤ綔鍙凤細' + data.wrkNo, shadeClose: true}, function () {
+ http.post(baseUrl + "/task/control", {workNo: data.wrkNo, type: 1}, function (res) {
+ $(".layui-laypage-btn")[0].click();
+ layer.msg(data.wrkNo + res.msg);
+ })
+ layer.closeAll();
+ });
+ break;
+ // 鍙栨秷
+ case 'cancel':
+ if (data.pdcType === "Y") {
+ layer.confirm('褰撳墠浠诲姟鍏宠仈ERP閿�鍞崟锛屽彇娑堝皢閲嶆柊鐢熸垚鍑哄簱浣滀笟锛屾槸鍚︾户缁紵', {
+ title: '宸ヤ綔鍙凤細' + data.wrkNo,
+ shadeClose: true
+ }, function () {
+ http.post(baseUrl + "/hand/control/wrkMast", {workNo: data.wrkNo, type: 2}, function (res) {
+ $(".layui-laypage-btn")[0].click();
+ layer.msg(data.wrkNo + res.msg);
+ })
+ layer.closeAll();
+ });
+ } else {
+ layer.confirm('纭鍙栨秷璇ョ瑪宸ヤ綔妗ｏ紵', {
+ title: '宸ヤ綔鍙凤細' + data.wrkNo,
+ shadeClose: true
+ }, function () {
+ http.post(baseUrl + "/hand/control/wrkMast", {workNo: data.wrkNo, type: 2}, function (res) {
+ $(".layui-laypage-btn")[0].click();
+ layer.msg(data.wrkNo + res.msg);
+ })
+ layer.closeAll();
+ });
+ }
+ break;
+ // 鎷ｆ枡鍏ュ簱
+ case 'pick':
+ layer.confirm('鎷ｆ枡鍏ュ簱璇ョ瑪宸ヤ綔妗ｏ紵', {title: '宸ヤ綔鍙凤細' + data.wrkNo, shadeClose: true}, function () {
+ http.post(baseUrl + "/hand/control/wrkMast", {workNo: data.wrkNo, type: 3}, function (res) {
+ $(".layui-laypage-btn")[0].click();
+ layer.msg(data.wrkNo + res.msg);
+ })
+ layer.closeAll();
+ });
+ break;
+ // 鍏堝叆鍝�
+ case 'preHave':
+ layer.confirm('浠诲姟鍙戠敓鍏堝叆鍝佸紓甯搞�傚闇�閲嶆柊鍏ュ簱锛岃纭繚璐х墿宸叉斁鑷冲爢鍨涙満鍑哄簱绔欙紒', {
+ title: '宸ヤ綔鍙凤細' + data.wrkNo,
+ shadeClose: true
+ }, function () {
+ http.post(baseUrl + "/deal/preHave/start", {wrkNo: data.wrkNo}, function (res) {
+ $(".layui-laypage-btn")[0].click();
+ layer.msg(data.wrkNo + res.msg, {icon: 1});
+ })
+ layer.closeAll();
+ });
+ break;
+ // 绌烘搷浣�
+ case 'takeNone':
+ layer.confirm('浠诲姟鍙戦�佺┖鎿嶄綔寮傚父锛佹槸鍚︺�傘�傘�傘�傘�傘�傘�傘�傦紵', {
+ title: '宸ヤ綔鍙凤細' + data.wrkNo,
+ shadeClose: true
+ }, function () {
+ });
break;
}
});
+
/* 寮圭獥 - 鏂板銆佷慨鏀� */
function showEditModel(mData) {
@@ -148,19 +238,19 @@
form.on('submit(editSubmit)', function (data) {
var loadIndex = layer.load(2);
$.ajax({
- url: baseUrl+"/task/"+(mData?'update':'add')+"/auth",
+ url: baseUrl + "/task/" + (mData ? 'update' : 'add') + "/auth",
headers: {'token': localStorage.getItem('token')},
data: data.field,
method: 'POST',
success: function (res) {
layer.close(loadIndex);
- if (res.code === 200){
+ if (res.code === 200) {
layer.close(dIndex);
layer.msg(res.msg, {icon: 1});
tableReload();
- } else if (res.code === 403){
- top.location.href = baseUrl+"/";
- }else {
+ } else if (res.code === 403) {
+ top.location.href = baseUrl + "/";
+ } else {
layer.msg(res.msg, {icon: 2});
}
}
@@ -182,17 +272,17 @@
layer.close(i);
var loadIndex = layer.load(2);
$.ajax({
- url: baseUrl+"/task/delete/auth",
+ url: baseUrl + "/task/delete/auth",
headers: {'token': localStorage.getItem('token')},
data: {ids: ids},
method: 'POST',
success: function (res) {
layer.close(loadIndex);
- if (res.code === 200){
+ if (res.code === 200) {
layer.msg(res.msg, {icon: 1});
tableReload();
- } else if (res.code === 403){
- top.location.href = baseUrl+"/";
+ } else if (res.code === 403) {
+ top.location.href = baseUrl + "/";
} else {
layer.msg(res.msg, {icon: 2});
}
@@ -219,28 +309,29 @@
setTimeout(function () {
layDate.render({
elem: '.layui-laydate-range'
- ,type: 'datetime'
- ,range: true
+ , type: 'datetime'
+ , range: true
});
}, 300);
}
+
layDateRender();
});
// 鍏抽棴鍔ㄤ綔
-$(document).on('click','#data-detail-close', function () {
+$(document).on('click', '#data-detail-close', function () {
parent.layer.closeAll();
});
function tableReload(child) {
var searchData = {};
- $.each($('#search-box [name]').serializeArray(), function() {
+ $.each($('#search-box [name]').serializeArray(), function () {
searchData[this.name] = this.value;
});
tableIns.reload({
where: searchData,
page: {curr: pageCurr}
- });
+ });
}
diff --git a/src/main/webapp/static/js/taskLog/taskLog.js b/src/main/webapp/static/js/taskLog/taskLog.js
index d0c663f..762510f 100644
--- a/src/main/webapp/static/js/taskLog/taskLog.js
+++ b/src/main/webapp/static/js/taskLog/taskLog.js
@@ -1,89 +1,39 @@
var pageCurr;
-layui.config({
- base: baseUrl + "/static/layui/lay/modules/"
-}).use(['table','laydate', 'form', 'admin'], function(){
+var wrkNo;
+var ioTime;
+layui.use(['table', 'laydate', 'form'], function () {
var table = layui.table;
var $ = layui.jquery;
var layer = layui.layer;
var layDate = layui.laydate;
var form = layui.form;
- var admin = layui.admin;
// 鏁版嵁娓叉煋
tableIns = table.render({
elem: '#taskLog',
headers: {token: localStorage.getItem('token')},
- url: baseUrl+'/taskLog/list/auth',
+ url: baseUrl + '/taskLog/list/auth',
page: true,
- limit: 15,
- limits: [15, 30, 50, 100, 200, 500],
+ limit: 16,
+ limits: [16, 30, 50, 100, 200, 500],
+ even: true,
toolbar: '#toolbar',
cellMinWidth: 50,
- height: 'full-120',
cols: [[
- {type: 'checkbox'}
- ,{field: 'id', align: 'center',title: ''}
- ,{field: 'wrkNo$', align: 'center',title: '宸ヤ綔鍙�'}
- ,{field: 'logId', align: 'center',title: ''}
- ,{field: 'invWh', align: 'center',title: ''}
- ,{field: 'ymd$', align: 'center',title: ''}
- ,{field: 'mk', align: 'center',title: ''}
- ,{field: 'whsType', align: 'center',title: ''}
- ,{field: 'wrkSts$', align: 'center',title: '宸ヤ綔鐘舵��'}
- ,{field: 'ioType$', align: 'center',title: '鍏ュ嚭搴撶被鍨�'}
- ,{field: 'crnNo$', align: 'center',title: '鍫嗗灈鏈哄彿'}
- ,{field: 'sheetNo', align: 'center',title: ''}
- ,{field: 'ioPri', align: 'center',title: '浼樺厛绾�'}
- ,{field: 'wrkDate$', align: 'center',title: ''}
- ,{field: 'locNo$', align: 'center',title: '鐩爣搴撲綅'}
- ,{field: 'staNo$', align: 'center',title: '鐩爣绔�'}
- ,{field: 'sourceStaNo$', align: 'center',title: '婧愮珯'}
- ,{field: 'sourceLocNo$', align: 'center',title: '婧愬簱浣�'}
- ,{field: 'locSts', align: 'center',title: ''}
- ,{field: 'picking', align: 'center',title: '鎷ｆ枡(checkBox)'}
- ,{field: 'linkMis', align: 'center',title: ''}
- ,{field: 'onlineYn', align: 'center',title: ''}
- ,{field: 'updMk', align: 'center',title: ''}
- ,{field: 'exitMk', align: 'center',title: '閫�鍑�(checkBox)'}
- ,{field: 'pltType', align: 'center',title: ''}
- ,{field: 'emptyMk', align: 'center',title: '绌烘澘(checkBox)'}
- ,{field: 'ioTime$', align: 'center',title: '宸ヤ綔鏃堕棿'}
- ,{field: 'ctnType', align: 'center',title: ''}
- ,{field: 'packed', align: 'center',title: ''}
- ,{field: 'oveMk', align: 'center',title: ''}
- ,{field: 'mtnType', align: 'center',title: ''}
- ,{field: 'userNo', align: 'center',title: ''}
- ,{field: 'crnStrTime$', align: 'center',title: '鍫嗗灈鏈哄惎鍔ㄦ椂闂�'}
- ,{field: 'crnEndTime$', align: 'center',title: '鍫嗗灈鏈哄仠姝㈡椂闂�'}
- ,{field: 'plcStrTime$', align: 'center',title: '鎷ｆ枡鏃堕棿'}
- ,{field: 'crnPosTime$', align: 'center',title: ''}
- ,{field: 'loadTime', align: 'center',title: ''}
- ,{field: 'expTime', align: 'center',title: ''}
- ,{field: 'refWrkno', align: 'center',title: ''}
- ,{field: 'refIotime$', align: 'center',title: ''}
- ,{field: 'modiUser$', align: 'center',title: '淇敼浜哄憳'}
- ,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿'}
- ,{field: 'appeUser$', align: 'center',title: '鍒涘缓鑰�'}
- ,{field: 'appeTime$', align: 'center',title: '娣诲姞鏃堕棿'}
- ,{field: 'pauseMk', align: 'center',title: ''}
- ,{field: 'errorTime$', align: 'center',title: ''}
- ,{field: 'errorMemo', align: 'center',title: ''}
- ,{field: 'ctnKind', align: 'center',title: ''}
- ,{field: 'manuType', align: 'center',title: ''}
- ,{field: 'memoM', align: 'center',title: ''}
- ,{field: 'scWeight', align: 'center',title: ''}
- ,{field: 'logMk', align: 'center',title: ''}
- ,{field: 'logErrTime$', align: 'center',title: ''}
- ,{field: 'logErrMemo', align: 'center',title: ''}
- ,{field: 'barcode', align: 'center',title: '鏉＄爜'}
- ,{field: 'PdcType', align: 'center',title: ''}
- ,{field: 'ctnNo', align: 'center',title: ''}
- ,{field: 'fullPlt', align: 'center',title: '婊℃澘(checkBox)'}
- ,{field: 'preHave', align: 'center',title: ''}
- ,{field: 'takeNone', align: 'center',title: ''}
- ,{field: 'lineNumber', align: 'center',title: ''}
-
- ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:120}
+ {field: 'wrkNo', align: 'center', title: '宸ヤ綔鍙�', event: 'wrkNo', sort: true}
+ , {field: 'ioTime$', align: 'center', title: '宸ヤ綔鏃堕棿', width: 160, sort: true}
+ , {field: 'wrkSts$', align: 'center', title: '宸ヤ綔鐘舵��', width: 160}
+ , {field: 'ioType$', align: 'center', title: '鍏ュ嚭搴撶被鍨�', width: 160}
+ , {field: 'ioPri', align: 'center', title: '浼樺厛绾�'}
+ , {field: 'crnNo$', align: 'center', title: '鍫嗗灈鏈哄彿'}
+ , {field: 'sourceStaNo$', align: 'center', title: '婧愮珯'}
+ , {field: 'staNo$', align: 'center', title: '鐩爣绔�'}
+ , {field: 'sourceLocNo$', align: 'center', title: '婧愬簱浣�'}
+ , {field: 'locNo$', align: 'center', title: '鐩爣搴撲綅'}
+ , {field: 'modiUser$', align: 'center', title: '淇敼浜哄憳', hide: true}
+ , {field: 'modiTime$', align: 'center', title: '淇敼鏃堕棿', hide: true}
+ , {field: 'barcode', align: 'center', title: '鏉＄爜'}
+ , {fixed: 'right', title: '鎿嶄綔', align: 'center', toolbar: '#operate', width: 80}
]],
request: {
pageName: 'curr',
@@ -100,172 +50,188 @@
response: {
statusCode: 200
},
- done: function(res, curr, count) {
+ done: function (res, curr, count) {
if (res.code === 403) {
- top.location.href = baseUrl+"/";
+ top.location.href = baseUrl + "/";
}
- pageCurr=curr;
+ pageCurr = curr;
limit();
+ form.on('checkbox(tableCheckbox)', function (data) {
+ var _index = $(data.elem).attr('table-index') || 0;
+ if (data.elem.checked) {
+ res.data[_index][data.value] = 'Y';
+ } else {
+ res.data[_index][data.value] = 'N';
+ }
+ });
}
});
// 鐩戝惉鎺掑簭浜嬩欢
table.on('sort(taskLog)', function (obj) {
var searchData = {};
- $.each($('#search-box [name]').serializeArray(), function() {
+ $.each($('#search-box [name]').serializeArray(), function () {
searchData[this.name] = this.value;
});
searchData['orderByField'] = obj.field;
searchData['orderByType'] = obj.type;
tableIns.reload({
where: searchData,
- page: {curr: 1}
+ page: {
+ curr: 1
+ },
+ done: function (res, curr, count) {
+ if (res.code === 403) {
+ top.location.href = baseUrl + "/";
+ }
+ pageCurr = curr;
+ limit();
+ }
});
- });
-
- // 鐩戝惉澶村伐鍏锋爮浜嬩欢
- table.on('toolbar(taskLog)', function (obj) {
- var checkStatus = table.checkStatus(obj.config.id).data;
- switch(obj.event) {
- case 'addData':
- showEditModel();
- break;
- case 'deleteData':
- if (checkStatus.length === 0) {
- layer.msg('璇烽�夋嫨瑕佸垹闄ょ殑鏁版嵁', {icon: 2});
- return;
- }
- del(checkStatus.map(function (d) {
- return d.id;
- }));
- break;
- case 'exportData':
- admin.confirm('纭畾瀵煎嚭Excel鍚�', {shadeClose: true}, function(){
- var titles=[];
- var fields=[];
- obj.config.cols[0].map(function (col) {
- if (col.type === 'normal' && col.hide === false && col.toolbar == null) {
- titles.push(col.title);
- fields.push(col.field);
- }
- });
- var exportData = {};
- $.each($('#search-box [name]').serializeArray(), function() {
- exportData[this.name] = this.value;
- });
- var param = {
- 'taskLog': exportData,
- 'fields': fields
- };
- $.ajax({
- url: baseUrl+"/taskLog/export/auth",
- headers: {'token': localStorage.getItem('token')},
- data: JSON.stringify(param),
- dataType:'json',
- contentType:'application/json;charset=UTF-8',
- method: 'POST',
- success: function (res) {
- layer.closeAll();
- if (res.code === 200) {
- table.exportFile(titles,res.data,'xls');
- } else if (res.code === 403) {
- top.location.href = baseUrl+"/";
- } else {
- layer.msg(res.msg, {icon: 2})
- }
- }
- });
- });
- break;
- }
});
// 鐩戝惉琛屽伐鍏蜂簨浠�
- table.on('tool(taskLog)', function(obj){
+ table.on('tool(taskLog)', function (obj) {
var data = obj.data;
switch (obj.event) {
- case 'edit':
- showEditModel(data);
- break;
- case "del":
- del([data.id]);
+ // 鏄庣粏灞曠ず
+ case 'detlShow':
+ wrkNo = data.wrkNo;
+ ioTime = data.ioTime;
+ // 琛ㄦ牸涓嬫柟鏄剧ず
+ // locDetl(data.wrkNo);
+ // 寮瑰眰鏄剧ず
+ layer.open({
+ type: 2,
+ title: '宸ヤ綔鏄庣粏鍘嗗彶妗�',
+ maxmin: true,
+ area: [top.detailWidth, top.detailHeight],
+ shadeClose: true,
+ content: 'taskLog_detail.html',
+ success: function (layero, index) {
+ }
+ });
break;
}
});
- /* 寮圭獥 - 鏂板銆佷慨鏀� */
- function showEditModel(mData) {
- admin.open({
- type: 1,
- area: '600px',
- title: (mData ? '淇敼' : '娣诲姞') + '璁㈠崟鐘舵��',
- content: $('#editDialog').html(),
- success: function (layero, dIndex) {
- layDateRender(mData);
- form.val('detail', mData);
- form.on('submit(editSubmit)', function (data) {
- var loadIndex = layer.load(2);
- $.ajax({
- url: baseUrl+"/taskLog/"+(mData?'update':'add')+"/auth",
- headers: {'token': localStorage.getItem('token')},
- data: data.field,
- method: 'POST',
- success: function (res) {
- layer.close(loadIndex);
- if (res.code === 200){
- layer.close(dIndex);
- layer.msg(res.msg, {icon: 1});
- tableReload();
- } else if (res.code === 403){
- top.location.href = baseUrl+"/";
- }else {
- layer.msg(res.msg, {icon: 2});
- }
- }
- })
- return false;
- });
- $(layero).children('.layui-layer-content').css('overflow', 'visible');
- layui.form.render('select');
- }
- });
- }
+ // 鏁版嵁淇濆瓨鍔ㄤ綔
+ form.on('submit(save)', function () {
+ if (banMsg != null) {
+ layer.msg(banMsg);
+ return;
+ }
+ method("add");
+ });
- /* 鍒犻櫎 */
- function del(ids) {
- layer.confirm('纭畾瑕佸垹闄ら�変腑鏁版嵁鍚楋紵', {
- skin: 'layui-layer-admin',
- shade: .1
- }, function (i) {
- layer.close(i);
- var loadIndex = layer.load(2);
- $.ajax({
- url: baseUrl+"/taskLog/delete/auth",
- headers: {'token': localStorage.getItem('token')},
- data: {ids: ids},
- method: 'POST',
- success: function (res) {
- layer.close(loadIndex);
- if (res.code === 200){
- layer.msg(res.msg, {icon: 1});
- tableReload();
- } else if (res.code === 403){
- top.location.href = baseUrl+"/";
- } else {
- layer.msg(res.msg, {icon: 2});
- }
+ // 鏁版嵁淇敼鍔ㄤ綔
+ form.on('submit(edit)', function () {
+ method("update")
+ });
+
+ function method(name) {
+ var index = layer.load(1, {
+ shade: [0.5, '#000'] //0.1閫忔槑搴︾殑鑳屾櫙
+ });
+ var data = {
+// id: $('#id').val(),
+ id: $('#id').val(),
+ wrkNo: $('#wrkNo').val(),
+ invWh: $('#invWh').val(),
+ ymd: top.strToDate($('#ymd\\$').val()),
+ mk: $('#mk').val(),
+ whsType: $('#whsType').val(),
+ wrkSts: $('#wrkSts').val(),
+ ioType: $('#ioType').val(),
+ crnNo: $('#crnNo').val(),
+ sheetNo: $('#sheetNo').val(),
+ ioPri: $('#ioPri').val(),
+ wrkDate: top.strToDate($('#wrkDate\\$').val()),
+ locNo: $('#locNo').val(),
+ staNo: $('#staNo').val(),
+ sourceStaNo: $('#sourceStaNo').val(),
+ sourceLocNo: $('#sourceLocNo').val(),
+ locSts: $('#locSts').val(),
+ picking: $('#picking').val(),
+ linkMis: $('#linkMis').val(),
+ onlineYn: $('#onlineYn').val(),
+ updMk: $('#updMk').val(),
+ exitMk: $('#exitMk').val(),
+ pltType: $('#pltType').val(),
+ emptyMk: $('#emptyMk').val(),
+ ioTime: top.strToDate($('#ioTime\\$').val()),
+ ctnType: $('#ctnType').val(),
+ packed: $('#packed').val(),
+ oveMk: $('#oveMk').val(),
+ mtnType: $('#mtnType').val(),
+ userNo: $('#userNo').val(),
+ crnStrTime: top.strToDate($('#crnStrTime\\$').val()),
+ crnEndTime: top.strToDate($('#crnEndTime\\$').val()),
+ plcStrTime: top.strToDate($('#plcStrTime\\$').val()),
+ crnPosTime: top.strToDate($('#crnPosTime\\$').val()),
+ loadTime: $('#loadTime').val(),
+ expTime: $('#expTime').val(),
+ refWrkno: $('#refWrkno').val(),
+ refIotime: top.strToDate($('#refIotime\\$').val()),
+ modiUser: $('#modiUser').val(),
+ modiTime: top.strToDate($('#modiTime\\$').val()),
+ appeUser: $('#appeUser').val(),
+ appeTime: top.strToDate($('#appeTime\\$').val()),
+ pauseMk: $('#pauseMk').val(),
+ errorTime: top.strToDate($('#errorTime\\$').val()),
+ errorMemo: $('#errorMemo').val(),
+ ctnKind: $('#ctnKind').val(),
+ manuType: $('#manuType').val(),
+ memoM: $('#memoM').val(),
+ scWeight: $('#scWeight').val(),
+ logMk: $('#logMk').val(),
+ logErrTime: top.strToDate($('#logErrTime\\$').val()),
+ logErrMemo: $('#logErrMemo').val(),
+ barcode: $('#barcode').val(),
+ PdcType: $('#PdcType').val(),
+ ctnNo: $('#ctnNo').val(),
+ fullPlt: $('#fullPlt').val(),
+
+ };
+ $.ajax({
+ url: baseUrl + "/taskLog/" + name + "/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: top.reObject(data),
+ method: 'POST',
+ success: function (res) {
+ if (res.code === 200) {
+ parent.layer.closeAll();
+ parent.$(".layui-laypage-btn")[0].click();
+ $("#data-detail :input").each(function () {
+ $(this).val("");
+ });
+ } else if (res.code === 403) {
+ top.location.href = baseUrl + "/";
+ } else {
+ layer.msg(res.msg)
}
- })
- });
+ layer.close(index);
+ }
+ })
}
- // 鎼滅储
+ // 澶嶉�夋浜嬩欢
+ form.on('checkbox(detailCheckbox)', function (data) {
+ var el = data.elem;
+ if (el.checked) {
+ $(el).val('Y');
+ } else {
+ $(el).val('N');
+ }
+ });
+
+ // 鎼滅储鏍忔悳绱簨浠�
form.on('submit(search)', function (data) {
pageCurr = 1;
tableReload(false);
});
- // 閲嶇疆
+ // 鎼滅储鏍忛噸缃簨浠�
form.on('submit(reset)', function (data) {
pageCurr = 1;
clearFormVal($('#search-box'));
@@ -273,92 +239,146 @@
});
// 鏃堕棿閫夋嫨鍣�
- function layDateRender(data) {
- setTimeout(function () {
- layDate.render({
- elem: '.layui-laydate-range'
- ,type: 'datetime'
- ,range: true
- });
- layDate.render({
- elem: '#ymd\\$',
- type: 'datetime',
- value: data!==undefined?data['ymd\\$']:null
- });
- layDate.render({
- elem: '#wrkDate\\$',
- type: 'datetime',
- value: data!==undefined?data['wrkDate\\$']:null
- });
- layDate.render({
- elem: '#ioTime\\$',
- type: 'datetime',
- value: data!==undefined?data['ioTime\\$']:null
- });
- layDate.render({
- elem: '#crnStrTime\\$',
- type: 'datetime',
- value: data!==undefined?data['crnStrTime\\$']:null
- });
- layDate.render({
- elem: '#crnEndTime\\$',
- type: 'datetime',
- value: data!==undefined?data['crnEndTime\\$']:null
- });
- layDate.render({
- elem: '#plcStrTime\\$',
- type: 'datetime',
- value: data!==undefined?data['plcStrTime\\$']:null
- });
- layDate.render({
- elem: '#crnPosTime\\$',
- type: 'datetime',
- value: data!==undefined?data['crnPosTime\\$']:null
- });
- layDate.render({
- elem: '#refIotime\\$',
- type: 'datetime',
- value: data!==undefined?data['refIotime\\$']:null
- });
- layDate.render({
- elem: '#modiTime\\$',
- type: 'datetime',
- value: data!==undefined?data['modiTime\\$']:null
- });
- layDate.render({
- elem: '#appeTime\\$',
- type: 'datetime',
- value: data!==undefined?data['appeTime\\$']:null
- });
- layDate.render({
- elem: '#errorTime\\$',
- type: 'datetime',
- value: data!==undefined?data['errorTime\\$']:null
- });
- layDate.render({
- elem: '#logErrTime\\$',
- type: 'datetime',
- value: data!==undefined?data['logErrTime\\$']:null
- });
-
- }, 300);
- }
- layDateRender();
+ layDate.render({
+ elem: '#ymd\\$',
+ type: 'datetime'
+ });
+ layDate.render({
+ elem: '#wrkDate\\$',
+ type: 'datetime'
+ });
+ layDate.render({
+ elem: '#ioTime\\$',
+ type: 'datetime'
+ });
+ layDate.render({
+ elem: '#crnStrTime\\$',
+ type: 'datetime'
+ });
+ layDate.render({
+ elem: '#crnEndTime\\$',
+ type: 'datetime'
+ });
+ layDate.render({
+ elem: '#plcStrTime\\$',
+ type: 'datetime'
+ });
+ layDate.render({
+ elem: '#crnPosTime\\$',
+ type: 'datetime'
+ });
+ layDate.render({
+ elem: '#refIotime\\$',
+ type: 'datetime'
+ });
+ layDate.render({
+ elem: '#modiTime\\$',
+ type: 'datetime'
+ });
+ layDate.render({
+ elem: '#appeTime\\$',
+ type: 'datetime'
+ });
+ layDate.render({
+ elem: '#errorTime\\$',
+ type: 'datetime'
+ });
+ layDate.render({
+ elem: '#logErrTime\\$',
+ type: 'datetime'
+ });
+ layDate.render({
+ elem: '.layui-laydate-range'
+ , type: 'datetime'
+ , range: true
+ });
});
// 鍏抽棴鍔ㄤ綔
-$(document).on('click','#data-detail-close', function () {
+$(document).on('click', '#data-detail-close', function () {
parent.layer.closeAll();
});
function tableReload(child) {
var searchData = {};
- $.each($('#search-box [name]').serializeArray(), function() {
+ $.each($('#search-box [name]').serializeArray(), function () {
searchData[this.name] = this.value;
});
- tableIns.reload({
+ (child ? parent.tableIns : tableIns).reload({
where: searchData,
- page: {curr: pageCurr}
- });
+ page: {
+ curr: pageCurr
+ },
+ done: function (res, curr, count) {
+ if (res.code === 403) {
+ top.location.href = baseUrl + "/";
+ }
+ pageCurr = curr;
+ if (res.data.length === 0 && count !== 0) {
+ tableIns.reload({
+ where: searchData,
+ page: {
+ curr: pageCurr - 1
+ }
+ });
+ pageCurr -= 1;
+ }
+ limit(child);
+ }
+ });
}
+
+function setFormVal(el, data, showImg) {
+ for (var val in data) {
+ var find = el.find(":input[id='" + val + "']");
+ if (find[0] != null) {
+ if (find[0].type === 'checkbox') {
+ if (data[val] === 'Y') {
+ find.attr("checked", "checked");
+ find.val('Y');
+ } else {
+ find.remove("checked");
+ find.val('N');
+ }
+ continue;
+ }
+ }
+ find.val(data[val]);
+ if (showImg) {
+ var next = find.next();
+ if (next.get(0)) {
+ if (next.get(0).localName === "img") {
+ find.hide();
+ next.attr("src", data[val]);
+ next.show();
+ }
+ }
+ }
+ }
+}
+
+function clearFormVal(el) {
+ $(':input', el)
+ .val('')
+ .removeAttr('checked')
+ .removeAttr('selected');
+}
+
+function detailScreen(index) {
+ var detail = layer.getChildFrame('#data-detail', index);
+ var height = detail.height() + 60;
+ if (height > ($(window).height() * 0.9)) {
+ height = ($(window).height() * 0.8);
+ }
+ layer.style(index, {
+// top: (($(window).height()-height)/3)+"px",
+ height: height + 'px'
+ });
+}
+
+$('body').keydown(function () {
+ if (event.keyCode === 13) {
+ $("#search").click();
+ }
+});
diff --git a/src/main/webapp/static/js/wrkMast/wrkMast.js b/src/main/webapp/static/js/wrkMast/wrkMast.js
index 60b5e91..b367be3 100644
--- a/src/main/webapp/static/js/wrkMast/wrkMast.js
+++ b/src/main/webapp/static/js/wrkMast/wrkMast.js
@@ -20,54 +20,23 @@
cellMinWidth: 50,
cols: [[
{type: 'checkbox'}
- ,{field: 'wrkNo', align: 'center',title: '宸ヤ綔鍙�',sort: true, width: 85}
- ,{field: 'ioTime$', align: 'center',title: '宸ヤ綔鏃堕棿',sort: true, width: 160}
- ,{field: 'wrkSts$', align: 'center',title: '宸ヤ綔鐘舵��'}
- ,{field: 'ioType$', align: 'center',title: '鍏ュ嚭搴撶被鍨�'}
+ ,{field: 'wrkNo', align: 'center',title: '宸ヤ綔鍙�',sort: true, width: 95}
+ ,{field: 'ioTime$', align: 'center',title: '宸ヤ綔鏃堕棿',sort: true, width: 170}
+ ,{field: 'wrkSts$', align: 'center',title: '宸ヤ綔鐘舵��', width: 120}
+ ,{field: 'ioType$', align: 'center',title: '鍏ュ嚭搴撶被鍨�', width: 140}
,{field: 'ioPri', align: 'center',title: '浼樺厛绾�'}
,{field: 'taskType$', align: 'center',title: '浠诲姟绫诲瀷'}
+ ,{field: 'barcode', align: 'center',title: '鏉＄爜', width: 120}
,{field: 'crnNo$', 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: 'sourceLocNo', align: 'center',title: '婧愬簱浣�', width: 120}
+ ,{field: 'locNo', align: 'center',title: '鐩爣搴撲綅', width: 120}
,{field: 'preHave', align: 'center',title: '鍏堝叆鍝�', hide: true}
,{field: 'takeNone', align: 'center',title: '绌烘搷浣�', hide: true}
- // ,{field: 'picking', align: 'center',title: '鎷ｆ枡', templet:function(row){
- // var html = "<input value='picking' type='checkbox' lay-skin='primary' lay-filter='tableCheckbox' table-index='"+row.LAY_TABLE_INDEX+"'";
- // if(row.picking === 'Y'){html += " checked ";}
- // html += ">";
- // return html;
- // }}
- // ,{field: 'exitMk', align: 'center',title: '閫�鍑�', templet:function(row){
- // var html = "<input value='exitMk' type='checkbox' lay-skin='primary' lay-filter='tableCheckbox' table-index='"+row.LAY_TABLE_INDEX+"'";
- // if(row.exitMk === 'Y'){html += " checked ";}
- // html += ">";
- // return html;
- // }}
- // ,{field: 'emptyMk', align: 'center',title: '绌烘澘', templet:function(row){
- // var html = "<input value='emptyMk' type='checkbox' lay-skin='primary' lay-filter='tableCheckbox' table-index='"+row.LAY_TABLE_INDEX+"'";
- // if(row.emptyMk === 'Y'){html += " checked ";}
- // html += ">";
- // return html;
- // }}
- //
- // ,{field: 'crnStrTime$', align: 'center',title: '鍫嗗灈鏈哄惎鍔ㄦ椂闂�'}
- // ,{field: 'crnEndTime$', align: 'center',title: '鍫嗗灈鏈哄仠姝㈡椂闂�'}
- // ,{field: 'refIotime$', align: 'center',title: '鎷ｆ枡鏃堕棿'}
,{field: 'modiUser$', align: 'center',title: '淇敼浜哄憳', hide:true}
,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿', hide:true, width: 160}
- // ,{field: 'memo', align: 'center',title: '澶囨敞'}
- //
- // ,{field: 'fullPlt', align: 'center',title: '婊℃澘', templet:function(row){
- // var html = "<input value='fullPlt' type='checkbox' lay-skin='primary' lay-filter='tableCheckbox' table-index='"+row.LAY_TABLE_INDEX+"'";
- // if(row.fullPlt === 'Y'){html += " checked ";}
- // html += ">";
- // return html;
- // }}
-
- ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:250}
+ ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:300}
]],
request: {
pageName: 'curr',
@@ -347,6 +316,24 @@
layer.confirm('浠诲姟鍙戦�佺┖鎿嶄綔寮傚父锛佹槸鍚︺�傘�傘�傘�傘�傘�傘�傘�傦紵', {title: '宸ヤ綔鍙凤細'+data.wrkNo, shadeClose: true}, function(){
});
break;
+ case 'priWrkMast':
+ layer.open({
+ type: 2,
+ title: '缁存姢宸ヤ綔妗�',
+ maxmin: true,
+ area: ['500px', top.detailHeight],
+ shadeClose: false,
+ content: 'wrkMast_detail2.html',
+ success: function(layero, index){
+ layer.getChildFrame('#data-detail-submit-save', index).hide();
+ setFormVal(layer.getChildFrame('#detail', index), data, false);
+ top.convertDisabled(layer.getChildFrame('#locNo', index), true);
+ layer.iframeAuto(index);layer.style(index, {top: (($(window).height()-layer.getChildFrame('#data-detail', index).height())/3)+"px"});
+ layero.find('iframe')[0].contentWindow.layui.form.render('select');
+ layero.find('iframe')[0].contentWindow.layui.form.render('checkbox');
+ }
+ });
+ break;
}
});
diff --git a/src/main/webapp/static/js/wrkMastLog/wrkMastLog.js b/src/main/webapp/static/js/wrkMastLog/wrkMastLog.js
index e637bfa..9f7c461 100644
--- a/src/main/webapp/static/js/wrkMastLog/wrkMastLog.js
+++ b/src/main/webapp/static/js/wrkMastLog/wrkMastLog.js
@@ -135,7 +135,7 @@
maxmin: true,
area: [top.detailWidth, top.detailHeight],
shadeClose: false,
- content: 'wrkMastLog_detail.html',
+ content: 'taskLog_detail.html',
success: function(layero, index){
layer.getChildFrame('#data-detail-submit-edit', index).hide();
clearFormVal(layer.getChildFrame('#detail', index));
@@ -248,7 +248,7 @@
maxmin: true,
area: [top.detailWidth, top.detailHeight],
shadeClose: false,
- content: 'wrkMastLog_detail.html',
+ content: 'taskLog_detail.html',
success: function(layero, index){
setFormVal(layer.getChildFrame('#detail', index), data, true);
top.convertDisabled(layer.getChildFrame('#data-detail :input', index), true);
diff --git a/src/main/webapp/views/.DS_Store b/src/main/webapp/views/.DS_Store
new file mode 100644
index 0000000..0dbb519
--- /dev/null
+++ b/src/main/webapp/views/.DS_Store
Binary files differ
diff --git a/src/main/webapp/views/basContainer/basContainer.html b/src/main/webapp/views/basContainer/basContainer.html
new file mode 100644
index 0000000..8756c3a
--- /dev/null
+++ b/src/main/webapp/views/basContainer/basContainer.html
@@ -0,0 +1,148 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+ <meta charset="utf-8">
+ <title></title>
+ <meta name="renderer" content="webkit">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+ <link rel="stylesheet" href="../../static/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../static/css/admin.css?v=318" media="all">
+ <link rel="stylesheet" href="../../static/css/cool.css" media="all">
+</head>
+<body>
+
+<div class="layui-fluid">
+ <div class="layui-card">
+ <div class="layui-card-body">
+ <div class="layui-form toolbar" id="search-box">
+ <div class="layui-form-item">
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="id" placeholder="缂栧彿" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline" style="width: 300px">
+ <div class="layui-input-inline">
+ <input class="layui-input layui-laydate-range" name="create_time" type="text"
+ placeholder="璧峰鏃堕棿 - 缁堟鏃堕棿" autocomplete="off" style="width: 300px">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="condition" placeholder="璇疯緭鍏�"
+ autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline"> 
+ <button class="layui-btn icon-btn" lay-filter="search" lay-submit>
+ <i class="layui-icon"></i>鎼滅储
+ </button>
+ <button class="layui-btn icon-btn" lay-filter="reset" lay-submit>
+ <i class="layui-icon"></i>閲嶇疆
+ </button>
+ </div>
+ </div>
+ </div>
+ <table class="layui-hide" id="basContainer" lay-filter="basContainer"></table>
+ </div>
+ </div>
+</div>
+
+<script type="text/html" id="toolbar">
+ <div class="layui-btn-container">
+ <button class="layui-btn layui-btn-sm" id="btn-add" lay-event="addData">鏂板</button>
+ <button class="layui-btn layui-btn-sm layui-btn-danger" id="btn-delete" lay-event="deleteData">鍒犻櫎</button>
+ <button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-init" lay-event="init">鍒濆鍖�</button>
+ </div>
+</script>
+
+<script type="text/html" id="operate">
+ <a class="layui-btn layui-btn-primary layui-btn-xs btn-edit" lay-event="edit">淇敼</a>
+ <a class="layui-btn layui-btn-danger layui-btn-xs btn-edit" lay-event="del">鍒犻櫎</a>
+</script>
+
+<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
+<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/basContainer/basContainer.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">瀹瑰櫒缂栫爜: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="barcode" placeholder="璇疯緭鍏ュ鍣ㄧ紪鐮�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">瀹瑰櫒绫诲瀷</label>
+ <div class="layui-input-inline">
+ <select name="type">
+ <option style="display: none"></option>
+ <option value="12">鏂欑</option>
+ <option value="13">绗兼</option>
+ <option value="14">鎵樼洏</option>
+ </select>
+ </div>
+ </div>
+ </div>
+ </div>
+ <hr class="layui-bg-gray">
+ <div class="layui-form-item text-right">
+ <button class="layui-btn" lay-filter="editSubmit" lay-submit="">淇濆瓨</button>
+ <button class="layui-btn layui-btn-primary" type="button" ew-event="closeDialog">鍙栨秷</button>
+ </div>
+ </form>
+</script>
+
+<div id="initContainer" style="margin: auto; display: none">
+ <div class="layui-form layui-form-pane" style="padding: 25px;">
+ <div class="layui-form-item">
+ <div class="layui-inline">
+ <label class="layui-form-label">鍒犻櫎瀹瑰櫒</label>
+ <div class="layui-input-inline" style="width: 100px;">
+ <input type="checkbox" name="flagInit" lay-skin="switch" value="0" lay-text="鍒犻櫎|淇濈暀">
+ </div>
+ </div>
+ </div>
+ <!-- 鎺� -->
+ <div class="layui-form-item">
+ <div class="layui-inline">
+ <label class="layui-form-label">璧锋</label>
+ <div class="layui-input-inline" style="width: 100px;">
+ <input type="text" name="start" autocomplete="off" class="layui-input"
+ lay-verify="required|number">
+ </div>
+ <div class="layui-form-mid">-</div>
+ <div class="layui-input-inline" style="width: 100px;">
+ <input type="text" name="end" autocomplete="off" class="layui-input"
+ lay-verify="required|number">
+ </div>
+ </div>
+ </div>
+ <!-- 瀹瑰櫒绫诲瀷 -->
+ <div class="layui-form-item">
+ <label class="layui-form-label">瀹瑰櫒绫诲瀷</label>
+ <div class="layui-input-inline">
+ <select name="type">
+ <option style="display: none"></option>
+ <option value="12">鏂欑</option>
+ <option value="13">绗兼</option>
+ <option value="14">鎵樼洏</option>
+ </select>
+ </div>
+ </div>
+ <div style="text-align: center; margin-top: 20px">
+ <button class="layui-btn layui-btn-primary" type="button" ew-event="closeDialog">鍙栨秷</button>
+ <button class="layui-btn layui-btn-normal" id="initDo" lay-submit lay-filter="initDo">纭畾</button>
+ </div>
+ </div>
+</div>
+</html>
+
diff --git a/src/main/webapp/views/basContainer/initContainer.html b/src/main/webapp/views/basContainer/initContainer.html
new file mode 100644
index 0000000..ac92aaf
--- /dev/null
+++ b/src/main/webapp/views/basContainer/initContainer.html
@@ -0,0 +1,164 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+ <meta charset="utf-8">
+ <title></title>
+ <meta name="renderer" content="webkit">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+ <link rel="stylesheet" href="../../static/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../static/css/cool.css" media="all">
+ <link rel="stylesheet" href="../../static/css/common.css" media="all">
+ <style>
+ </style>
+</head>
+<body>
+<div class="layui-inline" style="width:31%;margin-top: 20px">
+ <label class="layui-form-label">搴� 浣� 鍙凤細</label>
+ <div class="layui-input-inline">
+ <input id="locNo" class="layui-input" type="text" disabled="disabled">
+ </div>
+</div>
+
+<!-- 瀹瑰櫒鍒濆鍖� -->
+<div id="initContainer" style="margin: 20px 0 10px 30px; display: none">
+ <div class="layui-form layui-form-pane">
+ <div class="layui-form-item">
+ <div class="layui-inline">
+ <label class="layui-form-label">鍒犻櫎搴撲綅</label>
+ <div class="layui-input-inline" style="width: 100px;">
+ <input type="checkbox" name="enable" lay-skin="switch" value="1" lay-text="鍒犻櫎|淇濈暀">
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <div class="layui-inline">
+ <label class="layui-form-label"><span class="not-null">*</span>搴撳尯鍚嶇О锛�</label>
+ <div class="layui-input-inline cool-auto-complete">
+ <input id="identifying" name="identifying" class="layui-input" type="text" style="display: none">
+ <input id="identifying$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)"
+ type="text" onfocus=this.blur()>
+ <div class="cool-auto-complete-window">
+ <input class="cool-auto-complete-window-input" data-key="basAreasQueryBywhsType"
+ onkeyup="autoLoad(this.getAttribute('data-key'))">
+ <select class="cool-auto-complete-window-select" data-key="basAreasQueryBywhsTypeSelect"
+ onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
+ </select>
+ </div>
+ </div>
+ </div>
+ </div>
+ <!-- 鎺� -->
+ <div class="layui-form-item">
+ <div class="layui-inline">
+ <label class="layui-form-label">璧锋鎺�</label>
+ <div class="layui-input-inline" style="width: 100px;">
+ <input type="text" name="startRow" autocomplete="off" class="layui-input"
+ lay-verify="required|number">
+ </div>
+ <div class="layui-form-mid">-</div>
+ <div class="layui-input-inline" style="width: 100px;">
+ <input type="text" name="endRow" autocomplete="off" class="layui-input"
+ lay-verify="required|number">
+ </div>
+ </div>
+ </div>
+ <!-- 鍒� -->
+ <div class="layui-form-item">
+ <div class="layui-inline">
+ <label class="layui-form-label">璧锋鍒�</label>
+ <div class="layui-input-inline" style="width: 100px;">
+ <input type="text" name="startBay" autocomplete="off" class="layui-input"
+ lay-verify="required|number">
+ </div>
+ <div class="layui-form-mid">-</div>
+ <div class="layui-input-inline" style="width: 100px;">
+ <input type="text" name="endBay" autocomplete="off" class="layui-input"
+ lay-verify="required|number">
+ </div>
+ </div>
+ </div>
+ <!-- 灞� -->
+ <div class="layui-form-item">
+ <div class="layui-inline">
+ <label class="layui-form-label">璧锋灞�</label>
+ <div class="layui-input-inline" style="width: 100px;">
+ <input type="text" name="startLev" autocomplete="off" class="layui-input"
+ lay-verify="required|number">
+ </div>
+ <div class="layui-form-mid">-</div>
+ <div class="layui-input-inline" style="width: 100px;">
+ <input type="text" name="endLev" autocomplete="off" class="layui-input"
+ lay-verify="required|number">
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">鍫嗗灈鏈烘暟閲�</label>
+ <div class="layui-input-inline">
+ <input type="text" name="crnAmount" lay-verify="required|number" autocomplete="off" class="layui-input">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <div class="layui-inline">
+ <label class="layui-form-label">璧峰鍫嗗灈鏈�</label>
+ <div class="layui-input-inline">
+ <input type="text" name="staCrn" autocomplete="off" class="layui-input" lay-verify="number">
+ </div>
+ </div>
+ </div>
+ <!-- 搴撲綅绫诲瀷 -->
+ <div class="layui-form-item">
+ <label class="layui-form-label">楂樹綆绫诲瀷</label>
+ <div class="layui-input-inline">
+ <select name="locType1">
+ <option style="display: none"></option>
+ <option value="0">鏈煡</option>
+ <option value="1">浣庡簱浣�</option>
+ <option value="2">楂樺簱浣�</option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">瀹界獎绫诲瀷</label>
+ <div class="layui-input-inline">
+ <select name="locType2">
+ <option style="display: none"></option>
+ <option value="0">鏈煡</option>
+ <option value="1">绐勫簱浣�</option>
+ <option value="2">瀹藉簱浣�</option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">杞婚噸绫诲瀷</label>
+ <div class="layui-input-inline">
+ <select name="locType3">
+ <option style="display: none"></option>
+ <option value="0">鏈煡</option>
+ <option value="1">杞诲簱浣�</option>
+ <option value="2">閲嶅簱浣�</option>
+ </select>
+ </div>
+ </div>
+ <div style="text-align: center; margin-top: 20px">
+ <button class="layui-btn layui-btn-radius layui-btn-normal" id="initDo" lay-submit lay-filter="initDo">
+ 纭畾
+ </button>
+ </div>
+ </div>
+</div>
+
+
+</body>
+<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
+<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/locMast/locMast.js" charset="utf-8"></script>
+<script type="text/javascript">
+
+
+</script>
+
+</html>
\ No newline at end of file
diff --git a/src/main/webapp/views/basStation/basStation.html b/src/main/webapp/views/basStation/basStation.html
index d1050d8..ec8de94 100644
--- a/src/main/webapp/views/basStation/basStation.html
+++ b/src/main/webapp/views/basStation/basStation.html
@@ -22,14 +22,16 @@
<input class="layui-input" type="text" name="id" placeholder="缂栧彿" autocomplete="off">
</div>
</div>
- <div class="layui-inline" style="width: 300px">
+ <div class="layui-inline" style="width: 300px">
<div class="layui-input-inline">
- <input class="layui-input layui-laydate-range" name="create_time" type="text" placeholder="璧峰鏃堕棿 - 缁堟鏃堕棿" autocomplete="off" style="width: 300px">
+ <input class="layui-input layui-laydate-range" name="create_time" type="text"
+ placeholder="璧峰鏃堕棿 - 缁堟鏃堕棿" autocomplete="off" style="width: 300px">
</div>
</div>
<div class="layui-inline">
<div class="layui-input-inline">
- <input class="layui-input" type="text" name="condition" placeholder="璇疯緭鍏�" autocomplete="off">
+ <input class="layui-input" type="text" name="condition" placeholder="璇疯緭鍏�"
+ autocomplete="off">
</div>
</div>
<div class="layui-inline"> 
@@ -51,7 +53,6 @@
<div class="layui-btn-container">
<button class="layui-btn layui-btn-sm" id="btn-add" lay-event="addData">鏂板</button>
<button class="layui-btn layui-btn-sm layui-btn-danger" id="btn-delete" lay-event="deleteData">鍒犻櫎</button>
- <button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData" style="float: right">瀵煎嚭</button>
</div>
</script>
@@ -69,13 +70,16 @@
<!-- 琛ㄥ崟寮圭獥 -->
<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">
+ <input class="layui-input" name="id" style="display: none">
+ </div>
+ <div class="layui-form-item">
<label class="layui-form-label layui-form-required">缂栧彿: </label>
<div class="layui-input-block">
- <input class="layui-input" name="devNo" placeholder="璇疯緭鍏ョ紪鍙�" lay-vertype="tips" lay-verify="required">
+ <input class="layui-input" name="devNo" placeholder="璇疯緭鍏ョ紪鍙�" lay-vertype="tips"
+ lay-verify="required">
</div>
</div>
<div class="layui-form-item">
@@ -85,220 +89,30 @@
</div>
</div>
<div class="layui-form-item">
- <label class="layui-form-label">澶囨敞: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="devMk" 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="inEnable" placeholder="璇疯緭鍏ュ彲鍏�(checkBox)">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">鍙嚭(checkBox): </label>
- <div class="layui-input-block">
- <input class="layui-input" name="outEnable" placeholder="璇疯緭鍏ュ彲鍑�(checkBox)">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">鑷姩(checkBox): </label>
- <div class="layui-input-block">
- <input class="layui-input" name="autoing" placeholder="璇疯緭鍏ヨ嚜鍔�(checkBox)">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">鏈夌墿(checkBox): </label>
- <div class="layui-input-block">
- <input class="layui-input" name="loading" placeholder="璇疯緭鍏ユ湁鐗�(checkBox)">
- </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="canining" placeholder="璇疯緭鍏ヨ兘鍏�(checkBox)">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">鑳藉嚭(checkBox): </label>
- <div class="layui-input-block">
- <input class="layui-input" name="canouting" placeholder="璇疯緭鍏ヨ兘鍑�(checkBox)">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="fronting" placeholder="璇疯緭鍏�">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="rearing" placeholder="璇疯緭鍏�">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="uping" placeholder="璇疯緭鍏�">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="downing" placeholder="璇疯緭鍏�">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">宸ヤ綔鍙�: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="wrkNo" placeholder="璇疯緭鍏ュ伐浣滃彿">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">瀹瑰櫒绫诲瀷: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="ctnType" placeholder="璇疯緭鍏ュ鍣ㄧ被鍨�">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">鏉″舰鐮�: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="barcode" placeholder="璇疯緭鍏ユ潯褰㈢爜">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="inQty" placeholder="璇疯緭鍏�">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="row1" placeholder="璇疯緭鍏�">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="ioTime" id="ioTime$" placeholder="璇疯緭鍏�">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="area" placeholder="璇疯緭鍏�">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="inOk" placeholder="璇疯緭鍏�">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="outOk" placeholder="璇疯緭鍏�">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">楂樹綆绫诲瀷: </label>
- <div class="layui-input-block">
- <select name="locType1">
- <option value="">璇烽�夋嫨楂樹綆绫诲瀷</option>
- <option value="0">鏈煡</option>
- <option value="1">浣庡簱浣�</option>
- <option value="2">楂樺簱浣�</option>
- </select>
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">瀹界獎绫诲瀷: </label>
- <div class="layui-input-block">
- <select name="locType2">
- <option value="">璇烽�夋嫨瀹界獎绫诲瀷</option>
- <option value="0">鏈煡</option>
- <option value="1">绐勫簱浣�</option>
- <option value="2">瀹藉簱浣�</option>
- </select>
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">杞婚噸绫诲瀷: </label>
- <div class="layui-input-block">
- <select name="locType3">
- <option value="">璇烽�夋嫨杞婚噸绫诲瀷</option>
- <option value="0">鏈煡</option>
- <option value="1">杞诲簱浣�</option>
- <option value="2">閲嶅簱浣�</option>
- </select>
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">淇敼浜哄憳: </label>
+ <label class="layui-form-label">鍖哄煙锛�</label>
<div class="layui-input-block cool-auto-complete">
- <input class="layui-input" name="modiUser" placeholder="璇疯緭鍏ヤ慨鏀逛汉鍛�" style="display: none">
- <input id="modiUser$" name="modiUser$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏ヤ慨鏀逛汉鍛�" onfocus=this.blur()>
+ <input class="layui-input" name="areaId" placeholder="璇烽�夋嫨搴撳尯" style="display: none">
+ <input id="area" name="area" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇烽�夋嫨搴撳尯" onfocus=this.blur() lay-verType="tips" lay-verify="required">
<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">
+ <input class="cool-auto-complete-window-input" data-key="basAreasQueryBydocType" onkeyup="autoLoad(this.getAttribute('data-key'))">
+ <select class="cool-auto-complete-window-select" data-key="basAreasQueryBydocTypeSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
</select>
</div>
</div>
</div>
<div class="layui-form-item">
- <label class="layui-form-label">淇敼鏃堕棿: </label>
+ <label class="layui-form-label">绔欑偣鐘舵��: </label>
<div class="layui-input-block">
- <input class="layui-input" name="modiTime" id="modiTime$" placeholder="璇疯緭鍏ヤ慨鏀规椂闂�">
+ <select name="locSts">
+ <option value="O">闂茬疆</option>
+ <option value="F">鍦ㄥ簱</option>
+ <option value="S">鍏ュ簱棰勭害</option>
+ <option value="R">鍑哄簱棰勭害</option>
+ <option value="X">绂佺敤</option>
+ </select>
</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$" name="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="stdQty" placeholder="璇疯緭鍏�">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="minWt" placeholder="璇疯緭鍏�">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">閲嶉噺: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="grossWt" placeholder="璇疯緭鍏ラ噸閲�">
- </div>
- </div>
-
- </div>
+ </div>
</div>
<hr class="layui-bg-gray">
<div class="layui-form-item text-right">
diff --git a/src/main/webapp/views/locCache/locCache.html b/src/main/webapp/views/locCache/locCache.html
index b346397..ec258aa 100644
--- a/src/main/webapp/views/locCache/locCache.html
+++ b/src/main/webapp/views/locCache/locCache.html
@@ -52,11 +52,75 @@
<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" id="btn-delete" lay-event="deleteData">鍒犻櫎</button>
+ <button class="layui-btn layui-btn-sm" id="btn-print-batch" lay-event="batchModifties">鎵归噺淇敼</button>
+ <button class="layui-btn layui-btn-danger layui-btn-sm" id="btn-delete" lay-event="deleteData">鍒犻櫎</button>
<button class="layui-btn layui-btn-primary" id="btn-init" lay-event="init">鍒濆鍖�</button>
</div>
</script>
+
+<div id="batchModify" style="margin: 20px 0 10px 30px; display: none">
+ <div class="layui-form layui-form-pane">
+ <div class="layui-form-item">
+ <div class="layui-inline">
+ <label class="layui-form-label"><span class="not-null">*</span>搴撳尯鍚嶇О锛�</label>
+ <div class="layui-input-inline cool-auto-complete">
+ <input id="identifying" name="identifying" class="layui-input" type="text" style="display: none">
+ <input id="identifying$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)"
+ type="text" onfocus=this.blur()>
+ <div class="cool-auto-complete-window">
+ <input class="cool-auto-complete-window-input" data-key="basAreasQueryBywhsType"
+ onkeyup="autoLoad(this.getAttribute('data-key'))">
+ <select class="cool-auto-complete-window-select" data-key="basAreasQueryBywhsTypeSelect"
+ onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
+ </select>
+ </div>
+ </div>
+ </div>
+ </div>
+ <!-- 搴撲綅绫诲瀷 -->
+ <div class="layui-form-item">
+ <label class="layui-form-label">楂樹綆绫诲瀷</label>
+ <div class="layui-input-inline">
+ <select name="locType1">
+ <option style="display: none"></option>
+ <option value="0">鏈煡</option>
+ <option value="1">浣庡簱浣�</option>
+ <option value="2">楂樺簱浣�</option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">瀹界獎绫诲瀷</label>
+ <div class="layui-input-inline">
+ <select name="locType2">
+ <option style="display: none"></option>
+ <option value="0">鏈煡</option>
+ <option value="1">绐勫簱浣�</option>
+ <option value="2">瀹藉簱浣�</option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">杞婚噸绫诲瀷</label>
+ <div class="layui-input-inline">
+ <select name="locType3">
+ <option style="display: none"></option>
+ <option value="0">鏈煡</option>
+ <option value="1">杞诲簱浣�</option>
+ <option value="2">閲嶅簱浣�</option>
+ </select>
+ </div>
+ </div>
+ <div style="text-align: center; margin-top: 20px">
+ <button class="layui-btn layui-btn-normal" id="initDo" lay-submit lay-filter="initDo">
+ 纭畾
+ </button>
+ </div>
+ </div>
+</div>
+
+
<!-- 閲嶇疆搴撲綅寮圭獥 -->
<div id="resetLocDiv" style="margin: 20px 0 10px 30px; display: none">
<div class="layui-form layui-form-pane">
diff --git a/src/main/webapp/views/locCache/locDetail.html b/src/main/webapp/views/locCache/locDetail.html
index e509b24..48b34c0 100644
--- a/src/main/webapp/views/locCache/locDetail.html
+++ b/src/main/webapp/views/locCache/locDetail.html
@@ -32,7 +32,6 @@
function getCol() {
var cols = [
{field: 'locNo', align: 'center', title: '搴撲綅鍙�'}
- , {field: 'ioTime$', align: 'center', title: '宸ヤ綔鏃堕棿'}
];
cols.push.apply(cols, cacheCols);
return cols;
diff --git a/src/main/webapp/views/mat/mat.html b/src/main/webapp/views/mat/mat.html
index 6cdad50..19ed4fb 100644
--- a/src/main/webapp/views/mat/mat.html
+++ b/src/main/webapp/views/mat/mat.html
@@ -127,6 +127,7 @@
<div class="layui-btn-container">
<button class="layui-btn layui-btn-sm" id="btn-print-batch" lay-event="btnPrintBatch">鎵归噺鎵撳嵃</button>
<button class="layui-btn layui-btn-sm layui-btn-normal" id="btn-add" lay-event="addData">鏂板</button>
+ <button class="layui-btn layui-btn-sm" id="btn-print-batch" lay-event="batchModifties">鎵归噺淇敼</button>
<button class="layui-btn layui-btn-sm layui-btn-danger" id="btn-delete" lay-event="deleteData">鍒犻櫎</button>
<!-- 鍟嗗搧/鐗╂枡 鏁版嵁涓績 -->
<div class="dropdown-menu" style="float: right">
@@ -181,46 +182,44 @@
<input name="updateTime$" type="hidden">
<input name="updateBy" type="hidden">
<div class="layui-row">
-
<div class="layui-col-md6">
-
<div class="layui-form-item">
<label class="layui-form-label">鍒嗙被</label>
<div class="layui-input-block">
<div id="tagSel" class="ew-xmselect-tree"></div>
</div>
</div>
-
<div class="layui-form-item">
<label class="layui-form-label layui-form-required">鍟嗗搧鍚嶇О</label>
<div class="layui-input-block">
<input name="maktx" placeholder="璇疯緭鍏ュ晢鍝佸悕绉�" class="layui-input" lay-vertype="tips" lay-verify="required" required="">
</div>
</div>
-
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">缁勬墭涓婇檺</label>
+ <div class="layui-input-block">
+ <input name="upQty" placeholder="璇疯緭鍏ユ渶澶х粍鎵樻暟閲�" class="layui-input" lay-vertype="tips" lay-verify="required" required="">
+ </div>
+ </div>
<div class="layui-form-item">
<label class="layui-form-label">閰嶇疆</label>
<div class="layui-input-block">
<input name="specs" placeholder="璇疯緭鍏ラ厤缃�" class="layui-input">
</div>
</div>
-
<div class="layui-form-item">
<label class="layui-form-label">鍗曠鍑�閲�</label>
<div class="layui-input-block">
<input name="weight" placeholder="璇疯緭鍏ュ崟绠卞噣閲嶆牸" class="layui-input">
</div>
</div>
-
<div class="layui-form-item">
<label class="layui-form-label">鍗曠浣撶Н</label>
<div class="layui-input-block">
<input name="volume" placeholder="璇疯緭鍏ュ崟绠变綋绉�" class="layui-input">
</div>
</div>
-
</div>
-
<div class="layui-col-md6">
<div class="layui-form-item">
<label class="layui-form-label layui-form-required">鍟嗗搧缂栧彿</label>
@@ -228,35 +227,30 @@
<input id="matnr" name="matnr" placeholder="璇疯緭鍏ュ晢鍝佺紪鍙�" class="layui-input" lay-vertype="tips" lay-verify="required" required="">
</div>
</div>
-
<div class="layui-form-item">
<label class="layui-form-label">瑙勬牸</label>
<div class="layui-input-block">
<input name="specs" placeholder="璇疯緭鍏ヤ唬鐮�" class="layui-input">
</div>
</div>
-
<div class="layui-form-item">
<label class="layui-form-label">澶囨敞</label>
<div class="layui-input-block">
<input name="memo" placeholder="璇疯緭鍏ュ娉�" class="layui-input">
</div>
</div>
-
<div class="layui-form-item">
<label class="layui-form-label">鍗曠姣涢噸</label>
<div class="layui-input-block">
<input name="manLength" placeholder="璇疯緭鍏ュ崟绠辨瘺閲�" class="layui-input">
</div>
</div>
-
<div class="layui-form-item">
<label class="layui-form-label">鍗曠浣撶Н</label>
<div class="layui-input-block">
<input name="threeCode" placeholder="璇疯緭鍏ョ瀛愬昂瀵�" class="layui-input">
</div>
</div>
-
</div>
</div>
<hr class="layui-bg-gray">
@@ -350,6 +344,38 @@
</div>
</div>
+<div id="batchModifties" style="display: none;padding: 40px">
+ <form class="layui-form">
+ <input name="id" type="hidden">
+ <div class="layui-row">
+ <div class="layui-col-md8">
+ <div class="layui-form-item">
+ <label class="layui-form-label">搴撲綅绫诲瀷</label>
+ <div class="layui-input-block">
+ <select name="type">
+ <option style="display: none"></option>
+ <option value="12">鏂欑</option>
+ <option value="13">绗兼</option>
+ <option value="14">鎵樼洏</option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">缁勬墭涓婇檺</label>
+ <div class="layui-input-block">
+ <input name="upQty" placeholder="璇疯緭鍏ユ渶澶х粍鎵樻暟閲�" class="layui-input" lay-vertype="tips" lay-verify="required" required="">
+ </div>
+ </div>
+ </div>
+ </div>
+ <hr class="layui-bg-gray">
+ <div class="layui-form-item text-right">
+ <button class="layui-btn" lay-filter="batchModify" lay-submit="batchModify">淇濆瓨</button>
+ <button class="layui-btn layui-btn-primary" type="button" ew-event="closeDialog">鍙栨秷</button>
+ </div>
+ </form>
+</div>
+
<div id="box" style="display: block"></div>
<!-- 鍒濆鍖栨墦鍗版ā鏉跨殑鏉″舰鐮� -->
diff --git a/src/main/webapp/views/task/task.html b/src/main/webapp/views/task/task.html
index 25896cc..b3e97a7 100644
--- a/src/main/webapp/views/task/task.html
+++ b/src/main/webapp/views/task/task.html
@@ -22,14 +22,16 @@
<input class="layui-input" type="text" name="id" placeholder="缂栧彿" autocomplete="off">
</div>
</div>
- <div class="layui-inline" style="width: 300px">
+ <div class="layui-inline" style="width: 300px">
<div class="layui-input-inline">
- <input class="layui-input layui-laydate-range" name="create_time" type="text" placeholder="璧峰鏃堕棿 - 缁堟鏃堕棿" autocomplete="off" style="width: 300px">
+ <input class="layui-input layui-laydate-range" name="create_time" type="text"
+ placeholder="璧峰鏃堕棿 - 缁堟鏃堕棿" autocomplete="off" style="width: 300px">
</div>
</div>
<div class="layui-inline">
<div class="layui-input-inline">
- <input class="layui-input" type="text" name="condition" placeholder="璇疯緭鍏�" autocomplete="off">
+ <input class="layui-input" type="text" name="condition" placeholder="璇疯緭鍏�"
+ autocomplete="off">
</div>
</div>
<div class="layui-inline"> 
@@ -47,17 +49,22 @@
</div>
</div>
-<script type="text/html" id="toolbar">
- <div class="layui-btn-container">
- <button class="layui-btn layui-btn-sm" id="btn-add" lay-event="addData">鏂板</button>
- <button class="layui-btn layui-btn-sm layui-btn-danger" id="btn-delete" lay-event="deleteData">鍒犻櫎</button>
- <button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData" style="float: right">瀵煎嚭</button>
- </div>
-</script>
-
<script type="text/html" id="operate">
- <a class="layui-btn layui-btn-primary layui-btn-xs btn-edit" lay-event="edit">淇敼</a>
- <a class="layui-btn layui-btn-danger layui-btn-xs btn-edit" lay-event="del">鍒犻櫎</a>
+ {{#if (d.preHave === 'Y' && d.wrkSts === 3) { }}
+ <a class="layui-btn layui-btn-primary layui-border-red layui-btn-xs btn-error" lay-event="preHave">鍏堝叆鍝�</a>
+ {{# } }}
+ {{#if (d.takeNone === 'Y' && d.wrkSts === 12) { }}
+ <a class="layui-btn layui-btn-danger layui-btn-xs btn-error" lay-event="takeNone">绌烘搷浣�</a>
+ {{# } }}
+ <a class="layui-btn layui-btn-xs btn-detlShow" lay-event="detlShow">鏄庣粏</a>
+ <a class="layui-btn layui-btn-danger layui-btn-xs btn-complete" lay-event="complete">瀹屾垚</a>
+ <a class="layui-btn layui-btn-primary layui-btn-xs btn-cancel" lay-event="cancel">鍙栨秷</a>
+ {{#if (d.ioType === 103) { }}
+ <a class="layui-btn layui-btn-warm layui-btn-xs btn-pick" lay-event="pick">鎷�</a>
+ {{# } }}
+ {{#if (d.ioType === 107) { }}
+ <a class="layui-btn layui-btn-warm layui-btn-xs btn-pick" lay-event="pick">鐩�</a>
+ {{# } }}
</script>
<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
@@ -66,27 +73,6 @@
<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/task/task.js" charset="utf-8"></script>
</body>
-<!-- 琛ㄥ崟寮圭獥 -->
-<script type="text/html" id="editDialog">
- <form id="detail" lay-filter="detail" class="layui-form admin-form model-form">
- <input name="id" type="hidden">
- <div class="layui-row">
- <div class="layui-col-md12">
- <div class="layui-form-item">
- <label class="layui-form-label">浠诲姟绫诲瀷锛� agv , crn: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="taskType" placeholder="璇疯緭鍏ヤ换鍔＄被鍨嬶細 agv , crn">
- </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/task/taskDetl.html b/src/main/webapp/views/task/taskDetl.html
new file mode 100644
index 0000000..69e87b4
--- /dev/null
+++ b/src/main/webapp/views/task/taskDetl.html
@@ -0,0 +1,93 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+ <meta charset="utf-8">
+ <title></title>
+ <meta name="renderer" content="webkit">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+ <link rel="stylesheet" href="../../static/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../static/css/cool.css" media="all">
+ <link rel="stylesheet" href="../../static/css/common.css" media="all">
+ <style>
+ </style>
+</head>
+<body>
+<div class="layui-inline" style="width:31%;margin-top: 20px">
+ <label class="layui-form-label">宸� 浣� 鍙凤細</label>
+ <div class="layui-input-inline">
+ <input id="wrkNo" class="layui-input" type="text" disabled="disabled">
+ </div>
+</div>
+<table class="layui-hide" id="taskDetailByMast" lay-filter="taskDetailByMast"></table>
+</body>
+<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
+<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/locMast/locMast.js" charset="utf-8"></script>
+<script type="text/javascript">
+ var pageCur;
+
+ function getCol() {
+ var cols = [
+ {field: 'wrkNo', align: 'center', title: '宸ヤ綔鍙�'}
+ , {field: 'ioTime$', align: 'center', title: '宸ヤ綔鏃堕棿'}
+ ];
+ cols.push.apply(cols, detlCols);
+ return cols;
+ }
+
+ layui.use(['table', 'laydate', 'form'], function () {
+ table = layui.table;
+ var $ = layui.jquery;
+ var form = layui.form;
+
+ $('#wrkNo').val(parent.wrkNo);
+ // 鏁版嵁娓叉煋
+ tableIns1 = table.render({
+ elem: '#taskDetailByMast',
+ headers: {token: localStorage.getItem('token')},
+ url: baseUrl + '/taskDetl/list/auth',
+ where: {wrk_no: parent.wrkNo},
+ page: true,
+ limit: 16,
+ limits: [16, 30, 50, 100, 200, 500],
+ even: true,
+ toolbar: '#toolbar',
+ cellMinWidth: 50,
+ cols: [getCol()],
+ request: {
+ pageName: 'curr',
+ pageSize: 'limit'
+ },
+ parseData: function (res) {
+ return {
+ 'code': res.code,
+ 'msg': res.msg,
+ 'count': res.data.total,
+ 'data': res.data.records
+ }
+ },
+ response: {
+ statusCode: 200
+ },
+ done: function (res, curr, count) {
+ if (res.code === 403) {
+ top.location.href = baseUrl + "/";
+ }
+ pageCur = curr;
+ form.on('checkbox(tableCheckbox)', function (data) {
+ var _index = $(data.elem).attr('table-index') || 0;
+ if (data.elem.checked) {
+ res.data[_index][data.value] = 'Y';
+ } else {
+ res.data[_index][data.value] = 'N';
+ }
+ });
+ }
+ });
+ });
+</script>
+</html>
+
diff --git a/src/main/webapp/views/taskDetl/taskDetl.html b/src/main/webapp/views/taskDetl/taskDetl.html
deleted file mode 100644
index d38091f..0000000
--- a/src/main/webapp/views/taskDetl/taskDetl.html
+++ /dev/null
@@ -1,391 +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/layui/css/layui.css" media="all">
- <link rel="stylesheet" href="../../static/css/admin.css?v=318" media="all">
- <link rel="stylesheet" href="../../static/css/cool.css" media="all">
-</head>
-<body>
-
-<div class="layui-fluid">
- <div class="layui-card">
- <div class="layui-card-body">
- <div class="layui-form toolbar" id="search-box">
- <div class="layui-form-item">
- <div class="layui-inline">
- <div class="layui-input-inline">
- <input class="layui-input" type="text" name="id" placeholder="缂栧彿" autocomplete="off">
- </div>
- </div>
- <div class="layui-inline" style="width: 300px">
- <div class="layui-input-inline">
- <input class="layui-input layui-laydate-range" name="create_time" type="text" placeholder="璧峰鏃堕棿 - 缁堟鏃堕棿" autocomplete="off" style="width: 300px">
- </div>
- </div>
- <div class="layui-inline">
- <div class="layui-input-inline">
- <input class="layui-input" type="text" name="condition" placeholder="璇疯緭鍏�" autocomplete="off">
- </div>
- </div>
- <div class="layui-inline"> 
- <button class="layui-btn icon-btn" lay-filter="search" lay-submit>
- <i class="layui-icon"></i>鎼滅储
- </button>
- <button class="layui-btn icon-btn" lay-filter="reset" lay-submit>
- <i class="layui-icon"></i>閲嶇疆
- </button>
- </div>
- </div>
- </div>
- <table class="layui-hide" id="taskDetl" lay-filter="taskDetl"></table>
- </div>
- </div>
-</div>
-
-<script type="text/html" id="toolbar">
- <div class="layui-btn-container">
- <button class="layui-btn layui-btn-sm" id="btn-add" lay-event="addData">鏂板</button>
- <button class="layui-btn layui-btn-sm layui-btn-danger" id="btn-delete" lay-event="deleteData">鍒犻櫎</button>
- <button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData" style="float: right">瀵煎嚭</button>
- </div>
-</script>
-
-<script type="text/html" id="operate">
- <a class="layui-btn layui-btn-primary layui-btn-xs btn-edit" lay-event="edit">淇敼</a>
- <a class="layui-btn layui-btn-danger layui-btn-xs btn-edit" lay-event="del">鍒犻櫎</a>
-</script>
-
-<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
-<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
-<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
-<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
-<script type="text/javascript" src="../../static/js/taskDetl/taskDetl.js" charset="utf-8"></script>
-</body>
-<!-- 琛ㄥ崟寮圭獥 -->
-<script type="text/html" id="editDialog">
- <form id="detail" lay-filter="detail" class="layui-form admin-form model-form">
- <input name="id" type="hidden">
- <div class="layui-row">
- <div class="layui-col-md12">
- <div class="layui-form-item">
- <label class="layui-form-label layui-form-required">宸ヤ綔鍙�: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="wrkNo" placeholder="璇疯緭鍏ュ伐浣滃彿" lay-vertype="tips" lay-verify="required">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">宸ヤ綔鏃堕棿: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="ioTime" id="ioTime$" placeholder="璇疯緭鍏ュ伐浣滄椂闂�">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">鏁伴噺: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="anfme" placeholder="璇疯緭鍏ユ暟閲�">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">鎵樼洏鏉＄爜: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="zpallet" placeholder="璇疯緭鍏ユ墭鐩樻潯鐮�">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label layui-form-required">鍟嗗搧缂栧彿: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="matnr" placeholder="璇疯緭鍏ュ晢鍝佺紪鍙�" lay-vertype="tips" lay-verify="required">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">鍟嗗搧鍚嶇О: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="maktx" placeholder="璇疯緭鍏ュ晢鍝佸悕绉�">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">鎵瑰彿: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="batch" placeholder="璇疯緭鍏ユ壒鍙�">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">鍗曟嵁缂栧彿: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="orderNo" placeholder="璇疯緭鍏ュ崟鎹紪鍙�">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">瑙勬牸: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="specs" placeholder="璇疯緭鍏ヨ鏍�">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">鍨嬪彿: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="model" placeholder="璇疯緭鍏ュ瀷鍙�">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">棰滆壊: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="color" placeholder="璇疯緭鍏ラ鑹�">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">鍝佺墝: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="brand" placeholder="璇疯緭鍏ュ搧鐗�">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">鍗曚綅: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="unit" placeholder="璇疯緭鍏ュ崟浣�">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">鍗曚环: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="price" placeholder="璇疯緭鍏ュ崟浠�">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">sku: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="sku" placeholder="璇疯緭鍏ku">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">鍗曚綅閲�: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="units" placeholder="璇疯緭鍏ュ崟浣嶉噺">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">鏉＄爜: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="barcode" placeholder="璇疯緭鍏ユ潯鐮�">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">浜у湴: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="origin" placeholder="璇疯緭鍏ヤ骇鍦�">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">鍘傚: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="manu" placeholder="璇疯緭鍏ュ巶瀹�">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">鐢熶骇鏃ユ湡: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="manuDate" placeholder="璇疯緭鍏ョ敓浜ф棩鏈�">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">鍝侀」鏁�: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="itemNum" placeholder="璇疯緭鍏ュ搧椤规暟">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">瀹夊叏搴撳瓨閲�: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="safeQty" placeholder="璇疯緭鍏ュ畨鍏ㄥ簱瀛橀噺">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">閲嶉噺: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="weight" placeholder="璇疯緭鍏ラ噸閲�">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">闀垮害: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="manLength" placeholder="璇疯緭鍏ラ暱搴�">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">浣撶Н: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="volume" placeholder="璇疯緭鍏ヤ綋绉�">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">涓夋柟缂栫爜: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="threeCode" placeholder="璇疯緭鍏ヤ笁鏂圭紪鐮�">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">渚涘簲鍟�: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="supp" placeholder="璇疯緭鍏ヤ緵搴斿晢">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">渚涘簲鍟嗙紪鐮�: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="suppCode" placeholder="璇疯緭鍏ヤ緵搴斿晢缂栫爜">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">鏄惁鎵规: </label>
- <div class="layui-input-block">
- <select name="beBatch">
- <option value="">璇烽�夋嫨鏄惁鎵规</option>
- <option value="1">鏄�</option>
- <option value="0">鍚�</option>
- </select>
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">淇濊川鏈�: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="deadTime" placeholder="璇疯緭鍏ヤ繚璐ㄦ湡">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">棰勮澶╂暟: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="deadWarn" placeholder="璇疯緭鍏ラ璀﹀ぉ鏁�">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">鍒惰喘: </label>
- <div class="layui-input-block">
- <select name="source">
- <option value="">璇烽�夋嫨鍒惰喘</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">
- <select name="inspect">
- <option value="">璇烽�夋嫨瑕佹眰妫�楠�</option>
- <option value="1">鏄�</option>
- <option value="0">鍚�</option>
- </select>
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">鍗遍櫓鍝�: </label>
- <div class="layui-input-block">
- <select name="danger">
- <option value="">璇烽�夋嫨鍗遍櫓鍝�</option>
- <option value="1">鏄�</option>
- <option value="0">鍚�</option>
- </select>
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">淇敼浜哄憳: </label>
- <div class="layui-input-block cool-auto-complete">
- <input class="layui-input" name="modiUser" placeholder="璇疯緭鍏ヤ慨鏀逛汉鍛�" style="display: none">
- <input id="modiUser$" name="modiUser$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏ヤ慨鏀逛汉鍛�" onfocus=this.blur()>
- <div class="cool-auto-complete-window">
- <input class="cool-auto-complete-window-input" data-key="userQueryBymodiUser" onkeyup="autoLoad(this.getAttribute('data-key'))">
- <select class="cool-auto-complete-window-select" data-key="userQueryBymodiUserSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
- </select>
- </div>
- </div>
- </div>
- <div 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$" name="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 class="layui-form-item">
- <label class="layui-form-label">: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="lineNumber" placeholder="璇疯緭鍏�">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="standby1" placeholder="璇疯緭鍏�">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="standby2" placeholder="璇疯緭鍏�">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="standby3" placeholder="璇疯緭鍏�">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="boxType1" placeholder="璇疯緭鍏�">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="boxType2" placeholder="璇疯緭鍏�">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="boxType3" 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/taskLog/taskLog.html b/src/main/webapp/views/taskLog/taskLog.html
index 91b496a..ccd0810 100644
--- a/src/main/webapp/views/taskLog/taskLog.html
+++ b/src/main/webapp/views/taskLog/taskLog.html
@@ -7,500 +7,92 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
<link rel="stylesheet" href="../../static/layui/css/layui.css" media="all">
- <link rel="stylesheet" href="../../static/css/admin.css?v=318" media="all">
<link rel="stylesheet" href="../../static/css/cool.css" media="all">
+ <link rel="stylesheet" href="../../static/css/common.css" media="all">
</head>
<body>
-
-<div class="layui-fluid">
- <div class="layui-card">
- <div class="layui-card-body">
- <div class="layui-form toolbar" id="search-box">
- <div class="layui-form-item">
- <div class="layui-inline">
- <div class="layui-input-inline">
- <input class="layui-input" type="text" name="id" placeholder="缂栧彿" autocomplete="off">
- </div>
- </div>
- <div class="layui-inline" style="width: 300px">
- <div class="layui-input-inline">
- <input class="layui-input layui-laydate-range" name="create_time" type="text" placeholder="璧峰鏃堕棿 - 缁堟鏃堕棿" autocomplete="off" style="width: 300px">
- </div>
- </div>
- <div class="layui-inline">
- <div class="layui-input-inline">
- <input class="layui-input" type="text" name="condition" placeholder="璇疯緭鍏�" autocomplete="off">
- </div>
- </div>
- <div class="layui-inline"> 
- <button class="layui-btn icon-btn" lay-filter="search" lay-submit>
- <i class="layui-icon"></i>鎼滅储
- </button>
- <button class="layui-btn icon-btn" lay-filter="reset" lay-submit>
- <i class="layui-icon"></i>閲嶇疆
- </button>
- </div>
- </div>
- </div>
- <table class="layui-hide" id="taskLog" lay-filter="taskLog"></table>
+<!-- 鎼滅储鏍� -->
+<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="wrk_no" placeholder="宸ヤ綔鍙�" autocomplete="off">
</div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline cool-auto-complete">
+ <input id="wrkSts" class="layui-input" name="wrk_sts" type="text" placeholder="璇疯緭鍏�" autocomplete="off" style="display: none">
+ <input id="wrkSts$" 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="basWrkStatusQueryBywrkSts" onkeyup="autoLoad(this.getAttribute('data-key'))">
+ <select class="cool-auto-complete-window-select" data-key="basWrkStatusQueryBywrkStsSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
+ </select>
+ </div>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline cool-auto-complete">
+ <input id="ioType" class="layui-input" name="io_type" type="text" placeholder="璇疯緭鍏�" autocomplete="off" 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-inline">
+ <div class="layui-input-inline cool-auto-complete">
+ <input id="crnNo" class="layui-input" name="crn_no" type="text" placeholder="璇疯緭鍏�" autocomplete="off" 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-inline" style="width: 300px">
+ <div class="layui-input-inline">
+ <input class="layui-input layui-laydate-range" name="io_time" type="text" placeholder="璧峰鏃堕棿 - 缁堟鏃堕棿" autocomplete="off" style="width: 300px">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="condition" placeholder="璇疯緭鍏�" autocomplete="off">
+ </div>
+ </div>
+
+ <!-- 寰呮坊鍔� -->
+ <div 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>
+<!-- 琛ㄦ牸 -->
+<div class="layui-form">
+ <table class="layui-hide" id="wrkMastLog" lay-filter="wrkMastLog"></table>
+</div>
<script type="text/html" id="toolbar">
<div class="layui-btn-container">
- <button class="layui-btn layui-btn-sm" id="btn-add" lay-event="addData">鏂板</button>
- <button class="layui-btn layui-btn-sm layui-btn-danger" id="btn-delete" lay-event="deleteData">鍒犻櫎</button>
- <button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData" style="float: right">瀵煎嚭</button>
+ <button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData" style="margin-top: 10px">瀵煎嚭</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>
+ <a class="layui-btn layui-btn-xs btn-detlShow" lay-event="detlShow">鏄庣粏</a>
+ <!-- <a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="detail">璇︽儏</a>-->
</script>
<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
-<script type="text/javascript" src="../../static/js/taskLog/taskLog.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">: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="id" placeholder="璇疯緭鍏�">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label layui-form-required">宸ヤ綔鍙�: </label>
- <div class="layui-input-block cool-auto-complete">
- <input class="layui-input" name="wrkNo" placeholder="璇疯緭鍏ュ伐浣滃彿" lay-vertype="tips" lay-verify="required" style="display: none">
- <input id="wrkNo$" name="wrkNo$" 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="wrkMastQueryBywrkNo" onkeyup="autoLoad(this.getAttribute('data-key'))">
- <select class="cool-auto-complete-window-select" data-key="wrkMastQueryBywrkNoSelect" 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="logId" placeholder="璇疯緭鍏�">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="invWh" placeholder="璇疯緭鍏�">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="ymd" id="ymd$" placeholder="璇疯緭鍏�">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="mk" placeholder="璇疯緭鍏�">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="whsType" 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="wrkSts" placeholder="璇疯緭鍏ュ伐浣滅姸鎬�" style="display: none">
- <input id="wrkSts$" name="wrkSts$" 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="basWrkStatusQueryBywrkSts" onkeyup="autoLoad(this.getAttribute('data-key'))">
- <select class="cool-auto-complete-window-select" data-key="basWrkStatusQueryBywrkStsSelect" 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="ioType" placeholder="璇疯緭鍏ュ叆鍑哄簱绫诲瀷" style="display: none">
- <input id="ioType$" name="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$" name="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="sheetNo" placeholder="璇疯緭鍏�">
- </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">
- <input class="layui-input" name="wrkDate" id="wrkDate$" 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$" name="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$" name="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$" name="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$" name="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">
- <input class="layui-input" name="linkMis" placeholder="璇疯緭鍏�">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="onlineYn" placeholder="璇疯緭鍏�">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="updMk" 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="exitMk" placeholder="璇疯緭鍏ラ��鍑�(checkBox)">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="pltType" 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="emptyMk" placeholder="璇疯緭鍏ョ┖鏉�(checkBox)">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">宸ヤ綔鏃堕棿: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="ioTime" id="ioTime$" placeholder="璇疯緭鍏ュ伐浣滄椂闂�">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="ctnType" placeholder="璇疯緭鍏�">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="packed" placeholder="璇疯緭鍏�">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="oveMk" placeholder="璇疯緭鍏�">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="mtnType" placeholder="璇疯緭鍏�">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="userNo" placeholder="璇疯緭鍏�">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">鍫嗗灈鏈哄惎鍔ㄦ椂闂�: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="crnStrTime" id="crnStrTime$" placeholder="璇疯緭鍏ュ爢鍨涙満鍚姩鏃堕棿">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">鍫嗗灈鏈哄仠姝㈡椂闂�: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="crnEndTime" id="crnEndTime$" placeholder="璇疯緭鍏ュ爢鍨涙満鍋滄鏃堕棿">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">鎷ｆ枡鏃堕棿: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="plcStrTime" id="plcStrTime$" placeholder="璇疯緭鍏ユ嫞鏂欐椂闂�">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="crnPosTime" id="crnPosTime$" placeholder="璇疯緭鍏�">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="loadTime" placeholder="璇疯緭鍏�">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="expTime" placeholder="璇疯緭鍏�">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="refWrkno" placeholder="璇疯緭鍏�">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="refIotime" id="refIotime$" placeholder="璇疯緭鍏�">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">淇敼浜哄憳: </label>
- <div class="layui-input-block cool-auto-complete">
- <input class="layui-input" name="modiUser" placeholder="璇疯緭鍏ヤ慨鏀逛汉鍛�" style="display: none">
- <input id="modiUser$" name="modiUser$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏ヤ慨鏀逛汉鍛�" onfocus=this.blur()>
- <div class="cool-auto-complete-window">
- <input class="cool-auto-complete-window-input" data-key="userQueryBymodiUser" onkeyup="autoLoad(this.getAttribute('data-key'))">
- <select class="cool-auto-complete-window-select" data-key="userQueryBymodiUserSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
- </select>
- </div>
- </div>
- </div>
- <div 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$" name="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="pauseMk" placeholder="璇疯緭鍏�">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="errorTime" id="errorTime$" placeholder="璇疯緭鍏�">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="errorMemo" placeholder="璇疯緭鍏�">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="ctnKind" placeholder="璇疯緭鍏�">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="manuType" placeholder="璇疯緭鍏�">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="memoM" placeholder="璇疯緭鍏�">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="scWeight" placeholder="璇疯緭鍏�">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="logMk" placeholder="璇疯緭鍏�">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="logErrTime" id="logErrTime$" placeholder="璇疯緭鍏�">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="logErrMemo" placeholder="璇疯緭鍏�">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">鏉＄爜: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="barcode" placeholder="璇疯緭鍏ユ潯鐮�">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="PdcType" placeholder="璇疯緭鍏�">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="ctnNo" 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="fullPlt" placeholder="璇疯緭鍏ユ弧鏉�(checkBox)">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="preHave" placeholder="璇疯緭鍏�">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="takeNone" placeholder="璇疯緭鍏�">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="lineNumber" placeholder="璇疯緭鍏�">
- </div>
- </div>
+<script type="text/javascript" src="../../static/js/wrkMastLog/wrkMastLog.js" charset="utf-8"></script>
- </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>
+<iframe id="detail-iframe" scrolling="auto" style="display:none;"></iframe>
+
+</body>
</html>
diff --git a/src/main/webapp/views/taskLog/taskLog_detail.html b/src/main/webapp/views/taskLog/taskLog_detail.html
new file mode 100644
index 0000000..c6807ff
--- /dev/null
+++ b/src/main/webapp/views/taskLog/taskLog_detail.html
@@ -0,0 +1,196 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+ <meta charset="utf-8">
+ <title></title>
+ <meta name="renderer" content="webkit">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+ <link rel="stylesheet" href="../../static/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../static/css/cool.css" media="all">
+ <link rel="stylesheet" href="../../static/css/common.css" media="all">
+</head>
+<body>
+
+<!-- 璇︽儏 -->
+<div id="data-detail" class="layer_self_wrap">
+ <form id="detail" class="layui-form">
+ <div class="layui-inline" style="width:31%;display: none">
+ <label class="layui-form-label"><span class="not-null">*</span>缂栥��銆�鍙凤細</label>
+ <div class="layui-input-inline">
+ <input id="id" class="layui-input" type="text" onkeyup="check(this.id, 'wrkMastLog')" lay-verify="number" >
+ </div>
+ </div>
+ <div class="layui-inline" style="width:31%;">
+ <label class="layui-form-label"><span class="not-null">*</span>宸� 浣� 鍙凤細</label>
+ <div class="layui-input-inline">
+ <input id="wrkNo" class="layui-input" type="text" onkeyup="check(this.id, 'wrkMastLog')" lay-verify="required|number" >
+ </div>
+ </div>
+ <div class="layui-inline" style="width:31%;">
+ <label class="layui-form-label">宸ヤ綔鐘舵�侊細</label>
+ <div class="layui-input-inline cool-auto-complete">
+ <input id="wrkSts" class="layui-input" type="text" lay-verify="number" style="display: none">
+ <input id="wrkSts$" 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="basWrkStatusQueryBywrkSts" onkeyup="autoLoad(this.getAttribute('data-key'))">
+ <select class="cool-auto-complete-window-select" data-key="basWrkStatusQueryBywrkStsSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
+ </select>
+ </div>
+ </div>
+ </div>
+ <div class="layui-inline" style="width:31%;">
+ <label class="layui-form-label">鍏ュ嚭搴撶被鍨嬶細</label>
+ <div class="layui-input-inline cool-auto-complete">
+ <input id="ioType" class="layui-input" type="text" lay-verify="number" 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-inline" style="width:31%;">
+ <label class="layui-form-label">鍫嗗灈鏈哄彿锛�</label>
+ <div class="layui-input-inline cool-auto-complete">
+ <input id="crnNo" class="layui-input" type="text" lay-verify="number" 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-inline" style="width:31%;">
+ <label class="layui-form-label">浼� 鍏� 绾э細</label>
+ <div class="layui-input-inline">
+ <input id="ioPri" class="layui-input" type="text" lay-verify="number" >
+ </div>
+ </div>
+ <div class="layui-inline" style="width:31%;">
+ <label class="layui-form-label">鐩爣搴撲綅锛�</label>
+ <div class="layui-input-inline cool-auto-complete">
+ <input id="locNo" class="layui-input" type="text" 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-inline" style="width:31%;">
+ <label class="layui-form-label">鐩� 鏍� 绔欙細</label>
+ <div class="layui-input-inline cool-auto-complete">
+ <input id="staNo" class="layui-input" type="text" lay-verify="number" 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-inline" style="width:31%;">
+ <label class="layui-form-label">婧愩��銆�绔欙細</label>
+ <div class="layui-input-inline cool-auto-complete">
+ <input id="sourceStaNo" class="layui-input" type="text" lay-verify="number" 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-inline" style="width:31%;">
+ <label class="layui-form-label">婧� 搴� 浣嶏細</label>
+ <div class="layui-input-inline cool-auto-complete">
+ <input id="sourceLocNo" class="layui-input" type="text" 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-inline" style="width:31%;">
+ <label class="layui-form-label">鎷ｃ��銆�鏂欙細</label>
+ <div class="layui-input-inline">
+ <input id="picking" class="layui-input" type="checkBox" lay-skin="primary" lay-filter='detailCheckbox'>
+ </div>
+ </div>
+ <div class="layui-inline" style="width:31%;">
+ <label class="layui-form-label">閫�銆�銆�鍑猴細</label>
+ <div class="layui-input-inline">
+ <input id="exitMk" class="layui-input" type="checkBox" lay-skin="primary" lay-filter='detailCheckbox'>
+ </div>
+ </div>
+ <div class="layui-inline" style="width:31%;">
+ <label class="layui-form-label">绌恒��銆�鏉匡細</label>
+ <div class="layui-input-inline">
+ <input id="emptyMk" class="layui-input" type="checkBox" lay-skin="primary" lay-filter='detailCheckbox'>
+ </div>
+ </div>
+ <div class="layui-inline" style="width:31%;">
+ <label class="layui-form-label">宸ヤ綔鏃堕棿锛�</label>
+ <div class="layui-input-inline">
+ <input id="ioTime$" class="layui-input" type="text" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline" style="width:31%;">
+ <label class="layui-form-label" style="font-size: x-small">鍫嗗灈鏈哄惎鍔ㄦ椂闂达細</label>
+ <div class="layui-input-inline">
+ <input id="crnStrTime$" class="layui-input" type="text" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline" style="width:31%;">
+ <label class="layui-form-label" style="font-size: x-small">鍫嗗灈鏈哄仠姝㈡椂闂达細</label>
+ <div class="layui-input-inline">
+ <input id="crnEndTime$" class="layui-input" type="text" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline" style="width:31%;">
+ <label class="layui-form-label">鎷ｆ枡鏃堕棿锛�</label>
+ <div class="layui-input-inline">
+ <input id="plcStrTime$" class="layui-input" type="text" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline" style="width:31%;">
+ <label class="layui-form-label">鏉°��銆�鐮侊細</label>
+ <div class="layui-input-inline">
+ <input id="barcode" class="layui-input" type="text">
+ </div>
+ </div>
+ <div class="layui-inline" style="width:31%;">
+ <label class="layui-form-label">婊°��銆�鏉匡細</label>
+ <div class="layui-input-inline">
+ <input id="fullPlt" class="layui-input" type="checkBox" lay-skin="primary" lay-filter='detailCheckbox'>
+ </div>
+ </div>
+
+
+ <hr class="layui-bg-gray">
+
+ <div id="data-detail-btn" class="layui-btn-container layui-form-item">
+ <div id="data-detail-submit-save" type="button" class="layui-btn layui-btn-normal" lay-submit lay-filter="save">淇濆瓨</div>
+ <div id="data-detail-submit-edit" type="button" class="layui-btn layui-btn-normal" lay-submit lay-filter="edit">淇敼</div>
+ <div id="data-detail-close" type="button" class="layui-btn" lay-submit lay-filter="close">鍏抽棴</div>
+ </div>
+
+ <div id="prompt">
+ 娓╅Θ鎻愮ず锛氳浠旂粏濉啓鐩稿叧淇℃伅锛�<span class="extrude"><span class="not-null">*</span> 涓哄繀濉�夐」銆�</span>
+ </div>
+ </form>
+</div>
+</body>
+<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
+<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/wrkMastLog/wrkMastLog.js" charset="utf-8"></script>
+</html>
+
diff --git a/src/main/webapp/views/wrkMast/wrkMast.html b/src/main/webapp/views/wrkMast/wrkMast.html
index 77b804b..6fc48be 100644
--- a/src/main/webapp/views/wrkMast/wrkMast.html
+++ b/src/main/webapp/views/wrkMast/wrkMast.html
@@ -122,6 +122,7 @@
<a class="layui-btn layui-btn-xs btn-detlShow" lay-event="detlShow">鏄庣粏</a>
<a class="layui-btn layui-btn-danger layui-btn-xs btn-complete" lay-event="complete">瀹屾垚</a>
<a class="layui-btn layui-btn-primary layui-btn-xs btn-cancel" lay-event="cancel">鍙栨秷</a>
+ <a class="layui-btn layui-btn-warm layui-btn-xs btn-pick" lay-event="priWrkMast">缁存姢鐘舵��</a>
{{#if (d.ioType === 103) { }}
<a class="layui-btn layui-btn-warm layui-btn-xs btn-pick" lay-event="pick">鎷�</a>
{{# } }}
diff --git a/src/main/webapp/views/wrkMast/wrkMast_detail2.html b/src/main/webapp/views/wrkMast/wrkMast_detail2.html
new file mode 100644
index 0000000..4f39f9e
--- /dev/null
+++ b/src/main/webapp/views/wrkMast/wrkMast_detail2.html
@@ -0,0 +1,53 @@
+<!DOCTYPE html>
+<html lang="en" xmlns="http://www.w3.org/1999/html">
+<head>
+ <meta charset="utf-8">
+ <title></title>
+ <meta name="renderer" content="webkit">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+ <link rel="stylesheet" href="../../static/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../static/css/cool.css" media="all">
+ <link rel="stylesheet" href="../../static/css/common.css" media="all">
+</head>
+<body>
+
+<!-- 璇︽儏 -->
+<div id="data-detail" class="layer_self_wrap">
+ <form id="detail" class="layui-form" style="height: 100%">
+ <div class="layui-inline" >
+ <label class="layui-form-label"><span class="not-null">*</span>宸� 浣� 鍙凤細</label>
+ <div class="layui-input-inline">
+ <input id="wrkNo" class="layui-input" disabled =鈥渄isabled鈥� onkeyup="check(this.id, 'wrkMast')">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">宸ヤ綔鐘舵�侊細</label>
+ <div class="layui-input-inline cool-auto-complete" style="height: 200px">
+ <input id="wrkSts" class="layui-input" name="wrk_sts" type="text" placeholder="璇疯緭鍏�" autocomplete="off" style="display: none">
+ <input id="wrkSts$" 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="basWrkStatusQueryBywrkSts" onkeyup="autoLoad(this.getAttribute('data-key'))">
+ <select class="cool-auto-complete-window-select" data-key="basWrkStatusQueryBywrkStsSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
+ </select>
+ </div>
+ </div>
+ </div>
+ <div id="prompt">
+ 娓╅Θ鎻愮ず锛氬ぇ浜�10鐨勫伐浣滅姸鎬佽鏌ョ湅 鍩虹鏁版嵁<span style="font-weight: 900;color: black">鈫�</span>宸ヤ綔鐘舵��
+ </div>
+ <div id="data-detail-btn" class="layui-btn-container layui-form-item">
+ <div id="data-detail-submit-save" type="button" class="layui-btn layui-btn-normal" lay-submit lay-filter="save">淇濆瓨</div>
+ <div id="data-detail-submit-edit" type="button" class="layui-btn layui-btn-normal" lay-submit lay-filter="edit">淇敼</div>
+ <div id="data-detail-close" type="button" class="layui-btn" lay-submit lay-filter="close">鍏抽棴</div>
+ </div>
+ </form>
+</div>
+</body>
+<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
+<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/wrkMast/wrkMast.js" charset="utf-8"></script>
+</html>
+
--
Gitblit v1.9.1