esop

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

@@ -1,5 +1,6 @@
 package org.jeecg.modules.fbsMomOrder.controller;
 
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
@@ -11,6 +12,7 @@ import javax.servlet.http.HttpServletResponse;
 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.fbsMomOrder.entity.FbsMomOrder;
 import org.jeecg.modules.fbsMomOrder.service.IFbsMomOrderService;
 
@@ -19,6 +21,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.extern.slf4j.Slf4j;
 
+import org.jeecg.modules.fbsWorkshopDispatchList.service.IFbsWorkshopDispatchListService;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.entity.ExportParams;
@@ -26,6 +29,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.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.multipart.MultipartHttpServletRequest;
@@ -45,7 +49,11 @@ import com.alibaba.fastjson.JSON;
 public class FbsMomOrderController {
 	@Autowired
 	private IFbsMomOrderService fbsMomOrderService;
+	@Autowired
+	private IFbsWorkshopDispatchListService iFbsWorkshopDispatchListService;
 
+	 @Value("${jeecg.path.upload}")
+	 private String upLoadPath;
 
 	 /**
 	  * 查询任务数据（E-SOP看板）
@@ -57,7 +65,18 @@ public class FbsMomOrderController {
 		Result<List<Map<String,Object>>> result = new Result<>();
 
 		try {
-			List<Map<String,Object>> map = fbsMomOrderService.getEsopTaskList();
+//			List<Map<String,Object>> map = fbsMomOrderService.getEsopTaskList();
+
+			List<Map<String,Object>> map = iFbsWorkshopDispatchListService.getEsopList();
+			ArrayList<String> list = new ArrayList<>();
+			for(Map<String,Object> mapEn:map){
+				String par = FileList.getAllFileName(upLoadPath+mapEn.get("materialCode"),list);
+				if(par.equals("false")){//没有文件
+					mapEn.put("color","darkgray");
+				}else{//有文件
+					mapEn.put("color","goldenrod");
+				}
+			}
 			result.setResult(map);
 			result.success("操作成功");
 

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

@@ -2,11 +2,21 @@
 <!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  b.MoCode orderSheetCode,a.InvCode materialCode,c.cInvName materialName,QualifiedInQty ,Qty qty,
+      <!--  SELECT  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
+        production_order_number_name orderSheetCode,
+        product_id materialCode,
+        product materialName,
+        number_of_tasks qty
+        FROM
+        fbs_workshop_dispatch_list
+        WHERE
+        del_flag = '0'
+        AND number_of_tasks > latest_completed_quantity
     </select>
 </mapper>

src/main/java/org/jeecg/modules/fbsWorkshopDispatchList/mapper/FbsWorkshopDispatchListMapper.java

@@ -149,4 +149,13 @@ public interface FbsWorkshopDispatchListMapper extends BaseMapper<FbsWorkshopDis
     * @return java.util.List<org.jeecg.modules.fbsWorkshopDispatchList.entity.FbsWorkshopDispatchList>
     */
     List<FbsWorkshopDispatchList> getListWhereStartEnd();
+
+    /**
+    * @Author chenchuang
+    * @Description //TODO Esop展示数据
+    * @Date 2020/12/24 10:29
+    * @Param []
+    * @return java.util.List<java.util.Map<java.lang.String,java.lang.Object>>
+    */
+    List<Map<String,Object>> getEsopList();
 }

src/main/java/org/jeecg/modules/fbsWorkshopDispatchList/mapper/xml/FbsWorkshopDispatchListMapper.xml

@@ -436,5 +436,18 @@
        <!-- AND DATE_FORMAT( now( ), '%Y-%m-%d' ) <![CDATA[ >= ]]> DATE_FORMAT( planned_start_time, '%Y-%m-%d' )
         AND DATE_FORMAT( now( ), '%Y-%m-%d' ) <![CDATA[ <= ]]> DATE_FORMAT( planned_end_time, '%Y-%m-%d' )-->
     </select>
+
+    <select id="getEsopList" resultType="java.util.HashMap">
+        SELECT
+            production_order_number_name orderSheetCode,
+            product_id materialCode,
+            product materialName,
+            number_of_tasks qty
+        FROM
+          fbs_workshop_dispatch_list
+        WHERE
+            del_flag = '0'
+            AND number_of_tasks > latest_completed_quantity
+    </select>
     
 </mapper>

src/main/java/org/jeecg/modules/fbsWorkshopDispatchList/service/IFbsWorkshopDispatchListService.java

@@ -147,4 +147,6 @@ public interface IFbsWorkshopDispatchListService extends IService<FbsWorkshopDis
     * @return java.util.List<org.jeecg.modules.fbsWorkshopDispatchList.entity.FbsWorkshopDispatchList>
     */
     List<FbsWorkshopDispatchList> getListWhereStartEnd();
+
+    List<Map<String,Object>> getEsopList();
 }

src/main/java/org/jeecg/modules/fbsWorkshopDispatchList/service/impl/FbsWorkshopDispatchListServiceImpl.java

@@ -542,5 +542,10 @@ public class FbsWorkshopDispatchListServiceImpl extends ServiceImpl<FbsWorkshopD
         return fbsWorkshopDispatchListMapper.getListWhereStartEnd();
     }
 
+    @Override
+    public List<Map<String, Object>> getEsopList() {
+        return fbsWorkshopDispatchListMapper.getEsopList();
+    }
+
 
 }