From 9806ca2cd1f15c6cf7b595ae455ff61904792b8a Mon Sep 17 00:00:00 2001
From: Mr.Shi <1878285526@qq.com>
Date: 星期一, 21 八月 2023 09:56:14 +0800
Subject: [PATCH] 大屏
---
screen_standard/src/components/AppLayout.vue | 50 ++++++++++++
server/src/main/java/doumeemes/service/ext/StatisticsService.java | 1
screen_standard/src/App.vue | 65 +---------------
screen_standard/src/assets/main.css | 28 ------
server/src/main/java/doumeemes/dao/ext/WStockExtMapper.java | 3
server/src/main/java/doumeemes/service/ext/impl/StatisticsServiceImpl.java | 15 +++
server/src/main/java/doumeemes/api/ext/StatisticsController.java | 5 +
server/src/main/java/doumeemes/dao/business/dto/statistics/StockDataModel.java | 33 +++----
server/src/main/resources/mappers/WStockExtMapper.xml | 12 +++
9 files changed, 104 insertions(+), 108 deletions(-)
diff --git a/screen_standard/src/App.vue b/screen_standard/src/App.vue
index a3a8bdb..9799296 100644
--- a/screen_standard/src/App.vue
+++ b/screen_standard/src/App.vue
@@ -1,73 +1,16 @@
<script setup>
-import { RouterLink, RouterView } from 'vue-router'
+
import AppLayout from './components/AppLayout.vue'
</script>
<template>
<AppLayout />
+<<<<<<< HEAD
+=======
+>>>>>>> 5103535bcd7b012c0eda4cbb26968066b35704d1
</template>
<style scoped>
-header {
- line-height: 1.5;
- max-height: 100vh;
-}
-.logo {
- display: block;
- margin: 0 auto 2rem;
-}
-
-nav {
- width: 100%;
- font-size: 12px;
- text-align: center;
- margin-top: 2rem;
-}
-
-nav a.router-link-exact-active {
- color: var(--color-text);
-}
-
-nav a.router-link-exact-active:hover {
- background-color: transparent;
-}
-
-nav a {
- display: inline-block;
- padding: 0 1rem;
- border-left: 1px solid var(--color-border);
-}
-
-nav a:first-of-type {
- border: 0;
-}
-
-@media (min-width: 1024px) {
- header {
- display: flex;
- place-items: center;
- padding-right: calc(var(--section-gap) / 2);
- }
-
- .logo {
- margin: 0 2rem 0 0;
- }
-
- header .wrapper {
- display: flex;
- place-items: flex-start;
- flex-wrap: wrap;
- }
-
- nav {
- text-align: left;
- margin-left: -1rem;
- font-size: 1rem;
-
- padding: 1rem 0;
- margin-top: 1rem;
- }
-}
</style>
diff --git a/screen_standard/src/assets/main.css b/screen_standard/src/assets/main.css
index e8667cd..4dc5a1d 100644
--- a/screen_standard/src/assets/main.css
+++ b/screen_standard/src/assets/main.css
@@ -1,35 +1,9 @@
@import './base.css';
#app {
- max-width: 1280px;
margin: 0 auto;
- padding: 2rem;
-
+ height: 100vh;
font-weight: normal;
}
-a,
-.green {
- text-decoration: none;
- color: hsla(160, 100%, 37%, 1);
- transition: 0.4s;
-}
-@media (hover: hover) {
- a:hover {
- background-color: hsla(160, 100%, 37%, 0.2);
- }
-}
-
-@media (min-width: 1024px) {
- body {
- display: flex;
- place-items: center;
- }
-
- #app {
- display: grid;
- grid-template-columns: 1fr 1fr;
- padding: 0 2rem;
- }
-}
diff --git a/screen_standard/src/components/AppLayout.vue b/screen_standard/src/components/AppLayout.vue
index 0197674..f54d402 100644
--- a/screen_standard/src/components/AppLayout.vue
+++ b/screen_standard/src/components/AppLayout.vue
@@ -1,16 +1,64 @@
<template>
<div class="content">
-
+ <div class="header">
+ <div class="header-item" style="font-size: 20px;">璞嗙背绉戞妧</div>
+ <div class="title">DM浜戝伐鍘傝溅闂村ぇ灞�</div>
+ <div class="header-item">澶╂皵</div>
+ </div>
+
+ <div class="num-list">
+
+ </div>
+ <RouterView />
</div>
</template>
<script setup>
+import { reactive } from 'vue';
+import { RouterView } from 'vue-router'
+
+const layoutList = [
+ { bgImg: requir('@/assets/img/bg_zhixingzhong@2x.png'), name: '鎵ц涓鍒掓暟(涓�)', logo: requir('@/assets/img') }
+]
+
</script>
<style lang="scss" scoped>
.content {
background-image: url('@/assets/img/bg@2x.png');
+ background-position: center;
+ background-size: 100% 100%;
+ background-repeat: no-repeat;
+ width: 100%;
+ height: 100%;
+ padding: 30px;
+ box-sizing: border-box;
+ .header {
+ background-image: url('@/assets/img/bg_maintitle@2x.png');
+ background-size: 100% 74px;
+ width: 100%;
+ height: 74px;
+ display: flex;
+ padding-top: 1px;
+ justify-content: space-between;
+ color: #fff;
+ .header-item {
+ width: 200px;
+ }
+ .title {
+ margin-top: 15px;
+ font-size: 25px;
+ font-weight: 500;
+ text-shadow: 0px 2px 17px rgba(0,0,0,0.32);
+ line-height: 25px;
+ text-align: center;
+ }
+ }
+ .num-list {
+ display: flex;
+ justify-content: space-between;
+ }
}
</style>
diff --git a/server/src/main/java/doumeemes/api/ext/StatisticsController.java b/server/src/main/java/doumeemes/api/ext/StatisticsController.java
index 4a9c7a8..b3dbd43 100644
--- a/server/src/main/java/doumeemes/api/ext/StatisticsController.java
+++ b/server/src/main/java/doumeemes/api/ext/StatisticsController.java
@@ -87,6 +87,11 @@
public ApiResponse<List<ProcedureProcessModel>> getProcedureProcessList (@PathVariable Integer companyId, @PathVariable Integer departId ) {
return ApiResponse.success(statisticsService.getProcedureProcessList(companyId,departId));
}
+ @ApiOperation("鎴愬搧璁″垝-瀹炴椂浠撳簱浣欓噺缁熻")
+ @GetMapping("/getStockList/{companyId}/{departId}")
+ public ApiResponse<List<StockDataModel>> getStockList (@PathVariable Integer companyId, @PathVariable Integer departId ) {
+ return ApiResponse.success(statisticsService.getStockList(companyId,departId));
+ }
}
diff --git a/server/src/main/java/doumeemes/dao/business/dto/statistics/StockDataModel.java b/server/src/main/java/doumeemes/dao/business/dto/statistics/StockDataModel.java
index 07480b7..13cbf72 100644
--- a/server/src/main/java/doumeemes/dao/business/dto/statistics/StockDataModel.java
+++ b/server/src/main/java/doumeemes/dao/business/dto/statistics/StockDataModel.java
@@ -9,25 +9,20 @@
@Data
@ApiModel("澶у睆鏁版嵁鐪嬫澘-搴撳瓨瀹炴椂浣欓噺缁熻杩斿洖鏁版嵁")
/**
- * 鎵ц涓鍒掓暟锛氱粺璁¤寖鍥翠负锛氭垚鍝佽鍒掞紱鐘舵�佷负銆愭墽琛屼腑銆戯紱
- * 寤舵湡璁″垝鏁帮細缁熻鑼冨洿涓猴細鎴愬搧璁″垝锛涚姸鎬佷负銆愭墽琛屼腑銆戜笖褰撳墠鏃堕棿澶т簬璁″垝缁撴潫鏃堕棿锛�
- * 浠婃棩鐢熶骇浜烘暟锛氭牴鎹粖鏃ユ姇鏂�/浜у嚭璁板綍琛ㄦ暟鎹紝缁熻浠婃棩鐨勭敓浜т汉鏁帮紙鍘婚噸锛夛紱缁熻鑼冨洿涓哄伐鍗曠姸鎬佷负銆愬凡鍒涘缓銆佸凡澶囨枡銆佺敓浜т腑銆佸凡妫�楠屻�佸凡瀹屽伐妫�銆佸凡鎶ュ伐銆戯紱
- * 浠婃棩鐢熶骇璁惧锛氭牴鎹粖鏃ユ姇鏂�/浜у嚭璁板綍琛ㄥ叧鑱旂殑宸ュ崟鏁版嵁锛岀粺璁′粖鏃ョ殑鐢熶骇璁惧鏁帮紙鍘婚噸锛夛紱缁熻鑼冨洿涓哄伐鍗曠姸鎬佷负銆愬凡鍒涘缓銆佸凡澶囨枡銆佺敓浜т腑銆佸凡妫�楠屻�佸凡瀹屽伐妫�銆佸凡鎶ュ伐銆戯紱
- * 浠婃棩涓嶈壇鍝佺巼锛氭牴鎹粖鏃ヤ骇鍑鸿褰曡〃鏁版嵁锛岀粺璁′粖鏃ヤ骇鍑轰笉鑹暟/浠婃棩浜у嚭鎬绘暟閲�*100%锛涚粺璁¤寖鍥翠负宸ュ崟鐘舵�佷负銆愬凡鎶ュ伐銆戯紱
+ * 灞曠ず浠撳簱鐨勫疄鏃朵綑閲忔儏鍐碉紙鎷夊彇鍏ㄩ儴鏁版嵁锛夛紱鎸夌収銆愮墿鏂�+浠撳簱+鎵规鍙枫�戞眹鎬绘柟寮忥紱锛堝嵆PC绔簱瀛樻煡璇㈤粯璁ゅ垪琛ㄦ暟鎹級锛�
+ * 涓嶆粴鍔紝鏀寔涓婁笅婊氬姩鏌ョ湅鍏朵粬鏁版嵁锛�
*/
public class StockDataModel {
- @ApiModelProperty(value = "鎵ц涓鍒掓暟", example = "1")
- private Integer ingNum;
- @ApiModelProperty(value = "寤舵湡璁″垝鏁�", example = "1")
- private Integer delayNum;
- @ApiModelProperty(value = "浠婃棩鐢熶骇浜烘暟", example = "1")
- private Integer prouserNum;
- @ApiModelProperty(value = "浠婃棩鐢熶骇璁惧鏁�", example = "1")
- private Integer deviceNum;
- @ApiModelProperty(value = "浠婃棩涓嶈壇鍝佺巼", example = "1")
- private BigDecimal unqualifiedRate;
- @ApiModelProperty(value = "浠婃棩涓嶈壇鍝佹暟", example = "1",hidden = true)
- private BigDecimal unqualifiedNum;
- @ApiModelProperty(value = "浠婃棩鎶ュ伐鏁�", example = "1",hidden = true)
- private BigDecimal doneNUm;
+ @ApiModelProperty(value = "鐗╂枡鍚嶇О", example = "1")
+ private String materialName;
+ @ApiModelProperty(value = "宸ュ簭鍚嶇О", example = "1")
+ private String procedureName;
+ @ApiModelProperty(value = "浠撳簱鍚嶇О", example = "1")
+ private String warehouseName;
+ @ApiModelProperty(value = "璐ф灦鍚嶇О", example = "1")
+ private String location;
+ @ApiModelProperty(value = "鏁伴噺", example = "1")
+ private BigDecimal num;
+ @ApiModelProperty(value = "鍗曚綅")
+ private String unitName;
}
diff --git a/server/src/main/java/doumeemes/dao/ext/WStockExtMapper.java b/server/src/main/java/doumeemes/dao/ext/WStockExtMapper.java
index 9b4ea5c..d552db7 100644
--- a/server/src/main/java/doumeemes/dao/ext/WStockExtMapper.java
+++ b/server/src/main/java/doumeemes/dao/ext/WStockExtMapper.java
@@ -1,5 +1,6 @@
package doumeemes.dao.ext;
+import doumeemes.dao.business.dto.statistics.StockDataModel;
import doumeemes.dao.business.model.WStock;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import doumeemes.dao.ext.beanDto.QueryWStockDto;
@@ -32,4 +33,6 @@
List<WStockExtListVO> selectAdminListForH5(QueryWStockDto dto);
List<WStockExtListVO> choiceStockPageByTransfer(QueryWStockHeadNewDTO dto);
+
+ List<StockDataModel> getStatisticsStockList(QueryWStockExtDTO param);
}
diff --git a/server/src/main/java/doumeemes/service/ext/StatisticsService.java b/server/src/main/java/doumeemes/service/ext/StatisticsService.java
index 5df3ad2..4f15ff3 100644
--- a/server/src/main/java/doumeemes/service/ext/StatisticsService.java
+++ b/server/src/main/java/doumeemes/service/ext/StatisticsService.java
@@ -37,4 +37,5 @@
List<WorkPlansPageModel> getWorkPlansList(Integer companyId, Integer departId);
List<ProcedureProcessModel> getProcedureProcessList(Integer companyId, Integer departId);
+ List<StockDataModel> getStockList(Integer companyId, Integer departId);
}
diff --git a/server/src/main/java/doumeemes/service/ext/impl/StatisticsServiceImpl.java b/server/src/main/java/doumeemes/service/ext/impl/StatisticsServiceImpl.java
index 451eac9..c67ff46 100644
--- a/server/src/main/java/doumeemes/service/ext/impl/StatisticsServiceImpl.java
+++ b/server/src/main/java/doumeemes/service/ext/impl/StatisticsServiceImpl.java
@@ -49,6 +49,8 @@
@Autowired
private PlansExtMapper plansExtMapper;
@Autowired
+ private WStockExtMapper stockExtMapper;
+ @Autowired
private WorkorderRecordExtMapper workorderRecordExtMapper;
@Autowired
private DepartmentExtService departmentExtService;
@@ -135,6 +137,19 @@
return result;
}
@Override
+ public List<StockDataModel> getStockList(Integer companyId, Integer departId){
+ DepartmentExtListVO department = departmentExtService.getModelById(companyId,departId);
+ if(department == null || Constants.equalsInteger(department.getDeleted(), Constants.ONE)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"瀵逛笉璧凤紝浼佷笟鎴栬�呴儴闂ㄤ俊鎭笉鍚堟硶锛屽鏈夌枒闂紝璇疯仈绯荤郴缁熺鐞嗗憳");
+ }
+ QueryWStockExtDTO param = new QueryWStockExtDTO();
+ param.setRootDepartId(department.getRootId());
+ param.setWmodelDepartId(departId);
+ //鏌ヨ缁熻缁撴灉
+ List<StockDataModel> result = stockExtMapper.getStatisticsStockList(param);
+ return result;
+ }
+ @Override
public List<Unqualified7DayModel> getUnqualified7DayData(Integer companyId, Integer departId, Integer procedureId) {
DepartmentExtListVO department = departmentExtService.getModelById(companyId,departId);
if(department == null || Constants.equalsInteger(department.getDeleted(), Constants.ONE)){
diff --git a/server/src/main/resources/mappers/WStockExtMapper.xml b/server/src/main/resources/mappers/WStockExtMapper.xml
index 8001bb1..0f32d14 100644
--- a/server/src/main/resources/mappers/WStockExtMapper.xml
+++ b/server/src/main/resources/mappers/WStockExtMapper.xml
@@ -77,6 +77,18 @@
<result column="WMODEL_ADDR" jdbcType="VARCHAR" property="addr"/>
</association>
</resultMap>
+ <select id="getStatisticsStockList" parameterType="doumeemes.dao.ext.dto.QueryWStockExtDTO" resultType="doumeemes.dao.business.dto.statistics.StockDataModel">
+ select sum(a.NUM) as num,c.`NAME` as materialName,d.name as warehouseName,f.UNION_NAME as location,u.name as unitName
+ from w_stock a
+ left join material_distribute b on a.MATERIAL_ID=b.ID
+ left join material c on b.MATERIAL_ID=c.ID
+ left join warehouse d on a.WAREHOUSE_ID=d.ID
+ left join warehouse_location f on a.LOCATION_ID=f.ID
+ left join unit u on a.UNIT_ID=u.id
+ where a.DELETED = 0 AND a.ROOT_DEPART_ID = #{rootDepartId} AND d.DEPART_ID=#{wmodelDepartId}
+ GROUP BY a.MATERIAL_ID,a.WAREHOUSE_ID,a.BATCH
+ ORDER BY num DESC
+ </select>
<select id="selectAllList" parameterType="doumeemes.dao.ext.dto.QueryWStockExtDTO" resultMap="WStockExtListVO">
SELECT a.*
FROM w_stock a
--
Gitblit v1.9.3