Merge branch 'master' of http://42.192.7.176:3000/suojin/jonhon-mes-svr

blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/LiquidTankTaskSetVoService.java

@@ -116,7 +116,7 @@ public class LiquidTankTaskSetVoService {
         }
         WorkTank wt = workTankService.getById(vo.getWorkTankId());
         if (wt != null) {
-            vo.setWorkTankName(wt.getName());
+            vo.setWorkTankName(wt.getWorkTankCode());
         }
         TeamSet teamSet = teamSetService.getById(vo.getTeamId());
         if (teamSet != null) {
@@ -127,10 +127,16 @@ public class LiquidTankTaskSetVoService {
         );
         vo.setLiquidTank(lt);
         // 取样时间：当天时间
-        if(vo.getSampleDate()== null){
-            vo.setSampleDate(LocalDate.now());
+//        if(vo.getSampleDate()== null){
+//            vo.setSampleDate(LocalDate.now());
+//        }
+
+        if(null != vo.getFirstTestDate()){
+            vo.setSampleDate(vo.getFirstTestDate().toLocalDate());
         }
-//        vo.setSampleDate(LocalDate.now());
+
+//        vo.setSampleDate(vo.getFirstFillDate().toLocalDate());
+
         // 有效期
 //        Date validDateT = DateUtil.offsetDay(vo.getCreateTime(), vo.getAnalysisCycle());
 //        vo.setValidDate(LocalDateTimeUtil.of(validDateT).toLocalDate());

blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/LiquidTankTaskCopyServiceImpl.java

@@ -196,7 +196,7 @@ public class LiquidTankTaskCopyServiceImpl extends BaseServiceImpl<LiquidTankTas
 
             WorkTank tank = workTankService.getById(copyVO.getWorkTankId());
             if(tank != null){
-                copyVO.setWorkTankName(tank.getName());
+                copyVO.setWorkTankName(tank.getWorkTankCode());
             }
 
         }