Merge remote-tracking branch 'origin/master'

mes/src/main/java/com/ximai/mes/pro/controller/ProProductQrcodeRecordController.java

@@ -60,6 +60,8 @@ public class ProProductQrcodeRecordController extends BaseController
         query.eq(StringUtils.isNotEmpty(proProductQrcodeRecordQuery.getClientCode()), "m.client_code", proProductQrcodeRecordQuery.getClientCode());
         query.like(StringUtils.isNotEmpty(proProductQrcodeRecordQuery.getClientName()), "m.client_name", "%" + proProductQrcodeRecordQuery.getClientName() + "%");
         query.eq(StringUtils.isNotEmpty(proProductQrcodeRecordQuery.getItemDesc()), "m.item_desc", proProductQrcodeRecordQuery.getItemDesc());
+        query.eq(proProductQrcodeRecordQuery.getPrintTime()!=null, "m.print_time", proProductQrcodeRecordQuery.getPrintTime());
+
         List<ProProductQrcodeRecordDto> list = proProductQrcodeRecordService.selectProProductQrcodeRecordDtoList(query);
         return getDataTable(list);
     }

mes/src/main/java/com/ximai/mes/pro/controller/mobile/ProTaskMobController.java

@@ -272,7 +272,7 @@ public class ProTaskMobController extends BaseController {
     @ApiOperation("验证序列号报工")
     @PostMapping("/validateSerialNo")
     public AjaxResult<Boolean> validateSerialNo(@RequestBody FeedbackValidateSerialNoParams validateSerialNoParams) {
-        proFeedbackService.validateSerialNo(validateSerialNoParams);
+        proFeedbackService.validateSerialNo(validateSerialNoParams,false);
         return AjaxResult.success(true);
     }
 

mes/src/main/java/com/ximai/mes/pro/dto/ProProductQrcodeRecordQuery.java

@@ -76,5 +76,4 @@ public class ProProductQrcodeRecordQuery {
     private Date updateTime;
 
 
-
 }

mes/src/main/java/com/ximai/mes/pro/service/IProFeedbackService.java

@@ -63,7 +63,7 @@ public interface IProFeedbackService {
      * 验证序列号报工
      * @param validateSerialNoParams
      */
-    boolean validateSerialNo(FeedbackValidateSerialNoParams validateSerialNoParams);
+    boolean validateSerialNo(FeedbackValidateSerialNoParams validateSerialNoParams,boolean updateData);
 
     /**
      * 新增生产报工记录

mes/src/main/java/com/ximai/mes/pro/service/impl/ProFeedbackServiceImpl.java

@@ -306,7 +306,7 @@ public class ProFeedbackServiceImpl implements IProFeedbackService {
     }
 
     @Override
-    public boolean validateSerialNo(FeedbackValidateSerialNoParams validateSerialNoParams) {
+    public boolean validateSerialNo(FeedbackValidateSerialNoParams validateSerialNoParams,boolean updateData) {
         QueryWrapper<ProWorkorder> query = new QueryWrapper<>();
         query.eq("t4.task_workunit_id", validateSerialNoParams.getTaskWorkunitId());
         List<ProWorkorder> listOrder = proWorkorderMapper.selectJoinTaskWorkunitByQw(query);
@@ -327,8 +327,9 @@ public class ProFeedbackServiceImpl implements IProFeedbackService {
         if(feedbackList.size()>0){
             if(feedbackList.stream().filter(proFeedback -> proFeedback.getQuantityQualify().compareTo(BigDecimal.ZERO) > 0).count() > 0){
                 throw new ServiceException(MessageUtils.message("pro.feedback.error.repeat.serialNo.report"));
-            }else{
-                proFeedbackMapper.updateLastFeedback(validateSerialNoParams.getQrcode(),validateSerialNoParams.getTaskId());
+            }else {
+                if (updateData)
+                    proFeedbackMapper.updateLastFeedback(validateSerialNoParams.getQrcode(),validateSerialNoParams.getTaskId());
                 return true;
             }
         }
@@ -709,7 +710,6 @@ public class ProFeedbackServiceImpl implements IProFeedbackService {
         String updateMachineTime = proFeedback.getMachineTime();
         String oldMachineTime = oldFeedback.getMachineTime();
 
-
         double v1 = updateQuality.doubleValue() - oldQuality.doubleValue();
         double v2 = updateUnQuality.doubleValue() - oldUnQuality.doubleValue();
         boolean b3 = Objects.equals(updateMachineTime, oldMachineTime);
@@ -822,7 +822,8 @@ public class ProFeedbackServiceImpl implements IProFeedbackService {
         }
 
         proTaskWorkunitService.updateProTaskWorkunit(proTaskWorkunit);
-
+        //不允许修改报工时间
+        proFeedback.setMachineTime(oldFeedback.getMachineTime());
         this.updateProFeedback(proFeedback);
         return 1;
     }

mes/src/main/java/com/ximai/mes/pro/service/impl/task/ProTaskServiceImpl.java

@@ -796,7 +796,7 @@ public class ProTaskServiceImpl implements IProTaskService {
             feedbackValidateSerialNoParams.setQrcode(feedback.getQrcode());
             feedbackValidateSerialNoParams.setTaskWorkunitId(feedback.getTaskWorkunitId());
             feedbackValidateSerialNoParams.setTaskId(feedback.getTaskId());
-            addOneQuantityWait = proFeedbackService.validateSerialNo(feedbackValidateSerialNoParams);
+            addOneQuantityWait = proFeedbackService.validateSerialNo(feedbackValidateSerialNoParams,true);
         }
 
         ProTaskWorkunit taskWorkunit = proTaskWorkunitService.selectProTaskWorkunitByTaskWorkunitId(feedback.getTaskWorkunitId());
@@ -960,7 +960,8 @@ public class ProTaskServiceImpl implements IProTaskService {
                     }
             );
 
-
+            proTaskWorkunit.setStatus(TaskWorkunitStatusEnum.FINISHED.getStatus());
+            proTaskWorkunitService.updateProTaskWorkunit(proTaskWorkunit);
             //最后一道工序完工
             if (proTask.getIsLastProcess() != null && proTask.getIsLastProcess() == 1) {
                 //最后一个批次，回写关联订单状态为已完成
@@ -1021,7 +1022,20 @@ public class ProTaskServiceImpl implements IProTaskService {
             proStartWorkService.updateObj(proTask);
         }
 
-        this.updateProTask(proTask);
+
+
+        List<ProTaskWorkunit>  proTaskWorkunits = proTaskWorkunitMapper.selectProTaskWorkunitByTaskIds(proTaskWorkunit.getTaskId());
+
+        if(proTask.getStatus().equals(TaskStatusEnum.FINISHED.getStatus())){
+            if(proTaskWorkunits.stream().filter(x ->
+                    !x.getStatus().equals(TaskWorkunitStatusEnum.FINISHED.getStatus())
+                            &&!x.getStatus().equals(TaskWorkunitStatusEnum.CLOSE.getStatus())
+                            &&!x.getStatus().equals(TaskWorkunitStatusEnum.CANCEL.getStatus())).count() <= 0){
+                this.updateProTask(proTask);
+            }
+        }else{
+            this.updateProTask(proTask);
+        }
     }
 
 

mes/src/main/resources/mapper/pro/ProProcessMapper.xml

@@ -54,7 +54,7 @@
             <if test="attention != null  and attention != ''">and attention = #{attention}</if>
             <if test="enableFlag != null  and enableFlag != ''">and enable_flag = #{enableFlag}</if>
         </where>
-        order by create_time desc
+        order by create_time
     </select>
 
     <select id="selectProProcessByProcessId" parameterType="Long" resultMap="ProProcessResult">