11111

src/main/java/org/jeecg/modules/appInterface/FileList.java

@@ -0,0 +1,69 @@
+package org.jeecg.modules.appInterface;
+
+import org.springframework.beans.factory.annotation.Value;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileReader;
+import java.util.ArrayList;
+import java.util.List;
+
+public class FileList {
+//    @Value("${jeecg.path.upload}")
+//    private String upLoadPath;
+//    public static void main(String[] args) {
+//        ArrayList<String> list = new ArrayList<>();
+//        getAllFileName("D:\\VsCodeWork\\FBS_VIEW\\upFiles",list);
+//        System.out.println(list);
+//    }
+
+    /**
+     * 获取某个文件夹下的所有文件
+     *
+     * @param fileNameList 存放文件名称的list
+     * @param path 文件夹的路径
+     * @return
+     */
+    public static void getAllFileName(String path,ArrayList<String> fileNameList) {
+        //ArrayList<String> files = new ArrayList<String>();
+        boolean flag = false;
+        File file = new File(path);
+        File[] tempList = file.listFiles();
+
+        for (int i = 0; i < tempList.length; i++) {
+            if (tempList[i].isFile()) {
+//              System.out.println("文     件：" + tempList[i]);
+                //fileNameList.add(tempList[i].toString());
+                fileNameList.add(tempList[i].getName());
+            }
+            if (tempList[i].isDirectory()) {
+//              System.out.println("文件夹：" + tempList[i]);
+                getAllFileName(tempList[i].getAbsolutePath(),fileNameList);
+            }
+        }
+
+//        System.out.println(fileNameList);
+        return;
+    }
+
+
+    public static String txt2String(File file){
+        StringBuilder result = new StringBuilder();
+        try{
+            BufferedReader br = new BufferedReader(new FileReader(file));//构造一个BufferedReader类来读取文件
+            String s = null;
+            while((s = br.readLine())!=null){//使用readLine方法，一次读一行
+                result.append(System.lineSeparator()+s);
+            }
+            br.close();
+        }catch(Exception e){
+            e.printStackTrace();
+        }
+        return result.toString();
+    }
+
+    public static void main(String[] args){
+        File file = new File("D:\\VsCodeWork\\FBS_VIEW\\upFiles\\高后10月26.txt");
+        System.out.println(txt2String(file));
+    }
+}

src/main/java/org/jeecg/modules/appInterface/controller/FbsWorkingStatisticsController.java

@@ -1,12 +1,10 @@
 package org.jeecg.modules.appInterface.controller;
 
+import java.io.File;
 import java.math.BigDecimal;
 import java.sql.Connection;
 import java.sql.DriverManager;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
@@ -17,6 +15,7 @@ import org.apache.commons.lang.StringUtils;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.appInterface.FileList;
 import org.jeecg.modules.appInterface.ResHttpStatus;
 import org.jeecg.modules.appInterface.entity.FbsWorkingStatistics;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -36,6 +35,7 @@ import org.jeecgframework.poi.excel.entity.ImportParams;
 import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
@@ -61,7 +61,12 @@ public class FbsWorkingStatisticsController {
 	 private IFbsWorkshopDispatchListService fbsWorkshopDispatchListService;
 	 @Autowired
 	 private IFbsPersonService fbsPersonService;
-	 public static void main(String[] srg) {
+	 @Value("${jeecg.path.upload}")
+	 private String upLoadPath;
+	 @Value("${jeecg.path.upvedio}")
+	 private String upVedio;
+
+	 public static void main1(String[] srg) {
 		 String driverName = "com.microsoft.sqlserver.jdbc.SQLServerDriver";
 		 //加载JDBC驱动
 		 String dbURL = "jdbc:sqlserver://103.40.192.17:43110;DatabaseName=UFDATA_006_2019";
@@ -500,4 +505,78 @@ public class FbsWorkingStatisticsController {
 		return result;
 	}
 
-}
+	 @RequestMapping(value = "getEsopFileList")
+	 public Result<List<Map<String,Object>>> getEsopFileList(){
+		 Result<List<Map<String,Object>>> result=new Result<>();
+	 	 ArrayList<String> list = new ArrayList<>();
+		 FileList.getAllFileName(upLoadPath,list);
+		 List<Map<String,Object>> resuleMap = new ArrayList<>();
+		 try {
+
+		 	for (String o:list){
+				Map<String,Object> map = new HashMap<>();
+				map.put("fileName",o);
+				map.put("fileType",getFileOf(o).toLowerCase());
+				resuleMap.add(map);
+			}
+			result.setResult(resuleMap);
+			result.success("操作成功");
+
+		 } catch (Exception e) {
+			 e.printStackTrace();
+			 result.error500("操作失败："+e.getMessage());
+		 }
+
+		 return result;
+	 }
+
+	 @RequestMapping(value = "getVedioFileList")
+	 public Result<List<Map<String,Object>>> getVedioFileList(){
+		 Result<List<Map<String,Object>>> result=new Result<>();
+		 ArrayList<String> list = new ArrayList<>();
+		 FileList.getAllFileName(upVedio,list);
+		 List<Map<String,Object>> resuleMap = new ArrayList<>();
+		 try {
+
+			 for (String o:list){
+				 Map<String,Object> map = new HashMap<>();
+				 map.put("fileName",o);
+				 map.put("fileType",getFileOf(o).toLowerCase());
+				 resuleMap.add(map);
+				 break;
+			 }
+			 result.setResult(resuleMap);
+			 result.success("操作成功");
+
+		 } catch (Exception e) {
+			 e.printStackTrace();
+			 result.error500("操作失败："+e.getMessage());
+		 }
+
+		 return result;
+	 }
+
+
+	 /**
+	  * 获取文件后缀名
+	  * @param fileName
+	  * @return
+	  */
+	 public String getFileOf(String fileName) {
+
+		 String suffix = fileName.substring(fileName.lastIndexOf(".") + 1);
+		 return suffix;
+	 }
+
+//	 public static void main(String[] args) {
+//		 File file = new File("HelloWorld.java");
+//		 String fileName = file.getName();
+//		 System.out.println(fileName.lastIndexOf(".") + 1);
+//		 System.out.println("======================");
+//		 System.out.println(fileName.lastIndexOf("."));
+//		 System.out.println("======================");
+//		 String suffix = fileName.substring(fileName.lastIndexOf(".") + 1);
+//		 System.out.println(suffix);
+//	 }
+
+ }

src/main/java/org/jeecg/modules/fbsMomOrder/controller/FbsMomOrderController.java

@@ -45,7 +45,38 @@ import com.alibaba.fastjson.JSON;
 public class FbsMomOrderController {
 	@Autowired
 	private IFbsMomOrderService fbsMomOrderService;
-	
+
+
+	 /**
+	  * 查询任务数据（E-SOP看板）
+	  * @return
+	  */
+	@RequestMapping(value = "getEsopTaskList")
+	public Result<List<Map<String,Object>>> getEsopTaskList(){
+
+		Result<List<Map<String,Object>>> result = new Result<>();
+
+		try {
+			List<Map<String,Object>> map = fbsMomOrderService.getEsopTaskList();
+			result.setResult(map);
+			result.success("操作成功");
+
+		} catch (Exception e) {
+			e.printStackTrace();
+			result.error500("操作失败："+e.getMessage());
+		}
+
+		return result;
+	}
+
+
+
+
+
+
+
+
+
 	/**
 	  * 分页列表查询
 	 * @param fbsMomOrder

src/main/java/org/jeecg/modules/fbsMomOrder/mapper/FbsMomOrderMapper.java

@@ -1,6 +1,7 @@
 package org.jeecg.modules.fbsMomOrder.mapper;
 
 import java.util.List;
+import java.util.Map;
 
 import org.apache.ibatis.annotations.Param;
 import org.jeecg.modules.fbsMomOrder.entity.FbsMomOrder;
@@ -14,4 +15,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface FbsMomOrderMapper extends BaseMapper<FbsMomOrder> {
 
+    public List<Map<String,Object>> getEsopTaskList();
 }

src/main/java/org/jeecg/modules/fbsMomOrder/mapper/xml/FbsMomOrderMapper.xml

@@ -1,5 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.jeecg.modules.fbsMomOrder.mapper.FbsMomOrderMapper">
+    <select id="getEsopTaskList" resultType="java.util.HashMap">
 
+        SELECT top 9 b.MoCode orderSheetCode,a.InvCode materialCode,c.cInvName materialName,QualifiedInQty ,Qty qty,
+         c.cInvStd specs from mom_orderdetail a
+        left join mom_order b on a.MoId = b.MoId
+        left join Inventory c on a.InvCode = c.cInvCode
+        where Qty > QualifiedInQty and a.Status ='3'
+
+    </select>
 </mapper>

src/main/java/org/jeecg/modules/fbsMomOrder/service/IFbsMomOrderService.java

@@ -3,6 +3,9 @@ package org.jeecg.modules.fbsMomOrder.service;
 import org.jeecg.modules.fbsMomOrder.entity.FbsMomOrder;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * @Description: 生产订单
  * @author： jeecg-boot
@@ -10,5 +13,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @version： V1.0
  */
 public interface IFbsMomOrderService extends IService<FbsMomOrder> {
+    public List<Map<String,Object>> getEsopTaskList();
 
 }

src/main/java/org/jeecg/modules/fbsMomOrder/service/impl/FbsMomOrderServiceImpl.java

@@ -8,6 +8,10 @@ import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.Map;
+
 /**
  * @Description: 生产订单
  * @author： jeecg-boot
@@ -17,5 +21,12 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 @Service
 @DS("multi-datasource1")
 public class FbsMomOrderServiceImpl extends ServiceImpl<FbsMomOrderMapper, FbsMomOrder> implements IFbsMomOrderService {
+    @Resource
+    private FbsMomOrderMapper fbsMomOrderMapper;
+
+    @Override
+    public List<Map<String,Object>> getEsopTaskList(){
+        return fbsMomOrderMapper.getEsopTaskList();
+    }
 
 }

src/main/java/org/jeecg/modules/fbsPuArrivalvouch/mapper/xml/FbsPuArrivalvouchMapper.xml

@@ -58,7 +58,7 @@
     </select>
 
     <select id="getPassRateByVendor" resultType="org.jeecg.modules.fbsPuArrivalvouch.entity.FbsPuArrivalvouch">
-        SELECT
+        SELECT top 6
             v.cVenName,round( CAST (( SUM ( pa.fValidQuantity ) * 1.0 / SUM ( pa.iQuantity )) AS FLOAT ), 0 ) * 100 AS passRate
         FROM
             PU_ArrivalVouchs pa