更新BUG

admin/src/main/resources/i18n/messages.properties

@@ -215,4 +215,6 @@ qc.error.error6=\u68C0\u6D4B\u9879\u7F16\u53F7\u5DF2\u5B58\u5728
 qc.error.error7=\u68C0\u6D4B\u9879\u540D\u79F0\u5DF2\u5B58\u5728
 #system.printer
 system.printer.error.repeat.bind=\u8BE5\u6253\u5370\u673A\u5DF2\u7ED1\u5B9A\u4E86
-rule.currentSerial.error= \u8BE5\u4EA7\u54C1\u5E8F\u5217\u53F7\u5269\u4F59:{0}\u4E0D\u6EE1\u8DB3\u5DE5\u5355\u6570\u91CF:{1}
\ No newline at end of file
+rule.currentSerial.error= \u8BE5\u4EA7\u54C1\u5E8F\u5217\u53F7\u5269\u4F59:{0}\u4E0D\u6EE1\u8DB3\u5DE5\u5355\u6570\u91CF:{1}
+#工作单元编不唯一
+md.workUnit.error.workunitCode.unique = \u5de5\u5355\u5355\u5143\u7f16\u7801\u5df2\u5b58\u5728
\ No newline at end of file

admin/src/main/resources/i18n/messages_en.properties

@@ -212,4 +212,6 @@ qc.error.error6=Inspection item number already exists.
 qc.error.error7=Inspection item name already exists.
 #system.printer
 system.printer.error.repeat.bind=This printer has been bound.
-rule.currentSerial.error= The remaining quantity of the product serial number is insufficient ：{0} , workorder quantity :  {1}
\ No newline at end of file
+rule.currentSerial.error= The remaining quantity of the product serial number is insufficient ：{0} , workorder quantity :  {1}
+#工作单元编不唯一
+md.workUnit.error.workunitCode.unique =  unique workunitCode.
\ No newline at end of file

admin/src/main/resources/i18n/messages_th.properties

@@ -217,4 +217,6 @@ system.printer.error.repeat.bind=\u0E40\u0E04\u0E23\u0E37\u0E48\u0E2D\u0E07\u0E1
 md.workStation.error.not.productionSolutionCode = \u0050\u0072\u006f\u0064\u0075\u0063\u0074\u0069\u006f\u006e\u0053\u006f\u006c\u0075\u0074\u0069\u006f\u006e\u0043\u006f\u0064\u0065\u0020\u0e44\u0e21\u0e48\u0e44\u0e14\u0e49\u0e01\u0e23\u0e2d\u0e01
 md.workStation.error.productionSolutionCode.unique = \u0050\u0072\u006f\u0064\u0075\u0063\u0074\u0069\u006f\u006e\u0053\u006f\u006c\u0075\u0074\u0069\u006f\u006e\u0043\u006f\u0064\u0065\u003a\u0020\u0e44\u0e21\u0e48\u0e40\u0e09\u0e1e\u0e32\u0e30
 md.workStation.error.productionSolutionCode.size = \u0050\u0072\u006f\u0064\u0075\u0063\u0074\u0069\u006f\u006e\u0053\u006f\u006c\u0075\u0074\u0069\u006f\u006e\u0043\u006f\u0064\u0065\u003a\u0020\u0e21\u0e35\u0e04\u0e48\u0e32\u0e21\u0e32\u0e01\u0e02\u0e36\u0e49\u0e19\u0e2d\u0e22\u0e39\u0e48\u0e41\u0e25\u0e49\u0e27
-rule.currentSerial.error= \u0e2b\u0e21\u0e32\u0e22\u0e40\u0e25\u0e02\u0e1c\u0e25\u0e34\u0e15\u0e20\u0e31\u0e13\u0e11\u0e4c\u0020\u0e40\u0e2b\u0e25\u0e37\u0e2d {0},\u0e44\u0e21\u0e48\u0e40\u0e1b\u0e47\u0e19\u0e44\u0e1b\u0e15\u0e32\u0e21\u0e08\u0e33\u0e19\u0e27\u0e19\u0e43\u0e1a\u0e2a\u0e31\u0e48\u0e07\u0e07\u0e32\u0e19{1}
\ No newline at end of file
+rule.currentSerial.error= \u0e2b\u0e21\u0e32\u0e22\u0e40\u0e25\u0e02\u0e1c\u0e25\u0e34\u0e15\u0e20\u0e31\u0e13\u0e11\u0e4c\u0020\u0e40\u0e2b\u0e25\u0e37\u0e2d {0},\u0e44\u0e21\u0e48\u0e40\u0e1b\u0e47\u0e19\u0e44\u0e1b\u0e15\u0e32\u0e21\u0e08\u0e33\u0e19\u0e27\u0e19\u0e43\u0e1a\u0e2a\u0e31\u0e48\u0e07\u0e07\u0e32\u0e19{1}
+#工作单元编不唯一
+md.workUnit.error.workunitCode.unique = \u0e2b\u0e21\u0e32\u0e22\u0e40\u0e25\u0e02\u0e17\u0e35\u0e48\u0e21\u0e35\u0e2d\u0e22\u0e39\u0e48\u0e41\u0e25\u0e49\u0e27
\ No newline at end of file

admin/src/main/resources/i18n/messages_zh_CN.properties

@@ -215,4 +215,6 @@ qc.error.error6=\u68C0\u6D4B\u9879\u7F16\u53F7\u5DF2\u5B58\u5728
 qc.error.error7=\u68C0\u6D4B\u9879\u540D\u79F0\u5DF2\u5B58\u5728
 #system.printer
 system.printer.error.repeat.bind=\u8BE5\u6253\u5370\u673A\u5DF2\u7ED1\u5B9A\u4E86
-rule.currentSerial.error= \u8BE5\u4EA7\u54C1\u5E8F\u5217\u53F7\u5269\u4F59:{0}\u4E0D\u6EE1\u8DB3\u5DE5\u5355\u6570\u91CF:{1}
\ No newline at end of file
+rule.currentSerial.error= \u8BE5\u4EA7\u54C1\u5E8F\u5217\u53F7\u5269\u4F59:{0}\u4E0D\u6EE1\u8DB3\u5DE5\u5355\u6570\u91CF:{1}
+#工作单元编不唯一
+md.workUnit.error.workunitCode.unique = \u5de5\u5355\u5355\u5143\u7f16\u7801\u5df2\u5b58\u5728
\ No newline at end of file

mes/src/main/java/com/ximai/mes/md/service/impl/MdWorkunitServiceImpl.java

@@ -3,6 +3,7 @@ package com.ximai.mes.md.service.impl;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollectionUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.ximai.common.core.domain.AjaxResult;
 import com.ximai.common.utils.MessageUtils;
 import com.ximai.common.utils.data.DateUtils;
 import com.ximai.common.utils.data.ExceptionUtil;
@@ -93,6 +94,9 @@ public class MdWorkunitServiceImpl implements IMdWorkunitService {
             MdWorkstation mdWorkstation = mdWorkstationMapper.selectMdWorkstationByWorkstationId(mdWorkunit.getWorkstationId());
             if(mdWorkstation != null)
                 mdWorkunit.setWorkstationCode(mdWorkstation.getWorkstationCode());
+        }else{
+            MdWorkunit mdWorkunitCheck = mdWorkunitMapper.selectMdWorkunitByWorkunitCodes(mdWorkunit.getWorkunitCode());
+            ExceptionUtil.checkTrueThrowException(mdWorkunitCheck != null, MessageUtils.message("md.workUnit.error.workunitCode.unique"));
         }
         return mdWorkunitMapper.insertMdWorkunit(mdWorkunit);
     }

mes/src/main/java/com/ximai/mes/pro/service/impl/productionSolution/ProProductionSolutionServiceImpl.java

@@ -6,6 +6,7 @@ import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.ximai.common.exception.ServiceException;
 import com.ximai.common.utils.MessageUtils;
+import com.ximai.common.utils.SecurityUtils;
 import com.ximai.common.utils.data.DataUtil;
 import com.ximai.common.utils.data.ExceptionUtil;
 import com.ximai.common.utils.data.StringUtils;
@@ -224,6 +225,9 @@ public class ProProductionSolutionServiceImpl implements IProProductionSolutionS
         }
 
         // 保存主数据
+        String createBy = SecurityUtils.getUsername();
+        proProductionSolution.setCreateBy(createBy);
+        proProductionSolution.setCreateTime(new Date());
         int i = proProductionSolutionMapper.insertProProductionSolution(proProductionSolution);
         if (i != 1) {
             return 2;
@@ -397,6 +401,9 @@ public class ProProductionSolutionServiceImpl implements IProProductionSolutionS
         ProProductionSolution proProductionSolution = proProductionSolutionMapper.selectProProductionSolutionByProductionSolutionId(proProductionSolutionVo.getProductionSolutionId());
         proProductionSolution.setRemark(proProductionSolutionVo.getRemark());
         BeanUtils.copyProperties(proProductionSolutionVo, proProductionSolution);
+        String createBy = SecurityUtils.getUsername();
+        proProductionSolution.setCreateBy(createBy);
+        proProductionSolution.setCreateTime(new Date());
         int i = proProductionSolutionMapper.updateProProductionSolution(proProductionSolution);
 
         // 获取打样工序

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

@@ -29,8 +29,10 @@ import com.ximai.mes.pro.domain.productionSolution.ProProductionSolution;
 import com.ximai.mes.pro.domain.task.*;
 import com.ximai.mes.pro.domain.vo.*;
 import com.ximai.mes.pro.domain.vo.task.FeedbackValidateSerialNoParams;
+import com.ximai.mes.pro.dto.ProProductQrcodeRecordDto;
 import com.ximai.mes.pro.dto.task.ProTaskLinkFile;
 import com.ximai.mes.pro.mapper.ProProcessMapper;
+import com.ximai.mes.pro.mapper.ProProductQrcodeRecordMapper;
 import com.ximai.mes.pro.mapper.ProProductionLogMapper;
 import com.ximai.mes.pro.mapper.ProRouteMapper;
 import com.ximai.mes.pro.mapper.proWorkOrder.ProWorkOrderProcessMapper;
@@ -161,6 +163,8 @@ public class ProTaskServiceImpl implements IProTaskService {
     @Autowired
     ProProductionSolutionMapper proProductionSolutionMapper;
 
+    @Autowired
+    ProProductQrcodeRecordMapper proProductQrcodeRecordMapper;
     /**
      * 查询生产任务
      *
@@ -1393,9 +1397,17 @@ public class ProTaskServiceImpl implements IProTaskService {
                     Double v = proFeedbackService.selectQuantityQualifySum(new ProFeedback(arrangeCode, null, null, task.getTaskWorkunitId()));
                     task.setArrangeFeedbackSum(v);
                 }
+                //增加校验是否序列号报工
+                if(StringUtils.isNotEmpty(task.getIsSerialReport()) && "1".equals(task.getIsSerialReport())){
+                    QueryWrapper<ProProductQrcodeRecord> proProductQrcodeRecordQuery = new QueryWrapper<>();
+                    proProductQrcodeRecordQuery.eq("m.work_order_id",task.getWorkorderId());
+                    List<ProProductQrcodeRecordDto> proProductQrcodeRecordDtos = proProductQrcodeRecordMapper.selectDtoListByQw(proProductQrcodeRecordQuery);
+                    if(proProductQrcodeRecordDtos.size() < 1){
+                        task.setIsSerialReport("0");
+                    }
+                }
             }
         }
-
         Set<Long> taskWorkunitIds = rst.stream().map(ProTask::getTaskWorkunitId).collect(Collectors.toSet());
         if (CollectionUtil.isNotEmpty(taskWorkunitIds)) {
             Map<Long, ProTaskAssistProcess> assistProcessMap = proTaskAssistProcessMapper.selectListByQw(new QueryWrapper<ProTaskAssistProcess>().in("task_workunit_id", taskWorkunitIds)).stream().collect(Collectors.toMap(ProTaskAssistProcess::getTaskWorkunitId, x -> x));