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

blade-common/src/main/java/org/springblade/common/constant/LauncherConstant.java

@@ -31,8 +31,8 @@ public interface LauncherConstant {
     /**
      * nacos dev 地址
      */
-    String NACOS_DEV_ADDR = "192.168.249.27:8848";
+//    String NACOS_DEV_ADDR = "192.168.249.27:8848";
-//    String NACOS_DEV_ADDR = "127.0.0.1:8848";
+    String NACOS_DEV_ADDR = "127.0.0.1:8848";
 
     /**R
      * nacos prod 地址

blade-service/blade-desk/src/main/java/org/springblade/desk/produce/controller/PlateAroundController.java

@@ -62,10 +62,8 @@ public class PlateAroundController extends BladeController {
     @ApiOperationSupport(order = 2)
     @Operation(summary = "扫描流程卡获取镀前入库数据", description = "传入cardNo")
     public R<WorkPlan> getBeforePlatInCardNo(String cardNo) {
-        // todo 获取当前登录人班组
-        List<Long> tsIds = new ArrayList<>();
         // 获取镀前入库数据
-        WorkPlan wp = plateAroundService.getBeforePlatInCardNo(cardNo, tsIds);
+        WorkPlan wp = plateAroundService.getBeforePlatInCardNo(cardNo);
         if (wp != null) {
             if (!wp.getStatus().equals(WorkPlan.STATUS_WORK_OK)) {
                 throw new ServiceException("工序未报工完成，不能进行镀前入库！");
@@ -80,9 +78,7 @@ public class PlateAroundController extends BladeController {
     @ApiOperationSupport(order = 3)
     @Operation(summary = "扫描流程卡获取镀前出库数据", description = "传入cardNo")
     public R<PlateAround> getBeforePlatOutCardNo(String cardNo) {
-        // todo 获取当前登录人班组
+        PlateAround plateAround = plateAroundService.getBeforePlatOutCardNo(cardNo);
-        List<Long> tsIds = new ArrayList<>();
-        PlateAround plateAround = plateAroundService.getBeforePlatOutCardNo(cardNo, tsIds);
         if (plateAround == null) {
             throw new ServiceException("未找到镀前出库工序，无法出库!");
         }
@@ -93,9 +89,7 @@ public class PlateAroundController extends BladeController {
     @ApiOperationSupport(order = 4)
     @Operation(summary = "扫描流程卡获取镀后数据", description = "传入cardNo")
     public R<AfterPlateInVO> getAfterPlatInCardNo(String cardNo) {
-        // todo 获取当前登录人班组
+        return R.data(plateAroundService.getAfterPlatInCardNo(cardNo));
-        List<Long> tsIds = new ArrayList<>();
-        return R.data(plateAroundService.getAfterPlatInCardNo(cardNo, tsIds));
     }
 
     @PostMapping(value = "/deleteById")

blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/IPlateAroundService.java

@@ -23,11 +23,11 @@ public interface IPlateAroundService extends BaseService<PlateAround> {
 
     IPage<PlateAroundVO> queryByReadStatus(IPage<PlateAroundVO> page, PlateAroundDto query);
 
-    WorkPlan getBeforePlatInCardNo(String cardNo, List<Long> tsIds);
+    WorkPlan getBeforePlatInCardNo(String cardNo);
 
-    PlateAround getBeforePlatOutCardNo(String cardNo, List<Long> tsIds);
+    PlateAround getBeforePlatOutCardNo(String cardNo);
 
-    AfterPlateInVO getAfterPlatInCardNo(String cardNo, List<Long> tsIds);
+    AfterPlateInVO getAfterPlatInCardNo(String cardNo);
 
     boolean savePlateAround(SavePlateAroundDto plateAroundDto);
 

blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/PlateAroundServiceImpl.java

@@ -13,8 +13,10 @@ import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springblade.core.secure.BladeUser;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.desk.basic.pojo.entity.Oem;
+import org.springblade.desk.basic.pojo.entity.RelTeamSetUser;
 import org.springblade.desk.basic.pojo.entity.TeamSet;
 import org.springblade.desk.basic.service.IOemService;
+import org.springblade.desk.basic.service.IRelTeamSetUserService;
 import org.springblade.desk.basic.service.ITeamSetService;
 import org.springblade.desk.dashboard.pojo.entity.BsTeamSetEntity;
 import org.springblade.desk.dashboard.pojo.entity.DsPartEntity;
@@ -40,6 +42,7 @@ import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * 镀前镀后 服务实现类
@@ -69,18 +72,24 @@ public class PlateAroundServiceImpl extends BaseServiceImpl<PlateAroundMapper, P
 
     private final IOemStatementService oemStatementService;
 
+    private final IRelTeamSetUserService relTeamSetUserService;
+
     @Override
     public IPage<PlateAroundVO> queryByReadStatus(IPage<PlateAroundVO> page, PlateAroundDto plateAroundDto) {
         return page.setRecords(baseMapper.queryByReadStatus(page, plateAroundDto));
     }
 
     @Override
-    public WorkPlan getBeforePlatInCardNo(String cardNo, List<Long> tsIds) {
+    public WorkPlan getBeforePlatInCardNo(String cardNo) {
         WorkOrder wo = workOrderService.getWorkOrderByCardNo(cardNo);
         if (wo == null) {
             throw new ServiceException("车间订单不存在！");
         }
+        List<Long> tsIds = getTsIds();
         WorkPlan beforePlatInCardNo = baseMapper.getBeforePlatInCardNo(wo.getId(), tsIds, AuthUtil.getUserId());
+        if (beforePlatInCardNo == null) {
+            throw new ServiceException("未查询到订单！");
+        }
         long count = this.count(Wrappers.lambdaQuery(PlateAround.class).eq(PlateAround::getWpId, beforePlatInCardNo.getId()).eq(PlateAround::getPaType, PlateAround.BEFORE_PLAT_IN));
         if (count > 0) {
             throw new ServiceException("此订单已存在镀前入库记录！");
@@ -89,12 +98,16 @@ public class PlateAroundServiceImpl extends BaseServiceImpl<PlateAroundMapper, P
     }
 
     @Override
-    public PlateAround getBeforePlatOutCardNo(String cardNo, List<Long> tsIds) {
+    public PlateAround getBeforePlatOutCardNo(String cardNo) {
         WorkOrder wo = workOrderService.getWorkOrderByCardNo(cardNo);
         if (wo == null) {
             throw new ServiceException("车间订单不存在！");
         }
+        List<Long> tsIds = getTsIds();
         PlateAround plateAround = baseMapper.getBeforePlatOutCardNo(wo.getId(), tsIds, AuthUtil.getUserId());
+        if (plateAround == null) {
+            throw new ServiceException("未查询到订单！");
+        }
         long count = this.count(Wrappers.lambdaQuery(PlateAround.class).eq(PlateAround::getWpId, plateAround.getWpId()).eq(PlateAround::getPaType, PlateAround.BEFORE_PLAN_OUT));
         if (count > 0) {
             throw new ServiceException("此订单已存在镀前出库记录！");
@@ -103,12 +116,12 @@ public class PlateAroundServiceImpl extends BaseServiceImpl<PlateAroundMapper, P
     }
 
     @Override
-    public AfterPlateInVO getAfterPlatInCardNo(String cardNo, List<Long> tsIds) {
+    public AfterPlateInVO getAfterPlatInCardNo(String cardNo) {
         WorkOrder wo = workOrderService.getWorkOrderByCardNo(cardNo);
         if (wo == null) {
             throw new ServiceException("车间订单不存在！");
         }
-        WorkPlan wp = baseMapper.getAfterPlatInCardNo(wo.getId(), tsIds);
+        WorkPlan wp = baseMapper.getAfterPlatInCardNo(wo.getId(), getTsIds());
         if (wp == null) {
             throw new ServiceException("未找到镀后入库工序，无法入库!");
         }
@@ -146,6 +159,10 @@ public class PlateAroundServiceImpl extends BaseServiceImpl<PlateAroundMapper, P
         return afterPlateInVO;
     }
 
+    private List<Long> getTsIds() {
+        return relTeamSetUserService.list(Wrappers.lambdaQuery(RelTeamSetUser.class).eq(RelTeamSetUser::getUserId, AuthUtil.getUserId())).stream().map(RelTeamSetUser::getTeamSetId).collect(Collectors.toList());
+    }
+
     @Override
     public boolean savePlateAround(SavePlateAroundDto plateAroundDto) {
         List<PlateAround> plateArounds = plateAroundDto.getPlateArounds();