From 940cab832331ab054d2a4c74f13aacc6847dd79d Mon Sep 17 00:00:00 2001
From: zhangchao <zc857179121@qq.com>
Date: 星期五, 08 十一月 2024 08:43:26 +0800
Subject: [PATCH] Merge branch 'phyzwms2' into phyzasrs-erp
---
src/main/resources/mapper/OrderMapper.xml | 4
src/main/java/com/zy/asrs/controller/ReportDownloadController.java | 235 +++++++++++
src/main/java/com/zy/asrs/service/impl/AgvWrkMastServiceImp.java | 1
pom.xml | 2
src/main/java/com/zy/asrs/mapper/ReportQueryMapper.java | 1
src/main/java/com/zy/asrs/task/AgvWrkMastScheduler.java | 3
src/main/webapp/static/js/report/workOut.js | 54 +-
src/main/webapp/static/js/agvHandWrkMast/agvHandWrkMast.js | 1
src/main/webapp/views/report/viewWorkOut.html | 2
src/main/webapp/views/handWrkMast/handWrkMast.html | 6
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 3
src/main/java/com/zy/asrs/entity/ViewWorkInBean.java | 411 +++++++++++--------
src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java | 38 +
src/main/webapp/static/js/report/workCountIn.js | 113 +++--
src/main/webapp/static/js/report/workCountOut.js | 50 +-
src/main/java/com/zy/asrs/controller/OrderController.java | 6
src/main/resources/mapper/ViewWorkInMapper.xml | 11
src/main/webapp/static/js/report/workIn.js | 54 +-
src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java | 56 +-
src/main/webapp/views/report/viewWorkIn.html | 2
src/main/java/com/zy/asrs/controller/OrderDetlController.java | 4
src/main/webapp/views/report/viewWorkCountIn.html | 4
src/main/webapp/views/report/viewWorkCountOut.html | 4
src/main/java/com/zy/asrs/controller/AgvMobileController.java | 16
src/main/resources/mapper/ViewStockUseMapper.xml | 10
src/main/webapp/static/js/handWrkMast/handWrkMast.js | 52 +-
src/main/java/com/zy/asrs/entity/ViewWorkCountInView.java | 16
src/main/java/com/zy/asrs/entity/AdjDetl.java | 5
src/main/resources/application.yml | 21
29 files changed, 792 insertions(+), 393 deletions(-)
diff --git a/pom.xml b/pom.xml
index c4eda78..d27ad5a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -93,7 +93,7 @@
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>easyexcel</artifactId>
- <version>2.2.6</version>
+ <version>3.1.0</version>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
diff --git a/src/main/java/com/zy/asrs/controller/AgvMobileController.java b/src/main/java/com/zy/asrs/controller/AgvMobileController.java
index a43c796..33fae25 100644
--- a/src/main/java/com/zy/asrs/controller/AgvMobileController.java
+++ b/src/main/java/com/zy/asrs/controller/AgvMobileController.java
@@ -409,6 +409,9 @@
agvLocMastByContainerCode.setBarcode(barcode1);
agvLocMastService.updateById(agvLocMastByContainerCode);
}
+ // 淇濆瓨璋冩暣璁板綍
+ AdjDetl adjDetl = new AdjDetl();
+
return R.ok("缁存姢鎴愬姛");
}
@@ -634,6 +637,7 @@
Date now = new Date();
List<HashMap<String,String>> dbList = (List<HashMap<String, String>>) params.get("dbList");
params.get("dbList");
+ String orderNo = params.get("orderNo").toString();
for (HashMap<String, String> map : dbList) {
String locNo = map.get("locNo");
String barcode = map.get("suppCode");
@@ -664,11 +668,19 @@
// 鏇存柊璁㈠崟
// 鍏堟煡璇㈠簱璁㈠崟鏄庣粏 鎵�灞炵殑璁㈠崟
- OrderDetl orderDetl = orderDetlService.selectOne(new EntityWrapper<OrderDetl>().eq("source",36).eq("matnr", agvLocDetl.getMatnr()).eq("three_code",agvLocDetl.getThreeCode()));
+ OrderDetl orderDetl = orderDetlService.selectOne(new EntityWrapper<OrderDetl>().eq("order_no",orderNo).eq("source",17).eq("matnr", agvLocDetl.getMatnr()).eq("three_code",agvLocDetl.getThreeCode()));
orderDetl.setQty(orderDetl.getQty() + agvLocDetl.getAnfme());
- if (!orderDetlService.update(orderDetl,new EntityWrapper<OrderDetl>().eq("source",36).eq("matnr", agvLocDetl.getMatnr()).eq("three_code",agvLocDetl.getThreeCode()))){
+ if (!orderDetlService.update(orderDetl,new EntityWrapper<OrderDetl>().eq("order_no",orderNo).eq("source",17).eq("matnr", agvLocDetl.getMatnr()).eq("three_code",agvLocDetl.getThreeCode()))){
throw new CoolException("淇敼璁㈠崟鏄庣粏澶辫触锛岃鑱旂郴绠＄悊鍛�"+agvLocDetl.getOrderNo()+agvLocDetl.getMatnr());
}
+ // 鏇存柊璁㈠崟鐘舵��
+ Order order = orderService.selectByNo(orderNo);
+ Long settle = order.getSettle();
+ if (settle == 1L) {
+ if (!orderService.updateSettle(order.getId(),2L,getUserId())) {
+ throw new CoolException("璁㈠崟鍙凤細{"+order.getOrderNo()+"}鏇存柊璁㈠崟鐘舵�侊細1-->2 澶辫触锛�(鍗婃垚鍝佽皟鎷ㄥ崟浠诲姟)" );
+ }
+ }
}
// 鏇存柊婧愬簱浣�
AgvLocMast locMast = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_no", locNo));
diff --git a/src/main/java/com/zy/asrs/controller/OrderController.java b/src/main/java/com/zy/asrs/controller/OrderController.java
index 0d7cb2b..ae3270a 100644
--- a/src/main/java/com/zy/asrs/controller/OrderController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderController.java
@@ -337,7 +337,7 @@
List<DocType> pakins = docTypeService.selectList(new EntityWrapper<DocType>().eq("pakout", 1));
List<Long> docIds = new ArrayList<>();
for (DocType pakin : pakins) {
- if (pakin.getDocId() == 36) {
+ if (pakin.getDocId() == 17) {
docIds.add(pakin.getDocId());
}
}
@@ -1133,7 +1133,7 @@
throw new CoolException("鐢熸垚鍗曟嵁涓绘。澶辫触锛岃閲嶆柊瀵煎叆锛�");
}
}else {
- order2.setSettle(order.getSettle() == 1L ? 1L : 2L );
+ order2.setSettle(order2.getSettle() == 1L ? 1L : 2L );
orderService.updateById(order2);
}
@@ -1211,7 +1211,7 @@
throw new CoolException("鐢熸垚鍗曟嵁涓绘。澶辫触锛岃閲嶆柊瀵煎叆锛�");
}
}else {
- order3.setSettle(order.getSettle() == 1L ? 1L : 2L );
+ order3.setSettle(order3.getSettle() == 1L ? 1L : 2L );
orderService.updateById(order3);
}
diff --git a/src/main/java/com/zy/asrs/controller/OrderDetlController.java b/src/main/java/com/zy/asrs/controller/OrderDetlController.java
index 349450e..83caf0b 100644
--- a/src/main/java/com/zy/asrs/controller/OrderDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderDetlController.java
@@ -169,11 +169,11 @@
List<DocType> pakins = docTypeService.selectList(new EntityWrapper<DocType>().eq("pakout", 1));
List<Long> docIds = new ArrayList<>();
for (DocType pakin : pakins) {
- if (pakin.getDocId() != 33 && pakin.getDocId() != 34 && pakin.getDocId() != 35) {
+ if (pakin.getDocId() != 17 && pakin.getDocId() != 33 && pakin.getDocId() != 34 && pakin.getDocId() != 35) {
docIds.add(pakin.getDocId());
}
}
- wrapper.ne("source",19);
+ wrapper.in("source",docIds);
Page<OrderDetl> page = orderDetlService.selectPage(new Page<>(curr, limit), wrapper);
for (OrderDetl record : page.getRecords()) {
Double sumAnfme = agvLocDetlService.getSumAnfme(record.getMatnr(), record.getThreeCode());
diff --git a/src/main/java/com/zy/asrs/controller/ReportDownloadController.java b/src/main/java/com/zy/asrs/controller/ReportDownloadController.java
new file mode 100644
index 0000000..e6cf1d5
--- /dev/null
+++ b/src/main/java/com/zy/asrs/controller/ReportDownloadController.java
@@ -0,0 +1,235 @@
+package com.zy.asrs.controller;
+
+import com.alibaba.excel.EasyExcel;
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.plugins.Page;
+import com.core.common.Cools;
+import com.core.common.DateUtils;
+import com.core.common.R;
+import com.zy.asrs.entity.*;
+import com.zy.asrs.mapper.ReportQueryMapper;
+import com.zy.asrs.service.AgvWrkMastLogService;
+import com.zy.common.web.BaseController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import javax.xml.soap.SAAJResult;
+import java.io.IOException;
+import java.net.URLEncoder;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@RestController
+@RequestMapping("/report/download")
+public class ReportDownloadController extends BaseController {
+
+
+ @Autowired
+ private ReportQueryMapper reportQueryMapper;
+
+
+ @Autowired
+ private AgvWrkMastLogService wrkMastLogService;
+
+
+ /**
+ * 鏂囦欢涓嬭浇骞朵笖澶辫触鐨勬椂鍊欒繑鍥瀓son锛堥粯璁ゅけ璐ヤ簡浼氳繑鍥炰竴涓湁閮ㄥ垎鏁版嵁鐨凟xcel锛�
+ * 鏃ュ叆搴撴眹鎬绘煡璇�
+ *
+ * @since 2.1.1
+ */
+ @GetMapping("/countIn")
+ public void download1(HttpServletResponse response, @RequestParam Map<String, Object> param) throws IOException {
+ try {
+ response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
+ response.setCharacterEncoding("utf-8");
+ // 杩欓噷URLEncoder.encode鍙互闃叉涓枃涔辩爜 褰撶劧鍜宔asyexcel娌℃湁鍏崇郴
+ String fileName = URLEncoder.encode("鏃ュ叆搴撴眹鎬�", "UTF-8").replaceAll("\\+", "%20");
+ response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx");
+ // 杩欓噷闇�瑕佽缃笉鍏抽棴娴�
+ EasyExcel.write(response.getOutputStream(), ViewWorkCountInView.class).autoCloseStream(Boolean.FALSE).sheet("sheet1").doWrite(getInData(param));
+ } catch (Exception e) {
+ // 閲嶇疆response
+ response.reset();
+ response.setContentType("application/json");
+ response.setCharacterEncoding("utf-8");
+ Map<String, String> map = new HashMap<>();
+ map.put("status", "failure");
+ map.put("message", "涓嬭浇鏂囦欢澶辫触" + e.getMessage());
+ response.getWriter().println(JSON.toJSONString(map));
+ }
+ }
+
+
+ private List<ViewWorkCountInView> getInData(Map<String, Object> param) {
+ String startTime = "1970.1.2";
+ String endTime = "2099.1.2";
+ if (!Cools.isEmpty(param.get("query_date"))) {
+ String queryDate = (String) param.get("query_date");
+ String[] split = queryDate.split(" - ");
+ startTime = split[0].split(" ")[0].replace("-", ".");
+ endTime = split[1].split(" ")[0].replace("-", ".");
+ }
+ List<ViewWorkCountInView> allCountIn = reportQueryMapper.selectWorkCountIn(null, null, (String) param.get("matnr"), startTime, endTime);
+ return allCountIn;
+ }
+
+ /**
+ * 鏂囦欢涓嬭浇骞朵笖澶辫触鐨勬椂鍊欒繑鍥瀓son锛堥粯璁ゅけ璐ヤ簡浼氳繑鍥炰竴涓湁閮ㄥ垎鏁版嵁鐨凟xcel锛�
+ * 鏃ュ叆搴撴眹鎬绘煡璇�
+ *
+ * @since 2.1.1
+ */
+ @RequestMapping("/countOut")
+ public void download2(HttpServletResponse response, @RequestParam Map<String, Object> param) throws IOException {
+ try {
+ response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
+ response.setCharacterEncoding("utf-8");
+ // 杩欓噷URLEncoder.encode鍙互闃叉涓枃涔辩爜 褰撶劧鍜宔asyexcel娌℃湁鍏崇郴
+ String fileName = URLEncoder.encode("鏃ュ嚭搴撴眹鎬�", "UTF-8").replaceAll("\\+", "%20");
+ response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx");
+ List<ViewWorkCountInView> outData = getOutData(param);
+ // 杩欓噷闇�瑕佽缃笉鍏抽棴娴�
+ EasyExcel.write(response.getOutputStream(), ViewWorkCountInView.class).autoCloseStream(Boolean.FALSE).sheet("sheet1").doWrite(outData);
+ } catch (Exception e) {
+ // 閲嶇疆response
+ response.reset();
+ response.setContentType("application/json");
+ response.setCharacterEncoding("utf-8");
+ Map<String, String> map = new HashMap<>();
+ map.put("status", "failure");
+ map.put("message", "涓嬭浇鏂囦欢澶辫触" + e.getMessage());
+ response.getWriter().println(JSON.toJSONString(map));
+ }
+ }
+
+
+ private List<ViewWorkCountInView> getOutData(Map<String, Object> param) {
+ String startTime = "1970.1.2";
+ String endTime = "2099.1.2";
+ if (!Cools.isEmpty(param.get("query_date"))) {
+ String queryDate = (String) param.get("query_date");
+ String[] split = queryDate.split(" - ");
+ startTime = split[0].split(" ")[0].replace("-", ".");
+ endTime = split[1].split(" ")[0].replace("-", ".");
+ }
+ List<ViewWorkCountInView> allCountIn = reportQueryMapper.selectWorkCountOut(null,null, (String) param.get("matnr"), startTime, endTime);
+ return allCountIn;
+ }
+
+
+ /**
+ * 鏂囦欢涓嬭浇骞朵笖澶辫触鐨勬椂鍊欒繑鍥瀓son锛堥粯璁ゅけ璐ヤ簡浼氳繑鍥炰竴涓湁閮ㄥ垎鏁版嵁鐨凟xcel锛�
+ * 鏃ュ叆搴撴眹鎬绘煡璇�
+ *
+ * @since 2.1.1
+ */
+ @RequestMapping("/wrkMastLog")
+ public void wrkMastLog(HttpServletResponse response, @RequestParam Map<String, Object> param) throws IOException {
+ try {
+ response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
+ response.setCharacterEncoding("utf-8");
+ // 杩欓噷URLEncoder.encode鍙互闃叉涓枃涔辩爜 褰撶劧鍜宔asyexcel娌℃湁鍏崇郴
+ String fileName = URLEncoder.encode("宸ヤ綔妗ｇ淮鎶ゆ棩蹇�", "UTF-8").replaceAll("\\+", "%20");
+ response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx");
+ // 杩欓噷闇�瑕佽缃笉鍏抽棴娴�
+ EasyExcel.write(response.getOutputStream(), ViewWorkCountInView.class).autoCloseStream(Boolean.FALSE).sheet("sheet1").doWrite(getWrkMastLogData(param));
+ } catch (Exception e) {
+ // 閲嶇疆response
+ response.reset();
+ response.setContentType("application/json");
+ response.setCharacterEncoding("utf-8");
+ Map<String, String> map = new HashMap<>();
+ map.put("status", "failure");
+ map.put("message", "涓嬭浇鏂囦欢澶辫触" + e.getMessage());
+ response.getWriter().println(JSON.toJSONString(map));
+ }
+ }
+
+
+ private List<AgvWrkMastLog> getWrkMastLogData(Map<String, Object> param) {
+ excludeTrash(param);
+ EntityWrapper<AgvWrkMastLog> wrapper = new EntityWrapper<>();
+ convert(param, wrapper);
+ return wrkMastLogService.selectList(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 {
+ if (entry.getKey().equals("manu_type")) {
+ wrapper.like(entry.getKey(), val);
+ } else {
+ wrapper.eq(entry.getKey(), val);
+ }
+ }
+ }
+ }
+
+
+ /**
+ * 鏂囦欢涓嬭浇骞朵笖澶辫触鐨勬椂鍊欒繑鍥瀓son锛堥粯璁ゅけ璐ヤ簡浼氳繑鍥炰竴涓湁閮ㄥ垎鏁版嵁鐨凟xcel锛�
+ * 鏃ュ嚭搴撴槑缁嗙粺璁�
+ *
+ * @since 2.1.1
+ */
+ @RequestMapping("/out")
+ public void out(HttpServletResponse response, @RequestParam(required = false) ViewWorkInBean bean) throws IOException {
+ try {
+ response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
+ response.setCharacterEncoding("utf-8");
+ // 杩欓噷URLEncoder.encode鍙互闃叉涓枃涔辩爜 褰撶劧鍜宔asyexcel娌℃湁鍏崇郴
+ String fileName = URLEncoder.encode("鏃ュ嚭搴撴槑缁嗙粺璁�", "UTF-8").replaceAll("\\+", "%20");
+ response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx");
+ List<ViewWorkInBean> list = reportQueryMapper.queryViewWorkOutList(bean);
+ // 杩欓噷闇�瑕佽缃笉鍏抽棴娴�
+ EasyExcel.write(response.getOutputStream(), ViewWorkInBean.class).autoCloseStream(Boolean.FALSE).sheet("sheet1").doWrite(list);
+ } catch (Exception e) {
+ // 閲嶇疆response
+ response.reset();
+ response.setContentType("application/json");
+ response.setCharacterEncoding("utf-8");
+ Map<String, String> map = new HashMap<>();
+ map.put("status", "failure");
+ map.put("message", "涓嬭浇鏂囦欢澶辫触" + e.getMessage());
+ response.getWriter().println(JSON.toJSONString(map));
+ }
+ }
+
+ /**
+ * 鏂囦欢涓嬭浇骞朵笖澶辫触鐨勬椂鍊欒繑鍥瀓son锛堥粯璁ゅけ璐ヤ簡浼氳繑鍥炰竴涓湁閮ㄥ垎鏁版嵁鐨凟xcel锛�
+ * 鏃ュ叆搴撴槑缁嗙粺璁�
+ *
+ * @since 2.1.1
+ */
+ @RequestMapping("/in")
+ public void in(HttpServletResponse response, @RequestParam(required = false) ViewWorkInBean bean) throws IOException {
+ try {
+ response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
+ response.setCharacterEncoding("utf-8");
+ // 杩欓噷URLEncoder.encode鍙互闃叉涓枃涔辩爜 褰撶劧鍜宔asyexcel娌℃湁鍏崇郴
+ String fileName = URLEncoder.encode("鏃ュ叆搴撴槑缁嗙粺璁�", "UTF-8").replaceAll("\\+", "%20");
+ response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx");
+ List<ViewWorkInBean> list = reportQueryMapper.queryViewWorkInList(bean);
+ // 杩欓噷闇�瑕佽缃笉鍏抽棴娴�
+ EasyExcel.write(response.getOutputStream(), ViewWorkInBean.class).autoCloseStream(Boolean.FALSE).sheet("sheet1").doWrite(list);
+ } catch (Exception e) {
+ // 閲嶇疆response
+ response.reset();
+ response.setContentType("application/json");
+ response.setCharacterEncoding("utf-8");
+ Map<String, String> map = new HashMap<>();
+ map.put("status", "failure");
+ map.put("message", "涓嬭浇鏂囦欢澶辫触" + e.getMessage());
+ response.getWriter().println(JSON.toJSONString(map));
+ }
+ }
+}
diff --git a/src/main/java/com/zy/asrs/entity/AdjDetl.java b/src/main/java/com/zy/asrs/entity/AdjDetl.java
index 385e3ba..471cbc0 100644
--- a/src/main/java/com/zy/asrs/entity/AdjDetl.java
+++ b/src/main/java/com/zy/asrs/entity/AdjDetl.java
@@ -42,6 +42,11 @@
*/
@ApiModelProperty(value= "鐗╂枡鍙�")
private String matnr;
+ /**
+ * 鐗╂枡鍚嶇О
+ */
+ @ApiModelProperty(value= "鐗╂枡鍚嶇О")
+ private String maktx;
/**
* 搴忓垪鐮�
diff --git a/src/main/java/com/zy/asrs/entity/ViewWorkCountInView.java b/src/main/java/com/zy/asrs/entity/ViewWorkCountInView.java
index 8a8fd87..90e4e62 100644
--- a/src/main/java/com/zy/asrs/entity/ViewWorkCountInView.java
+++ b/src/main/java/com/zy/asrs/entity/ViewWorkCountInView.java
@@ -1,11 +1,25 @@
package com.zy.asrs.entity;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.format.NumberFormat;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
import lombok.Data;
@Data
public class ViewWorkCountInView {
+ @ColumnWidth(25)
+ @ExcelProperty("鍏ュ簱鏃ユ湡")
private String oneday;
+
+ @ColumnWidth(25)
+ @ExcelProperty("鐗╂枡鍙�")
private String matnr;
+
+ @ColumnWidth(50)
+ @ExcelProperty("鐗╂枡鍚嶇О")
private String maktx;
- private String anfme;
+
+ @ColumnWidth(25)
+ @ExcelProperty("鏁伴噺")
+ private Double anfme;
}
diff --git a/src/main/java/com/zy/asrs/entity/ViewWorkInBean.java b/src/main/java/com/zy/asrs/entity/ViewWorkInBean.java
index 1d26c21..96f6f30 100644
--- a/src/main/java/com/zy/asrs/entity/ViewWorkInBean.java
+++ b/src/main/java/com/zy/asrs/entity/ViewWorkInBean.java
@@ -1,10 +1,13 @@
package com.zy.asrs.entity;
+import com.alibaba.excel.annotation.ExcelIgnore;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.format.DateTimeFormat;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
import com.core.common.Cools;
import com.core.common.SpringUtils;
import com.zy.system.entity.User;
import com.zy.system.service.UserService;
-import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.text.SimpleDateFormat;
@@ -12,237 +15,293 @@
/**
* 鍏ュ簱鏄庣粏缁熻
+ *
* @author admin
* @date 2018骞�11鏈�26鏃�
*/
@Data
public class ViewWorkInBean {
+ @ExcelIgnore
+ private int pageNumber;
- private int pageNumber;
- private int pageSize;
+ @ExcelIgnore
+ private int pageSize;
- private int stay_time;
+ @ExcelIgnore
+ private int stay_time;
- private String begin_date;
- private String end_date;
- private String query_date;
+ @ExcelIgnore
+ private String begin_date;
- private Integer row;
+ @ExcelIgnore
+ private String end_date;
- private String crn_str_time;
- private String crn_end_time;
+ @ExcelIgnore
+ private String query_date;
- @ApiModelProperty(value= "宸ヤ綔鍙�")
- private Integer wrk_no;
+ @ExcelIgnore
+ private Integer row;
- @ApiModelProperty(value= "宸ヤ綔鏃堕棿")
- private Date io_time;
+ @ExcelIgnore
+ private String crn_str_time;
- @ApiModelProperty(value= "搴撲綅鍙�")
- private String loc_no;
+ @ExcelIgnore
+ private String crn_end_time;
- @ApiModelProperty(value= "璐ф灦鏉＄爜")
- private String zpallet;
+ @ColumnWidth(15)
+ @ExcelProperty(value = "閿�鍞崟鍙�")
+ private String three_code;
- @ApiModelProperty(value= "鏁伴噺")
- private Double anfme;
+ @ExcelIgnore
+ @ExcelProperty(value = "宸ヤ綔鍙�")
+ private Integer wrk_no;
- @ApiModelProperty(value= "鐗╂枡鍙�")
- private String matnr;
+ @ColumnWidth(20)
+ @ExcelProperty(value = "鍏ュ簱鏃堕棿")
+ private Date io_time;
- @ApiModelProperty(value= "鐗╂枡鍙�")
- private String maktx;
+ @ColumnWidth(20)
+ @ExcelProperty(value = "搴撲綅鍙�")
+ private String loc_no;
- @ApiModelProperty(value= "搴忓垪鐮�")
- private String batch;
+ @ExcelProperty(value = "璐х珯鐮�")
+ private String supp_code;
- @ApiModelProperty(value= "鍗曟嵁缂栧彿")
- private String order_no;
+ @ExcelProperty(value = "璐ф灦鏉＄爜")
+ private String zpallet;
- @ApiModelProperty(value= "瑙勬牸")
- private String specs;
+ @ExcelProperty(value = "鏁伴噺")
+ private Double anfme;
- @ApiModelProperty(value= "鎵规")
- private String model;
+ @ColumnWidth(15)
+ @ExcelProperty(value = "鐗╂枡鍙�")
+ private String matnr;
- @ApiModelProperty(value= "棰滆壊")
- private String color;
+ @ColumnWidth(35)
+ @ExcelProperty(value = "鐗╂枡鍚嶇О")
+ private String maktx;
- @ApiModelProperty(value= "鍝佺墝")
- private String brand;
+ @ExcelProperty(value = "搴忓垪鐮�")
+ private String batch;
- @ApiModelProperty(value= "鍗曚綅")
- private String unit;
+ @ExcelProperty(value = "鍗曟嵁缂栧彿")
+ private String order_no;
- @ApiModelProperty(value= "鍗曚环")
- private Double price;
+ @ExcelProperty(value = "瑙勬牸")
+ private String specs;
- @ApiModelProperty(value= "sku")
- private String sku;
+ @ExcelProperty(value = "鎵规")
+ private String model;
- @ApiModelProperty(value= "鍖呮暟")
- private Double units;
+ @ExcelIgnore
+ private String color;
- @ApiModelProperty(value= "鏉＄爜")
- private String barcode;
+ @ExcelProperty(value = "鍝佺墝")
+ private String brand;
- @ApiModelProperty(value= "鐗╂枡鐘舵��")
- private String origin;
+ @ExcelProperty(value = "鍗曚綅")
+ private String unit;
- @ApiModelProperty(value= "鍘傚")
- private String manu;
+ @ExcelIgnore
+ private Double price;
- @ApiModelProperty(value= "鍗曟嵁鏃堕棿")
- private String manu_date;
+ @ExcelProperty(value = "sku")
+ private String sku;
- @ApiModelProperty(value= "鍝侀」鏁�")
- private String item_num;
+ @ExcelIgnore
+ private Double units;
- @ApiModelProperty(value= "瀹夊叏搴撳瓨閲�")
- private Double safe_qty;
+ @ExcelProperty(value = "鏉＄爜")
+ private String barcode;
- @ApiModelProperty(value= "閲嶉噺")
- private Double weight;
+ @ExcelIgnore
+ private String origin;
- @ApiModelProperty(value= "闀垮害")
- private Double length;
+ @ExcelIgnore
+ @ExcelProperty(value = "鍘傚")
+ private String manu;
- @ApiModelProperty(value= "浣撶Н")
- private Double volume;
+ @ExcelProperty(value = "鍗曟嵁鏃堕棿")
+ private String manu_date;
- @ApiModelProperty(value= "涓夋柟缂栫爜")
- private String three_code;
+ @ExcelProperty(value = "鍝侀」鏁�")
+ private String item_num;
- @ApiModelProperty(value= "渚涘簲鍟�")
- private String supp;
+ @ExcelProperty(value = "瀹夊叏搴撳瓨閲�")
+ private Double safe_qty;
- @ApiModelProperty(value= "渚涘簲鍟嗙紪鐮�")
- private String supp_code;
+ @ExcelProperty(value = "閲嶉噺")
+ private Double weight;
+ @ExcelIgnore
+ @ExcelProperty(value = "闀垮害")
+ private Double length;
+ @ExcelIgnore
+ @ExcelProperty(value = "浣撶Н")
+ private Double volume;
- @ApiModelProperty(value= "鏄惁鎵规 1: 鏄� 0: 鍚� ")
- private Integer be_batch;
- @ApiModelProperty(value= "淇濊川鏈�")
- private String dead_time;
- private String deadTime=dead_time;
- @ApiModelProperty(value= "棰勮澶╂暟")
- private Integer dead_warn;
- private Integer deadWarn=this.dead_warn;
+ @ExcelProperty(value = "渚涘簲鍟�")
+ private String supp;
- @ApiModelProperty(value= "鍒惰喘 1: 鍒堕�� 2: 閲囪喘 3: 澶栧崗 ")
- private Integer source;
- @ApiModelProperty(value= "瑕佹眰妫�楠� 1: 鏄� 0: 鍚� ")
- private Integer inspect;
- @ApiModelProperty(value= "鍗遍櫓鍝� 1: 鏄� 0: 鍚� ")
- private Integer danger;
+ @ExcelIgnore
+ @ExcelProperty(value = "鏄惁鎵规 1: 鏄� 0: 鍚� ")
+ private Integer be_batch;
- @ApiModelProperty(value= "淇敼浜哄憳")
- private Long modi_user;
+ @ExcelIgnore
+ @ExcelProperty(value = "淇濊川鏈�")
+ private String dead_time;
+ @ExcelIgnore
+ private String deadTime = dead_time;
+ @ExcelIgnore
+ @ExcelProperty(value = "棰勮澶╂暟")
+ private Integer dead_warn;
+ @ExcelIgnore
+ private Integer deadWarn = this.dead_warn;
+ @ExcelIgnore
+ @ExcelProperty(value = "鍒惰喘 1: 鍒堕�� 2: 閲囪喘 3: 澶栧崗 ")
+ private Integer source;
+ @ExcelIgnore
+ @ExcelProperty(value = "瑕佹眰妫�楠� 1: 鏄� 0: 鍚� ")
+ private Integer inspect;
+ @ExcelIgnore
+ @ExcelProperty(value = "鍗遍櫓鍝� 1: 鏄� 0: 鍚� ")
+ private Integer danger;
- @ApiModelProperty(value= "淇敼鏃堕棿")
- private Object modi_time;
+ @ExcelProperty(value = "淇敼浜哄憳")
+ private Long modi_user;
- @ApiModelProperty(value= "鍒涘缓鑰�")
- private Long appe_user;
+ @ExcelProperty(value = "淇敼鏃堕棿")
+ private Date modi_time;
- @ApiModelProperty(value= "娣诲姞鏃堕棿")
- private Object appe_time;
+ @ExcelProperty(value = "鍒涘缓鑰�")
+ private Long appe_user;
- @ApiModelProperty(value= "澶囨敞")
- private String memo;
+ @ExcelProperty(value = "娣诲姞鏃堕棿")
+ private Date appe_time;
- // 宸ヤ綔鍙�
- private Integer wrkNo;
- // 宸ヤ綔鏃堕棿
- private Date ioTime;
- //鍗曟嵁缂栧彿
- private String orderNo;
- //鍗曟嵁鏃堕棿
- private String manuDate;
- //鍝侀」鏁�
- private String itemNum;
- //瀹夊叏搴撳瓨閲�
- private Double safeQty;
- //涓夋柟缂栫爜
- private String threeCode;
- //渚涘簲鍟嗙紪鐮�
- private String suppCode;
- //鏄惁鎵规 1: 鏄� 0: 鍚�
- private Integer beBatch;
- // 淇敼浜哄憳
- private Long modiUser;
- // 淇敼鏃堕棿
- private Object modiTime;
- // 鍒涘缓鑰�
- private Long appeUser;
- // 娣诲姞鏃堕棿
- private Object appeTime;
- public void sype(){
- // 宸ヤ綔鍙�
- wrkNo=wrk_no;
- // 宸ヤ綔鏃堕棿
- ioTime=io_time;
- //鍗曟嵁缂栧彿
- orderNo=order_no;
- //鍗曟嵁鏃堕棿
- manuDate=manu_date;
- //鍝侀」鏁�
- itemNum=item_num;
- //瀹夊叏搴撳瓨閲�
- safeQty=safe_qty;
- //涓夋柟缂栫爜
- threeCode=three_code;
- //渚涘簲鍟嗙紪鐮�
- suppCode=supp_code;
- //鏄惁鎵规 1: 鏄� 0: 鍚�
- beBatch=be_batch;
- // 淇敼浜哄憳
- modiUser=modi_user;
- // 淇敼鏃堕棿
- modiTime=modi_time;
- // 鍒涘缓鑰�
- appeUser=appe_user;
- // 娣诲姞鏃堕棿
- appeTime=appe_time;
- }
+ @ExcelProperty(value = "澶囨敞")
+ private String memo;
- public String getModiUser$(){
- UserService service = SpringUtils.getBean(UserService.class);
- User user = service.selectById(this.modi_user);
- if (!Cools.isEmpty(user)){
- return String.valueOf(user.getUsername());
- }
- return null;
- }
+ @ExcelIgnore
+ @ExcelProperty(value = "宸ヤ綔鍙�")
+ // 宸ヤ綔鍙�
+ private Integer wrkNo;
+ @ExcelIgnore
+ @DateTimeFormat(value = "yyyy-MM-dd HH:mm:ss")
+ @ExcelProperty(value = "宸ヤ綔鏃堕棿")
+ // 宸ヤ綔鏃堕棿
+ private Date ioTime;
+ @ExcelIgnore
+ @ExcelProperty(value = "鍗曟嵁缂栧彿")
+ //鍗曟嵁缂栧彿
+ private String orderNo;
+ @ExcelIgnore
+ @ExcelProperty(value = "鍗曟嵁鏃堕棿")
+ //鍗曟嵁鏃堕棿
+ private String manuDate;
+ @ExcelIgnore
+ @ExcelProperty(value = "鍝侀」鏁�")
+ //鍝侀」鏁�
+ private String itemNum;
+ @ExcelIgnore
+ @ExcelProperty(value = "瀹夊叏搴撳瓨閲�")
+ //瀹夊叏搴撳瓨閲�
+ private Double safeQty;
+ @ExcelIgnore
+ @ExcelProperty(value = "閿�鍞崟鍙�")
+ //涓夋柟缂栫爜
+ private String threeCode;
+ @ExcelIgnore
+ @ExcelProperty(value = "渚涘簲鍟嗙紪鐮�")
+ //渚涘簲鍟嗙紪鐮�
+ private String suppCode;
+ @ExcelIgnore
+ @ExcelProperty(value = "甯堝倕鎵规")
+ //鏄惁鎵规 1: 鏄� 0: 鍚�
+ private Integer beBatch;
+ @ExcelIgnore
+ @ExcelProperty(value = "淇敼浜哄憳")
+ // 淇敼浜哄憳
+ private Long modiUser;
+ @ExcelIgnore
+ @ExcelProperty(value = "淇敼鏃堕棿")
+ // 淇敼鏃堕棿
+ private Date modiTime;
+ @ExcelIgnore
+ @ExcelProperty(value = "鍒涘缓鑰�")
+ // 鍒涘缓鑰�
+ private Long appeUser;
+ @ExcelIgnore
+ @ExcelProperty(value = "娣诲姞鏃堕棿")
+ // 娣诲姞鏃堕棿
+ private Date appeTime;
- public String getAppeUser$(){
- UserService service = SpringUtils.getBean(UserService.class);
- User user = service.selectById(this.appe_user);
- if (!Cools.isEmpty(user)){
- return String.valueOf(user.getUsername());
- }
- return null;
- }
+ public void sype() {
+ // 宸ヤ綔鍙�
+ wrkNo = wrk_no;
+ // 宸ヤ綔鏃堕棿
+ ioTime = io_time;
+ //鍗曟嵁缂栧彿
+ orderNo = order_no;
+ //鍗曟嵁鏃堕棿
+ manuDate = manu_date;
+ //鍝侀」鏁�
+ itemNum = item_num;
+ //瀹夊叏搴撳瓨閲�
+ safeQty = safe_qty;
+ //涓夋柟缂栫爜
+ threeCode = three_code;
+ //渚涘簲鍟嗙紪鐮�
+ suppCode = supp_code;
+ //鏄惁鎵规 1: 鏄� 0: 鍚�
+ beBatch = be_batch;
+ // 淇敼浜哄憳
+ modiUser = modi_user;
+ // 淇敼鏃堕棿
+ modiTime = modi_time;
+ // 鍒涘缓鑰�
+ appeUser = appe_user;
+ // 娣诲姞鏃堕棿
+ appeTime = appe_time;
+ }
- public String getIoTime$(){
- if (Cools.isEmpty(this.io_time)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.io_time);
- }
+ public String getModiUser$() {
+ UserService service = SpringUtils.getBean(UserService.class);
+ User user = service.selectById(this.modi_user);
+ if (!Cools.isEmpty(user)) {
+ return String.valueOf(user.getUsername());
+ }
+ return null;
+ }
- public void setQuery_date(String query_date) {
- this.query_date = query_date;
- if (query_date.contains(" - ")) {
- String[] dates = query_date.split(" - ");
- this.begin_date = dates[0];
- this.end_date = dates[1];
+ public String getAppeUser$() {
+ UserService service = SpringUtils.getBean(UserService.class);
+ User user = service.selectById(this.appe_user);
+ if (!Cools.isEmpty(user)) {
+ return String.valueOf(user.getUsername());
+ }
+ return null;
+ }
- }
- }
+ public String getIoTime$() {
+ if (Cools.isEmpty(this.io_time)) {
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.io_time);
+ }
+
+ public void setQuery_date(String query_date) {
+ this.query_date = query_date;
+ if (query_date.contains(" - ")) {
+ String[] dates = query_date.split(" - ");
+ this.begin_date = dates[0];
+ this.end_date = dates[1];
+
+ }
+ }
}
diff --git a/src/main/java/com/zy/asrs/mapper/ReportQueryMapper.java b/src/main/java/com/zy/asrs/mapper/ReportQueryMapper.java
index 678ebb3..5b4ae01 100644
--- a/src/main/java/com/zy/asrs/mapper/ReportQueryMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/ReportQueryMapper.java
@@ -89,6 +89,7 @@
List<ViewWorkCountInView> selectWorkCountIn(@Param("curr") Integer curr, @Param("limit") Integer limit, @Param("matnr")String matnr, @Param("start") String startTime, @Param("end") String endTime);
+
Integer selectWorkCountInTotal(String matnr, @Param("start") String startTime, @Param("end") String endTime);
List<ViewWorkCountInView> selectWorkCountOut(@Param("curr") Integer pageNumber, @Param("limit") Integer pageSize, String matnr, @Param("start") String startTime, @Param("end") String endTime);
diff --git a/src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java
index 03b6140..d22feea 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java
@@ -164,6 +164,12 @@
if (!orderDetlService.update(orderDetl,new EntityWrapper<OrderDetl>().eq("order_no", pick.getOrderNo()).eq("matnr", pick.getMatnr()).eq("three_code",pick.getThreeCode()))){
throw new CoolException("淇敼璁㈠崟鏄庣粏澶辫触锛岃鑱旂郴绠＄悊鍛�"+pick.getOrderNo()+pick.getMatnr());
}
+ Order order = orderService.selectByNo(orderDetl.getOrderNo());
+ if (order.getSettle() == 1) {
+ if (!orderService.updateSettle(order.getId(), 2L, userId)) {
+ throw new CoolException("鍐嶆鎷ｆ枡锛氭洿鏂拌鍗曠姸鎬佸け璐ワ紒");
+ }
+ }
}
// 纭鏄惁鍏ㄩ儴鍑哄簱
double totleWrkdetl = 0.0;
@@ -183,7 +189,7 @@
// agvLocDetls.size() == 1
- return "缁勬墭鎴愬姛锛岀粦瀹氱珯鐐规垚鍔�";
+ return "鎷ｆ枡鎴愬姛";
}
/*
@@ -422,6 +428,8 @@
if (agvLocMast.getFloor() != floor) {
if (agvLocMast.getFloor() == 1 && (floor == 2 || floor == 3)) {
throw new CoolException("褰撳墠搴撲綅璇烽�夋嫨璋冩嫧鍗曡皟鎷紒");
+ } else if ((agvLocMast.getFloor() == 2 || agvLocMast.getFloor() == 3) && (floor == 1 || floor == 4)) {
+ throw new CoolException("褰撳墠搴撲綅璇烽�夋嫨璋冩嫧鍥炴祦鍗曞洖閫�锛�");
} else {
ioType = 12;
}
@@ -512,29 +520,29 @@
});
}
- // 濡傛灉褰撳墠浠诲姟鏄澹充簩涓夋ゼ鍥為��涓�妤肩殑 鍥炴粴璋冩嫧鍗�
- if (ioType == 12 && locMast.getFloor() == 1 && floor != 4 && agvLocMast.getFloor() != 1) {
- List<AgvLocDetl> agvLocDetls = agvLocDetlService.selectList(new EntityWrapper<AgvLocDetl>().eq("loc_no", agvLocMast.getLocNo()));
- for (AgvLocDetl agvLocDetl : agvLocDetls) {
- OrderDetl orderDetl = orderDetlService.selectOne(new EntityWrapper<OrderDetl>().eq("three_code", agvLocDetl.getThreeCode()).eq("matnr", agvLocDetl.getMatnr()).eq("source", 33));
- if (Cools.isEmpty(orderDetl)) {
- throw new CoolException("褰撳墠鐗╂枡鐨勮皟鎷ㄥ崟涓嶅瓨鍦紒");
- }
- Order order = orderService.selectByNo(orderDetl.getOrderNo());
- if (Cools.isEmpty(order)) {
- throw new CoolException("褰撳墠鐗╂枡鐨勮皟鎷ㄥ崟涓嶅瓨鍦紒");
- }
- if (order.getSettle() == 4L) {
- if (!orderService.updateSettle(order.getId(),2L,userId)) {
- throw new CoolException("璋冩嫧鍗曞洖婊氬紓甯�!");
- }
- }
- orderDetl.setQty(orderDetl.getQty() - agvLocDetl.getAnfme());
- if (!orderDetlService.updateById(orderDetl)) {
- throw new CoolException("淇濆瓨宸ヤ綔鏄庣粏澶辫触");
- }
- }
- }
+// // 濡傛灉褰撳墠浠诲姟鏄澹充簩涓夋ゼ鍥為��涓�妤肩殑 鍥炴粴璋冩嫧鍗�
+// if (ioType == 12 && locMast.getFloor() == 1 && floor != 4 && agvLocMast.getFloor() != 1) {
+// List<AgvLocDetl> agvLocDetls = agvLocDetlService.selectList(new EntityWrapper<AgvLocDetl>().eq("loc_no", agvLocMast.getLocNo()));
+// for (AgvLocDetl agvLocDetl : agvLocDetls) {
+// OrderDetl orderDetl = orderDetlService.selectOne(new EntityWrapper<OrderDetl>().eq("three_code", agvLocDetl.getThreeCode()).eq("matnr", agvLocDetl.getMatnr()).eq("source", 33));
+// if (Cools.isEmpty(orderDetl)) {
+// throw new CoolException("褰撳墠鐗╂枡鐨勮皟鎷ㄥ崟涓嶅瓨鍦紒");
+// }
+// Order order = orderService.selectByNo(orderDetl.getOrderNo());
+// if (Cools.isEmpty(order)) {
+// throw new CoolException("褰撳墠鐗╂枡鐨勮皟鎷ㄥ崟涓嶅瓨鍦紒");
+// }
+// if (order.getSettle() == 4L) {
+// if (!orderService.updateSettle(order.getId(),2L,userId)) {
+// throw new CoolException("璋冩嫧鍗曞洖婊氬紓甯�!");
+// }
+// }
+// orderDetl.setQty(orderDetl.getQty() - agvLocDetl.getAnfme());
+// if (!orderDetlService.updateById(orderDetl)) {
+// throw new CoolException("淇濆瓨宸ヤ綔鏄庣粏澶辫触");
+// }
+// }
+// }
//鏇存柊鐩爣搴撲綅鐘舵��
updateAgvLocMast(agvLocMast,"P");
updateAgvLocMast(locMast,"Q");
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 721488c..722ec96 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java
@@ -690,6 +690,7 @@
adjDetl.setLocNo(locDetl.getLocNo());
adjDetl.setMatnr(locDetl.getMatnr());
adjDetl.setBatch(locDetl.getBatch());
+ adjDetl.setMaktx(locDetl.getMaktx());
adjDetl.setOriQty(locDetl.getAnfme());
adjDetl.setAdjQty(adjust.getCount());
adjDetl.setModiTime(now);
@@ -721,6 +722,7 @@
adjDetl.setLocNo(locDetl.getLocNo());
adjDetl.setMatnr(locDetl.getMatnr());
adjDetl.setBatch(locDetl.getBatch());
+ adjDetl.setMaktx(locDetl.getMaktx());
adjDetl.setOriQty(locDetl.getAnfme());
adjDetl.setAdjQty(0.0D);
adjDetl.setModiTime(now);
@@ -757,6 +759,7 @@
adjDetl.setLocNo(locMast.getLocNo());
adjDetl.setMatnr(adjust.getMatnr());
adjDetl.setBatch(adjust.getBatch());
+ adjDetl.setMaktx(locDetl.getMaktx());
adjDetl.setOriQty(0.0D);
adjDetl.setAdjQty(adjust.getCount());
adjDetl.setModiTime(now);
@@ -1009,15 +1012,15 @@
String locNo = wrkMast.getSourceLocNo();
// 鐩爣搴撲綅
String targetLocNo = wrkMast.getLocNo();
- agvLocMastService.updateLocStsByLocNo(locNo,"F",wrkMast.getBarcode(),(short)getContainerTypeByloc(locNo),"",(short)0);
+ agvLocMastService.updateLocStsByLocNo(locNo, "F", wrkMast.getBarcode(), (short) getContainerTypeByloc(locNo), "", (short) 0);
if (wrkMast.getIoType() == 108) {
if (wrkMast.getWrkSts() != 22) {
- agvLocMastService.updateLocStsByLocNo(targetLocNo,"O","",null);
+ agvLocMastService.updateLocStsByLocNo(targetLocNo, "O", "", null);
}
} else {
if (wrkMast.getWrkSts() != 207L && wrkMast.getWrkSts() != 205L) {
if (wrkMast.getWrkSts() != 22) {
- agvBasDevpService.updateLocStsAndBarcodeByDevNo(targetLocNo,"O","",wrkMast.getWhsType().shortValue());
+ agvBasDevpService.updateLocStsAndBarcodeByDevNo(targetLocNo, "O", "", wrkMast.getWhsType().shortValue());
}
} else {
throw new CoolException("褰撳墠浣滀笟涓嶈兘鍙栨秷锛�");
@@ -1029,10 +1032,10 @@
List<AgvLocDetl> agvLocDetls = agvLocDetlService.selectList(new EntityWrapper<AgvLocDetl>().eq("loc_no", locNo));
// 鏇存柊璁㈠崟
for (AgvLocDetl agvLocDetl : agvLocDetls) {
- OrderDetl orderDetl = orderDetlService.selectOne(new EntityWrapper<OrderDetl>().eq("order_no", "DB" + agvLocDetl.getOrderNo()).eq("matnr", agvLocDetl.getMatnr()).eq("three_code",agvLocDetl.getThreeCode()));
+ OrderDetl orderDetl = orderDetlService.selectOne(new EntityWrapper<OrderDetl>().eq("order_no", "DB" + agvLocDetl.getOrderNo()).eq("matnr", agvLocDetl.getMatnr()).eq("three_code", agvLocDetl.getThreeCode()));
orderDetl.setQty(orderDetl.getQty() - agvLocDetl.getAnfme());
- if (!orderDetlService.update(orderDetl,new EntityWrapper<OrderDetl>().eq("order_no","DB" + agvLocDetl.getOrderNo()).eq("matnr", agvLocDetl.getMatnr()).eq("three_code",agvLocDetl.getThreeCode()))){
- throw new CoolException("淇敼璁㈠崟鏄庣粏澶辫触锛岃鑱旂郴绠＄悊鍛�"+agvLocDetl.getOrderNo()+agvLocDetl.getMatnr());
+ if (!orderDetlService.update(orderDetl, new EntityWrapper<OrderDetl>().eq("order_no", "DB" + agvLocDetl.getOrderNo()).eq("matnr", agvLocDetl.getMatnr()).eq("three_code", agvLocDetl.getThreeCode()))) {
+ throw new CoolException("淇敼璁㈠崟鏄庣粏澶辫触锛岃鑱旂郴绠＄悊鍛�" + agvLocDetl.getOrderNo() + agvLocDetl.getMatnr());
}
// FlowLog flowLog = new FlowLog();
// flowLog.setFid(String.valueOf(flowId));
@@ -1061,6 +1064,27 @@
// if (!flowLogService.insert(flowLog)) {
// throw new CoolException("鍚屾鍗婃垚鍝佽皟鎷ㄥ崟娴佹按璁板綍澶辫触");
// }
+ }
+
+ // 鍥炴祦鍗曞彇娑�
+ } else if (wrkMast.getIoType() == 114) {
+ //婧愬簱浣�
+ String locNo = wrkMast.getSourceLocNo();
+ // 鐩爣搴撲綅
+ String targetLocNo = wrkMast.getLocNo();
+ agvLocMastService.updateLocStsByLocNo(locNo,"F",wrkMast.getBarcode(),(short)getContainerTypeByloc(locNo));
+ agvLocMastService.updateLocStsByLocNo(targetLocNo,"O","",null);
+ // 婧愬簱浣� 搴撲綅涓绘。
+ AgvLocMast sourceLocMast = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_no", locNo));
+ AgvLocMast locMast = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_no", targetLocNo));
+ // 褰撳墠浠诲姟鏄法灞傜Щ搴� 涓旂洰鏍囨ゼ灞傛槸1妤肩殑 鍥炴粴璋冩嫧鍗�
+ List<AgvLocDetl> agvLocDetls = agvLocDetlService.selectList(new EntityWrapper<AgvLocDetl>().eq("loc_no", locNo));
+ for (AgvLocDetl agvLocDetl : agvLocDetls) {
+ OrderDetl orderDetl = orderDetlService.selectOne(new EntityWrapper<OrderDetl>().eq("three_code", agvLocDetl.getThreeCode()).eq("matnr", agvLocDetl.getMatnr()).eq("source", 17));
+ orderDetl.setQty(orderDetl.getQty() - agvLocDetl.getAnfme());
+ if (!orderDetlService.updateById(orderDetl)) {
+ throw new CoolException("鏇存柊璁㈠崟鏄庣粏澶辫触");
+ }
}
//鍑哄簱鍙栨秷
} else {
@@ -1105,7 +1129,7 @@
}
- if(wrkMast.getIoType() != 1 && wrkMast.getIoType() != 10 && wrkMast.getIoType()!=111 && wrkMast.getIoType()!=108 && wrkMast.getIoType() != 12 && wrkMast.getIoType() != 11){
+ if(wrkMast.getIoType() != 114 && wrkMast.getIoType() != 1 && wrkMast.getIoType() != 10 && wrkMast.getIoType()!=111 && wrkMast.getIoType()!=108 && wrkMast.getIoType() != 12 && wrkMast.getIoType() != 11){
//璁㈠崟鍥炴粴
//List<AgvWrkDetl> agvWrkDetlList = agvWrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
List<AgvWrkDetl> agvWrkDetlList1 = agvWrkDetlService.selectList(new EntityWrapper<AgvWrkDetl>().eq("wrk_no", wrkMast.getWrkNo()));
diff --git a/src/main/java/com/zy/asrs/service/impl/AgvWrkMastServiceImp.java b/src/main/java/com/zy/asrs/service/impl/AgvWrkMastServiceImp.java
index 1e4e397..51a32a9 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvWrkMastServiceImp.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvWrkMastServiceImp.java
@@ -225,6 +225,7 @@
}
agvTaskCreateParam.setTaskCode(agvWrkMast.getWrkNo().toString());
switch (agvWrkMast.getIoType()) {
+ case 114:
case 108:
case 12:
agvTaskCreateParam.setTaskTyp("F06");
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 b5ddaf2..0098053 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -983,6 +983,7 @@
adjDetl.setLocNo(locDetl.getLocNo());
adjDetl.setMatnr(locDetl.getMatnr());
adjDetl.setBatch(locDetl.getBatch());
+ adjDetl.setMaktx(locDetl.getMaktx());
adjDetl.setOriQty(locDetl.getAnfme());
adjDetl.setAdjQty(adjust.getCount());
adjDetl.setModiTime(now);
@@ -1012,6 +1013,7 @@
adjDetl.setLocNo(locDetl.getLocNo());
adjDetl.setMatnr(locDetl.getMatnr());
adjDetl.setBatch(locDetl.getBatch());
+ adjDetl.setMaktx(locDetl.getMaktx());
adjDetl.setOriQty(locDetl.getAnfme());
adjDetl.setAdjQty(0.0D);
adjDetl.setModiTime(now);
@@ -1047,6 +1049,7 @@
adjDetl.setLocNo(locMast.getLocNo());
adjDetl.setMatnr(adjust.getMatnr());
adjDetl.setBatch(adjust.getBatch());
+ adjDetl.setMaktx(locDetl.getMaktx());
adjDetl.setOriQty(0.0D);
adjDetl.setAdjQty(adjust.getCount());
adjDetl.setModiTime(now);
diff --git a/src/main/java/com/zy/asrs/task/AgvWrkMastScheduler.java b/src/main/java/com/zy/asrs/task/AgvWrkMastScheduler.java
index b37336e..3dc5546 100644
--- a/src/main/java/com/zy/asrs/task/AgvWrkMastScheduler.java
+++ b/src/main/java/com/zy/asrs/task/AgvWrkMastScheduler.java
@@ -136,7 +136,8 @@
.or().eq("io_type", 108)
.or().eq("io_type", 111)
.or().eq("io_type", 112)
- .or().eq("io_type", 113)).getRecords();
+ .or().eq("io_type", 113)
+ .or().eq("io_type", 114)).getRecords();
if(!Cools.isEmpty(agvWrkMastList)){
agvWrkMastList.forEach(agvWrkMast -> {
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 7512ebf..dbc655f 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,5 +1,5 @@
server:
- port: 8080
+ port: 8083
servlet:
context-path: /@pom.build.finalName@
@@ -87,19 +87,12 @@
u8:
url: http://192.168.9.3:8877
orderReportPath: /DBMS/U8/CM/add
-#ERP:
-# url: http://39.184.149.30:8877
-# orderReportPath: /DBMS/U8/CM/add
-mes:
- url: https://v3-ali.blacklake.cn/api/openapi/domain/web/v1/route
- orderReportPath: /inventory/open/v2/transfer_order/ordinary/_execute
- pakinReportPath: /inventory/open/v2/inbound_order/execute/_inbound
- buyPakinReportPath: /schedule-for-yinzuo/open/yinzuo/inboundOrder
- pakoutReportPath: /inventory/open/v2/outbound_order/_outbound_by_suggest
- getTokenUrl: https://v3-ali.blacklake.cn
- getTokenPath: /api/openapi/domain/api/v1/access_token/_get_access_token
- appKey: cli_1712644281065780
- appSecret: 6710d24e31e64adc963d4c213b2c9b8e
+ERP:
+ url: http://39.184.149.30:8877
+ orderReportPath: /DBMS/U8/CM/add
+MES:
+ url: http://192.168.1.55:8010
+ orderReportPath: /api/RdAudit
agvBasDev:
maxWorkNum: 1
diff --git a/src/main/resources/mapper/OrderMapper.xml b/src/main/resources/mapper/OrderMapper.xml
index c6a6f20..261603b 100644
--- a/src/main/resources/mapper/OrderMapper.xml
+++ b/src/main/resources/mapper/OrderMapper.xml
@@ -64,12 +64,12 @@
</update>
<select id="selectComplete" resultMap="BaseResultMap">
- select top 5 *
+ select TOP 5 *
from man_order
where 1=1
and settle = 4
and status = 1
- order by create_time asc
+ order by newID(), create_time asc
</select>
<select id="selectorderNoL" resultMap="BaseResultMap">
diff --git a/src/main/resources/mapper/ViewStockUseMapper.xml b/src/main/resources/mapper/ViewStockUseMapper.xml
index 1bd682c..148e133 100644
--- a/src/main/resources/mapper/ViewStockUseMapper.xml
+++ b/src/main/resources/mapper/ViewStockUseMapper.xml
@@ -152,7 +152,10 @@
</if>
) a ) b
- WHERE 1=1 and b.row between ((#{curr}-1)*#{limit}+1) and (#{curr}*#{limit})
+ WHERE 1=1
+ <if test="curr != null and curr !=''">
+ and b.row between ((#{curr}-1)*#{limit}+1) and (#{curr}*#{limit})
+ </if>
</select>
<select id="selectWorkCountInTotal" resultType="java.lang.Integer">
@@ -183,7 +186,10 @@
and matnr = #{matnr}
</if>
) a ) b
- WHERE 1=1 and b.row between ((#{curr}-1)*#{limit}+1) and (#{curr}*#{limit})
+ WHERE 1=1
+ <if test="curr != null and curr !=''">
+ and b.row between ((#{curr}-1)*#{limit}+1) and (#{curr}*#{limit})
+ </if>
</select>
<select id="selectWorkCountOutTotal" resultType="java.lang.Integer">
SELECT COUNT(*) FROM asr_wrkout_count_view
diff --git a/src/main/resources/mapper/ViewWorkInMapper.xml b/src/main/resources/mapper/ViewWorkInMapper.xml
index 6b3d6d5..d5db4e7 100644
--- a/src/main/resources/mapper/ViewWorkInMapper.xml
+++ b/src/main/resources/mapper/ViewWorkInMapper.xml
@@ -87,7 +87,10 @@
where 1=1
<include refid="viewWorkInConditionSql"></include>
) t
- ) a where 1=1 and a.row between ((#{pageNumber}-1)*#{pageSize}+1) and (#{pageNumber}*#{pageSize})
+ ) a where 1=1
+ <if test="pageNumber!=null and pageSize!=null">
+ and a.row between ((#{pageNumber}-1)*#{pageSize}+1) and (#{pageNumber}*#{pageSize})
+ </if>
</select>
<select id="getViewWorkInCount" parameterType="com.zy.asrs.entity.ViewWorkInBean" resultType="Integer">
@@ -132,8 +135,10 @@
where 1=1
<include refid="viewWorkInConditionSql"></include>
) t
- ) a where 1=1 and a.row between ((#{pageNumber}-1)*#{pageSize}+1) and (#{pageNumber}*#{pageSize})
-
+ ) a where 1=1
+ <if test="pageNumber!=null and pageSize!=null">
+ and a.row between ((#{pageNumber}-1)*#{pageSize}+1) and (#{pageNumber}*#{pageSize})
+ </if>
</select>
<select id="getViewWorkOutCount" parameterType="com.zy.asrs.entity.ViewWorkInBean" resultType="Integer">
diff --git a/src/main/webapp/static/js/agvHandWrkMast/agvHandWrkMast.js b/src/main/webapp/static/js/agvHandWrkMast/agvHandWrkMast.js
index e800e93..cc8b3e5 100644
--- a/src/main/webapp/static/js/agvHandWrkMast/agvHandWrkMast.js
+++ b/src/main/webapp/static/js/agvHandWrkMast/agvHandWrkMast.js
@@ -109,6 +109,7 @@
'wrkMast': exportData,
'fields': fields
};
+
$.ajax({
url: baseUrl+"/wrkMast/export/auth",
headers: {'token': localStorage.getItem('token')},
diff --git a/src/main/webapp/static/js/handWrkMast/handWrkMast.js b/src/main/webapp/static/js/handWrkMast/handWrkMast.js
index 5cfc49c..b3056e2 100644
--- a/src/main/webapp/static/js/handWrkMast/handWrkMast.js
+++ b/src/main/webapp/static/js/handWrkMast/handWrkMast.js
@@ -101,32 +101,40 @@
fields.push(col.field);
}
});
+ // var exportData = {};
+ // $.each($('#search-box [name]').serializeArray(), function() {
+ // exportData[this.name] = this.value;
+ // });
+ // var param = {
+ // 'wrkMast': exportData,
+ // 'fields': fields
+ // };
+ var param = '?';
var exportData = {};
$.each($('#search-box [name]').serializeArray(), function() {
exportData[this.name] = this.value;
+ param += this.name + '=' + this.value + '&';
});
- var param = {
- 'wrkMast': exportData,
- 'fields': fields
- };
- $.ajax({
- url: baseUrl+"/wrkMast/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)
- }
- }
- });
+ window.location.href = baseUrl + "/report/download/wrkMastLog" + param;
+ layer.closeAll();
+ // $.ajax({
+ // url: baseUrl+"/wrkMast/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)
+ // }
+ // }
+ // });
});
break;
}
diff --git a/src/main/webapp/static/js/report/workCountIn.js b/src/main/webapp/static/js/report/workCountIn.js
index e9ea3aa..70912b6 100644
--- a/src/main/webapp/static/js/report/workCountIn.js
+++ b/src/main/webapp/static/js/report/workCountIn.js
@@ -1,16 +1,17 @@
var pageCurr;
+
function getCol() {
var cols = [
{field: 'oneday', align: 'center', title: '鍏ュ簱鏃ユ湡', width: 200}
- ,{field: 'matnr', align: 'center',title: '鐗╂枡鍙�'}
- ,{field: 'maktx', align: 'center',title: '鐗╂枡鍚嶇О'}
- ,{field: 'anfme', align: 'center',title: '鏁伴噺'}
+ , {field: 'matnr', align: 'center', title: '鐗╂枡鍙�'}
+ , {field: 'maktx', align: 'center', title: '鐗╂枡鍚嶇О'}
+ , {field: 'anfme', align: 'center', title: '鏁伴噺'}
];
return cols;
}
-layui.use(['table','laydate', 'form'], function(){
+layui.use(['table', 'laydate', 'form'], function () {
var table = layui.table;
var $ = layui.jquery;
var layer = layui.layer;
@@ -22,7 +23,7 @@
tableIns = table.render({
elem: '#workIn',
headers: {token: localStorage.getItem('token')},
- url: baseUrl+'/report/viewWorkCountInList.action',
+ url: baseUrl + '/report/viewWorkCountInList.action',
page: true,
limit: 16,
limits: [16, 30, 50, 100, 200, 500],
@@ -45,12 +46,12 @@
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();
}
});
@@ -58,7 +59,7 @@
// 鐩戝惉鎺掑簭浜嬩欢
table.on('sort(workIn)', 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;
@@ -70,9 +71,9 @@
},
done: function (res, curr, count) {
if (res.code === 403) {
- top.location.href = baseUrl+"/";
+ top.location.href = baseUrl + "/";
}
- pageCurr=curr;
+ pageCurr = curr;
limit();
}
});
@@ -81,43 +82,51 @@
// 鐩戝惉澶村伐鍏锋爮浜嬩欢
table.on('toolbar(workIn)', function (obj) {
var checkStatus = table.checkStatus(obj.config.id);
- switch(obj.event) {
+ switch (obj.event) {
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);
fields.push(col.field);
}
});
+ var param = '?';
var exportData = {};
- $.each($('#search-box [name]').serializeArray(), function() {
+ $.each($('#search-box [name]').serializeArray(), function () {
exportData[this.name] = this.value;
+ param += this.name + '=' + this.value + '&';
});
- var param = {
- fields: fields,
- exportData: exportData
- };
- $.ajax({
- url: baseUrl+"/report/viewWorkInExport.action",
- 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)
- }
- }
- });
+ window.location.href = baseUrl + "/report/download/countIn" + param;
+ layer.closeAll();
+ // var param = {
+ // fields: fields,
+ // exportData: exportData
+ // };
+ // $.ajax({
+ // url: baseUrl + "/report/download/in",
+ // headers: {'token': localStorage.getItem('token')},
+ // data: JSON.stringify(param),
+ // responseType: "blob",
+ // contentType: 'application/json;charset=UTF-8',
+ // method: 'POST',
+ // success: function (res) {
+ // layer.closeAll();
+ // if (res.code === 200) {
+ // var blob = new Blob([response], { type: 'application/vnd.ms-excel' });
+ // var link = document.createElement('a');
+ // link.href = URL.createObjectURL(blob);
+ // link.download = 'exported_file.xls'; // 璁剧疆涓嬭浇鏂囦欢鍚�
+ // link.click();
+ // } else if (res.code === 403) {
+ // top.location.href = baseUrl + "/";
+ // } else {
+ // layer.msg(res.msg)
+ // }
+ // }
+ // });
});
break;
}
@@ -136,19 +145,19 @@
});
layDate.render({
elem: '.layui-laydate-range'
- ,type: 'datetime'
- ,range: true
+ , 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;
});
(child ? parent.tableIns : tableIns).reload({
@@ -158,14 +167,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;
@@ -179,9 +188,9 @@
for (var val in data) {
var find = el.find(":input[id='" + val + "']");
find.val(data[val]);
- if (showImg){
+ if (showImg) {
var next = find.next();
- if (next.get(0)){
+ if (next.get(0)) {
if (next.get(0).localName === "img") {
find.hide();
next.attr("src", data[val]);
@@ -201,13 +210,13 @@
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.9);
+ var height = detail.height() + 60;
+ if (height > ($(window).height() * 0.9)) {
+ height = ($(window).height() * 0.9);
}
layer.style(index, {
- top: (($(window).height()-height)/3)+"px",
- height: height+'px'
+ top: (($(window).height() - height) / 3) + "px",
+ height: height + 'px'
});
$(".layui-layer-shade").remove();
}
diff --git a/src/main/webapp/static/js/report/workCountOut.js b/src/main/webapp/static/js/report/workCountOut.js
index 6ef3da7..41dcd9c 100644
--- a/src/main/webapp/static/js/report/workCountOut.js
+++ b/src/main/webapp/static/js/report/workCountOut.js
@@ -91,32 +91,34 @@
fields.push(col.field);
}
});
- var exportData = {};
+ var param = '?';
$.each($('#search-box [name]').serializeArray(), function() {
- exportData[this.name] = this.value;
+ param += this.name + '=' + this.value + '&';
});
- var param = {
- fields: fields,
- exportData: exportData
- };
- $.ajax({
- url: baseUrl+"/report/viewWorkOutExport.action",
- 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)
- }
- }
- });
+ window.location.href = baseUrl + "/report/download/countOut" + param;
+ layer.closeAll();
+ // var param = {
+ // fields: fields,
+ // exportData: exportData
+ // };
+ // $.ajax({
+ // url: baseUrl+"/report/download/out",
+ // 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)
+ // }
+ // }
+ // });
});
break;
}
diff --git a/src/main/webapp/static/js/report/workIn.js b/src/main/webapp/static/js/report/workIn.js
index ec329f9..2ca190e 100644
--- a/src/main/webapp/static/js/report/workIn.js
+++ b/src/main/webapp/static/js/report/workIn.js
@@ -88,32 +88,38 @@
fields.push(col.field);
}
});
- var exportData = {};
+ var param = '?';
$.each($('#search-box [name]').serializeArray(), function() {
- exportData[this.name] = this.value;
+ param += this.name + '=' + this.value + '&';
});
- var param = {
- fields: fields,
- exportData: exportData
- };
- $.ajax({
- url: baseUrl+"/report/viewWorkInExport.action",
- 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)
- }
- }
- });
+ window.location.href = baseUrl + "/report/download/in" + param;
+ layer.closeAll();
+ // var exportData = {};
+ // $.each($('#search-box [name]').serializeArray(), function() {
+ // exportData[this.name] = this.value;
+ // });
+ // var param = {
+ // fields: fields,
+ // exportData: exportData
+ // };
+ // $.ajax({
+ // url: baseUrl+"/report/viewWorkInExport.action",
+ // 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)
+ // }
+ // }
+ // });
});
break;
}
diff --git a/src/main/webapp/static/js/report/workOut.js b/src/main/webapp/static/js/report/workOut.js
index c8b06bf..5074519 100644
--- a/src/main/webapp/static/js/report/workOut.js
+++ b/src/main/webapp/static/js/report/workOut.js
@@ -90,32 +90,38 @@
fields.push(col.field);
}
});
- var exportData = {};
+ var param = '?';
$.each($('#search-box [name]').serializeArray(), function() {
- exportData[this.name] = this.value;
+ param += this.name + '=' + this.value + '&';
});
- var param = {
- fields: fields,
- exportData: exportData
- };
- $.ajax({
- url: baseUrl+"/report/viewWorkOutExport.action",
- 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)
- }
- }
- });
+ window.location.href = baseUrl + "/report/download/out" + param;
+ layer.closeAll();
+ // var exportData = {};
+ // $.each($('#search-box [name]').serializeArray(), function() {
+ // exportData[this.name] = this.value;
+ // });
+ // var param = {
+ // fields: fields,
+ // exportData: exportData
+ // };
+ // $.ajax({
+ // url: baseUrl+"/report/viewWorkOutExport.action",
+ // 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)
+ // }
+ // }
+ // });
});
break;
}
diff --git a/src/main/webapp/views/handWrkMast/handWrkMast.html b/src/main/webapp/views/handWrkMast/handWrkMast.html
index 9bdd5b4..2283ce8 100644
--- a/src/main/webapp/views/handWrkMast/handWrkMast.html
+++ b/src/main/webapp/views/handWrkMast/handWrkMast.html
@@ -104,8 +104,8 @@
</div>
<script type="text/html" id="toolbar">
<div class="layui-btn-container">
- <button class="layui-btn layui-btn-normal" id="btn-pri-add" lay-event="priAdd"><i class="layui-icon"></i>澧炲姞浼樺厛绾�</button>
- <button class="layui-btn layui-btn-normal" id="btn-pri-red" lay-event="priRed"><i class="layui-icon"></i>闄嶄綆浼樺厛绾�</button>
+<!-- <button class="layui-btn layui-btn-normal" id="btn-pri-add" lay-event="priAdd"><i class="layui-icon"></i>澧炲姞浼樺厛绾�</button>-->
+<!-- <button class="layui-btn layui-btn-normal" id="btn-pri-red" lay-event="priRed"><i class="layui-icon"></i>闄嶄綆浼樺厛绾�</button>-->
<button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData">瀵煎嚭</button>
</div>
</script>
@@ -127,7 +127,7 @@
<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/handWrkMast/handWrkMast.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/handWrkMast/handWrkMast.js?v=1" charset="utf-8"></script>
<iframe id="detail-iframe" scrolling="auto" style="display:none;"></iframe>
diff --git a/src/main/webapp/views/report/viewWorkCountIn.html b/src/main/webapp/views/report/viewWorkCountIn.html
index 205be16..a62668d 100644
--- a/src/main/webapp/views/report/viewWorkCountIn.html
+++ b/src/main/webapp/views/report/viewWorkCountIn.html
@@ -46,7 +46,7 @@
<table class="layui-hide" id="workIn" lay-filter="workIn"></table>
<script type="text/html" id="toolbar">
<div class="layui-btn-container">
-<!-- <button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData" >瀵煎嚭</button>-->
+ <button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData" >瀵煎嚭</button>
</div>
</script>
@@ -57,7 +57,7 @@
<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/report/workCountIn.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/report/workCountIn.js?v=4" charset="utf-8"></script>
</body>
</html>
diff --git a/src/main/webapp/views/report/viewWorkCountOut.html b/src/main/webapp/views/report/viewWorkCountOut.html
index e6ed38a..272b34a 100644
--- a/src/main/webapp/views/report/viewWorkCountOut.html
+++ b/src/main/webapp/views/report/viewWorkCountOut.html
@@ -47,7 +47,7 @@
<table class="layui-hide" id="workOut" lay-filter="workOut"></table>
<script type="text/html" id="toolbar">
<div class="layui-btn-container">
-<!-- <button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData" >瀵煎嚭</button>-->
+ <button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData" >瀵煎嚭</button>
</div>
</script>
@@ -58,7 +58,7 @@
<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/report/workCountOut.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/report/workCountOut.js?v=1" charset="utf-8"></script>
</body>
</html>
diff --git a/src/main/webapp/views/report/viewWorkIn.html b/src/main/webapp/views/report/viewWorkIn.html
index 63930ca..31dd485 100644
--- a/src/main/webapp/views/report/viewWorkIn.html
+++ b/src/main/webapp/views/report/viewWorkIn.html
@@ -55,7 +55,7 @@
<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/report/workIn.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/report/workIn.js?v=2" charset="utf-8"></script>
</body>
</html>
diff --git a/src/main/webapp/views/report/viewWorkOut.html b/src/main/webapp/views/report/viewWorkOut.html
index a115e3c..225dfac 100644
--- a/src/main/webapp/views/report/viewWorkOut.html
+++ b/src/main/webapp/views/report/viewWorkOut.html
@@ -55,7 +55,7 @@
<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/report/workOut.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/report/workOut.js?v=1" charset="utf-8"></script>
</body>
</html>
--
Gitblit v1.9.1