From 42f143b527febec4998056f4a28fcd59402e6e6e Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期一, 17 七月 2023 13:53:54 +0800
Subject: [PATCH] #出库修改
---
src/main/java/com/zy/asrs/controller/OpenController.java | 12 +++++-
src/main/java/com/zy/asrs/entity/param/DigitalTwin.java | 24 ++++++++++++
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 25 ++++++++++--
src/main/java/com/zy/asrs/service/OpenService.java | 1
4 files changed, 55 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 5430a22..8f565ae 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -1,7 +1,6 @@
package com.zy.asrs.controller;
import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
import com.core.annotations.AppAuth;
import com.core.common.*;
import com.core.exception.CoolException;
@@ -12,7 +11,6 @@
import com.zy.common.web.BaseController;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
@@ -73,6 +71,16 @@
return R.ok();
}
+ /*
+ * 閫熻吘鏁板瓧瀛敓璋冪敤鎺ュ彛
+ * */
+ @PostMapping("/digital/twin/inventory/quantity")
+ public synchronized R inventoryQuantity(@RequestHeader(required = false) String appkey,
+ HttpServletRequest request) {
+ auth(appkey, null, request);
+ return R.ok(openService.inventoryQuantity());
+ }
+
/**
* 娣诲姞鍑哄簱鍗�
diff --git a/src/main/java/com/zy/asrs/entity/param/DigitalTwin.java b/src/main/java/com/zy/asrs/entity/param/DigitalTwin.java
new file mode 100644
index 0000000..647e8a9
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/param/DigitalTwin.java
@@ -0,0 +1,24 @@
+package com.zy.asrs.entity.param;
+
+import lombok.Data;
+
+@Data
+public class DigitalTwin {
+ private Integer count; //鎬婚噺
+// private Integer countO; //绌烘�婚噺
+// private Integer countF; //闈炵┖鎬婚噺
+ private int fqty; //鍦ㄥ簱搴撲綅
+ private int oqty;//绌哄簱浣�
+ private int uqty;//浣跨敤搴撲綅
+ private int xqty;//绂佺敤搴撲綅
+// private Integer artificialWarehousecount; //骞冲簱鎬婚噺
+// private Integer automatedWarehousecount; //绔嬪簱鎬婚噺
+// private Integer artificialWarehouseF; //骞冲簱闈炵┖鎬婚噺
+// private Integer automatedWarehouseF; //绔嬪簱闈炵┖鎬婚噺
+// private Integer artificialWarehouseO; //骞冲簱绌烘�婚噺
+// private Integer automatedWarehouseO; //绔嬪簱绌烘�婚噺
+ public DigitalTwin(){}
+ public DigitalTwin(Integer count){
+ this.count=count;
+ }
+}
diff --git a/src/main/java/com/zy/asrs/service/OpenService.java b/src/main/java/com/zy/asrs/service/OpenService.java
index e6233e5..dba0277 100644
--- a/src/main/java/com/zy/asrs/service/OpenService.java
+++ b/src/main/java/com/zy/asrs/service/OpenService.java
@@ -46,4 +46,5 @@
void syncMat(MatSyncParam param);
R getInOutDetl();
+ DigitalTwin inventoryQuantity();
}
diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index 51c7b77..4bdab86 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -1,7 +1,5 @@
package com.zy.asrs.service.impl;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
import com.core.common.DateUtils;
@@ -11,15 +9,13 @@
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.*;
import com.zy.asrs.entity.result.InOutCountDto;
-import com.zy.asrs.entity.result.OpenOrderCompeteResult;
import com.zy.asrs.entity.result.StockVo;
+import com.zy.asrs.mapper.ReportQueryMapper;
import com.zy.asrs.mapper.TagMapper;
import com.zy.asrs.service.*;
import com.zy.asrs.utils.MatUtils;
-import com.zy.asrs.utils.Utils;
import com.zy.common.model.DetlDto;
import com.zy.common.utils.NodeUtils;
-import com.zy.common.utils.Synchro;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -64,6 +60,8 @@
private ManPakOutService manPakOutService;
@Autowired
private LocOwnerService locOwnerService;
+ @Autowired
+ private ReportQueryMapper reportQueryMapper;
@Override
@Transactional
@@ -509,4 +507,21 @@
return R.ok().add(top100);
}
+ /*
+ * 閫熻吘鏁板瓧瀛敓璋冪敤鎺ュ彛
+ * */
+ @Override
+ public DigitalTwin inventoryQuantity() {
+ DigitalTwin digitalTwin = new DigitalTwin();
+ LocChartPie locUseRate = reportQueryMapper.getLocUseRate();
+ if(locUseRate!=null) {
+ digitalTwin.setCount(locUseRate.getOqty()+locUseRate.getFqty()+locUseRate.getUqty()+locUseRate.getXqty());
+ digitalTwin.setOqty(locUseRate.getOqty());
+ digitalTwin.setFqty(locUseRate.getFqty());
+ digitalTwin.setUqty(locUseRate.getUqty());
+ digitalTwin.setXqty(locUseRate.getXqty());
+ }
+ return digitalTwin;
+ }
+
}
--
Gitblit v1.9.1