From a7a93455872d11f82624884c5016c2911d7211f2 Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期一, 31 三月 2025 15:13:57 +0800
Subject: [PATCH] wcs电视机代码移植
---
src/main/java/com/zy/asrs/mapper/ReportQueryMapper.java | 65 ++++++++++++++++++++++++++++++++
src/main/java/com/zy/asrs/controller/ConsoleController.java | 4 +-
src/main/java/com/zy/asrs/domain/enums/SiteStatusType.java | 27 -------------
3 files changed, 67 insertions(+), 29 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/ConsoleController.java b/src/main/java/com/zy/asrs/controller/ConsoleController.java
index 1458636..9b81018 100644
--- a/src/main/java/com/zy/asrs/controller/ConsoleController.java
+++ b/src/main/java/com/zy/asrs/controller/ConsoleController.java
@@ -1,10 +1,10 @@
package com.zy.asrs.controller;
import com.core.common.R;
+import com.zy.asrs.domain.dto.WorkChartAxis;
+import com.zy.asrs.domain.vo.LocChartPie;
import com.zy.asrs.entity.AxisBean;
import com.zy.asrs.entity.ChartBean;
-import com.zy.asrs.entity.LocChartPie;
-import com.zy.asrs.entity.WorkChartAxis;
import com.zy.asrs.mapper.ReportQueryMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
diff --git a/src/main/java/com/zy/asrs/domain/enums/SiteStatusType.java b/src/main/java/com/zy/asrs/domain/enums/SiteStatusType.java
index b3adb37..91fa115 100644
--- a/src/main/java/com/zy/asrs/domain/enums/SiteStatusType.java
+++ b/src/main/java/com/zy/asrs/domain/enums/SiteStatusType.java
@@ -1,8 +1,5 @@
package com.zy.asrs.domain.enums;
-
-import com.zy.core.model.protocol.StaProtocol;
-
/**
* 绔欑偣鐘舵�佹灇涓�
*/
@@ -18,29 +15,5 @@
SITE_AUTO_RUN,
// 鑷姩+ID
SITE_AUTO_ID,
-
- ;
-
- public static SiteStatusType process(StaProtocol staProtocol){
- if (staProtocol == null) {
- return null;
- }
- if (staProtocol.isAutoing() && staProtocol.isLoading() && staProtocol.getWorkNo() > 0) {
- return SITE_AUTO_RUN_ID;
- }
- if (staProtocol.isAutoing() && staProtocol.isLoading()) {
- return SITE_AUTO_RUN;
- }
- if (staProtocol.isAutoing() && staProtocol.getWorkNo() > 0) {
- return SITE_AUTO_ID;
- }
- if (staProtocol.isAutoing()) {
- return SITE_AUTO;
- }
- if (!staProtocol.isAutoing()) {
- return SITE_UNAUTO;
- }
- return null;
- }
}
diff --git a/src/main/java/com/zy/asrs/mapper/ReportQueryMapper.java b/src/main/java/com/zy/asrs/mapper/ReportQueryMapper.java
index bd14d54..5bac1d0 100644
--- a/src/main/java/com/zy/asrs/mapper/ReportQueryMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/ReportQueryMapper.java
@@ -2,7 +2,9 @@
import com.zy.asrs.domain.dto.WorkChartAxis;
import com.zy.asrs.domain.vo.LocChartPie;
+import com.zy.asrs.entity.*;
import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import org.springframework.stereotype.Repository;
@@ -50,4 +52,67 @@
@Select("select count(1) as totalLoc from asr_loc_mast")
Integer getTotalLocByCrnId();
+ //鍒嗛〉鏌ヨ搴撲綅浣跨敤鐜�
+ List<ViewStockUseBean> queryViewStockUseList(ViewStockUseBean viewStockUse);
+ int getViewStockUseCount(ViewStockUseBean viewStockUse);
+ List<ViewStockUseBean> getViewStockUseAll(ViewStockUseBean viewStockUse);
+
+ //鍒嗛〉鏌ヨ搴撳瓨婊炵暀鏃堕棿
+ public List<ViewStayTimeBean> queryViewStayTimeList(ViewStayTimeBean viewStayTime);
+ public int getViewStayTimeCount(ViewStayTimeBean viewStayTime);
+ //涓嶅垎椤垫煡璇㈡墍鏈変俊鎭紝鐢ㄤ簬excel瀵煎嚭
+ public List<ViewStayTimeBean> getViewStayTimeAll(ViewStayTimeBean viewStayTime);
+
+ // // 搴撲綅Map
+ @Select("select distinct row1 from asr_loc_mast order by row1 asc")
+ List<Integer> getViewLocRowTotal();
+
+ @Select("select distinct lev1 from asr_loc_mast where row1=#{row1} order by lev1 desc")
+ public List<String> getViewLocLevCount(@Param("row1") int row1);
+ //
+ @Select("select loc_no as locNo, bay1,loc_sts as locSts from asr_loc_mast where row1=#{row1} and lev1=#{lev1} order by bay1")
+ public List<ViewLocMapDto> getViewLocBays(@Param("row1") int row1, @Param("lev1") int lev1);
+
+ // 搴撲綅Map
+ @Select("select distinct bay1 from asr_loc_mast where row1=#{row1} order by bay1")
+ public List<String> getViewLocBayCount(@Param("row1") int row1);
+
+ @Select("select lev1,loc_sts as locSts from asr_loc_mast where row1=#{row1} and bay1=#{bay1} order by bay1")
+ public List<ViewLocMapDto> getViewLocLevs(@Param("row1") int row1, @Param("bay1") int bay1);
+
+
+ //鍒嗛〉鏌ヨ绔欑偣鍏ュ嚭搴撴鏁扮粺璁�
+ public List<ViewInOutBean> queryViewInOutList(ViewInOutBean viewInOut);
+ public int getViewInOutCount(ViewInOutBean viewInOut);
+ //涓嶅垎椤垫煡璇㈡墍鏈変俊鎭紝鐢ㄤ簬excel瀵煎嚭
+ public List<ViewInOutBean> getViewInOutAll(ViewInOutBean viewInOut);
+
+ //鍒嗛〉鏌ヨ鏃ュ叆搴撹褰�
+ public List<ViewWorkInBean> queryViewWorkInList(ViewWorkInBean viewWorkIn);
+ public int getViewWorkInCount(ViewWorkInBean viewWorkIn);
+ //涓嶅垎椤垫煡璇㈡墍鏈変俊鎭紝鐢ㄤ簬excel瀵煎嚭
+ public List<ViewWorkInBean> getViewWorkInAll(ViewWorkInBean viewWorkIn);
+
+ //鍒嗛〉鏌ヨ鏃ュ嚭搴撹褰�
+ public List<ViewWorkInBean> queryViewWorkOutList(ViewWorkInBean viewWorkOut);
+ public int getViewWorkOutCount(ViewWorkInBean viewWorkOut);
+ //涓嶅垎椤垫煡璇㈡墍鏈変俊鎭紝鐢ㄤ簬excel瀵煎嚭
+ public List<ViewWorkInBean> getViewWorkOutAll(ViewWorkInBean viewWorkOut);
+
+
+ // ------鍥捐〃
+
+
+ List<ViewWorkCountInView> selectWorkCountIn(@Param("curr") Integer curr, @Param("limit") Integer limit, @Param("matnr")String matnr, @Param("start") String startTime, @Param("end") String endTime);
+
+ Integer selectWorkCountInTotal(String matnr, @Param("start") String startTime, @Param("end") String endTime);
+
+ List<ViewWorkCountInView> selectWorkCountOut(@Param("curr") Integer pageNumber, @Param("limit") Integer pageSize, String matnr, @Param("start") String startTime, @Param("end") String endTime);
+
+ Integer selectWorkCountOutTotal(String matnr, @Param("start") String startTime, @Param("end") String endTime);
+
+ Integer selectWorkCountInSum(String matnr, @Param("start") String startTime, @Param("end") String endTime);
+
+ Integer selectWorkCountOutSum(String matnr, @Param("start") String startTime, @Param("end") String endTime);
+
}
--
Gitblit v1.9.1