调整

src/main/java/org/jeecg/modules/fbsAbnormalWorkingHours/controller/FbsAbnormalWorkingHoursController.java

@@ -415,10 +415,10 @@ public class FbsAbnormalWorkingHoursController {
 	 * @return org.jeecg.common.api.vo.Result<java.util.List<org.jeecg.modules.fbsWorkshopDispatchList.entity.FbsWorkshopDispatchList>>
 	 */
 	 @GetMapping(value = "/getDispatchListByDate")
-	 public Result<List<FbsWorkshopDispatchList>> getDispatchListByDate(String date){
+	 public Result<List<FbsWorkshopDispatchList>> getDispatchListByDate(String date,String productionOrderNumberName){
 		 Result<List<FbsWorkshopDispatchList>> result=new Result<>();
 		 try {
-			 List<FbsWorkshopDispatchList> fbsWorkshopDispatchListList=fbsAbnormalWorkingHoursService.getDispatchListByDate(date);
+			 List<FbsWorkshopDispatchList> fbsWorkshopDispatchListList=fbsAbnormalWorkingHoursService.getDispatchListByDate(date,productionOrderNumberName);
 			 result.setResult(fbsWorkshopDispatchListList);
 			 result.success("操作成功");
 		 } catch (Exception e) {

src/main/java/org/jeecg/modules/fbsAbnormalWorkingHours/service/IFbsAbnormalWorkingHoursService.java

@@ -51,7 +51,7 @@ public interface IFbsAbnormalWorkingHoursService extends IService<FbsAbnormalWor
     * @Param [date]
     * @return java.util.List<org.jeecg.modules.fbsWorkshopDispatchList.entity.FbsWorkshopDispatchList>
     */
-    List<FbsWorkshopDispatchList> getDispatchListByDate(String date);
+    List<FbsWorkshopDispatchList> getDispatchListByDate(String date,String productionOrderNumberName);
 
     /**
     * @Author chenchuang

src/main/java/org/jeecg/modules/fbsAbnormalWorkingHours/service/impl/FbsAbnormalWorkingHoursServiceImpl.java

@@ -277,8 +277,8 @@ public class FbsAbnormalWorkingHoursServiceImpl extends ServiceImpl<FbsAbnormalW
 
 
     @Override
-    public List<FbsWorkshopDispatchList> getDispatchListByDate(String date) {
-        return fbsWorkshopDispatchListMapper.getDispatchListByDate(date);
+    public List<FbsWorkshopDispatchList> getDispatchListByDate(String date,String productionOrderNumberName) {
+        return fbsWorkshopDispatchListMapper.getDispatchListByDate(date,productionOrderNumberName);
     }
 
     @Override

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

@@ -74,7 +74,7 @@ public interface FbsWorkshopDispatchListMapper extends BaseMapper<FbsWorkshopDis
     * @Param []
     * @return java.util.List<org.jeecg.modules.fbsWorkshopDispatchList.entity.FbsWorkshopDispatchList>
     */
-    List<FbsWorkshopDispatchList> getDispatchListByDate(@Param("date")String date);
+    List<FbsWorkshopDispatchList> getDispatchListByDate(@Param("date")String date,@Param("productionOrderNumberName")String productionOrderNumberName);
 
     List<FbsWorkshopDispatchList> getDispatchClose(@Param("startDate")String startDate,@Param("endDate")String endDate ,@Param("list") List<String> list);
 

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

@@ -25,9 +25,10 @@
         LEFT JOIN fbs_technological_process ftp on fwdl.fbs_technological_process_id=ftp.id
         WHERE
         fwdl.del_flag = '0'
-            and DATE_FORMAT( #{date},'%Y-%m-%d') <![CDATA[ >= ]]> DATE_FORMAT(fwdl.planned_start_time,'%Y-%m-%d')
-            and DATE_FORMAT( #{date},'%Y-%m-%d') <![CDATA[ <= ]]> DATE_FORMAT(fwdl.planned_end_time,'%Y-%m-%d')
+           <!-- and DATE_FORMAT( #{date},'%Y-%m-%d') <![CDATA[ >= ]]> DATE_FORMAT(fwdl.planned_start_time,'%Y-%m-%d')
+            and DATE_FORMAT( #{date},'%Y-%m-%d') <![CDATA[ <= ]]> DATE_FORMAT(fwdl.planned_end_time,'%Y-%m-%d')-->
             <!--AND date_format( date, '%Y-%m-%d' ) = DATE_FORMAT( #{date}, '%Y-%m-%d' )-->
+        and fwdl.production_order_number_name =#{productionOrderNumberName}
         GROUP BY
             product
     </select>