fix: 工装夹具同步修改、新增同步

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/productionReadyCenter/service/MToolClampService.java

@@ -50,4 +50,5 @@ public interface MToolClampService extends SuperService<MToolClamp> {
      * @return
      */
     Boolean delete(MToolClamp model);
+    Boolean deleteByNo(MToolClamp model);
 }

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/productionReadyCenter/service/impl/MToolClampServiceImpl.java

@@ -1,5 +1,6 @@
 package com.github.zuihou.business.productionReadyCenter.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.github.zuihou.base.service.SuperServiceImpl;
 import com.github.zuihou.business.productionReadyCenter.dao.MToolClampMapper;
@@ -11,6 +12,7 @@ import com.github.zuihou.common.constant.CodeRuleModule;
 import com.github.zuihou.database.mybatis.auth.DataScope;
 import com.github.zuihou.database.mybatis.conditions.Wraps;
 import com.github.zuihou.database.mybatis.conditions.query.LbqWrapper;
+import com.github.zuihou.exception.BizException;
 import com.github.zuihou.injection.annonation.InjectionResult;
 import com.github.zuihou.tenant.service.CodeRuleService;
 import com.github.zuihou.utils.BeanPlusUtil;
@@ -48,7 +50,9 @@ public class MToolClampServiceImpl extends SuperServiceImpl<MToolClampMapper, MT
     @Transactional(rollbackFor = Exception.class)
     public MToolClamp save(MToolClampSaveDTO data) {
         //验证名称是否重复
-        isFalse(check(data), "编码重复，请重新输入");
+        if(check(data)){
+            throw new BizException("编码重复，请重新输入");
+        }
         MToolClamp module = BeanPlusUtil.toBean(data, MToolClamp.class);
 //        String no = codeRuleService.getBillCode(CodeRuleModule.CODE_RULE_METERIAL);
 //        module.setNo(no);
@@ -59,6 +63,11 @@ public class MToolClampServiceImpl extends SuperServiceImpl<MToolClampMapper, MT
     @Override
     @Transactional(rollbackFor = Exception.class)
     public MToolClamp update(MToolClampUpdateDTO data) {
+        MToolClamp mToolClamp = baseMapper.selectOne(Wraps.<MToolClamp>lbQ().eq(MToolClamp::getNo, data.getNo()));
+        if(mToolClamp != null){
+            data.setId(mToolClamp.getId());
+        }
+
         MToolClamp module = BeanPlusUtil.toBean(data, MToolClamp.class);
         updateById(module);
         return module;
@@ -74,4 +83,13 @@ public class MToolClampServiceImpl extends SuperServiceImpl<MToolClampMapper, MT
     public Boolean delete(MToolClamp model) {
         return removeById(model);
     }
+
+    @Override
+    public Boolean deleteByNo(MToolClamp model) {
+        MToolClamp mToolClamp = baseMapper.selectOne(Wraps.<MToolClamp>lbQ().eq(MToolClamp::getNo, model.getNo()));
+        if(mToolClamp!=null){
+            model.setId(mToolClamp.getId());
+        }
+        return  removeById(model);
+    }
 }

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/productionReadyCenter/service/impl/TrayServiceImpl.java

@@ -4,26 +4,30 @@ import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.github.zuihou.base.service.SuperServiceImpl;
 import com.github.zuihou.business.productionReadyCenter.dao.TrayMapper;
-import com.github.zuihou.business.productionReadyCenter.dto.TrayPositionSaveDTO;
-import com.github.zuihou.business.productionReadyCenter.dto.TrayPositionUpdateDTO;
-import com.github.zuihou.business.productionReadyCenter.dto.TraySaveDTO;
-import com.github.zuihou.business.productionReadyCenter.dto.TrayUpdateDTO;
+import com.github.zuihou.business.productionReadyCenter.dto.*;
+import com.github.zuihou.business.productionReadyCenter.entity.MToolClamp;
 import com.github.zuihou.business.productionReadyCenter.entity.Tray;
 import com.github.zuihou.business.productionReadyCenter.entity.TrayPosition;
+import com.github.zuihou.business.productionReadyCenter.service.MToolClampService;
 import com.github.zuihou.business.productionReadyCenter.service.TrayPositionService;
 import com.github.zuihou.business.productionReadyCenter.service.TrayService;
 import com.github.zuihou.common.constant.CodeRuleModule;
+import com.github.zuihou.common.util.StringUtil;
 import com.github.zuihou.database.mybatis.auth.DataScope;
 import com.github.zuihou.database.mybatis.conditions.Wraps;
 import com.github.zuihou.database.mybatis.conditions.query.LbqWrapper;
+import com.github.zuihou.exception.BizException;
 import com.github.zuihou.injection.annonation.InjectionResult;
+import com.github.zuihou.model.RemoteData;
 import com.github.zuihou.tenant.service.CodeRuleService;
 import com.github.zuihou.utils.BeanPlusUtil;
+import com.xxl.job.core.util.DateUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.Date;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -42,6 +46,11 @@ public class TrayServiceImpl extends SuperServiceImpl<TrayMapper, Tray> implemen
 
     @Autowired
     TrayPositionService trayPositionService;
+
+    @Autowired
+    MToolClampService mToolClampService;
+    
+    
     @Autowired
     CodeRuleService codeRuleService;
 
@@ -55,6 +64,10 @@ public class TrayServiceImpl extends SuperServiceImpl<TrayMapper, Tray> implemen
     @Transactional(rollbackFor = Exception.class)
     public Tray save(TraySaveDTO data) {
         Tray module = BeanPlusUtil.toBean(data, Tray.class);
+        if(StringUtil.isNotEmpty(module.getName())){
+            module.setName(module.getName() + "_托盘");
+        }
+
         //根据编码规则
         //String no = codeRuleService.getBillCode(CodeRuleModule.CODE_RULE_TRAY);
         //module.setNo(no);
@@ -72,6 +85,29 @@ public class TrayServiceImpl extends SuperServiceImpl<TrayMapper, Tray> implemen
             trayPositionService.saveBatch(trayPositionList);
         }
 
+        // 新增托盘的时候同时新增，工装，保证子盘编码与工装编码的数据的对应关系
+        String gzName = module.getName();
+        if(module.getName().indexOf("_托盘")>0){
+            gzName = gzName.substring(0,module.getName().indexOf("_托盘"));
+        }
+
+        MToolClampSaveDTO mToolClampSaveDTO = MToolClampSaveDTO.builder().build();
+        mToolClampSaveDTO.setZoneId(data.getZoneId());
+        mToolClampSaveDTO.setNo(module.getNo());
+        mToolClampSaveDTO.setName(gzName+"_夹具");
+        mToolClampSaveDTO.setMaterialType("夹具");
+        mToolClampSaveDTO.setFactory(data.getFactory());
+        mToolClampSaveDTO.setJoinDate(data.getJoinDate());
+        mToolClampSaveDTO.setPeriod(data.getPeriod());
+        mToolClampSaveDTO.setExpiryDate(data.getExpiryDate());
+        mToolClampSaveDTO.setNum(1);
+        mToolClampSaveDTO.setStatus(module.getStatus());
+        mToolClampSaveDTO.setCategory(new RemoteData<>("", ""));
+        mToolClampSaveDTO.setSynFlag(0);
+        mToolClampSaveDTO.setJoinDate(DateUtil.format(new Date()));
+
+        mToolClampService.save(mToolClampSaveDTO);
+
         return module;
     }
 
@@ -79,6 +115,10 @@ public class TrayServiceImpl extends SuperServiceImpl<TrayMapper, Tray> implemen
     @Transactional(rollbackFor = Exception.class)
     public Tray update(TrayUpdateDTO data) {
         Tray module = BeanPlusUtil.toBean(data, Tray.class);
+        if(!module.getName().contains("_托盘")){
+            module.setName(module.getName() + "_托盘");
+        }
+
         updateById(module);
 
         //先删除，再新增
@@ -94,6 +134,28 @@ public class TrayServiceImpl extends SuperServiceImpl<TrayMapper, Tray> implemen
             trayPositionService.saveBatch(trayPositionList);
         }
 
+        // 修改托盘的时候同时新增，工装，保证子盘编码与工装编码的数据的对应关系
+        String gzName = module.getName();
+        if(module.getName().indexOf("_托盘")>0){
+            gzName = gzName.substring(0,module.getName().indexOf("_托盘"));
+        }
+
+        MToolClampUpdateDTO mToolClampUpdateDTO = MToolClampUpdateDTO.builder().build();
+        mToolClampUpdateDTO.setNo(module.getNo());
+        mToolClampUpdateDTO.setName(gzName+"_夹具");
+        mToolClampUpdateDTO.setMaterialType("夹具");
+        mToolClampUpdateDTO.setFactory(data.getFactory());
+        mToolClampUpdateDTO.setJoinDate(data.getJoinDate());
+        mToolClampUpdateDTO.setPeriod(data.getPeriod());
+        mToolClampUpdateDTO.setExpiryDate(data.getExpiryDate());
+        mToolClampUpdateDTO.setNum(1);
+        mToolClampUpdateDTO.setStatus(module.getStatus());
+        mToolClampUpdateDTO.setCategory(new RemoteData<>("", ""));
+        mToolClampUpdateDTO.setSynFlag(0);
+        mToolClampUpdateDTO.setJoinDate(DateUtil.format(new Date()));
+
+        mToolClampService.update(mToolClampUpdateDTO);
+
         return module;
     }
 
@@ -102,6 +164,29 @@ public class TrayServiceImpl extends SuperServiceImpl<TrayMapper, Tray> implemen
     public Tray updateStatus(TrayUpdateDTO data) {
         Tray module = BeanPlusUtil.toBean(data, Tray.class);
         updateById(module);
+
+        // 修改托盘的时候同时新增，工装，保证子盘编码与工装编码的数据的对应关系
+        String gzName = module.getName();
+        if(module.getName().indexOf("_托盘")>0){
+            gzName = gzName.substring(0,module.getName().indexOf("_托盘"));
+        }
+
+        MToolClampUpdateDTO mToolClampUpdateDTO = MToolClampUpdateDTO.builder().build();
+        mToolClampUpdateDTO.setNo(module.getNo());
+        mToolClampUpdateDTO.setName(gzName+"_夹具");
+        mToolClampUpdateDTO.setMaterialType("夹具");
+        mToolClampUpdateDTO.setFactory(data.getFactory());
+        mToolClampUpdateDTO.setJoinDate(data.getJoinDate());
+        mToolClampUpdateDTO.setPeriod(data.getPeriod());
+        mToolClampUpdateDTO.setExpiryDate(data.getExpiryDate());
+        mToolClampUpdateDTO.setNum(1);
+        mToolClampUpdateDTO.setStatus(module.getStatus());
+        mToolClampUpdateDTO.setCategory(new RemoteData<>("", ""));
+        mToolClampUpdateDTO.setSynFlag(0);
+        mToolClampUpdateDTO.setJoinDate(DateUtil.format(new Date()));
+
+        mToolClampService.update(mToolClampUpdateDTO);
+
         return module;
     }
 
@@ -110,8 +195,13 @@ public class TrayServiceImpl extends SuperServiceImpl<TrayMapper, Tray> implemen
     public Boolean delete(Tray model) {
         //删除对应夹紧位置
         trayPositionService.remove(Wraps.<TrayPosition>lbQ().eq(TrayPosition::getTrayId,model.getId()));
+        removeById(model.getId());
+
+        MToolClamp mToolClamp = MToolClamp.builder().build();
+        mToolClamp.setNo(model.getNo());
+
+        return mToolClampService.deleteByNo(mToolClamp);
 
-        return removeById(model.getId());
     }
 
     @Override

imcs-admin-boot/imcs-business-controller/src/main/java/com/github/zuihou/business/controller/productionReadyCenter/MToolClampController.java

@@ -59,7 +59,8 @@ public class MToolClampController extends SuperController<MToolClampService, Lon
                 .eq(MToolClamp::getBrand, module.getBrand())
 //                .eq(MToolClamp::getCategory, module.getCategory() )
                 .like(MToolClamp::getModel,module.getModel())
-                .orderByDesc(MToolClamp::getCreateTime);
+                .orderByAsc(MToolClamp::getNo)
+                .orderByAsc(MToolClamp::getName);
         IPage<MToolClamp> list= baseService.pageList(page, wrapper);
         //取出分页里面得数据
         List<MToolClamp> l = list.getRecords();

imcs-admin-boot/imcs-business-controller/src/main/java/com/github/zuihou/business/controller/productionReadyCenter/TrayController.java

@@ -62,7 +62,9 @@ public class TrayController extends SuperController<TrayService, Long, Tray, Tra
                 .like(Tray::getSpecification, tray.getSpecification())
                 //.eq(Tray::getBrand,tray.getBrand())
                 .eq(Tray::getProductionType, tray.getProductionType())
-                .eq(Tray::getStatus,tray.getStatus());
+                .eq(Tray::getStatus,tray.getStatus())
+                .orderByAsc(Tray::getNo)
+                .orderByAsc(Tray::getName);
 
         IPage<Tray> list= baseService.pageList(page, wrapper);
 //        //取出分页里面得数据