From 0379bbe120f509f8c330713958b59687d25b80b3 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期六, 08 二月 2025 16:34:50 +0800
Subject: [PATCH] 兼容四期
---
src/main/webapp/views/orderView/orderView.html | 2
src/main/java/com/zy/asrs/controller/OrderController.java | 156 +++++++++++++++++++++++++
src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java | 50 +++++++-
src/main/java/com/zy/asrs/controller/AgvLocDetlController.java | 3
src/main/webapp/static/js/orderView/orderView.js | 6
src/main/webapp/views/order/order.html | 6
src/main/java/com/zy/asrs/controller/OrderLogController.java | 8 +
src/main/java/com/zy/common/service/AgvCommonService.java | 6
src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java | 30 ++--
src/main/java/com/zy/asrs/utils/LocUtils.java | 16 +-
src/main/webapp/static/js/order/order.js | 32 +++++
src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java | 6
src/main/java/com/zy/asrs/task/ReportDataScheduler.java | 2
13 files changed, 283 insertions(+), 40 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/AgvLocDetlController.java b/src/main/java/com/zy/asrs/controller/AgvLocDetlController.java
index 63c9e80..d2adaec 100644
--- a/src/main/java/com/zy/asrs/controller/AgvLocDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/AgvLocDetlController.java
@@ -157,6 +157,9 @@
// }
if (Cools.isEmpty(orderDetl)) {
record.setStock(0D);
+ if (!Cools.isEmpty(orderNo)) {
+ record.setOrderNo(orderNo);
+ }
} else {
record.setStock(orderDetl.getAnfme() - orderDetl.getQty());
record.setOrderNo(orderDetl.getOrderNo());
diff --git a/src/main/java/com/zy/asrs/controller/OrderController.java b/src/main/java/com/zy/asrs/controller/OrderController.java
index 29a40fd..a03bba3 100644
--- a/src/main/java/com/zy/asrs/controller/OrderController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderController.java
@@ -1,6 +1,5 @@
package com.zy.asrs.controller;
-import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
@@ -31,7 +30,6 @@
import java.io.IOException;
import java.io.InputStream;
import java.util.*;
-import java.util.stream.Collectors;
@Slf4j
@RestController
@@ -1320,6 +1318,160 @@
}
+ /**
+ * excel瀵煎叆
+ */
+ @PostMapping(value = "/order/excel/import3/auth")
+ @ManagerAuth(memo = "鍗曟嵁Excel瀵煎叆")
+ @Transactional
+ public R cstmrExcelImport3(MultipartFile file) throws IOException {
+ InputStream inStream = file.getInputStream();
+ String fileMime = file.getContentType();
+ int excelVersion = 2007;
+ if ("application/vnd.ms-excel".equals(fileMime)) {
+ excelVersion = 2003;
+ }
+ Workbook book = null;
+ try {
+ if (excelVersion == 2003) {
+ book = new HSSFWorkbook(inStream);
+ } else { // 褰� excel 鏄� 2007 鏃�
+ book = new XSSFWorkbook(inStream);
+ }
+ } catch (Exception e) {
+ log.error("fail", e);
+ return R.error("瀵煎叆鏂囦欢鏍煎紡閿欒锛岃浣跨敤xls鍚庣紑鐨勬枃浠讹紒");
+ }
+
+ Sheet sheet = book.getSheetAt(0);
+ int totalRows = sheet.getLastRowNum() + 1; // 鎬�
+ Long userId = getUserId();
+ Date now = new Date();
+ DataFormatter dataFormatter = new DataFormatter();
+ for (int i = 1; i < totalRows; i++) {
+ Integer proSts = 0;
+ Row row = sheet.getRow(i);
+ //鍗曟嵁绫诲瀷
+ String docName = dataFormatter.formatCellValue(row.getCell(0)).trim();
+ //鍗曟嵁缂栧彿
+ String uuid = dataFormatter.formatCellValue(row.getCell(1)).trim();
+ //鐗╂枡鍙�
+ String matnr = dataFormatter.formatCellValue(row.getCell(2)).trim();
+ //閿�鍞崟鍙�
+ String csocode = dataFormatter.formatCellValue(row.getCell(3)).trim();
+ //鑷敱椤�
+ String isocode = dataFormatter.formatCellValue(row.getCell(4)).trim();
+ // 鏁伴噺
+ if (Cools.isEmpty(dataFormatter.formatCellValue(row.getCell(5)))) {
+ continue;
+ }
+ Double anfme = Double.parseDouble(dataFormatter.formatCellValue(row.getCell(5)));
+
+ Mat mat = matService.selectByMatnr(matnr);
+ if (null == mat) {
+ throw new CoolException(matnr + "鍟嗗搧缂栫爜鐨勫晢鍝佷笉瀛樺湪锛岃閲嶆柊瀵煎叆锛�");
+ }
+ DocType docType = docTypeService.selectOne(new EntityWrapper<DocType>().eq("doc_name", docName));
+
+ String odNo = uuid;
+ if (docName.contains("璋冩嫧鍗�")) {
+ odNo = "DB" + odNo;
+ } else if (docName.contains("鍔犲伐鍗�")) {
+ odNo = "JG" + odNo;
+ }else {
+ if (docType.getPakin() == 1) {
+ odNo += "_I";
+ } else {
+ odNo += "_O";
+ }
+ }
+ Date date = new Date();
+ Order order = orderService.selectByNo(odNo);
+ if (null == order) {
+ order = new Order(
+ String.valueOf(snowflakeIdWorker.nextId()), // 缂栧彿[闈炵┖]
+ odNo, // 璁㈠崟缂栧彿
+ DateUtils.convert(date), // 鍗曟嵁鏃ユ湡
+ 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, // 鐘舵��
+ userId, // 娣诲姞浜哄憳
+ now, // 娣诲姞鏃堕棿
+ userId, // 淇敼浜哄憳
+ now, // 淇敼鏃堕棿
+ null // 澶囨敞
+ );
+ if (!orderService.insert(order)) {
+ throw new CoolException("鐢熸垚鍗曟嵁涓绘。澶辫触锛岃閲嶆柊瀵煎叆锛�");
+ }
+ } else {
+ // 鏈夊師璁㈠崟鍦ㄧ殑鎯呭喌
+ DocType orderType = docTypeService.selectById(order.getDocType());
+ if (!orderType.getDocName().equals(docName)) {
+ throw new CoolException("鏂拌鍗曪細" + uuid + " 涓庣郴缁熷唴鐨勮鍗曞彿鐩稿悓锛屽崟鎹被鍨嬩笉鍚屻�傝纭鏂拌鍗曞崟鎹被鍨嬶紒");
+ }
+ order.setSettle(order.getSettle() == 1L ? 1L : 2L);
+ orderService.updateById(order);
+ }
+
+ OrderDetl orderDetl = orderDetlService.selectItem(order.getId(), matnr, null, csocode, isocode);
+ if (orderDetl == null) {
+ orderDetl = new OrderDetl();
+ orderDetl.sync(mat);
+ orderDetl.setSource(docType.getDocId().intValue());
+ orderDetl.setBatch(null);
+ orderDetl.setAnfme(anfme);
+ orderDetl.setOrderId(order.getId());
+ orderDetl.setOrderNo(order.getOrderNo());
+ orderDetl.setCreateBy(userId);
+ orderDetl.setCreateTime(now);
+ orderDetl.setUpdateBy(userId);
+ orderDetl.setUpdateTime(now);
+ orderDetl.setThreeCode(csocode);
+ orderDetl.setDeadTime(isocode);
+ orderDetl.setStatus(1);
+ orderDetl.setQty(0.0D);
+ orderDetl.setProcessSts(proSts);
+ if (!orderDetlService.insert(orderDetl)) {
+ throw new CoolException("鐢熸垚鍗曟嵁鏄庣粏澶辫触锛岃閲嶆柊瀵煎叆锛�");
+ }
+ } else {
+ if (anfme < 0) {
+ throw new CoolException("璁㈠崟鏁伴噺涓嶅厑璁镐负璐熸暟锛�");
+ }
+ if (!orderDetlService.increaseAnfme(order.getId(), matnr, null, anfme, csocode, isocode)) {
+ throw new CoolException("鐢熸垚鍗曟嵁鏄庣粏澶辫触锛岃閲嶆柊瀵煎叆锛�");
+ }
+ }
+
+ }
+ return R.ok("瀵煎叆鎴愬姛");
+ }
+
+
// @RequestMapping(value = "/order/sync")
// @Transactional
// public R sync() {
diff --git a/src/main/java/com/zy/asrs/controller/OrderLogController.java b/src/main/java/com/zy/asrs/controller/OrderLogController.java
index 379fdbd..237e355 100644
--- a/src/main/java/com/zy/asrs/controller/OrderLogController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderLogController.java
@@ -1,5 +1,6 @@
package com.zy.asrs.controller;
+import com.alibaba.excel.EasyExcel;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
@@ -8,13 +9,17 @@
import com.core.common.*;
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.result.WrkTraceVo;
+import com.zy.asrs.excel.CloseOrderReadListener;
+import com.zy.asrs.excel.ExcelOrder;
import com.zy.asrs.service.*;
import com.zy.common.web.BaseController;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import java.io.IOException;
import java.util.*;
@Slf4j
@@ -40,6 +45,9 @@
@Autowired
private MatService matService;
+ @Autowired
+ private OrderService orderService;
+
@RequestMapping(value = "/orderLog/nav/list/auth")
@ManagerAuth
public R navList(@RequestParam(required = false) String orderNo){
diff --git a/src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java
index fbf95e5..d702e36 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java
@@ -1,6 +1,5 @@
package com.zy.asrs.service.impl;
-import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
@@ -8,7 +7,10 @@
import com.core.common.Cools;
import com.core.common.SnowflakeIdWorker;
import com.core.exception.CoolException;
-import com.zy.asrs.entity.*;
+import com.zy.asrs.entity.AgvLocDetl;
+import com.zy.asrs.entity.AgvLocMast;
+import com.zy.asrs.entity.AgvWrkDetl;
+import com.zy.asrs.entity.OrderDetl;
import com.zy.asrs.mapper.AgvLocDetlMapper;
import com.zy.asrs.service.*;
import com.zy.asrs.utils.Utils;
@@ -93,18 +95,20 @@
}
- public double queryStockAndSetLocDto(String matnr, String batch, String orderNo, List<LocDto> locDtoList, double issued, String csocode, String isoseq, String type) {
+ public double queryStockAndSetLocDto(String matnr, String batch, String orderNo, List<LocDto> locDtoList, double issued, String csocode, String isoseq, String type2) {
//鏍规嵁鐗╂枡鍙峰拰鎵规鎵惧埌瀵瑰簲鐨勫簱瀛橈紝骞朵笖鎸夌収淇敼鏃堕棿鎺掑簭
Wrapper<AgvLocDetl> wrapper = new EntityWrapper<AgvLocDetl>().eq("matnr", matnr).orderBy("modi_time");
- if (type != null) {
- wrapper.notLike("loc_no", "F1");
- }
+// if (type != null) {
+// wrapper.notLike("loc_no", "F1");
+// }
wapperSetCondition(wrapper, "batch", batch);
wapperSetCondition(wrapper, "three_code", csocode);
- wapperSetCondition(wrapper, "dead_time", isoseq);
+ //wapperSetCondition(wrapper, "dead_time", isoseq);
if ("JG".equals(orderNo.substring(0, 2))) {
wapperSetCondition(wrapper, "process_sts", "1");
+ } else {
+ wrapper.ne("process_sts", "1");
}
List<AgvLocDetl> agvLocDetls = this.selectList(wrapper);
@@ -136,7 +140,37 @@
//locDto.setAgvStaNos(queryAgvStaNosByFloor(floor));
//鍥涙湡
//locDto.setAgvStaNos(agvBasDevpService.selectCacheShelvesStationCodeByLocType(agvLocMast.getLocType1(), floor));
- locDto.setAgvStaNos(agvBasDevpService.selectCacheShelvesStationCodeByLocType(agvLocMast.getLocType1()));
+
+ List<String> strings = agvBasDevpService.selectCacheShelvesStationCodeByLocType(agvLocMast.getLocType1());
+ List<String> agvStaNos = new ArrayList<>();
+ if (agvLocDetl.getLocNo().contains("01F1")) {
+ for (String string : strings) {
+ if (string.contains("F1") || string.contains("F4")) {
+ agvStaNos.add(string);
+ }
+ }
+ } else if (agvLocDetl.getLocNo().contains("02F1")) {
+ for (String string : strings) {
+ if (string.contains("F1") || string.contains("F4")) {
+ agvStaNos.add(string);
+ }
+ }
+ } else if (agvLocDetl.getLocNo().contains("F2")) {
+ for (String string : strings) {
+ if (string.contains("F2") || string.contains("F4")) {
+ agvStaNos.add(string);
+ }
+ }
+ } else if (agvLocDetl.getLocNo().contains("F3")) {
+ for (String string : strings) {
+ if (string.contains("F3")) {
+ agvStaNos.add(string);
+ }
+ }
+ } else {
+ agvStaNos = strings;
+ }
+ locDto.setAgvStaNos(agvStaNos);
locDtoList.add(locDto);
issued -= anfme;
diff --git a/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java
index b869eb7..f3158bd 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java
@@ -801,7 +801,11 @@
}
//瀵绘壘鐩稿簲绫诲瀷鐨勭┖璐ф灦
- AgvLocMast agvLocMast = agvLocMastService.selectEmptyZpallet(containerType, agvBasDevp.getFloor());
+ Integer floor = agvBasDevp.getFloor();
+ if (floor == 4) {
+ floor = 1;
+ }
+ AgvLocMast agvLocMast = agvLocMastService.selectEmptyZpallet(containerType, floor);
if (containerType == 0) {
//绌烘澘鑷姩鍑哄簱锛屾牴鎹珯鐐圭被鍨嬮�夋嫨
agvLocMastService.selectEmptyZpalletByLocType1(agvBasDevp.getLocType1());
diff --git a/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
index 0882598..56677f2 100644
--- a/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
@@ -126,15 +126,14 @@
// 濡傛灉 浣滀笟鏁伴噺绛変簬鍗曟嵁鎬绘暟閲� && 宸ヤ綔鏄庣粏妗ｄ腑鏃犺鍗曟嵁鐨勬暟鎹� && AGV宸ヤ綔鏄庣粏妗ｄ腑鏃犺鍗曟嵁鐨勬暟鎹�
//int count = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("order_no", orderNo));
- //boolean wrkDeltExist = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().like("order_no", orderNo)) < 1;
- //boolean agvWrkDetlExist = agvWrkDetlService.selectCount(new EntityWrapper<AgvWrkDetl>().like("order_no", orderNo)) < 1;
- //boolean waitPakinExist = agvWaitPakinService.selectCount(new EntityWrapper<AgvWaitPakin>().like("order_no", orderNo)) < 1;
+ boolean wrkDeltExist = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().like("order_no", orderNo)) < 1;
+ boolean agvWrkDetlExist = agvWrkDetlService.selectCount(new EntityWrapper<AgvWrkDetl>().like("order_no", orderNo)) < 1;
+ boolean waitPakinExist = agvWaitPakinService.selectCount(new EntityWrapper<AgvWaitPakin>().like("order_no", orderNo)) < 1;
- //ManPakOut manPakOut = manPakOutService.selectByOrderWithName(orderNo);
+ ManPakOut manPakOut = manPakOutService.selectByOrderWithName(orderNo);
- //boolean manPakoutExist = Cools.isEmpty(manPakOut) || (manPakOut.getPayment() != null && manPakOut.getPayment() == 1);
- //if (complete && wrkDeltExist && agvWrkDetlExist && waitPakinExist && manPakoutExist) {
- if (complete) {
+ boolean manPakoutExist = Cools.isEmpty(manPakOut) || (manPakOut.getPayment() != null && manPakOut.getPayment() == 1);
+ if (complete && wrkDeltExist && agvWrkDetlExist && waitPakinExist && manPakoutExist) {
if (pltType == null) {
if (!this.updateSettle(order.getId(), 6L, 9528L)) {
throw new CoolException("淇敼璁㈠崟銆恛rderNo = " + order.getOrderNo() + "銆戠姸鎬佷负宸插畬鎴愬け璐�");
@@ -173,15 +172,14 @@
// 濡傛灉 浣滀笟鏁伴噺绛変簬鍗曟嵁鎬绘暟閲� && 宸ヤ綔鏄庣粏妗ｄ腑鏃犺鍗曟嵁鐨勬暟鎹� && AGV宸ヤ綔鏄庣粏妗ｄ腑鏃犺鍗曟嵁鐨勬暟鎹�
//int count = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("order_no", orderNo));
-// boolean wrkDeltExist = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().like("order_no", orderNo)) < 1;
-// boolean agvWrkDetlExist = agvWrkDetlService.selectCount(new EntityWrapper<AgvWrkDetl>().like("order_no", orderNo)) < 1;
-// boolean waitPakinExist = agvWaitPakinService.selectCount(new EntityWrapper<AgvWaitPakin>().like("order_no", orderNo)) < 1;
-//
-// ManPakOut manPakOut = manPakOutService.selectByOrderWithName(orderNo);
-//
-// boolean manPakoutExist = Cools.isEmpty(manPakOut) || (manPakOut.getPayment() != null && manPakOut.getPayment() == 1);
-// if (complete && wrkDeltExist && agvWrkDetlExist && waitPakinExist && manPakoutExist) {
- if (complete) {
+ boolean wrkDeltExist = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().like("order_no", orderNo)) < 1;
+ boolean agvWrkDetlExist = agvWrkDetlService.selectCount(new EntityWrapper<AgvWrkDetl>().like("order_no", orderNo)) < 1;
+ boolean waitPakinExist = agvWaitPakinService.selectCount(new EntityWrapper<AgvWaitPakin>().like("order_no", orderNo)) < 1;
+
+ ManPakOut manPakOut = manPakOutService.selectByOrderWithName(orderNo);
+
+ boolean manPakoutExist = Cools.isEmpty(manPakOut) || (manPakOut.getPayment() != null && manPakOut.getPayment() == 1);
+ if (complete && wrkDeltExist && agvWrkDetlExist && waitPakinExist && manPakoutExist) {
if (!this.updateSettle(order.getId(), 6L, 9528L)) {
throw new CoolException("淇敼璁㈠崟銆恛rderNo = " + order.getOrderNo() + "銆戠姸鎬佷负宸插畬鎴愬け璐�");
}
diff --git a/src/main/java/com/zy/asrs/task/ReportDataScheduler.java b/src/main/java/com/zy/asrs/task/ReportDataScheduler.java
index 83201cd..73fb731 100644
--- a/src/main/java/com/zy/asrs/task/ReportDataScheduler.java
+++ b/src/main/java/com/zy/asrs/task/ReportDataScheduler.java
@@ -74,7 +74,7 @@
@Scheduled(cron = "0 0 2 * * ? ")
private void delReportDataLog() {
String format = DateUtil.format(DateUtil.offsetMonth(new Date(), -2), "yyyy-MM-dd HH:mm:ss");
- List<ReportDataLog> agvWarnList = reportDataLogService.selectList(new EntityWrapper<ReportDataLog>().le("modi_time", format));
+ List<ReportDataLog> agvWarnList = reportDataLogService.selectList(new EntityWrapper<ReportDataLog>().le("create_time", format));
for (ReportDataLog agvWarn : agvWarnList) {
reportDataLogService.deleteById(agvWarn);
}
diff --git a/src/main/java/com/zy/asrs/utils/LocUtils.java b/src/main/java/com/zy/asrs/utils/LocUtils.java
index 5471092..87db780 100644
--- a/src/main/java/com/zy/asrs/utils/LocUtils.java
+++ b/src/main/java/com/zy/asrs/utils/LocUtils.java
@@ -9,7 +9,6 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
-import java.util.ArrayList;
import java.util.List;
@Component
@@ -24,7 +23,7 @@
* @param factory
* @return
*/
- public AgvLocMast getLocNoRuleByFactory(int type, boolean isEmpty, String factory) {
+ public AgvLocMast getLocNoRuleByFactory(int type, boolean isEmpty, String factory) {
if (Cools.isEmpty(factory)) {
throw new CoolException("鎼滅储搴撲綅鏃讹紝璁㈠崟绫诲瀷閿欒");
}
@@ -35,13 +34,13 @@
if (factory.equalsIgnoreCase(AsrsConstants.ERCHANG)) {
if (isEmpty) {
wrapper.orderBy("lev1", true);
- }else {
+ } else {
wrapper.orderBy("lev1", false);
}
} else if (factory.equalsIgnoreCase(AsrsConstants.SANCHANG)) {
wrapper.orderBy("lev1", true);
}
- List<AgvLocMast> agvLocMasts = agvLocMastService.selectList(wrapper);
+ List<AgvLocMast> agvLocMasts = agvLocMastService.selectList(wrapper);
for (AgvLocMast agvLocMast : agvLocMasts) {
AgvLocMast agvLocMast1 = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_no", agvLocMast.getLocNo()));
@@ -61,10 +60,15 @@
* @param floor
* @return
*/
- public AgvLocMast getLocNoRuleByFloor(int type, Integer floor, boolean isEmpty, Integer lev1) {
+ public AgvLocMast getLocNoRuleByFloor(int type, Integer floor) {
try {
EntityWrapper<AgvLocMast> wrapper = new EntityWrapper<>();
- wrapper.eq("loc_sts", "O").eq("loc_type1", type).eq("floor", floor).eq("lev1", lev1);
+ wrapper.eq("loc_sts", "O").eq("loc_type1", type);
+ if (floor == 4) {
+ wrapper.orderBy("lev1", false);
+ } else {
+ wrapper.orderBy("lev1", true);
+ }
List<AgvLocMast> agvLocMasts = agvLocMastService.selectList(wrapper);
for (AgvLocMast agvLocMast : agvLocMasts) {
AgvLocMast agvLocMast1 = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_no", agvLocMast.getLocNo()));
diff --git a/src/main/java/com/zy/common/service/AgvCommonService.java b/src/main/java/com/zy/common/service/AgvCommonService.java
index c7903e4..e25c7ef 100644
--- a/src/main/java/com/zy/common/service/AgvCommonService.java
+++ b/src/main/java/com/zy/common/service/AgvCommonService.java
@@ -128,7 +128,11 @@
// locMast = locUtils.getLocNoRuleByFloor(type, floor, isEmpty, 2);
// } else {
// //涓嶅姩杩欎釜閫昏緫
- locMast = getLocNoRule(type, floor, isEmpty, isCurrLev);
+ if (type == 6) {
+ locMast = locUtils.getLocNoRuleByFloor(type, floor);
+ } else {
+ locMast = getLocNoRule(type, floor, isEmpty, isCurrLev);
+ }
// }
if (locMast != null) {
return locMast;
diff --git a/src/main/webapp/static/js/order/order.js b/src/main/webapp/static/js/order/order.js
index a2cdbef..0903332 100644
--- a/src/main/webapp/static/js/order/order.js
+++ b/src/main/webapp/static/js/order/order.js
@@ -103,6 +103,10 @@
$("#importOrder").click(function () {
$("#importExcel").trigger("click");
});
+ // 瀵煎叆鍗婃垚鍝�
+ $("#importBcpOrder").click(function () {
+ $("#importBcpExcel").trigger("click");
+ });
$("#orderCheckBtn").click(function () {
$("#importExcel2").trigger("click");
@@ -668,6 +672,34 @@
}, function(index){
});
}
+
+function upload3(obj){
+ if(!obj.files) {
+ return;
+ }
+ var file = obj.files[0];
+ admin.confirm('纭瀵煎叆 [' + file.name +'] 鏂囦欢鍚楋紵', function (index) {
+ layer.load(1, {shade: [0.1,'#fff']});
+ var url = baseUrl + "/order/excel/import3/auth";
+ var form = new FormData();
+ form.append("file", file);
+ let xhr = new XMLHttpRequest();
+ xhr.open("post", url, true);
+ xhr.setRequestHeader('token', localStorage.getItem('token'));
+ xhr.onload = uploadComplete;
+ xhr.onerror = uploadFailed;
+ xhr.onloadend = function () {
+ layer.closeAll('loading');
+ };
+ // xhr.upload.onprogress = progressFunction;
+ xhr.upload.onloadstart = function(){
+ ot = new Date().getTime();
+ oloaded = 0;
+ };
+ xhr.send(form);
+ }, function(index){
+ });
+}
function uploadComplete(evt) {
let res = JSON.parse(evt.target.responseText);
if(res.code === 200) {
diff --git a/src/main/webapp/static/js/orderView/orderView.js b/src/main/webapp/static/js/orderView/orderView.js
index c4c1ff3..34b8bd0 100644
--- a/src/main/webapp/static/js/orderView/orderView.js
+++ b/src/main/webapp/static/js/orderView/orderView.js
@@ -54,14 +54,14 @@
{field: 'anfme', align: 'center',title: '鏁伴噺', width: 90},
{field: 'qty', align: 'center',title: '浣滀笟鏁伴噺', width: 90},
{field: 'matnr', align: 'center',title: '鐗╂枡鍙�', width: 140},
- {field: 'maktx', align: 'center',title: '鐗╂枡鍚嶇О', width: 180},
- {field: 'processSts$', title: '宸ュ簭', hide: true},
+ {field: 'maktx', align: 'center',title: '鐗╂枡鍚嶇О'},
+ {field: 'processSts$', title: '宸ュ簭', width: 140},
{field: 'reportQty', align: 'center',title: '涓婃姤鏁伴噺', width: 90},
{field: 'settle$', align: 'center', title: '鐘舵��', templet: '#settleTpl', minWidth: 130, width: 130},
//{field: 'defNumber', align: 'center', title: '涓氬姟绫诲瀷'},
//{field: 'postFee', align: 'center', title: '鎬绘暟閲�', minWidth: 130, width: 130},
//{align: 'center', title: '鏄庣粏', toolbar: '#tbLook', minWidth: 160, width: 160},
- {field: 'orderTime', align: 'center',title: '鍗曟嵁鏃ユ湡', hide: true, width: 180},
+ {field: 'orderTime', align: 'center',title: '鍗曟嵁鏃ユ湡', width: 190},
//{field: 'shipCode', align: 'center',title: '鍒跺崟浜�'},
{field: 'createBy$', title: '鍒涘缓浜�', width: 120},
{field: 'createTime$', title: '鍒涘缓鏃堕棿', hide: true, width: 180},
diff --git a/src/main/webapp/views/order/order.html b/src/main/webapp/views/order/order.html
index 32a1253..9bd59bd 100644
--- a/src/main/webapp/views/order/order.html
+++ b/src/main/webapp/views/order/order.html
@@ -99,10 +99,14 @@
<button id="importOrder" class="layui-btn icon-btn btn-add">
<i class="layui-icon layui-icon-upload"></i> 瀵煎叆鍗曟嵁
</button>
+ <button id="importBcpOrder" class="layui-btn icon-btn btn-add2">
+ <i class="layui-icon layui-icon-upload"></i> 瀵煎叆鍗婃垚鍝佺澹冲崟鎹�
+ </button>
<button id="orderCheckBtn" class="layui-btn icon-btn btn-add">
<i class="layui-icon"></i>娣诲姞
</button>
<input style="display:none" id="importExcel" type="file" onchange="upload(this)" >
+ <input style="display:none" id="importBcpExcel" type="file" onchange="upload3(this)" >
<input style="display:none" id="importExcel2" type="file" onchange="upload2(this)" >
</div>
</div>
@@ -319,7 +323,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/order.js?v=7" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/order/order.js?v=8" charset="utf-8"></script>
<script type="text/template" id="docTypeTpl">
<option value="">閫夋嫨绫诲瀷</option>
diff --git a/src/main/webapp/views/orderView/orderView.html b/src/main/webapp/views/orderView/orderView.html
index 7b9d396..3b826e6 100644
--- a/src/main/webapp/views/orderView/orderView.html
+++ b/src/main/webapp/views/orderView/orderView.html
@@ -329,7 +329,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/orderView/orderView.js?v=11" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/orderView/orderView.js?v=12" charset="utf-8"></script>
<script type="text/template" id="docTypeTpl">
<option value="">閫夋嫨绫诲瀷</option>
--
Gitblit v1.9.1