问题处理

hx-mes/src/main/java/com/fjhx/mes/entity/production/dto/ProductionTaskDetailSelectDto.java

@@ -1,5 +1,6 @@
 package com.fjhx.mes.entity.production.dto;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fjhx.mes.entity.production.po.ProductionTaskDetail;
 import com.ruoyi.common.core.domain.BaseSelectDto;
 import lombok.Getter;
@@ -49,6 +50,7 @@ public class ProductionTaskDetailSelectDto extends BaseSelectDto {
     /**
      * 任务完成期限
      */
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
     private Date dueDate;
     /**
      * 当前工序名称
@@ -65,6 +67,7 @@ public class ProductionTaskDetailSelectDto extends BaseSelectDto {
     /**
      * 任务完成时间
      */
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
     private String getFinishTime;
 
 

hx-mes/src/main/java/com/fjhx/mes/entity/production/vo/ProductionTaskDetailVo.java

@@ -1,5 +1,6 @@
 package com.fjhx.mes.entity.production.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fjhx.mes.entity.production.po.ProductionTaskDetail;
 import lombok.Getter;
 import lombok.Setter;
@@ -90,6 +91,7 @@ public class ProductionTaskDetailVo extends ProductionTaskDetail {
     /**
      * 任务完成期限
      */
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
     private Date dueDate;
     /**
      * 当前工序名称

hx-mes/src/main/java/com/fjhx/mes/entity/work/dto/WorkOrderProductionProcessesDto.java

@@ -1,5 +1,6 @@
 package com.fjhx.mes.entity.work.dto;
 
+import com.fjhx.file.entity.ObsFile;
 import com.fjhx.mes.entity.work.po.WorkOrderProductionProcesses;
 import com.fjhx.mes.entity.work.vo.WorkOrderProductionProcessesVo;
 import lombok.Getter;
@@ -27,4 +28,9 @@ public class WorkOrderProductionProcessesDto extends WorkOrderProductionProcesse
      */
     private Integer technologyStatus;
 
+    /**
+     * 附件列表
+     */
+    private List<ObsFile> fileList;
+
 }

hx-mes/src/main/java/com/fjhx/mes/service/production/impl/ProductionTaskDetailServiceImpl.java

@@ -1,6 +1,7 @@
 package com.fjhx.mes.service.production.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.dynamic.datasource.annotation.DSTransactional;
@@ -416,16 +417,24 @@ public class ProductionTaskDetailServiceImpl extends ServiceImpl<ProductionTaskD
         //高级检索
         wrapper.like("t1.contractCode",dto.getContractCode());
         wrapper.like("t1.workOrderCode",dto.getWorkOrderCode());
-        wrapper.like("t1.productionPlanCode",dto.getProductionTaskCode());
+        wrapper.like("t1.productionPlanCode",dto.getProductionPlanCode());
         wrapper.like("t1.productionTaskCode",dto.getProductionTaskCode());
         wrapper.like("t1.productCode",dto.getProductCode());
         wrapper.like("t1.productName",dto.getProductName());
         wrapper.like("t1",ProductionTaskDetail::getProductSn,dto.getProductSn());
-        wrapper.like("t1.due_date",dto.getDueDate());
+        wrapper.eq("t1.due_date",dto.getDueDate());
         wrapper.like("t1.productionProcessesName",dto.getProductionProcessesName());
         wrapper.like("t1.personLiableName",dto.getPersonLiableName());
         wrapper.eq("t1",ProductionTaskDetail::getFinishStatus,dto.getGetFinishStatus());
-        wrapper.like("t1",ProductionTaskDetail::getFinishTime,dto.getGetFinishTime());
+//        wrapper.eq("t1",ProductionTaskDetail::getFinishTime,dto.getGetFinishTime());
+
+        //完成时间包含时分秒需要将时间特殊处理
+        if(ObjectUtil.isNotEmpty(dto.getGetFinishTime())) {
+            Date beginTime = DateUtil.beginOfDay(DateUtil.parse(dto.getGetFinishTime()));
+            Date endTime = DateUtil.endOfDay(DateUtil.parse(dto.getGetFinishTime()));
+            wrapper.between("t1", ProductionTaskDetail::getFinishTime, beginTime, endTime);
+        }
+
 
         wrapper.orderByDesc("t1",ProductionTaskDetail::getId);
 

hx-mes/src/main/java/com/fjhx/mes/service/production/impl/ProductionTaskServiceImpl.java

@@ -299,6 +299,8 @@ public class ProductionTaskServiceImpl extends ServiceImpl<ProductionTaskMapper,
 //            productionTaskDetail.setPersonLiableId(productionTaskDto.getPersonLiableId());//负责人ID
             productionTaskDetail.setCirculationStatus(1);//流转中
 
+            productionTaskDetail.setProcessesStatus(0);
+
             productionTaskDetailList.add(productionTaskDetail);
             //创建任务明细记录
             ProductionTaskDetailRecord productionTaskDetailRecord = new ProductionTaskDetailRecord();

hx-mes/src/main/java/com/fjhx/mes/service/work/impl/WorkOrderProductionProcessesServiceImpl.java

@@ -122,6 +122,9 @@ public class WorkOrderProductionProcessesServiceImpl extends ServiceImpl<WorkOrd
 
         //检查定制工单是否配置BOM、工艺 配置完成发消息
         workOrderService.checkCustomizedInfo(workOrderProductionProcessesDto.getWorkOrderId());
+
+        //增加附件（绑定到工单上）
+        ObsFileUtil.editFile(workOrderProductionProcessesDto.getFileList(),workOrderProductionProcessesDto.getWorkOrderId());
     }
 
 }