From e7a730c10dd204240256d38c858abba8b3fd6b56 Mon Sep 17 00:00:00 2001
From: Junjie <DELL@qq.com>
Date: 星期四, 22 一月 2026 11:08:36 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/OpenController.java | 309 ++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 245 insertions(+), 64 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 4217e4e..ed79c41 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -2,13 +2,20 @@
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.plugins.Page;
import com.core.annotations.AppAuth;
import com.core.common.*;
import com.core.exception.CoolException;
+import com.zy.asrs.domain.dto.AxisBean;
+import com.zy.asrs.domain.dto.WorkChartAxis;
+import com.zy.asrs.domain.vo.LocChartPie;
+import com.zy.asrs.entity.LocDetl;
+import com.zy.asrs.entity.Mat;
+import com.zy.asrs.entity.WrkDetl;
import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.entity.param.*;
-import com.zy.asrs.service.OpenService;
-import com.zy.asrs.service.WrkMastService;
+import com.zy.asrs.mapper.ReportQueryMapper;
+import com.zy.asrs.service.*;
import com.zy.common.model.DetlDto;
import com.zy.common.web.BaseController;
import lombok.extern.slf4j.Slf4j;
@@ -16,10 +23,9 @@
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
+import java.text.SimpleDateFormat;
+import java.util.*;
+import java.util.concurrent.TimeUnit;
/**
* Created by vincent on 2022/4/8
@@ -38,12 +44,155 @@
private OpenService openService;
@Autowired
private WrkMastService wrkMastService;
+ @Autowired
+ private WorkService workService;
+ @Autowired
+ private WrkDetlService wrkDetlService;
+ @Autowired
+ private ReportQueryMapper reportQueryMapper;
+ @Autowired
+ private LocDetlService locDetlService;
+ @Autowired
+ private MatService matService;
+
+ /**
+ * 浠诲姟鏌ヨ鎺ュ彛
+ */
+ @PostMapping("/queryTask")
+ public synchronized R queryTask(@RequestBody QueryTaskParam param) {
+ if (Cools.isEmpty(param)) {
+ return R.parse(BaseRes.PARAM);
+ }
+ if (Cools.isEmpty(param.getTaskNo())) {
+ return R.error("浠诲姟鍙穂taskNo]涓嶈兘涓虹┖");
+ }
+ WrkMast wrkMast = wrkMastService.selectByTaskNo(param.getTaskNo());
+ if (wrkMast == null) {
+ return R.error("浠诲姟涓嶅瓨鍦�");
+ }
+
+ List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(Integer.valueOf(param.getTaskNo()));
+
+ HashMap<String, Object> map = new HashMap<>();
+ map.put("taskNo", param.getTaskNo());
+ map.put("ioType", wrkMast.getIoType());
+ map.put("wrkDetls", wrkDetls);
+ return R.ok().add(map);
+ }
+
+ /**
+ * 搴撳瓨淇℃伅鏌ヨ鎺ュ彛
+ */
+ @GetMapping("/queryLoc")
+ public synchronized R queryLoc() {
+ List<Map<String, Object>> pie = new ArrayList<>();
+ LocChartPie locUseRate = reportQueryMapper.getLocUseRate();
+
+ if (locUseRate != null) {
+ Map<String, Object> map = new HashMap<>();
+ map.put("name", "鍦ㄥ簱");
+ map.put("value", locUseRate.getFqty());
+ pie.add(map);
+
+ Map<String, Object> map1 = new HashMap<>();
+ map1.put("name", "绌�");
+ map1.put("value", locUseRate.getOqty());
+ pie.add(map1);
+
+ Map<String, Object> map2 = new HashMap<>();
+ map2.put("name", "浣跨敤");
+ map2.put("value", locUseRate.getUqty());
+ pie.add(map2);
+
+ Map<String, Object> map3 = new HashMap<>();
+ map3.put("name", "绂佺敤");
+ map3.put("value", locUseRate.getXqty());
+ pie.add(map3);
+ }
+
+ // 鎬诲簱浣嶆暟
+ Integer total = (int) Arith.add(0, locUseRate.getFqty(), locUseRate.getOqty(), locUseRate.getUqty(), locUseRate.getXqty());
+ // 浣跨敤涓�
+ Integer used = locUseRate.getFqty() + locUseRate.getUqty();
+ // 搴撲綅浣跨敤鐜�
+ double usedDivides = Arith.divides(3, used, total);
+ double usedPr = Arith.multiplys(1, usedDivides, 100);
+
+ return R.ok(
+ Cools.add("pie", pie)
+ .add("stockCount", locUseRate.getFqty())
+ .add("emptyCount", locUseRate.getOqty())
+ .add("disableCount", locUseRate.getXqty())
+ .add("total", total)
+ .add("used", used)
+ .add("usedPr", usedPr)
+ );
+ }
+
+ @GetMapping("/line/charts")
+ public R locIoLineCharts(){
+ Map<String,Object> map=new HashMap<String, Object>();
+ List<AxisBean> list = new ArrayList<AxisBean>();
+
+ List<WorkChartAxis> listChart = reportQueryMapper.getChartAxis();
+
+ 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);
+ }
+
+ @GetMapping("/locDetl/statistics")
+ public R locDetlStatistics(){
+ HashMap<String, Object> param = new HashMap<>();
+ Page<LocDetl> stockStatis = locDetlService.getStockStatis(toPage(1, 100, param, LocDetl.class));
+ for (LocDetl locDetl : stockStatis.getRecords()) {
+ Mat mat = matService.selectByMatnr(locDetl.getMatnr());
+ if (mat != null) {
+ locDetl.sync(mat);
+ }
+ }
+ return R.ok(stockStatis);
+ }
@PostMapping("/order/matSync/default/v1")
@AppAuth(memo = "鍟嗗搧淇℃伅鍚屾鎺ュ彛")
public synchronized R syncMatInfo(@RequestHeader(required = false) String appkey,
@RequestBody(required = false) MatSyncParam param,
- HttpServletRequest request){
+ HttpServletRequest request) {
auth(appkey, param, request);
if (Cools.isEmpty(param)) {
return R.parse(BaseRes.PARAM);
@@ -218,30 +367,31 @@
* 浠诲姟寮�濮�
*/
@RequestMapping("/start/task")
- public HashMap<String ,Object> startTask(@RequestBody HashMap<String,Object> map) {
- String taskNo = map.get("TaskNo")+"";
- HashMap<String ,Object> map1 = new HashMap<>();
- if(Cools.isEmpty(taskNo)){
+ public HashMap<String, Object> startTask(@RequestBody HashMap<String, Object> map) {
+ String taskNo = map.get("TaskNo") + "";
+ HashMap<String, Object> map1 = new HashMap<>();
+ if (Cools.isEmpty(taskNo)) {
map1.put("ReturnStatus", "1");
map1.put("ErrorMessage", "浠诲姟鍙蜂负绌�");
- }else{
- WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no",Integer.valueOf(taskNo)));
- if(wrkMast == null){
+ } else {
+ WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", Integer.valueOf(taskNo)));
+ if (wrkMast == null) {
map1.put("ReturnStatus", "1");
- map1.put("ErrorMessage", "娌℃湁鎵惧埌璇ヤ换鍔″彿锛�"+taskNo);
- }else{
- if(wrkMast.getIoType()==1){
+ map1.put("ErrorMessage", "娌℃湁鎵惧埌璇ヤ换鍔″彿锛�" + taskNo);
+ } else {
+ if (wrkMast.getIoType() == 1||wrkMast.getIoType() == 57|| wrkMast.getIoType() == 53) {
wrkMast.setWrkSts(3L);//鍏ュ簱寮�濮�
- }else if(wrkMast.getIoType()==11){
+ } else if (wrkMast.getIoType() == 11 ||wrkMast.getIoType() == 107|| wrkMast.getIoType() == 103 ) {
wrkMast.setWrkSts(13L);//鍑哄簱寮�濮�
}
wrkMast.setModiTime(new Date());
- if(wrkMastService.updateById(wrkMast)){
+ if (wrkMastService.updateById(wrkMast)) {
+ log.info("WMS浠诲姟寮�濮嬫洿鏂�"+wrkMast);
map1.put("ReturnStatus", "0");
map1.put("ErrorMessage", "");
- }else{
+ } else {
map1.put("ReturnStatus", "1");
- map1.put("ErrorMessage", "鏇存柊浠诲姟鐘舵�佸け璐�"+wrkMast);
+ map1.put("ErrorMessage", "鏇存柊浠诲姟鐘舵�佸け璐�" + wrkMast);
}
}
}
@@ -252,63 +402,94 @@
* 鎼繍鍒扮洰鐨勫湴
*/
@RequestMapping("/destination/task")
- public HashMap<String ,Object> destinationTask(@RequestBody HashMap<String,Object> map) {
- String taskNo = map.get("TaskNo")+"";
- HashMap<String ,Object> map1 = new HashMap<>();
- if(Cools.isEmpty(taskNo)){
+ public HashMap<String, Object> destinationTask(@RequestBody HashMap<String, Object> map) {
+ String taskNo = map.get("TaskNo") + "";
+ HashMap<String, Object> map1 = new HashMap<>();
+ if (Cools.isEmpty(taskNo)) {
map1.put("ReturnStatus", "1");
map1.put("ErrorMessage", "浠诲姟鍙蜂负绌�");
- }else{
- WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no",Integer.valueOf(taskNo)));
- if(wrkMast == null){
- map1.put("ReturnStatus", "1");
- map1.put("ErrorMessage", "娌℃湁鎵惧埌璇ヤ换鍔″彿锛�"+taskNo);
- }else{
- if(wrkMast.getIoType()==1){
- wrkMast.setWrkSts(4L);//浠诲姟缁撴潫
- }else if(wrkMast.getIoType()==11){
- wrkMast.setWrkSts(13L);//鍑哄簱鍒扮珯鐐逛笂
- }
- wrkMast.setModiTime(new Date());
- if(wrkMastService.updateById(wrkMast)){
- map1.put("ReturnStatus", "0");
- map1.put("ErrorMessage", "");
- }else{
+ } else {
+ //浠诲姟瀹屾垚
+ if (map.get("Result").equals(1)) {
+ WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", Integer.valueOf(taskNo)));
+ if (wrkMast == null) {
map1.put("ReturnStatus", "1");
- map1.put("ErrorMessage", "鏇存柊浠诲姟鐘舵�佸け璐�"+wrkMast);
+ map1.put("ErrorMessage", "娌℃湁鎵惧埌璇ヤ换鍔″彿锛�" + taskNo);
+ } else {
+ if (wrkMast.getIoType() == 1 || wrkMast.getIoType() == 10) {
+ wrkMast.setWrkSts(4L);//浠诲姟缁撴潫
+ } else if (wrkMast.getIoType() == 101) {
+ wrkMast.setWrkSts(13L);//鍑哄簱鍒扮珯鐐逛笂
+ } else if (wrkMast.getIoType() == 53 || wrkMast.getIoType() == 57) {
+ wrkMast.setWrkSts(4L);//4.浠诲姟缁撴潫
+ } else if (wrkMast.getIoType() == 103 || wrkMast.getIoType() == 107 || wrkMast.getIoType() == 110) {
+ wrkMast.setWrkSts(14L);
+ }else if(wrkMast.getIoType() == 11) {
+ wrkMast.setWrkSts(4L);
+ }
+ wrkMast.setModiTime(new Date());
+ if (wrkMastService.update(wrkMast,new EntityWrapper<WrkMast>().eq("wrk_no",wrkMast.getWrkNo()))) {
+ log.info("WMS浠诲姟瀹屾垚鏇存柊"+wrkMast);
+ map1.put("ReturnStatus", "0");
+ map1.put("ErrorMessage", "");
+ } else {
+ map1.put("ReturnStatus", "1");
+ map1.put("ErrorMessage", "鏇存柊浠诲姟鐘舵�佸け璐�" + wrkMast);
+ }
}
+ } else {
+ //浠诲姟鍙栨秷
+ WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", Integer.valueOf(taskNo)));
+ if (wrkMast == null) {
+ map1.put("ReturnStatus", "1");
+ map1.put("ErrorMessage", "娌℃湁鎵惧埌璇ヤ换鍔″彿锛�" + taskNo);
+ return map1;
+ }
+ workService.cancelWrkMast(String.valueOf(wrkMast.getWrkNo()),9999L);
+ map1.put("ReturnStatus", "0");
+ map1.put("ErrorMessage", "");
}
}
return map1;
}
/**
- * 鎼繍鍒扮洰鐨勫湴
+ * 鍑哄簱---鐩殑鍦版惉绂�
*/
@RequestMapping("/leave/task")
- public HashMap<String ,Object> leaveTask(@RequestBody HashMap<String,Object> map) {
- String taskNo = map.get("TaskNo")+"";
- HashMap<String ,Object> map1 = new HashMap<>();
- if(Cools.isEmpty(taskNo)){
- map1.put("ReturnStatus", "1");
- map1.put("ErrorMessage", "浠诲姟鍙蜂负绌�");
- }else{
- WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no",Integer.valueOf(taskNo)));
- if(wrkMast == null){
- map1.put("ReturnStatus", "1");
- map1.put("ErrorMessage", "娌℃湁鎵惧埌璇ヤ换鍔″彿锛�"+taskNo);
- }else{
- wrkMast.setWrkSts(14L);//鍑哄簱鍒扮珯鐐逛笂
- wrkMast.setModiTime(new Date());
- if(wrkMastService.updateById(wrkMast)){
- map1.put("ReturnStatus", "0");
- map1.put("ErrorMessage", "");
- }else{
- map1.put("ReturnStatus", "1");
- map1.put("ErrorMessage", "鏇存柊浠诲姟鐘舵�佸け璐�"+wrkMast);
+ public R leaveTask(@RequestBody HashMap<String, Object> map) {
+ String taskNo = String.valueOf(map.get("taskNo"));
+ String status = String.valueOf(map.get("status"));
+ HashMap<String, Object> map1 = new HashMap<>();
+ if (Cools.isEmpty(taskNo)) {
+ return R.error("浠诲姟鍙蜂负绌�");
+ } else {
+ WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", Integer.valueOf(taskNo)));
+ if (wrkMast == null) {
+ return R.error("娌℃湁鎵惧埌璇ヤ换鍔″彿锛�" + taskNo);
+ }
+
+ if (status.equals("complete")) {
+ // 鍏ュ簱 + 搴撲綅杞Щ
+ if (wrkMast.getWrkSts() < 4 || (wrkMast.getWrkSts() > 10 && wrkMast.getIoType()==11)) {
+ wrkMast.setWrkSts(4L);
+ // 鍑哄簱
+ } else if (wrkMast.getWrkSts() > 10) {
+ wrkMast.setWrkSts(14L);
}
+ Date now = new Date();
+ wrkMast.setWrkSts(14L);//鍑哄簱鍒扮珯鐐逛笂
+ wrkMast.setCrnStrTime(DateUtils.calculate(now, 1L, TimeUnit.SECONDS, true));
+ wrkMast.setCrnEndTime(now);
+ wrkMast.setModiTime(now);
+ wrkMastService.updateById(wrkMast);
+
+ return R.ok();
+ } else if (status.equals("cancel")) {
+ workService.cancelWrkMast(taskNo, 9527L);
+ return R.ok();
}
}
- return map1;
+ return R.error();
}
}
--
Gitblit v1.9.1