项目调整

src/main/java/org/jeecg/modules/fbsDispatchLists/service/impl/FbsDispatchListsServiceImpl.java

@@ -37,6 +37,8 @@ public class FbsDispatchListsServiceImpl extends ServiceImpl<FbsDispatchListsMap
                 if(StringUtils.isBlank(fbsDispatchLists.getCitemname())){
                     fbsDispatchLists.setCitemname("空");
                 }
+//                if(fbsDispatchLists.getCitemname().length())
+//                fbsDispatchLists.setCitemname(fbsDispatchLists.getCitemname().substring(1,5)+"...");
                 map.put(fbsDispatchLists.getCitemname(),fbsDispatchLists.getIquantity());
             }
         }
@@ -52,13 +54,18 @@ public class FbsDispatchListsServiceImpl extends ServiceImpl<FbsDispatchListsMap
         //根据月份获取每个月数据
         if(fbsDispatchListsList!=null){
             for(String month:moths){
+                boolean ismonth=false;
                 for(FbsDispatchLists fbsDispatchLists:fbsDispatchListsList){
                     if(StringUtils.isNotBlank(fbsDispatchLists.getMonths())){
                         if(month.equals(fbsDispatchLists.getMonths())){
-                            map.put(month,fbsDispatchLists.getItemCount());
+                            map.put(month+"月",fbsDispatchLists.getItemCount());
+                            ismonth=true;
                         }
                     }
                 }
+                if(ismonth==false){
+                    map.put(month+"月","0");
+                }
             }
         }
 

src/main/java/org/jeecg/modules/fbsInventory/mapper/xml/FbsInventoryMapper.xml

@@ -27,6 +27,16 @@
         select a.iQuantity realStockSum,b.cInvName materialName,b.cInvCode cInvCode from
         (select cInvCode,sum(iQuantity) as iQuantity  from CurrentStock group by cInvCode) a
         left join Inventory b on a.cInvCode = b.cInvCode
+        where b.cInvCCode='0101' and a.iQuantity>0
+       <!-- SELECT
+          cInvName materialName,
+          SUM ( iSafeNum ) realStockSum
+        FROM
+          Inventory
+        where cInvCCode='0101'
+        GROUP BY
+          cInvCode,
+          cInvName -->
 
     </select>
 </mapper>

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

@@ -382,4 +382,25 @@ public class FbsMomOrderdetailController {
 		 return result;
 	 }
 
+	 /**
+	 * @Author chenchuang
+	 * @Description //TODO 仓库看板：领料申请完成数量
+	 * @Date 2020/11/6 10:46
+	 * @Param []
+	 * @return org.jeecg.common.api.vo.Result<java.lang.Integer>
+	 */
+	 @GetMapping(value = "/getApplyCompleteSum")
+	 public Result<Integer> getApplyCompleteSum(){
+		 Result<Integer> result=new Result<>();
+		 try {
+			 Integer i=fbsMomOrderdetailService.getApplyCompleteSum();
+			 result.setResult(i);
+			 result.success("操作成功");
+		 } catch (Exception e) {
+			 e.printStackTrace();
+			 result.error500("操作失败："+e.getMessage());
+		 }
+		 return result;
+	 }
+
 }

src/main/java/org/jeecg/modules/fbsMomOrder/entity/FbsMomOrderdetail.java

@@ -429,4 +429,11 @@ public class FbsMomOrderdetail implements Serializable {
 	//项目名称
 	@TableField(exist = false)
 	private String define12;
+
+	//申请人
+	@TableField(exist = false)
+	private String cmaker;
+	//部门名称
+	@TableField(exist = false)
+	private String cdepName;
 }

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

@@ -89,11 +89,20 @@ public interface FbsMomOrderdetailMapper extends BaseMapper<FbsMomOrderdetail> {
 
     /**
     * @Author chenchuang
-    * @Description //TODO 工单缺料
+    * @Description //TODO 仓库看板：工单缺料
     * @Date 2020/11/5 21:08
     * @Param []
     * @return java.util.List<org.jeecg.modules.fbsMomOrder.entity.FbsMomOrderdetail>
     */
 
     List<FbsMomOrderdetail> getListByOrderSheetNotEnough();
+
+    /**
+    * @Author chenchuang
+    * @Description //TODO 仓库看板：领料申请完成数量
+    * @Date 2020/11/6 10:40
+    * @Param []
+    * @return java.lang.Integer
+    */
+    Integer getApplyCompleteSum();
 }

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

@@ -146,7 +146,7 @@
 
 
     <select id="getApplyList" resultType="org.jeecg.modules.fbsMomOrder.entity.FbsMomOrderdetail">
-        SELECT SUM
+       <!-- SELECT SUM
             ( mm.RequisitionQty ) - SUM ( RequisitionIssQty ) AS unfinishedQuantity,
             mo.InvCode,
             m.MoCode,
@@ -166,6 +166,31 @@
             i.cinvcode,
             i.cinvstd
         HAVING
-            SUM ( mm.RequisitionQty )-sum(RequisitionIssQty)>0
+            SUM ( mm.RequisitionQty )-sum(RequisitionIssQty)>0 -->
+        SELECT
+        mas.cInvCode,
+        i.cInvName,
+        ma.cMaker,
+        (mas.iQuantity - mas.fOutQuantity) as unfinishedQuantity,
+        d.cDepName
+        FROM
+        MaterialAppVouchs mas
+        LEFT JOIN MaterialAppVouch ma ON mas.ID= ma.ID
+        LEFT JOIN Department d ON ma.cDepCode= d.cDepCode
+        LEFT JOIN Inventory i ON mas.cInvCode= i.cInvCode
+        WHERE
+        mas.iQuantity - mas.fOutQuantity >0
+    </select>
+
+    <select id="getApplyCompleteSum" resultType="java.lang.Integer">
+        SELECT
+        count(mas.ID)
+        FROM
+        MaterialAppVouchs mas
+        LEFT JOIN MaterialAppVouch ma ON mas.ID= ma.ID
+        LEFT JOIN Department d ON ma.cDepCode= d.cDepCode
+        LEFT JOIN Inventory i ON mas.cInvCode= i.cInvCode
+        WHERE
+        mas.iQuantity - mas.fOutQuantity <![CDATA[ <=]]>0
     </select>
 </mapper>

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

@@ -84,4 +84,13 @@ public interface IFbsMomOrderdetailService extends IService<FbsMomOrderdetail> {
     * @return java.util.List<org.jeecg.modules.fbsMomOrder.entity.FbsMomOrderdetail>
     */
     List<FbsMomOrderdetail> getListByOrderSheetNotEnough();
+
+    /**
+    * @Author chenchuang
+    * @Description //TODO 仓库看板：领料申请完成数量
+    * @Date 2020/11/6 10:41
+    * @Param []
+    * @return java.lang.Integer
+    */
+    Integer getApplyCompleteSum();
 }

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

@@ -136,4 +136,9 @@ public class FbsMomOrderdetailServiceImpl extends ServiceImpl<FbsMomOrderdetailM
         return fbsMomOrderdetailList;
     }
 
+    @Override
+    public Integer getApplyCompleteSum() {
+        return fbsMomOrderdetailMapper.getApplyCompleteSum();
+    }
+
 }

src/main/java/org/jeecg/modules/fbsWorkshopDispatchList/controller/FbsWorkshopDispatchListController.java

@@ -609,14 +609,16 @@ public class FbsWorkshopDispatchListController {
 	@GetMapping(value = "/getListNotStarted")
 	 public Result<List<FbsWorkshopDispatchList>> getListNotStarted(){
 		 Result<List<FbsWorkshopDispatchList>> result=new Result<>();
-		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
-		String format = sdf.format(new Date());
-		 QueryWrapper<FbsWorkshopDispatchList> queryWrapper=new QueryWrapper<>();
-		queryWrapper.lambda().eq(FbsWorkshopDispatchList::getDelFlag,"0");
-		queryWrapper.lambda().eq(FbsWorkshopDispatchList::getState,"0");
-		queryWrapper.eq("date_format( date, '%Y-%m-%d' )",format);
-		queryWrapper.lambda().orderByDesc(FbsWorkshopDispatchList::getDate);
-		 List<FbsWorkshopDispatchList> fbsWorkshopDispatchListList=fbsWorkshopDispatchListService.list(queryWrapper);
+//		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+//		String format = sdf.format(new Date());
+//		 QueryWrapper<FbsWorkshopDispatchList> queryWrapper=new QueryWrapper<>();
+//		queryWrapper.lambda().eq(FbsWorkshopDispatchList::getDelFlag,"0");
+//		queryWrapper.lambda().eq(FbsWorkshopDispatchList::getState,"0");
+//		queryWrapper.eq("date_format( date, '%Y-%m-%d' )",format);
+//		queryWrapper.lambda().orderByDesc(FbsWorkshopDispatchList::getDate);
+//		 List<FbsWorkshopDispatchList> fbsWorkshopDispatchListList=fbsWorkshopDispatchListService.list(queryWrapper);
+		List<FbsWorkshopDispatchList> fbsWorkshopDispatchListList=fbsWorkshopDispatchListService.getListWhereStartEnd();
+
 		 result.setResult(fbsWorkshopDispatchListList);
 		 result.success("操作成功");
 		 return result;

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

@@ -131,4 +131,13 @@ public interface FbsWorkshopDispatchListMapper extends BaseMapper<FbsWorkshopDis
     * @return java.util.List<org.jeecg.modules.fbsWorkshopDispatchList.entity.FbsWorkshopDispatchList>
     */
     List<FbsWorkshopDispatchList> getProjectScheduleCompletion();
+
+    /**
+    * @Author chenchuang
+    * @Description //TODO 产线看板：生产计划
+    * @Date 2020/11/6 16:59
+    * @Param []
+    * @return java.util.List<org.jeecg.modules.fbsWorkshopDispatchList.entity.FbsWorkshopDispatchList>
+    */
+    List<FbsWorkshopDispatchList> getListWhereStartEnd();
 }

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

@@ -285,5 +285,12 @@
           fwdl.production_order_number_id
         ORDER BY fwdl.production_order_number_name
     </select>
+
+    <select id="getListWhereStartEnd" resultType="org.jeecg.modules.fbsWorkshopDispatchList.entity.FbsWorkshopDispatchList">
+        select * from fbs_workshop_dispatch_list
+        WHERE del_flag='0' AND state='0'
+        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>
     
 </mapper>

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

@@ -136,4 +136,13 @@ public interface IFbsWorkshopDispatchListService extends IService<FbsWorkshopDis
     * @return void
     */
     void workSaveBatch(FbsWorkshopDispatchList fbsWorkshopDispatchList);
+
+    /**
+    * @Author chenchuang
+    * @Description //TODO 产线看板：生产计划
+    * @Date 2020/11/6 17:00
+    * @Param []
+    * @return java.util.List<org.jeecg.modules.fbsWorkshopDispatchList.entity.FbsWorkshopDispatchList>
+    */
+    List<FbsWorkshopDispatchList> getListWhereStartEnd();
 }

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

@@ -390,5 +390,10 @@ public class FbsWorkshopDispatchListServiceImpl extends ServiceImpl<FbsWorkshopD
         }
     }
 
+    @Override
+    public List<FbsWorkshopDispatchList> getListWhereStartEnd() {
+        return fbsWorkshopDispatchListMapper.getListWhereStartEnd();
+    }
+
 
 }