From d7c7cbbe2ba964b92e31e36d15c6941b4328b9b4 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期四, 23 十月 2025 16:31:38 +0800
Subject: [PATCH] 13
---
src/main/java/com/zy/asrs/service/impl/OrderReportLogServiceImpl.java | 18 +
src/main/java/com/zy/asrs/service/OrderReportLogService.java | 10
src/main/webapp/static/js/order/orderPakout.js | 17
src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java | 99 ++-----
src/main/java/com/zy/asrs/task/AutoLocMoveScheduler.java | 49 ---
src/main/java/com/zy/asrs/task/OverYearLogScheduler.java | 2
src/main/webapp/static/js/orderReport/orderReport.js | 2
src/main/java/com/zy/asrs/task/WorkMastScheduler.java | 223 -----------------
src/main/java/com/zy/asrs/task/OrderSyncScheduler.java | 82 ++++-
src/main/webapp/views/orderReport/orderReport.html | 16
src/main/java/com/zy/asrs/mapper/OrderReportLogMapper.java | 14 +
src/main/java/com/zy/asrs/controller/OrderReportController.java | 76 +++++
/dev/null | 59 ----
src/main/webapp/static/js/order/orderPakin.js | 17
src/main/java/com/zy/asrs/task/LocMoveAllScheduler.java | 1
src/main/java/com/zy/asrs/task/handler/AutoLocMoveHandler.java | 43 ---
src/main/java/com/zy/asrs/task/handler/OrderMoveHistoryHandler.java | 15 -
src/main/webapp/static/js/order/out.js | 2
src/main/java/com/zy/system/timer/LoadingConfigTimer.java | 6
src/main/webapp/views/order/orderPakout.html | 2
src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java | 6
src/main/webapp/static/js/locMast/locMast.js | 3
src/main/java/com/zy/asrs/task/handler/OverYearLogHandler.java | 14
23 files changed, 267 insertions(+), 509 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OrderReportController.java b/src/main/java/com/zy/asrs/controller/OrderReportController.java
new file mode 100644
index 0000000..61414f9
--- /dev/null
+++ b/src/main/java/com/zy/asrs/controller/OrderReportController.java
@@ -0,0 +1,76 @@
+package com.zy.asrs.controller;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.mapper.Wrapper;
+import com.baomidou.mybatisplus.plugins.Page;
+import com.core.annotations.ManagerAuth;
+import com.core.common.BaseRes;
+import com.core.common.Cools;
+import com.core.common.DateUtils;
+import com.core.common.R;
+import com.zy.asrs.entity.DocType;
+import com.zy.asrs.entity.OrderPakout;
+import com.zy.asrs.entity.OrderReport;
+import com.zy.asrs.service.DocTypeService;
+import com.zy.asrs.service.OrderDetlReportService;
+import com.zy.asrs.service.OrderReportService;
+import com.zy.common.web.BaseController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.*;
+
+@RestController
+@RequestMapping(value = "/report")
+public class OrderReportController extends BaseController {
+
+ @Autowired
+ private OrderReportService orderReportService;
+ @Autowired
+ private OrderDetlReportService orderDetlReportService;
+
+ @Autowired
+ private DocTypeService docTypeService;
+
+
+ @RequestMapping(value = "/order/head/page/auth")
+ @ManagerAuth
+ public R head(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam(required = false) String orderByField,
+ @RequestParam(required = false) String orderByType,
+ @RequestParam Map<String, Object> param) {
+ EntityWrapper<OrderReport> wrapper = new EntityWrapper<>();
+ excludeTrash(param);
+ convert(param, wrapper);
+ if (!Cools.isEmpty(orderByField)) {
+ wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
+ } else {
+ wrapper.orderBy("settle").orderBy("create_time", false);
+ }
+ wrapper.eq("status", 1);
+ return R.ok(orderReportService.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);
+ }
+ }
+ }
+
+
+
+
+}
diff --git a/src/main/java/com/zy/asrs/mapper/OrderReportLogMapper.java b/src/main/java/com/zy/asrs/mapper/OrderReportLogMapper.java
new file mode 100644
index 0000000..5bfce79
--- /dev/null
+++ b/src/main/java/com/zy/asrs/mapper/OrderReportLogMapper.java
@@ -0,0 +1,14 @@
+package com.zy.asrs.mapper;
+
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.zy.asrs.entity.OrderReport;
+import com.zy.asrs.entity.OrderReportLog;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+@Mapper
+@Repository
+public interface OrderReportLogMapper extends BaseMapper<OrderReportLog> {
+
+
+}
diff --git a/src/main/java/com/zy/asrs/service/OrderReportLogService.java b/src/main/java/com/zy/asrs/service/OrderReportLogService.java
new file mode 100644
index 0000000..47178f5
--- /dev/null
+++ b/src/main/java/com/zy/asrs/service/OrderReportLogService.java
@@ -0,0 +1,10 @@
+package com.zy.asrs.service;
+
+import com.baomidou.mybatisplus.service.IService;
+import com.zy.asrs.entity.OrderReport;
+import com.zy.asrs.entity.OrderReportLog;
+
+public interface OrderReportLogService extends IService<OrderReportLog> {
+
+
+}
diff --git a/src/main/java/com/zy/asrs/service/impl/OrderReportLogServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OrderReportLogServiceImpl.java
new file mode 100644
index 0000000..a4f7fd0
--- /dev/null
+++ b/src/main/java/com/zy/asrs/service/impl/OrderReportLogServiceImpl.java
@@ -0,0 +1,18 @@
+package com.zy.asrs.service.impl;
+
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.zy.asrs.entity.OrderReport;
+import com.zy.asrs.entity.OrderReportLog;
+import com.zy.asrs.mapper.OrderReportLogMapper;
+import com.zy.asrs.mapper.OrderReportMapper;
+import com.zy.asrs.service.OrderReportLogService;
+import com.zy.asrs.service.OrderReportService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+@Slf4j
+@Service("orderReportLogService")
+public class OrderReportLogServiceImpl extends ServiceImpl<OrderReportLogMapper, OrderReportLog> implements OrderReportLogService {
+
+
+}
diff --git a/src/main/java/com/zy/asrs/task/AutoLocMoveScheduler.java b/src/main/java/com/zy/asrs/task/AutoLocMoveScheduler.java
index fd83954..0d5d7c0 100644
--- a/src/main/java/com/zy/asrs/task/AutoLocMoveScheduler.java
+++ b/src/main/java/com/zy/asrs/task/AutoLocMoveScheduler.java
@@ -1,20 +1,14 @@
package com.zy.asrs.task;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.core.common.Cools;
-import com.zy.asrs.entity.BasCrnp;
-import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.service.AutoMoveService;
import com.zy.asrs.service.BasCrnpService;
import com.zy.asrs.service.WorkService;
import com.zy.asrs.service.WrkMastService;
import com.zy.asrs.task.handler.AutoLocMoveHandler;
import com.zy.common.properties.SlaveWmsParameterProperties;
-import com.zy.system.entity.Config;
import com.zy.system.service.ConfigService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
@Slf4j
@@ -37,48 +31,5 @@
@Autowired
private AutoMoveService autoMoveService;
- //瀹氭椂鍑哄簱 缁忓吀鍙屼几
-
- //瀹氭椂鍑哄簱
- @Scheduled(cron = "0/3 * * * * ? ")
- public void locToLoc11() {
- if (slaveWmsParameterProperties.isAutoLocMoveUnilateralBoolean()) {
- Config config = configService.selectConfigByCode("AutoLocMoveUnilateral");
- if (Cools.isEmpty(config) || config.getValue().equals("false")) {
- return;
- }
- int crnCount = basCrnpService.selectCount(new EntityWrapper<>());
- for (int crnNo = 1; crnNo < crnCount; crnNo++) {
- WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("io_type", 11).eq("crn_no", crnNo));
- WrkMast wrkMast1 = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("io_type", 111).eq("crn_no", crnNo));
- if (Cools.isEmpty(wrkMast) && Cools.isEmpty(wrkMast1)) {
- autoLocMoveHandler.start(crnNo, 11);
- }
- }
- }
- }
-
- //瀹氭椂鍏ュ簱
- @Scheduled(cron = "0/3 * * * * ? ")
- public void locToLoc111() {
- if (slaveWmsParameterProperties.isAutoLocMoveUnilateralBoolean()) {
- Config config = configService.selectConfigByCode("AutoLocMoveUnilateral");
- if (Cools.isEmpty(config) || config.getValue().equals("false")) {
- return;
- }
- int crnCount = basCrnpService.selectCount(new EntityWrapper<>());
- for (int crnNo = 1; crnNo < crnCount; crnNo++) {
- BasCrnp basCrnp = basCrnpService.selectById(crnNo);
- if (basCrnp == null) {
- continue;
- }
- WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("io_type", 111).eq("crn_no", crnNo));
- WrkMast wrkMast1 = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("io_type", 11).eq("crn_no", crnNo));
- if (Cools.isEmpty(wrkMast) && Cools.isEmpty(wrkMast1)) {
- autoLocMoveHandler.start(crnNo, 111);
- }
- }
- }
- }
}
diff --git a/src/main/java/com/zy/asrs/task/LocMoveAllScheduler.java b/src/main/java/com/zy/asrs/task/LocMoveAllScheduler.java
index 6015e93..b15f057 100644
--- a/src/main/java/com/zy/asrs/task/LocMoveAllScheduler.java
+++ b/src/main/java/com/zy/asrs/task/LocMoveAllScheduler.java
@@ -112,7 +112,6 @@
locMastEnd = locNo;
}
}
-// if (Cools.isEmpty(locMastStart) || Cools.isEmpty(locMastEnd)){
ReturnT<String> result = locMoveAllHandler.start(locMastStart, locMastEnd, basCrnp.getCrnNo());
if (!result.isSuccess()) {
diff --git a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
index 0765a21..93257c8 100644
--- a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
+++ b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
@@ -1,11 +1,20 @@
package com.zy.asrs.task;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.core.common.Cools;
+import com.zy.asrs.entity.*;
import com.zy.asrs.service.*;
+import com.zy.asrs.task.core.ReturnT;
import com.zy.asrs.task.handler.OrderSyncHandler;
+import com.zy.common.entity.Parameter;
+import com.zy.common.utils.Synchro;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
+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 2020/7/7
@@ -26,6 +35,10 @@
private OrderDetlReportService orderDetlReportService;
@Autowired
private OrderDetlReportLogService orderDetlReportLogService;
+ @Autowired
+ private OrderReportService orderReportService;
+ @Autowired
+ private OrderReportLogService orderReportLogService;
@Scheduled(cron = "0 0 1 * * ? ")
public void clearApiLog() {
@@ -36,31 +49,16 @@
}
}
- /* @Scheduled(cron = "0/30 * * * * ? ")
- public void clearReportLog() {
- try {
- List<OrderDetlReport> orderDetls = orderDetlReportService.selectList(new EntityWrapper<OrderDetlReport>());
- for (OrderDetlReport orderDetl : orderDetls) {
- OrderPakin order = orderService.selectByNo(orderDetl.getOrderNo());
- if (order == null) {
- OrderDetlReportLog orderDetlReportLog = new OrderDetlReportLog();
- orderDetlReportLog.sync(orderDetl);
- orderDetlReportLog.setId(null);
- orderDetlReportLogService.insert(orderDetlReportLog);
- orderDetlReportService.deleteById(orderDetl.getId());
- }
- }
- } catch (Exception e) {
- log.error("涓婃姤鏃ュ織鍒犻櫎", e);
- }
- }
+ /**
+ * 璁㈠崟鐘舵��4鑷�6,骞朵笖鍐欏叆涓婃姤琛�
+ */
@Scheduled(cron = "0/5 * * * * ? ")
@Async("orderThreadPool")
- public void completeAndReport() {
+ public void completeOrderPakin() {
String erpReport = Parameter.get().getErpReport();
if (!Cools.isEmpty(erpReport) && erpReport.equals("true")) {
- List<OrderPakin> orders = orderService.selectComplete();
+ List<OrderPakin> orders = orderPakinService.selectComplete();
for (OrderPakin order : orders) {
ReturnT<String> result = orderSyncHandler.start(order);
if (!result.isSuccess()) {
@@ -68,6 +66,48 @@
}
}
}
- }*/
+ }
+ /**
+ * 璁㈠崟鐘舵��4鑷�6,骞朵笖鍐欏叆涓婃姤琛�
+ */
+ @Scheduled(cron = "0/5 * * * * ? ")
+ @Async("orderThreadPool")
+ public void completeOrderPakout() {
+ String erpReport = Parameter.get().getErpReport();
+ if (!Cools.isEmpty(erpReport) && erpReport.equals("true")) {
+ List<OrderPakout> orders = orderPakoutService.selectComplete();
+ for (OrderPakout order : orders) {
+ ReturnT<String> result = orderSyncHandler.start(order);
+ if (!result.isSuccess()) {
+ log.error("鍗曟嵁[orderNo={}]涓婃姤erp澶辫触", order.getOrderNo());
+ }
+ }
+ }
+ }
+
+
+ //@Scheduled(cron = "0 0 3 * * ? ")
+ @Scheduled(cron = "0/5 * * * * ? ")
+ public void clearReportLog() {
+ try {
+ List<OrderReport> orderReports = orderReportService.selectList(new EntityWrapper<OrderReport>().eq("status", 1).eq("settle", 4));
+ for (OrderReport orderReport : orderReports) {
+ List<OrderDetlReportLog> orderId = orderDetlReportLogService.selectList(new EntityWrapper<OrderDetlReportLog>().eq("order_id", orderReport.getId()));
+ for (OrderDetlReportLog orderDetl : orderId) {
+ OrderDetlReportLog orderDetlReportLog = new OrderDetlReportLog();
+ orderDetlReportLog.sync(orderDetl);
+ orderDetlReportLog.setId(null);
+ orderDetlReportLogService.insert(orderDetlReportLog);
+ orderDetlReportService.deleteById(orderDetl.getId());
+ }
+ OrderReportLog reportLog = new OrderReportLog();
+ Synchro.Copy(orderReport, reportLog);
+ orderReportLogService.insert(reportLog);
+ orderReportService.deleteById(orderReport.getId());
+ }
+ } catch (Exception e) {
+ log.error("涓婃姤鏃ュ織鍒犻櫎", e);
+ }
+ }
}
diff --git a/src/main/java/com/zy/asrs/task/OverYearLogScheduler.java b/src/main/java/com/zy/asrs/task/OverYearLogScheduler.java
index aaea1ad..1d92492 100644
--- a/src/main/java/com/zy/asrs/task/OverYearLogScheduler.java
+++ b/src/main/java/com/zy/asrs/task/OverYearLogScheduler.java
@@ -19,7 +19,7 @@
@Autowired
private OverYearLogHandler overYearLogHandler;
- @Scheduled(cron = "0/3 * * * * ? ")
+ @Scheduled(cron = "0 0 2 * * ? ")
private void execute() {
ReturnT<String> returnT = overYearLogHandler.start();
if (!returnT.isSuccess()) {
diff --git a/src/main/java/com/zy/asrs/task/WorkMastScheduler.java b/src/main/java/com/zy/asrs/task/WorkMastScheduler.java
index 7f58192..036e5e8 100644
--- a/src/main/java/com/zy/asrs/task/WorkMastScheduler.java
+++ b/src/main/java/com/zy/asrs/task/WorkMastScheduler.java
@@ -1,21 +1,10 @@
package com.zy.asrs.task;
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.core.common.Cools;
-import com.core.exception.CoolException;
-import com.zy.asrs.entity.LocMast;
import com.zy.asrs.entity.WrkMast;
-import com.zy.asrs.entity.param.ShuttleMoveTask;
-import com.zy.asrs.entity.param.ShuttleOutTask;
-import com.zy.asrs.entity.param.ShuttleTask;
import com.zy.asrs.service.WrkMastService;
import com.zy.asrs.service.impl.LocMastServiceImpl;
import com.zy.asrs.task.core.ReturnT;
import com.zy.asrs.task.handler.WorkMastHandler;
-import com.zy.common.utils.HttpHandler;
-import com.zy.system.entity.Config;
import com.zy.system.service.ConfigService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -67,216 +56,4 @@
}
}
- @Scheduled(cron = "0/3 * * * * ? ") //鍏ュ簱浠诲姟涓嬪彂
- private void ShuttleInTaskSend() {
- procesMode();
- List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>()
- .eq("wrk_sts", 2).in("io_type", 1, 10, 53, 54, 57).eq("crn_no", 7));
- if (Cools.isEmpty(wrkMasts)) {
- return;
- }
-
- try {
- for (WrkMast wrkMast : wrkMasts) {
- if (wrkMast.getStaNo() == 1031) {
- Config config = configService.selectConfigByCode("2.5F_Mode");
- if (Cools.isEmpty(config) || config.getValue().equals("false")) {
- return;
- }
- if (config.getValue().equalsIgnoreCase("1")) {
- log.info("妯″紡涓嶅2");
- return;
- }
- }
- LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", wrkMast.getLocNo()));
- if (locMast == null) {
- throw new CoolException("涓嬪彂鍥涘悜杞cs浠诲姟澶辫触");
- }
-
- String loc;
- if ((locMast.getRow1() - 4) >= 10) {
- loc = (locMast.getRow1() - 4) + locMast.getLocNo().substring(2);
- } else {
- loc = "0" + (locMast.getRow1() - 4) + locMast.getLocNo().substring(2);
- }
- //String loc = (locMast.getRow1() - 4) + "-" + locMast.getBay1() + "-" + locMast.getLev1();
- ShuttleTask param = new ShuttleTask();
- param.setTaskNo(wrkMast.getWrkNo().toString());
- param.setLocNo(loc);
- param.setTaskNo2(Cools.isEmpty(wrkMast.getPltType()) ? null : wrkMast.getPltType().toString());
- param.setSourceStaNo(wrkMast.getSourceStaNo());
- param.setStaNo(wrkMast.getStaNo());
- param.setBarcode(wrkMast.getBarcode());
- //param.setPriority("11");
- String response = new HttpHandler.Builder()
- .setUri(shuttleWcsUrl)
- .setPath("/openapi/createInTask")
- .setJson(JSON.toJSONString(param))
- .build()
- .doPost();
- JSONObject jsonObject = JSON.parseObject(response);
- Integer code = jsonObject.getInteger("code");
- if (code.equals(200)) {
- wrkMast.setWrkSts(105L);
- wrkMast.setModiTime(new Date());
- if (!wrkMastService.updateById(wrkMast)) {
- log.error("宸ヤ綔妗workNo={}]鏍囪寰呭鐞嗗け璐�", wrkMast.getWrkNo());
- }
- }
- }
- } catch (Exception e) {
- throw new CoolException("涓嬪彂鍥涘悜杞cs浠诲姟澶辫触");
- }
-
- }
-
- @Scheduled(cron = "0/3 * * * * ? ") //鍑哄簱搴撲换鍔′笅鍙�
- private void ShuttleOutTaskSend() {
- procesMode();
- List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>()
- .in("io_type", 101, 110, 103, 104, 107)
- .eq("wrk_sts", 11).eq("crn_no", 7));
- if (Cools.isEmpty(wrkMasts)) {
- return;
- }
- try {
- for (WrkMast wrkMast : wrkMasts) {
- if (wrkMast.getStaNo() == 1031) {
- Config config = configService.selectConfigByCode("2.5F_Mode");
- if (Cools.isEmpty(config) || config.getValue().equals("false")) {
- return;
- }
- if (config.getValue().equalsIgnoreCase("2")) {
- log.info("妯″紡涓嶅2");
- return;
- }
- }
- LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", wrkMast.getSourceLocNo()));
- if (locMast == null) {
- throw new CoolException("涓嬪彂鍥涘悜杞cs浠诲姟澶辫触");
- }
- String loc;
- if ((locMast.getRow1() - 4) >= 10) {
- loc = (locMast.getRow1() - 4) + locMast.getLocNo().substring(2);
- } else {
- loc = "0" + (locMast.getRow1() - 4) + locMast.getLocNo().substring(2);
- }
- //String loc = (locMast.getRow1() - 4) + "-" + locMast.getBay1() + "-" + locMast.getLev1();
- ShuttleOutTask param = new ShuttleOutTask();
- param.setTaskNo(wrkMast.getWrkNo().toString());
- param.setSourceLocNo(loc);
- param.setStaNo(wrkMast.getStaNo());
- //param.setPriority("11");
- String response = new HttpHandler.Builder()
- .setUri(shuttleWcsUrl)
- .setPath("/openapi/createOutTask")
- .setJson(JSON.toJSONString(param))
- .build()
- .doPost();
- JSONObject jsonObject = JSON.parseObject(response);
- Integer code = jsonObject.getInteger("code");
- if (code.equals(200)) {
- wrkMast.setWrkSts(105L);
- wrkMast.setModiTime(new Date());
- if (!wrkMastService.updateById(wrkMast)) {
- log.error("宸ヤ綔妗workNo={}]鏍囪寰呭鐞嗗け璐�", wrkMast.getWrkNo());
- }
- }
- }
- } catch (Exception e) {
- throw new CoolException("涓嬪彂鍥涘悜杞cs浠诲姟澶辫触");
- }
-
- }
-
- // @Scheduled(cron = "0/3 * * * * ? ") //绉诲簱浠诲姟涓嬪彂
- private void ShuttleMoveTaskSend() {
- List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>().eq("wrk_sts", 11).eq("io_type", 11));
- if (wrkMasts.isEmpty()) {
- return;
- }
- try {
- for (WrkMast wrkMast : wrkMasts) {
- LocMast destLoc = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", wrkMast.getLocNo()));
- LocMast originLoc = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", wrkMast.getSourceLocNo()));
- if (originLoc == null || destLoc == null) {
- throw new CoolException("涓嬪彂鍥涘悜杞cs浠诲姟澶辫触");
- }
- String originLoc1 = (originLoc.getRow1() - 16) + "-" + originLoc.getBay1() + "-" + originLoc.getLev1();
- String destLoc1 = (destLoc.getRow1() - 16) + "-" + destLoc.getBay1() + "-" + destLoc.getLev1();
- ShuttleMoveTask param = new ShuttleMoveTask();
- param.setTaskNo(wrkMast.getWrkNo().toString());
- param.setOriginLoc(originLoc1);
- param.setDestLoc(destLoc1);
- param.setRecord(true);
- param.setPriority("11");
- String response = new HttpHandler.Builder()
- .setUri(shuttleWcsUrl)
- .setPath("/openapi/createLadenMoveTakeTask")
- .setJson(JSON.toJSONString(param))
- .build()
- .doPost();
- JSONObject jsonObject = JSON.parseObject(response);
- Integer code = jsonObject.getInteger("code");
- if (code.equals(200)) {
- wrkMast.setWrkSts(105L);
- if (!wrkMastService.updateById(wrkMast)) {
- log.error("宸ヤ綔妗workNo={}]鏍囪寰呭鐞嗗け璐�", wrkMast.getWrkNo());
- }
- }
- }
- } catch (Exception e) {
- throw new CoolException("涓嬪彂鍥涘悜杞cs浠诲姟澶辫触");
- }
-
- }
-
- //@Scheduled(cron = "0/3 * * * * ? ") //绉诲簱浠诲姟涓嬪彂
- public void switchMode() {
- procesMode();
- }
-
- //1:浠庡洓鍚戝簱鍒板爢鍨涙満搴�
- //2:浠庡爢鍨涙満搴撳埌鍥涘悜搴�
- private void procesMode() {
- Config config = configService.selectConfigByCode("2.5F_Mode");
- if (Cools.isEmpty(config) || config.getValue().equals("false")) {
- return;
- }
- List<WrkMast> wrkMastList1 = wrkMastService.selectList(new EntityWrapper<WrkMast>()
- .in("io_type", 1, 10).eq("crn_no", 1).eq("sta_no", 1131));
- List<WrkMast> wrkMastList2 = wrkMastService.selectList(new EntityWrapper<WrkMast>()
- .in("io_type", 101, 110).eq("crn_no", 7).eq("sta_no", 1031));
- if (wrkMastList1.isEmpty() && wrkMastList2.isEmpty()) {
- List<WrkMast> wrkMastList3 = wrkMastService.selectList(new EntityWrapper<WrkMast>()
- .in("io_type", 101, 110).eq("crn_no", 1).eq("sta_no", 1135));
- List<WrkMast> wrkMastList4 = wrkMastService.selectList(new EntityWrapper<WrkMast>()
- .in("io_type", 1, 10).eq("crn_no", 7).eq("sta_no", 1032));
- if (!wrkMastList3.isEmpty() || !wrkMastList4.isEmpty()) {
- if (!config.getValue().equalsIgnoreCase("2")) {
- log.info("瀛樺湪璋冩嫧浠诲姟鍘诲洓鍚戝簱,鍒囨崲妯″紡");
- config.setValue("2");
- configService.updateById(config);
- }
- } else {
- if (!config.getValue().equalsIgnoreCase("0")) {
- log.info("涓嶅瓨鍦ㄤ换鍔�");
- config.setValue("0");
- configService.updateById(config);
- }
- }
- } else {
- List<WrkMast> wrkMastList3 = wrkMastService.selectList(new EntityWrapper<WrkMast>()
- .in("io_type", 101, 110).eq("crn_no", 1).eq("sta_no", 1135));
- List<WrkMast> wrkMastList4 = wrkMastService.selectList(new EntityWrapper<WrkMast>()
- .in("io_type", 1, 10).eq("crn_no", 7).eq("sta_no", 1032));
- if (wrkMastList3.isEmpty() && wrkMastList4.isEmpty()) {
- if (!config.getValue().equalsIgnoreCase("1")) {
- log.info("瀛樺湪璋冩嫧浠诲姟鍘籨uiduo,鍒囨崲妯″紡");
- config.setValue("1");
- configService.updateById(config);
- }
- }
- }
- }
}
diff --git a/src/main/java/com/zy/asrs/task/core/WcsDispatcher.java b/src/main/java/com/zy/asrs/task/core/WcsDispatcher.java
deleted file mode 100644
index f11a940..0000000
--- a/src/main/java/com/zy/asrs/task/core/WcsDispatcher.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package com.zy.asrs.task.core;
-
-import com.zy.asrs.task.handler.WorkLogHandler;
-import com.zy.asrs.task.handler.WorkMastHandler;
-import com.zy.system.service.ConfigService;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
-
-/**
- * 鍗曠嚎绋嬫ā寮� 锛� 宸插純鐢� )
- * 浠诲姟涓績璋冨害鍣�
- * Created by vincent on 2020/7/4
- */
-//@Component
-@Deprecated
-public class WcsDispatcher {
-
- private static final Logger log = LoggerFactory.getLogger(WcsDispatcher.class);
- private Thread thread;
-
- @Autowired
- private WorkMastHandler workMastHandler;
- @Autowired
- private WorkLogHandler workLogHandler;
- @Autowired
- private ConfigService configService;
-
- @PostConstruct
- private void start() {
- thread = new Thread(() -> {
- while (!Thread.currentThread().isInterrupted()) {
- try {
- Thread.sleep(3000);
-
-// workMastHandler.start();
-//
-// workLogHandler.start();
-
- } catch (Exception e) {
- log.error("Exception", e);
- }
- }
- });
- thread.start();
- log.info("浠诲姟涓績璋冨害鍣ㄥ凡鍚姩......");
- }
-
- @PreDestroy
- public void shutDown() {
- if (thread != null)
- thread.interrupt();
- log.info("浠诲姟涓績璋冨害鍣ㄥ凡鍋滄......");
- }
-
-}
diff --git a/src/main/java/com/zy/asrs/task/handler/AutoLocMoveHandler.java b/src/main/java/com/zy/asrs/task/handler/AutoLocMoveHandler.java
index 6b5c8e4..bf91aef 100644
--- a/src/main/java/com/zy/asrs/task/handler/AutoLocMoveHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/AutoLocMoveHandler.java
@@ -36,49 +36,6 @@
@Autowired
private WorkService workService;
- @Transactional(isolation = Isolation.REPEATABLE_READ)
- public ReturnT<String> start(Integer crnNo, Integer ioType) {
- try {
- //11 绌挎绉诲崟杈�
- if (ioType == 11) {
- for (int bay = 1; bay < 27; bay++) {
- for (int lev = 1; lev < 6; lev++) {
- List<LocMast> locMasts = locMastService.selectLocMastShuttleMoveUnilateral(bay, lev, crnNo);
- if (!Cools.isEmpty(locMasts) && locMasts.size() < 4) {
- for (LocMast locMast : locMasts) {
- LocDetl locDetl = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("loc_no", locMast.getLocNo()));
-// StartupDto startupDto = commonService.getLocNo(crnNo == 1 ? 6 : 5, ioType, crnNo == 1 ? 917 : 918, locDetl.getMatnr(), locDetl.getBatch(),locDetl.getBrand(), null);
- StartupDto startupDto = commonService.getLocNo(ioType, crnNo == 1 ? 917 : 918, locDetl.getMatnr(), locDetl.getBatch(), locDetl.getBrand(), null, false);
- workService.locMove(locMast.getLocNo(), startupDto.getLocNo(), 9527L);
- }
- return SUCCESS;
- }
- }
- }
- } else {//11 鍗曡竟绉荤┛姊�
- List<Map<String, Object>> list = locDetlService.selectLocDetlUnilateralMoveShuttleMap(crnNo);//111 鍗曡竟绉荤┛姊�
- for (Map<String, Object> map : list) {
- String matnr = map.getOrDefault("matnr", "").toString();//鐗╂枡鍙�
- String batch = map.getOrDefault("batch", "").toString();//鎵瑰彿
- String grade = map.getOrDefault("brand", "").toString();//绛夌骇
- int count = Integer.parseInt(map.get("count").toString());//鍗曡竟搴撴暟閲�
- if (count < 4) {
- continue;
- }
- List<LocDetl> locDetlList = locDetlService.selectLocDetlUnilateralMoveShuttle(matnr, batch, grade, crnNo);
- for (LocDetl locDetl : locDetlList) {
-// StartupDto startupDto = commonService.getLocNo(crnNo == 1 ? 4 : 3, ioType, crnNo == 1 ? 901 : 932, locDetl.getMatnr(), locDetl.getBatch(), locDetl.getBrand(), null);
- StartupDto startupDto = commonService.getLocNo(ioType, crnNo == 1 ? 901 : 932, locDetl.getMatnr(), locDetl.getBatch(), locDetl.getBrand(), null, false);
- workService.locMove(locDetl.getLocNo(), startupDto.getLocNo(), 9527L);
- }
- }
- return SUCCESS;
- }
- } catch (Exception e) {
- log.error("鑷姩绉诲簱鍑洪敊,鍫嗗灈鏈哄彿{}锛屽伐浣滅被鍨媨}", crnNo, ioType);
- }
- return SUCCESS;
- }
}
diff --git a/src/main/java/com/zy/asrs/task/handler/OrderMoveHistoryHandler.java b/src/main/java/com/zy/asrs/task/handler/OrderMoveHistoryHandler.java
index 9734f40..5d1886d 100644
--- a/src/main/java/com/zy/asrs/task/handler/OrderMoveHistoryHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/OrderMoveHistoryHandler.java
@@ -39,13 +39,7 @@
List<OrderDetlPakin> orderDetlPakouts = orderDetlPakinService.selectList(new EntityWrapper<OrderDetlPakin>()
.eq("order_no", order.getOrderNo()));
moveBothPakin(order, orderDetlPakouts);
- List<OrderDetlReport> orderNo = orderDetlReportService.selectList(new EntityWrapper<OrderDetlReport>().eq("order_no", order.getOrderNo()));
- for (OrderDetlReport orderDetlReport : orderNo) {
- OrderDetlReportLog log = new OrderDetlReportLog();
- log.sync(orderDetlReport);
- orderDetlReportLogService.insert(log);
- orderDetlReportService.deleteById(orderDetlReport);
- }
+
log.info("宸插畬鎴愬崟鎹Щ鍔ㄨ嚦鍘嗗彶琛ㄦ垚鍔� =====>" + order);
}
return SUCCESS;
@@ -79,13 +73,6 @@
List<OrderDetlPakout> orderDetlPakouts = orderDetlPakoutService.selectList(new EntityWrapper<OrderDetlPakout>()
.eq("order_no", order.getOrderNo()));
moveBothPakout(order, orderDetlPakouts);
- List<OrderDetlReport> orderNo = orderDetlReportService.selectList(new EntityWrapper<OrderDetlReport>().eq("order_no", order.getOrderNo()));
- for (OrderDetlReport orderDetlReport : orderNo) {
- OrderDetlReportLog log = new OrderDetlReportLog();
- log.sync(orderDetlReport);
- orderDetlReportLogService.insert(log);
- orderDetlReportService.deleteById(orderDetlReport);
- }
log.info("宸插畬鎴愬崟鎹Щ鍔ㄨ嚦鍘嗗彶琛ㄦ垚鍔� =====>" + order);
}
return SUCCESS;
diff --git a/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java b/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
index fdbbce2..b4b4a8d 100644
--- a/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
@@ -1,6 +1,7 @@
package com.zy.asrs.task.handler;
import com.zy.asrs.entity.OrderPakin;
+import com.zy.asrs.entity.OrderPakout;
import com.zy.asrs.service.*;
import com.zy.asrs.task.AbstractHandler;
import com.zy.asrs.task.core.ReturnT;
@@ -41,4 +42,9 @@
return SUCCESS;
}
+ @Transactional
+ public ReturnT<String> start(OrderPakout order) {
+
+ return SUCCESS;
+ }
}
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 cd60675..055a6d3 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,13 +18,20 @@
@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_wrk_detl_log where dateadd(day,360,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,360,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();
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 c60379e..5d2fc58 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
@@ -57,7 +57,6 @@
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() + "]");
}
@@ -133,8 +132,7 @@
}
try {
if (!Cools.isEmpty(orderDetlPakout)) {
- if (!orderDetlPakinService.increaseQtyByOrderNo(wrkDetl.getOrderNo(), wrkDetl.getMatnr(),
- orderDetlPakout.getBatch(), wrkDetl.getAnfme())) {
+ if (!orderDetlPakinService.increaseQtyByOrderNo(wrkDetl.getOrderNo(), wrkDetl.getMatnr(), orderDetlPakout.getBatch(), wrkDetl.getAnfme())) {
// exceptionHandle("鍏ㄦ澘鍏ュ簱 ===>> 鏇存柊璁㈠崟瀹屾垚鏁伴噺澶辫触锛沎workNo={0}],[locNo={1}]",
// wrkMast.getWrkNo(), wrkMast.getLocNo());
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
@@ -187,8 +185,7 @@
}
try {
if (!Cools.isEmpty(orderDetlPakout)) {
- if (!orderDetlPakoutService.increaseQtyByOrderNo(wrkDetl.getOrderNo(), wrkDetl.getMatnr(),
- orderDetlPakout.getBatch(), wrkDetl.getAnfme())) {
+ if (!orderDetlPakoutService.increaseQtyByOrderNo(wrkDetl.getOrderNo(), wrkDetl.getMatnr(), orderDetlPakout.getBatch(), wrkDetl.getAnfme())) {
// exceptionHandle("鎷ｆ枡鍏ュ簱 ===>> 鏇存柊璁㈠崟瀹屾垚鏁伴噺澶辫触锛沎workNo={0}],[locNo={1}]",
// wrkMast.getWrkNo(), wrkMast.getLocNo());
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
@@ -254,8 +251,7 @@
}
try {
if (!Cools.isEmpty(orderDetlPakout)) {
- if (!orderDetlPakinService.increaseQtyByOrderNo(wrkDetl.getOrderNo(), wrkDetl.getMatnr(),
- orderDetlPakout.getBatch(), wrkDetl.getAnfme())) {
+ if (!orderDetlPakinService.increaseQtyByOrderNo(wrkDetl.getOrderNo(), wrkDetl.getMatnr(), orderDetlPakout.getBatch(), wrkDetl.getAnfme())) {
// exceptionHandle("鍏ㄦ澘鍏ュ簱 ===>> 鏇存柊璁㈠崟瀹屾垚鏁伴噺澶辫触锛沎workNo={0}],[locNo={1}]",
// wrkMast.getWrkNo(), wrkMast.getLocNo());
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
@@ -348,14 +344,6 @@
break;
}
- // 鏇存柊鍏ュ簱绔欑偣鐨勫叆搴撴殏瀛樻暟
- // int sourceStaNo = wrkMast.getSourceStaNo() == null ? 0 : wrkMast.getSourceStaNo();
-// if (sourceSite.get(sourceStaNo) != null) {
-// BasDevpMapper basDevpMapper = SpringUtils.getBean(BasDevpMapper.class);
-// BasDevp basDevp = basDevpMapper.selectById(sourceSite.get(sourceStaNo));
-// basDevp.setInQty(basDevp.getInQty() -1);
-// basDevpMapper.updateById(basDevp);
-// }
// 淇敼宸ヤ綔涓绘。鐘舵��
wrkMast.setWrkSts(5L);
@@ -388,59 +376,42 @@
// 鍏ㄦ澘鍑哄簱
case 101:
List<WrkDetl> wrkDetls101 = wrkDetlService.selectList(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkMast.getWrkNo()));
- if (wrkMast.getStaNo() == 1135) {
- //閭ｉ渶瑕佺敓鎴愪竴鏉″洓椤瑰簱鐨勫叆搴撲换鍔�
- workService.toSxk(wrkMast, wrkDetls101, (short) 1);
- } else if (wrkMast.getStaNo() == 1031) {
- //閭ｉ渶瑕佺敓鎴愪竴鏉″洓椤瑰簱鐨勫叆搴撲换鍔�
- workService.toCrn(wrkMast, wrkDetls101, (short) 1);
- } else {
- // 鍑哄簱纭淇″彿浣�
-// if (Cools.isEmpty(wrkMast.getInvWh()) || wrkMast.getInvWh().equals("N")) {
-// return SUCCESS;
-// }
- // 鏍规嵁宸ヤ綔鍙凤紝鏌ヨ宸ヤ綔鏄庣粏妗�
- if (wrkDetls101.isEmpty()) {
-// exceptionHandle("鍏ㄦ澘鍑哄簱 ===>> 宸ヤ綔鏄庣粏妗ｄ负绌猴紱[workNo={0}]", wrkMast.getWrkNo());
- TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
- return FAIL.setMsg("鍏ㄦ澘鍑哄簱 ===>> 宸ヤ綔鏄庣粏妗ｄ负绌�; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getSourceLocNo() + "]");
+
+
+ if (wrkDetls101.isEmpty()) {
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ return FAIL.setMsg("鍏ㄦ澘鍑哄簱 ===>> 宸ヤ綔鏄庣粏妗ｄ负绌�; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getSourceLocNo() + "]");
+ }
+ for (WrkDetl wrkDetl : wrkDetls101) {
+ // 鏇存柊璁㈠崟瀹屾垚鏁伴噺
+ OrderDetlPakout orderDetlPakout = orderDetlPakoutService.selectItem(wrkDetl.getOrderNo(), wrkDetl.getMatnr(), wrkDetl.getBatch());
+ if (orderDetlPakout == null) {
+ orderDetlPakout = orderDetlPakoutService.selectItem(wrkDetl.getOrderNo(), wrkDetl.getMatnr(), null);
}
- for (WrkDetl wrkDetl : wrkDetls101) {
- // 鏇存柊璁㈠崟瀹屾垚鏁伴噺
- OrderDetlPakout orderDetlPakout = orderDetlPakoutService.selectItem(wrkDetl.getOrderNo(), wrkDetl.getMatnr(), wrkDetl.getBatch());
- if (orderDetlPakout == null) {
- orderDetlPakout = orderDetlPakoutService.selectItem(wrkDetl.getOrderNo(), wrkDetl.getMatnr(), null);
- }
- try {
- if (!Cools.isEmpty(orderDetlPakout)) {
- if (!orderDetlPakoutService.increaseQtyByOrderNo(wrkDetl.getOrderNo(), wrkDetl.getMatnr(),
- orderDetlPakout.getBatch(), wrkDetl.getAnfme())) {
-// exceptionHandle("鍏ㄦ澘鍑哄簱 ===>> 鏇存柊璁㈠崟瀹屾垚鏁伴噺澶辫触锛沎workNo={0}],[locNo={1}]",
-// wrkMast.getWrkNo(), wrkMast.getLocNo());
- TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
- return FAIL.setMsg("鍏ㄦ澘鍑哄簱 ===>> 鏇存柊璁㈠崟瀹屾垚鏁伴噺澶辫触; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getSourceLocNo() + "]");
- }
+ try {
+ if (!Cools.isEmpty(orderDetlPakout)) {
+ if (!orderDetlPakoutService.increaseQtyByOrderNo(wrkDetl.getOrderNo(), wrkDetl.getMatnr(), orderDetlPakout.getBatch(), wrkDetl.getAnfme())) {
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ return FAIL.setMsg("鍏ㄦ澘鍑哄簱 ===>> 鏇存柊璁㈠崟瀹屾垚鏁伴噺澶辫触; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getSourceLocNo() + "]");
}
- } catch (Exception ignore) {
}
+ } catch (Exception ignore) {
}
- // 鍒犻櫎宸ヤ綔妗ｆ簮搴撲綅鐨勫簱瀛樻槑缁�
- if (!locDetlService.delete(new EntityWrapper<LocDetl>().eq("loc_no", wrkMast.getSourceLocNo()))) {
-// exceptionHandle("鍏ㄦ澘鍑哄簱 ===>> 鍒犻櫎搴撳瓨鏄庣粏澶辫触锛沎workNo={0}],[sourceLocNo={1}]", wrkMast.getWrkNo(), wrkMast.getSourceLocNo());
+ }
+ // 鍒犻櫎宸ヤ綔妗ｆ簮搴撲綅鐨勫簱瀛樻槑缁�
+ if (!locDetlService.delete(new EntityWrapper<LocDetl>().eq("loc_no", wrkMast.getSourceLocNo()))) {
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ return FAIL.setMsg("鍏ㄦ澘鍑哄簱 ===>> 鍒犻櫎搴撳瓨鏄庣粏澶辫触; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getSourceLocNo() + "]");
+ }
+ // 淇敼婧愬簱浣嶇姸鎬� R ===>> O
+ if (locMast.getLocSts().equals("R")) {
+ locMast.setLocSts("O");
+ locMast.setBarcode("");
+ locMast.setModiTime(now);
+ locMast.setIoTime(now);
+ if (!locMastService.updateById(locMast)) {
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
- return FAIL.setMsg("鍏ㄦ澘鍑哄簱 ===>> 鍒犻櫎搴撳瓨鏄庣粏澶辫触; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getSourceLocNo() + "]");
- }
- // 淇敼婧愬簱浣嶇姸鎬� R ===>> O
- if (locMast.getLocSts().equals("R")) {
- locMast.setLocSts("O");
- locMast.setBarcode("");
- 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() + "]");
- }
+ return FAIL.setMsg("鍏ㄦ澘鍑哄簱 ===>> 淇敼婧愬簱浣嶇姸鎬佸け璐�; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getSourceLocNo() + "]");
}
}
break;
@@ -453,7 +424,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() + "]");
}
@@ -466,7 +436,6 @@
wrkMast.setWrkSts(15L);
wrkMast.setModiTime(now);
if (!wrkMastService.updateById(wrkMast)) {
-// exceptionHandle("鏇存柊鍑哄簱瀹屾垚鐘舵�佸け璐�;[workNo={0}]", wrkMast.getWrkNo());
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
return FAIL.setMsg("鏇存柊鍑哄簱瀹屾垚鐘舵�佸け璐�; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getSourceLocNo() + "]");
}
diff --git a/src/main/java/com/zy/system/timer/LoadingConfigTimer.java b/src/main/java/com/zy/system/timer/LoadingConfigTimer.java
index 32d5ac0..12e4a0a 100644
--- a/src/main/java/com/zy/system/timer/LoadingConfigTimer.java
+++ b/src/main/java/com/zy/system/timer/LoadingConfigTimer.java
@@ -23,6 +23,11 @@
* token鏁伴噺闄愬埗
*/
private Integer tokenNumber = 1;
+ /**
+ * 鍒犻櫎澶╂暟
+ */
+ private Integer logDeleteDays = 360;
+
@Autowired
@@ -32,6 +37,7 @@
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/webapp/static/js/locMast/locMast.js b/src/main/webapp/static/js/locMast/locMast.js
index 20e5195..f515470 100644
--- a/src/main/webapp/static/js/locMast/locMast.js
+++ b/src/main/webapp/static/js/locMast/locMast.js
@@ -29,6 +29,7 @@
// ,{field: 'locSts', align: 'center',title: ''}
// ,{field: 'sheetNo', align: 'center',title: ''}
,{field: 'crnNo', align: 'center',title: '鍫嗗灈鏈哄彿', hide:false}
+ ,{field: 'locType1$', align: 'center',title: '楂樹綆绫诲瀷', hide:false}
,{field: 'row1', align: 'center',title: '鎺�', sort:true, hide:false}
,{field: 'bay1', align: 'center',title: '鍒�', sort:true, hide:false}
,{field: 'lev1', align: 'center',title: '灞�', sort:true, hide:false}
@@ -55,7 +56,7 @@
// ,{field: 'barcode', align: 'center',title: ''}
// ,{field: 'PdcType', align: 'center',title: ''}
// ,{field: 'ctnNo', align: 'center',title: ''}
- ,{field: 'locType1$', align: 'center',title: '楂樹綆绫诲瀷', hide:true}
+
,{field: 'locType2$', align: 'center',title: '瀹界獎绫诲瀷', hide:true}
,{field: 'locType3$', align: 'center',title: '杞婚噸绫诲瀷', hide:true}
diff --git a/src/main/webapp/static/js/order/orderPakin.js b/src/main/webapp/static/js/order/orderPakin.js
index f85e12f..11bb4fe 100644
--- a/src/main/webapp/static/js/order/orderPakin.js
+++ b/src/main/webapp/static/js/order/orderPakin.js
@@ -17,6 +17,7 @@
url: baseUrl+"/docType/list/auth",
headers: {'token': localStorage.getItem('token')},
data: {
+ pakin: 1,
limit: 9999
},
method: 'POST',
@@ -36,7 +37,7 @@
// 娓叉煋琛ㄦ牸
var insTb = table.render({
elem: '#order',
- url: baseUrl+'/order/head/page/auth',
+ url: baseUrl+'/pakin/order/head/page/auth',
headers: {token: localStorage.getItem('token')},
page: true,
cellMinWidth: 100,
@@ -116,7 +117,7 @@
table.render({
elem: '#lookSSXMTable',
headers: {token: localStorage.getItem('token')},
- url: baseUrl+'/orderDetl/list/auth',
+ url: baseUrl+'/pakin/orderDetl/list/auth',
where: {
order_id: data.id
},
@@ -173,7 +174,7 @@
// 鐩戝惉琛屽伐鍏蜂簨浠�
table.on('tool(lookSSXMTable)', function(obj) {
$.ajax({
- url: baseUrl+"/orderDetl/getPrintDetl/" + obj.data.id,
+ url: baseUrl+"/pakin/orderDetl/getPrintDetl/" + obj.data.id,
headers: {'token': localStorage.getItem('token'),'Content-Type' :'application/json'},
method: 'GET',
async: false,
@@ -241,7 +242,7 @@
}
layer.load(2);
$.ajax({
- url: baseUrl+"/order/form/" + (isExpAdd?"add":"modify") + "/auth",
+ url: baseUrl+"/pakin/order/form/" + (isExpAdd?"add":"modify") + "/auth",
headers: {'token': localStorage.getItem('token')},
data: JSON.stringify({
orderId: Number(data.field.id),
@@ -294,7 +295,7 @@
};
if (!isExpAdd) {
$.ajax({
- url: baseUrl+"/order/detl/all/auth?orderId=" + expTpe.id,
+ url: baseUrl+"/pakin/order/detl/all/auth?orderId=" + expTpe.id,
headers: {'token': localStorage.getItem('token')},
method: 'GET',
async: false,
@@ -455,7 +456,7 @@
layer.close(i);
layer.load(2);
$.ajax({
- url: baseUrl+"/order/delete/auth",
+ url: baseUrl+"/pakin/order/delete/auth",
headers: {'token': localStorage.getItem('token')},
data: {
orderId: orderId
@@ -491,7 +492,7 @@
console.log(orderId);
console.log(settle);
$.ajax({
- url: baseUrl+"/order/update/auth",
+ url: baseUrl+"/pakin/order/update/auth",
headers: {'token': localStorage.getItem('token')},
data: {
id: orderId,
@@ -522,7 +523,7 @@
function showWrkTrace(orderId) {
let loadIndex = layer.msg('璇锋眰涓�...', {icon: 16, shade: 0.01, time: false});
$.ajax({
- url: baseUrl+"/order/wrk/trace/auth",
+ url: baseUrl+"/pakin/order/wrk/trace/auth",
headers: {'token': localStorage.getItem('token')},
data: {
orderId: orderId
diff --git a/src/main/webapp/static/js/order/orderPakout.js b/src/main/webapp/static/js/order/orderPakout.js
index f85e12f..447d6cc 100644
--- a/src/main/webapp/static/js/order/orderPakout.js
+++ b/src/main/webapp/static/js/order/orderPakout.js
@@ -17,6 +17,7 @@
url: baseUrl+"/docType/list/auth",
headers: {'token': localStorage.getItem('token')},
data: {
+ pakout: 1,
limit: 9999
},
method: 'POST',
@@ -36,7 +37,7 @@
// 娓叉煋琛ㄦ牸
var insTb = table.render({
elem: '#order',
- url: baseUrl+'/order/head/page/auth',
+ url: baseUrl+'/pakout/order/head/page/auth',
headers: {token: localStorage.getItem('token')},
page: true,
cellMinWidth: 100,
@@ -116,7 +117,7 @@
table.render({
elem: '#lookSSXMTable',
headers: {token: localStorage.getItem('token')},
- url: baseUrl+'/orderDetl/list/auth',
+ url: baseUrl+'/pakout/orderDetl/list/auth',
where: {
order_id: data.id
},
@@ -173,7 +174,7 @@
// 鐩戝惉琛屽伐鍏蜂簨浠�
table.on('tool(lookSSXMTable)', function(obj) {
$.ajax({
- url: baseUrl+"/orderDetl/getPrintDetl/" + obj.data.id,
+ url: baseUrl+"/pakout/orderDetl/getPrintDetl/" + obj.data.id,
headers: {'token': localStorage.getItem('token'),'Content-Type' :'application/json'},
method: 'GET',
async: false,
@@ -241,7 +242,7 @@
}
layer.load(2);
$.ajax({
- url: baseUrl+"/order/form/" + (isExpAdd?"add":"modify") + "/auth",
+ url: baseUrl+"/pakout/order/form/" + (isExpAdd?"add":"modify") + "/auth",
headers: {'token': localStorage.getItem('token')},
data: JSON.stringify({
orderId: Number(data.field.id),
@@ -294,7 +295,7 @@
};
if (!isExpAdd) {
$.ajax({
- url: baseUrl+"/order/detl/all/auth?orderId=" + expTpe.id,
+ url: baseUrl+"/pakout/order/detl/all/auth?orderId=" + expTpe.id,
headers: {'token': localStorage.getItem('token')},
method: 'GET',
async: false,
@@ -455,7 +456,7 @@
layer.close(i);
layer.load(2);
$.ajax({
- url: baseUrl+"/order/delete/auth",
+ url: baseUrl+"/pakout/order/delete/auth",
headers: {'token': localStorage.getItem('token')},
data: {
orderId: orderId
@@ -491,7 +492,7 @@
console.log(orderId);
console.log(settle);
$.ajax({
- url: baseUrl+"/order/update/auth",
+ url: baseUrl+"/pakout/order/update/auth",
headers: {'token': localStorage.getItem('token')},
data: {
id: orderId,
@@ -522,7 +523,7 @@
function showWrkTrace(orderId) {
let loadIndex = layer.msg('璇锋眰涓�...', {icon: 16, shade: 0.01, time: false});
$.ajax({
- url: baseUrl+"/order/wrk/trace/auth",
+ url: baseUrl+"/pakout/order/wrk/trace/auth",
headers: {'token': localStorage.getItem('token')},
data: {
orderId: orderId
diff --git a/src/main/webapp/static/js/order/out.js b/src/main/webapp/static/js/order/out.js
index 2338842..cdd2a12 100644
--- a/src/main/webapp/static/js/order/out.js
+++ b/src/main/webapp/static/js/order/out.js
@@ -21,7 +21,7 @@
insTb2 = table.render({
elem: '#orderDetlTable',
headers: {token: localStorage.getItem('token')},
- url: baseUrl+'/orderDetl/pakout/list/auth',
+ url: baseUrl+'/pakout/orderDetl/pakout/list/auth',
page: true,
limit: 15,
limits: [15, 30, 50, 100, 200, 500],
diff --git a/src/main/webapp/static/js/orderReport/orderReport.js b/src/main/webapp/static/js/orderReport/orderReport.js
index f85e12f..8e80e31 100644
--- a/src/main/webapp/static/js/orderReport/orderReport.js
+++ b/src/main/webapp/static/js/orderReport/orderReport.js
@@ -36,7 +36,7 @@
// 娓叉煋琛ㄦ牸
var insTb = table.render({
elem: '#order',
- url: baseUrl+'/order/head/page/auth',
+ url: baseUrl+'/report/order/head/page/auth',
headers: {token: localStorage.getItem('token')},
page: true,
cellMinWidth: 100,
diff --git a/src/main/webapp/views/order/orderPakout.html b/src/main/webapp/views/order/orderPakout.html
index b5bfb1b..c435e25 100644
--- a/src/main/webapp/views/order/orderPakout.html
+++ b/src/main/webapp/views/order/orderPakout.html
@@ -343,7 +343,7 @@
<script type="text/javascript" src="../../static/js/echarts/echarts.min.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/order/orderPakout.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/order/orderPakout.js?v=1" charset="utf-8"></script>
<script type="text/template" id="docTypeTpl">
<option value="">閫夋嫨绫诲瀷</option>
diff --git a/src/main/webapp/views/orderReport/orderReport.html b/src/main/webapp/views/orderReport/orderReport.html
index 78dd2e4..e0fdd95 100644
--- a/src/main/webapp/views/orderReport/orderReport.html
+++ b/src/main/webapp/views/orderReport/orderReport.html
@@ -68,9 +68,8 @@
<div class="layui-input-inline">
<select name="settle">
<option value="">閫夋嫨鐘舵��</option>
- <option value="1">寰呭鐞�</option>
- <option value="2">浣滀笟涓�</option>
- <option value="4">宸插畬鎴�</option>
+ <option value="4">寰呬笂鎶�</option>
+ <option value="5">涓婃姤澶辫触</option>
<option value="6">涓婃姤瀹屾垚</option>
</select>
</div>
@@ -97,12 +96,9 @@
<div id="box" style="display: block"></div>
<!-- 琛ㄦ牸鎿嶄綔鍒� -->
<script type="text/html" id="operate">
- {{# if (d.settle == 0 || d.settle == 1) { }}
- <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-delete" lay-event="del">鍒犻櫎</a>
- {{# } }}
- {{# if (d.settle == 2) { }}
- <a class="layui-btn layui-btn-primary layui-border-blue layui-btn-xs btn-complete" lay-event="complete">瀹岀粨</a>
+ {{# if (d.settle == 5 ) { }}
+ <a class="layui-btn layui-btn-primary layui-btn-xs btn-edit" lay-event="edit">閲嶆柊涓婃姤</a>
+
{{# } }}
</script>
<!-- 琛ㄦ牸鎿嶄綔鍒� -->
@@ -343,7 +339,7 @@
<script type="text/javascript" src="../../static/js/echarts/echarts.min.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/order/orderPakin.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/orderReport/orderReport.js" charset="utf-8"></script>
<script type="text/template" id="docTypeTpl">
<option value="">閫夋嫨绫诲瀷</option>
--
Gitblit v1.9.1