From 65c2069cc4f4009c959236e515d3f82a1928840c Mon Sep 17 00:00:00 2001
From: 王佳豪 <g675230687@126.com>
Date: 星期三, 09 六月 2021 09:03:43 +0800
Subject: [PATCH] pda立库组托入库允许只填生成单号数据插入入库通知档
---
src/main/java/com/zy/asrs/controller/LocNormalController.java | 79 ++++++++++++++++++++++++++++++++++++---
1 files changed, 73 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/LocNormalController.java b/src/main/java/com/zy/asrs/controller/LocNormalController.java
index 64d82cc..f95e567 100644
--- a/src/main/java/com/zy/asrs/controller/LocNormalController.java
+++ b/src/main/java/com/zy/asrs/controller/LocNormalController.java
@@ -12,7 +12,9 @@
import com.core.common.R;
import com.sun.org.apache.bcel.internal.generic.NEW;
import com.zy.asrs.entity.LocNormal;
+import com.zy.asrs.entity.LocNormalReport;
import com.zy.asrs.entity.param.LocNormalParam;
+import com.zy.asrs.service.LocNormalReportService;
import com.zy.asrs.service.LocNormalService;
import com.zy.common.utils.excel.locNomal.LocNormalExcel;
import com.zy.common.utils.excel.locNomal.LocNormalExcelListener;
@@ -28,6 +30,7 @@
import org.springframework.web.multipart.MultipartFile;
import java.io.IOException;
+import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -39,6 +42,8 @@
public class LocNormalController extends BaseController {
@Autowired
private LocNormalService locNormalService;
+ @Autowired
+ private LocNormalReportService locNormalReportService;
@RequestMapping(value = "/locNomal/list/auth")
@ManagerAuth
@@ -56,7 +61,7 @@
wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
}
if (Cools.isEmpty(param.get("state"))) {
- wrapper.eq("state", "1").or().eq("state", "2");
+ wrapper.in("state", "1,2");
}
return R.ok(locNormalService.selectPage(new Page<>(curr, limit), wrapper));
}
@@ -103,7 +108,7 @@
public void updateLocNormal(LocNormal param) {
Long modiUser = getUserId();
Date modiTime = new Date();
- locNormalService.updateLocNormal(param.getMatnr(), param.getAnfme(), modiUser, modiTime);
+ locNormalService.updateLocNormal(param.getMatnr(), param.getAnfme(), modiUser, modiTime, param.getId());
}
@RequestMapping(value = "/locNormal/outLoc/auth")
@@ -111,7 +116,7 @@
public void outLocNormal(LocNormal param) {
Long modiUser = getUserId();
Date modiTime = new Date();
- locNormalService.outLocNormal(param.getMatnr(), modiUser, modiTime);
+ locNormalService.outLocNormal(param.getMatnr(), modiUser, modiTime, param.getId());
}
@RequestMapping(value = "/locNormal/removeLoc/auth")
@@ -119,7 +124,7 @@
public void removeLoc(LocNormal param) {
Long modiUser = getUserId();
Date modiTime = new Date();
- locNormalService.removeLocNormal(param.getMatnr(), modiUser, modiTime);
+ locNormalService.removeLocNormal(param.getMatnr(), modiUser, modiTime, param.getId());
}
/* 瀵煎叆 */
@@ -166,9 +171,9 @@
@RequestMapping(value = "/locNormal/pda/out/query")
@ManagerAuth(memo = "pda鍑哄簱鏌ヨ")
@Transactional
- public R locNormalPdaOutQuery(String matnr, String warehouse) {
+ public R locNormalPdaOutQuery(String matnr, String warehouse, String billNo) {
List<LocNormal> list = new ArrayList<>();
- list = locNormalService.pdaLocNormalQuery(matnr, warehouse);
+ list = locNormalService.pdaLocNormalQuery(matnr, warehouse, billNo);
return R.ok(list);
}
@@ -186,4 +191,66 @@
locNormalService.pdaLocNormalOut(list);
return R.ok();
}
+
+ @RequestMapping(value = "/locNormal/pda/warehouseQuery")
+ @ManagerAuth(memo = "pda鏍规嵁搴撳尯鏌ヨ鐗╂枡娓呭崟")
+ @Transactional
+ public R locNormalPdaWarehouseQuery(String warehouse, String matnr) {
+ List<LocNormal> list = locNormalService.pdaLocNormalWarehouseQuery(warehouse, matnr);
+ return R.ok(list);
+ }
+
+ @RequestMapping(value = "/locNormal/pda/move")
+ @ManagerAuth(memo = "pda绉诲簱")
+ @Transactional
+ public R LocNormalPdaMove(@RequestBody LocNormalParam param) {
+ Long userId = getUserId();
+ Date timeNow = new Date();
+ List<LocNormal> list = param.getNormalList();
+ for (Integer i = 0; i < list.size(); i++) {
+ list.get(i).setModiUser(userId);
+ list.get(i).setModiTime(timeNow);
+ }
+ locNormalService.pdaLocNormalMove(list);
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/locNomal/getInListByDay")
+ @ManagerAuth(memo = "骞充粨鏃ュ嚭鍏ュ簱鏌ヨ")
+ public R getInListByDay(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam(required = false) String orderByField,
+ @RequestParam(required = false) String orderByType,
+ @RequestParam(required = false) String condition,
+ @RequestParam Map<String, Object> param) {
+ excludeTrash(param);
+ EntityWrapper<LocNormalReport> wrapper = new EntityWrapper<>();
+ List<String> orderList = new ArrayList<>();
+ orderList.add("time");
+ wrapper.eq("state", param.get("state").toString()).orderDesc(orderList);
+ String timeRange = "";
+ String time1 = "";
+ String time2 = "";
+ if (!Cools.isEmpty(param.get("query_date"))) {
+ timeRange = param.get("query_date").toString();
+ time1 = timeRange.substring(0, 19);
+ time2 = timeRange.substring(21, timeRange.length());
+ }
+ param.remove("query_date");
+ convert(param, wrapper);
+ if (time1 != "" && time2 != "") {
+ SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ Date dateTime1 = new Date();
+ Date dateTime2 = new Date();
+ try {
+ dateTime1 = formatter.parse(time1);
+ dateTime2 = formatter.parse(time2);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ wrapper.ge("time", dateTime1).and().le("time", dateTime2);
+ }
+ allLike(LocNormalReport.class, param.keySet(), wrapper, condition);
+ return R.ok(locNormalReportService.selectPage(new Page<>(curr, limit), wrapper));
+ }
}
--
Gitblit v1.9.1