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 | 168 +++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 149 insertions(+), 19 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/LocNormalController.java b/src/main/java/com/zy/asrs/controller/LocNormalController.java
index c17ad69..f95e567 100644
--- a/src/main/java/com/zy/asrs/controller/LocNormalController.java
+++ b/src/main/java/com/zy/asrs/controller/LocNormalController.java
@@ -10,7 +10,11 @@
import com.core.common.Cools;
import com.core.common.DateUtils;
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;
@@ -26,37 +30,46 @@
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;
import java.util.Map;
import static jdk.nashorn.api.scripting.ScriptUtils.convert;
@RestController
-public class LocNormalController extends BaseController{
+public class LocNormalController extends BaseController {
@Autowired
private LocNormalService locNormalService;
+ @Autowired
+ private LocNormalReportService locNormalReportService;
@RequestMapping(value = "/locNomal/list/auth")
@ManagerAuth
- public R list(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam(required = false)String orderByField,
- @RequestParam(required = false)String orderByType,
- @RequestParam(required = false)String condition,
- @RequestParam Map<String, Object> param){
+ public R list(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam(required = false) String orderByField,
+ @RequestParam(required = false) String orderByType,
+ @RequestParam(required = false) String condition,
+ @RequestParam Map<String, Object> param) {
excludeTrash(param);
EntityWrapper<LocNormal> wrapper = new EntityWrapper<>();
convert(param, wrapper);
allLike(LocNormal.class, param.keySet(), wrapper, condition);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
- wrapper.eq("state", "1").or().eq("state", "2");
+ if (!Cools.isEmpty(orderByField)) {
+ wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
+ }
+ if (Cools.isEmpty(param.get("state"))) {
+ wrapper.in("state", "1,2");
+ }
return R.ok(locNormalService.selectPage(new Page<>(curr, limit), wrapper));
}
- private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
- for (Map.Entry<String, Object> entry : map.entrySet()){
+ private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper) {
+ for (Map.Entry<String, Object> entry : map.entrySet()) {
String val = String.valueOf(entry.getValue());
- if (val.contains(RANGE_TIME_LINK)){
+ if (val.contains(RANGE_TIME_LINK)) {
String[] dates = val.split(RANGE_TIME_LINK);
wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
@@ -84,7 +97,7 @@
@ManagerAuth
public R query(@RequestBody JSONObject param) {
Wrapper<LocNormal> wrapper = new EntityWrapper<LocNormal>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
- if (null != locNormalService.selectOne(wrapper)){
+ if (null != locNormalService.selectOne(wrapper)) {
return R.parse(BaseRes.REPEAT).add(getComment(LocNormal.class, String.valueOf(param.get("key"))));
}
return R.ok();
@@ -95,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")
@@ -103,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")
@@ -111,16 +124,133 @@
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());
}
- // 瀵煎叆
+ /* 瀵煎叆 */
@RequestMapping(value = "/locNormal/import/auth")
@ManagerAuth(memo = "骞充粨绠＄悊瀵煎叆")
@Transactional
- public R matCodeImport(MultipartFile file) throws IOException, InterruptedException {
+ public R locNormalImport(MultipartFile file) throws IOException, InterruptedException {
LocNormalExcelListener listener = new LocNormalExcelListener(getUserId());
EasyExcel.read(file.getInputStream(), LocNormalExcel.class, listener).sheet().doRead();
- return R.ok("鎴愬姛瀵煎叆"+listener.getTotal()+"鏉＄墿鏂欎俊鎭�");
+ return R.ok("鎴愬姛瀵煎叆" + listener.getTotal() + "鏉＄墿鏂欎俊鎭�");
+ }
+
+ /* 骞充粨鍏ュ簱 */
+ @RequestMapping(value = "/locNormal/in")
+ @ManagerAuth(memo = "骞充粨鍏ュ簱")
+ @Transactional
+ public R locNormalIn(@RequestBody LocNormalParam param) {
+ Long userId = getUserId();
+ Date timeNow = new Date();
+ for (Integer i = 0; i < param.getNormalList().size(); i++) {
+ param.getNormalList().get(i).setAppeUser(userId);
+ param.getNormalList().get(i).setAppeTime(timeNow);
+ }
+ locNormalService.locNormalIn(param.getNormalList());
+ return R.ok();
+ }
+
+ /* pda鍏ュ簱 */
+ @RequestMapping(value = "/locNormal/pda/in")
+ @ManagerAuth(memo = "骞充粨绠＄悊pda鍏ュ簱")
+ @Transactional
+ public R locNormalPdaIn(@RequestBody LocNormalParam param) {
+ Long userId = getUserId();
+ Date timeNow = new Date();
+ for (Integer i = 0; i < param.getNormalList().size(); i++) {
+ param.getNormalList().get(i).setAppeUser(userId);
+ param.getNormalList().get(i).setAppeTime(timeNow);
+ }
+ locNormalService.pdaLocNormalIn(param.getNormalList());
+ return R.ok();
+ }
+
+ /* pda鍑哄簱鏌ヨ */
+ @RequestMapping(value = "/locNormal/pda/out/query")
+ @ManagerAuth(memo = "pda鍑哄簱鏌ヨ")
+ @Transactional
+ public R locNormalPdaOutQuery(String matnr, String warehouse, String billNo) {
+ List<LocNormal> list = new ArrayList<>();
+ list = locNormalService.pdaLocNormalQuery(matnr, warehouse, billNo);
+ return R.ok(list);
+ }
+
+ @RequestMapping(value = "/locNormal/pda/out")
+ @ManagerAuth(memo = "pda鍑哄簱")
+ @Transactional
+ public R locNormalPdaOut(@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.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