From 0e1b0582d0e59ce3a85ac59515a878a385adc507 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期四, 16 十一月 2023 14:20:47 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/MobileController.java | 159 +++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 154 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index 4610846..7fcf3f4 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -1,24 +1,38 @@
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;
+import com.core.annotations.AppAuth;
import com.core.annotations.ManagerAuth;
+import com.core.common.BaseRes;
import com.core.common.Cools;
+import com.core.common.DateUtils;
import com.core.common.R;
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.CombParam;
import com.zy.asrs.entity.param.MobileAdjustParam;
+import com.zy.asrs.entity.param.Review;
import com.zy.asrs.entity.result.MobileAdjustResult;
import com.zy.asrs.service.*;
+import com.zy.asrs.service.impl.MobileServiceImpl;
+import com.zy.asrs.task.handler.WorkLogHandler;
+import com.zy.common.constant.MesConstant;
+import com.zy.common.model.LocDto;
+import com.zy.common.model.TaskDto;
import com.zy.common.model.WrkDto;
+import com.zy.common.utils.HttpHandler;
import com.zy.common.web.BaseController;
+import com.zy.common.web.param.SearchLocParam;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
+import org.springframework.web.bind.annotation.*;
+import javax.servlet.http.HttpServletRequest;
+import java.text.SimpleDateFormat;
import java.util.*;
/**
@@ -38,6 +52,8 @@
@Autowired
private OrderService orderService;
@Autowired
+ private OrderDetlService orderDetlService;
+ @Autowired
private DocTypeService docTypeService;
@Autowired
private WrkMastService wrkMastService;
@@ -47,6 +63,16 @@
private BasDevpService basDevpService;
@Autowired
private PackService packService;
+
+
+ // 鍟嗗搧涓婃灦
+ @RequestMapping("/mat/onSale/auth")
+ //@ManagerAuth
+ public R matOnSale(@RequestBody CombParam combParam){
+ mobileService.onSale(combParam);
+ return R.ok("涓婃灦鎴愬姛");
+ }
+ // 鍟嗗搧涓嬫灦
// 缁勬墭 ----------------------------------------------------------------------------------------------------
@@ -142,7 +168,7 @@
if (wrkMast != null) {
List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
// 鍘婚櫎宸插嚭搴撶‘璁ょ殑鏄庣粏
- wrkDetls.removeIf(wrkDetl -> wrkDetl.getInspect() == 1);
+ wrkDetls.removeIf(wrkDetl -> wrkDetl.getInspect() != null && wrkDetl.getInspect() != 0);
return R.ok().add(Cools.add("wrkNo", wrkMast.getWrkNo()).add("ioType", wrkMast.getIoType()).add("list", wrkDetls));
}
return R.ok();
@@ -294,5 +320,128 @@
return R.ok("鐩樼偣鎴愬姛");
}
+ @PostMapping("/order/out/pakout/auth")
+ @ManagerAuth(memo = "璁㈠崟鍑哄簱")
+ public synchronized R pakoutByOrder(@RequestBody JSONObject param) {
+ if(!param.containsKey("staNo") || !param.containsKey("orderNo")){
+ return R.parse(BaseRes.PARAM);
+ }
+ mobileService.pakoutByOrder(param,getUserId());
+ return R.ok("鍑哄簱鎴愬姛");
+ }
+
+
+ /*...........................璧ｅ窞鏂板..............浠ヤ笅.............璧ｅ窞鏂板...........................*/
+// @PostMapping("/test/startUp/auth")
+// @ManagerAuth(memo = "鐢宠PACK娴嬭瘯")
+// public synchronized R startUpTestPACK(@RequestBody TestMast testMast) {
+// if (Cools.isEmpty(testMast)) {
+// return R.parse(BaseRes.PARAM);
+// }
+// mobileService.startUpTestPACK(testMast); //鎻愪氦娴嬭瘯绯荤粺
+// return R.ok();
+// }
+
+ @PostMapping("/test/suspend/auth")
+// @ManagerAuth(memo = "鏆傚仠娴嬭瘯")
+ @ResponseBody
+ public synchronized R suspendTestPACK(@RequestBody SearchLocParam param) {
+ if (mobileService.suspendTestPACK(param.getBarcode())){ //璇锋眰鏆傚仠娴嬭瘯
+ return R.ok();
+ }else {
+ return R.error("鏆傚仠澶辫触");
+ }
+ }
+ /**
+ * 娴嬭瘯搴撳熀鏈俊鎭�
+ */
+ @RequestMapping("/pack/basic/information")
+// @ManagerAuth(memo = "娴嬭瘯搴撳熀鏈俊鎭�")
+ public R packTestBasicInformation(){
+ return R.ok().add(mobileService.packTestBasicInformation());
+ }
+ /**
+ * 娴嬭瘯搴撲娇鐢ㄦ儏鍐�
+ */
+ @RequestMapping("/pack/usage/rate")
+// @ManagerAuth(memo = "娴嬭瘯搴撲娇鐢ㄦ儏鍐�")
+ public R packUsageRate(){
+ return R.ok().add(mobileService.packUsageRate());
+ }
+ /**
+ * 娴嬭瘯搴撳悎鏍兼暟
+ */
+ @RequestMapping("/pack/qualified")
+// @ManagerAuth(memo = "娴嬭瘯搴撳悎鏍兼暟")
+ public R packQualified(){
+ return R.ok().add(mobileService.packQualified());
+ }
+ /**
+ * 鏃�8-鏅�20
+ */
+ @RequestMapping("/pack/morning")
+// @ManagerAuth(memo = "娴嬭瘯搴撳悎鏍兼暟")
+ public R chartAxisMorning(){
+ return R.ok().add(mobileService.chartAxisMorning());
+ }
+ /**
+ * 鏅�20-绗簩澶╂棭8
+ */
+ @RequestMapping("/pack/evening")
+// @ManagerAuth(memo = "娴嬭瘯搴撳悎鏍兼暟")
+ public R chartAxisEvening(){
+ return R.ok().add(mobileService.chartAxisEvening());
+ }
+
+ @RequestMapping("/pack/morning/v2")
+// @ManagerAuth(memo = "娴嬭瘯搴撳悎鏍兼暟")
+ public R chartAxisMorningV2(){
+ Map<String,Object> map=new HashMap<String, Object>();
+ List<AxisBean> list = new ArrayList<AxisBean>();
+
+ List<WorkChartAxis> listChart = mobileService.chartAxisMorning();
+
+ if(listChart!=null) {
+ ArrayList<Integer> data1 = new ArrayList<Integer>();
+ ArrayList<Integer> data2 = new ArrayList<Integer>();
+
+ SimpleDateFormat sf = new SimpleDateFormat("yyyy-MM-dd");
+ Calendar calendar = Calendar.getInstance();
+ calendar.add(Calendar.DATE, -12);
+ for(int i=0;i<12;i++) {
+ boolean flag = true;
+ calendar.add(Calendar.DATE, 1);
+ String str = sf.format(calendar.getTime());
+ for(WorkChartAxis workChart : listChart) {
+ if(str.equals(workChart.getYmd())) {
+ data1.add(workChart.getInqty());
+ data2.add(workChart.getOutqty());
+ flag = false;
+ break;
+ }
+ }
+ if(flag) {
+ data1.add(0);
+ data2.add(0);
+ }
+ }
+ AxisBean inqty = new AxisBean();
+ inqty.setName("鍏ュ簱鏁伴噺");
+ Integer[] array1 = new Integer[data1.size()];
+ inqty.setData(data1.toArray(array1));
+ list.add(inqty);
+ AxisBean outqty = new AxisBean();
+ outqty.setName("鍑哄簱鏁伴噺");
+ Integer[] array2 = new Integer[data2.size()];
+ outqty.setData(data2.toArray(array2));
+ list.add(outqty);
+ }
+ map.put("rows",list);
+ return R.ok(map);
+ }
+
+
+ /*...........................璧ｅ窞鏂板..............浠ヤ笂.............璧ｅ窞鏂板...........................*/
+
}
--
Gitblit v1.9.1