添加产线字段

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

@@ -10,6 +10,7 @@ import com.github.zuihou.business.productionReadyCenter.entity.MMeterial;
 import com.github.zuihou.business.productionReadyCenter.entity.MMeterialReceiveLog;
 import com.github.zuihou.business.productionReadyCenter.entity.MToolClamp;
 import com.github.zuihou.database.mybatis.conditions.query.LbqWrapper;
+import com.github.zuihou.security.model.SysUser;
 
 /**
  * <p>

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

@@ -1,6 +1,9 @@
 package com.github.zuihou.business.productionReadyCenter.service.impl;
 
+import cn.hutool.core.collection.CollectionUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.github.zuihou.authority.entity.auth.Role;
+import com.github.zuihou.authority.service.auth.RoleService;
 import com.github.zuihou.base.service.SuperServiceImpl;
 import com.github.zuihou.business.productionReadyCenter.dao.MMeterialMapper;
 import com.github.zuihou.business.productionReadyCenter.dao.PlateMapper;
@@ -15,10 +18,15 @@ import com.github.zuihou.business.productionReadyCenter.entity.Plate;
 import com.github.zuihou.business.productionReadyCenter.service.MMeterialService;
 import com.github.zuihou.business.productionReadyCenter.service.PlateService;
 import com.github.zuihou.business.productionReadyCenter.service.TrayPositionService;
+import com.github.zuihou.business.productionResourceCenter.entity.ZZone;
+import com.github.zuihou.business.productionResourceCenter.service.ZZoneService;
 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.injection.annonation.InjectionResult;
+import com.github.zuihou.security.model.SysUser;
 import com.github.zuihou.tenant.service.CodeRuleService;
 import com.github.zuihou.utils.BeanPlusUtil;
 import lombok.extern.slf4j.Slf4j;
@@ -26,6 +34,9 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.List;
+import java.util.stream.Collectors;
+
 /**
  * <p>
  * 业务实现类
@@ -39,12 +50,33 @@ import org.springframework.transaction.annotation.Transactional;
 @Service
 public class MMeterialServiceImpl extends SuperServiceImpl<MMeterialMapper, MMeterial> implements MMeterialService {
 
+    @Autowired
+    RoleService roleService;
+
+    @Autowired
+    ZZoneService zoneService;
     @Override
     public IPage<MMeterial> pageList(IPage page, LbqWrapper<MMeterial> wrapper) {
         return baseMapper.pageList(page, wrapper, new DataScope());
     }
     @Override
     public MMeterial save(MMeterialSaveDTO data) {
+        if(StringUtil.isEmpty(data.getZoneId())){//如果是舱体或框体人员。会根据当前角色获取对应的舱体或框体ID
+            //获取用户ID
+            if(StringUtil.isNotEmpty(data.getUserId())){
+                List<Role> roleList=  roleService.findRoleByUserId(Long.parseLong(data.getUserId()));
+                if(CollectionUtil.isNotEmpty(roleList)){
+                    String roles = roleList.stream().map(e -> e.getName()).collect(Collectors.joining(","));
+                    ZZone zZone = new ZZone();
+                    if(roles.indexOf("舱体")>=0){
+                        zZone = zoneService.getOne(Wraps.<ZZone>lbQ().like(ZZone::getName, "舱体"));
+                    }else{
+                        zZone = zoneService.getOne(Wraps.<ZZone>lbQ().like(ZZone::getName, "框体"));
+                    }
+                    data.setZoneId(zZone.getId().toString());
+                }
+            }
+        }
         MMeterial module = BeanPlusUtil.toBean(data, MMeterial.class);
         save(module);
         return module;

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

@@ -1,6 +1,11 @@
 package com.github.zuihou.business.productionReadyCenter.service.impl;
 
+import cn.hutool.core.collection.CollectionUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.github.zuihou.authority.entity.auth.Role;
+import com.github.zuihou.authority.entity.auth.User;
+import com.github.zuihou.authority.service.auth.RoleService;
+import com.github.zuihou.authority.service.auth.UserService;
 import com.github.zuihou.base.service.SuperServiceImpl;
 import com.github.zuihou.business.productionReadyCenter.dao.PlateMapper;
 import com.github.zuihou.business.productionReadyCenter.dto.PlateSaveDTO;
@@ -8,16 +13,24 @@ import com.github.zuihou.business.productionReadyCenter.dto.PlateUpdateDTO;
 import com.github.zuihou.business.productionReadyCenter.entity.Plate;
 import com.github.zuihou.business.productionReadyCenter.service.PlateService;
 import com.github.zuihou.business.productionReadyCenter.service.TrayPositionService;
+import com.github.zuihou.business.productionResourceCenter.entity.ZZone;
+import com.github.zuihou.business.productionResourceCenter.service.ZZoneService;
 import com.github.zuihou.common.constant.CodeRuleModule;
+import com.github.zuihou.common.util.StringUtil;
+import com.github.zuihou.database.mybatis.conditions.Wraps;
 import com.github.zuihou.database.mybatis.conditions.query.LbqWrapper;
 import com.github.zuihou.injection.annonation.InjectionResult;
 import com.github.zuihou.tenant.service.CodeRuleService;
 import com.github.zuihou.utils.BeanPlusUtil;
 import lombok.extern.slf4j.Slf4j;
+import org.bouncycastle.jcajce.provider.symmetric.AES;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.List;
+import java.util.stream.Collectors;
+
 /**
  * <p>
  * 业务实现类
@@ -35,6 +48,11 @@ public class PlateServiceImpl extends SuperServiceImpl<PlateMapper, Plate> imple
     TrayPositionService trayPositionService;
     @Autowired
     CodeRuleService codeRuleService;
+    @Autowired
+    RoleService roleService;
+
+    @Autowired
+    ZZoneService zoneService;
 
     @Override
     @InjectionResult
@@ -45,12 +63,28 @@ public class PlateServiceImpl extends SuperServiceImpl<PlateMapper, Plate> imple
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Plate save(PlateSaveDTO data) {
+        if(StringUtil.isEmpty(data.getZoneId())){//如果是舱体或框体人员。会根据当前角色获取对应的舱体或框体ID
+            //获取用户ID
+            if(StringUtil.isNotEmpty(data.getUserId())){
+                List<Role> roleList=  roleService.findRoleByUserId(Long.parseLong(data.getUserId()));
+                if(CollectionUtil.isNotEmpty(roleList)){
+                    String roles = roleList.stream().map(e -> e.getName()).collect(Collectors.joining(","));
+                    ZZone zZone = new ZZone();
+                    if(roles.indexOf("舱体")>=0){
+                        zZone = zoneService.getOne(Wraps.<ZZone>lbQ().like(ZZone::getName, "舱体"));
+                    }else{
+                        zZone = zoneService.getOne(Wraps.<ZZone>lbQ().like(ZZone::getName, "框体"));
+                    }
+                    data.setZoneId(zZone.getId().toString());
+                }
+            }
+        }
         Plate module = BeanPlusUtil.toBean(data, Plate.class);
+
         //根据编码规则
         String no = codeRuleService.getBillCode(CodeRuleModule.CODE_RULE_TRAY);
         module.setPlateNo(no);
         save(module);
-
         return module;
     }
 

imcs-admin-boot/imcs-business-biz/src/main/resources/mapper_business/base/productionReadyCenter/MMeterialMapper.xml

@@ -20,7 +20,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id,create_time,create_user,update_time,update_user,
+        id,create_time,create_user,update_time,update_user,zone_id,
         meterial_code, equipment_name, trade_mark, specification, handle_status, status, num, org_id
     </sql>
 

imcs-admin-boot/imcs-business-biz/src/main/resources/mapper_business/base/productionReadyCenter/MToolClampMapper.xml

@@ -25,7 +25,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id,create_time,create_user,update_time,update_user,join_date,factory,
+        id,create_time,create_user,update_time,update_user,join_date,factory,zone_id,
         no, name, status, model, category, brand,map_no,period,expiry_date,num,material_type,org_id
     </sql>
 

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

@@ -17,6 +17,8 @@ import com.github.zuihou.common.constant.BizConstant;
 import com.github.zuihou.database.mybatis.conditions.Wraps;
 import com.github.zuihou.database.mybatis.conditions.query.LbqWrapper;
 import com.github.zuihou.database.mybatis.conditions.query.QueryWrap;
+import com.github.zuihou.security.annotation.LoginUser;
+import com.github.zuihou.security.model.SysUser;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
@@ -26,6 +28,7 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
+import springfox.documentation.annotations.ApiIgnore;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -89,7 +92,7 @@ public class MMeterialController extends SuperController<MMeterialService, Long,
 
     @ApiOperation(value = "修改原材料管理", notes = "修改原材料管理")
     @PostMapping("/update")
-    public R<MMeterial> update(@RequestBody MMeterialUpdateDTO model) {
+    public R<MMeterial> update(@RequestBody MMeterialUpdateDTO model, @ApiIgnore @LoginUser SysUser sysUser) {
         MMeterial MMeterial  = baseService.update(model);
         return success(MMeterial);
     }

imcs-admin-boot/imcs-business-entity/src/main/java/com/github/zuihou/business/productionReadyCenter/dto/MMeterialSaveDTO.java

@@ -81,4 +81,8 @@ public class MMeterialSaveDTO implements Serializable {
     @ApiModelProperty(value = "")
     private Integer num;
 
+    private String zoneId;
+
+    private String userId;
+
 }

imcs-admin-boot/imcs-business-entity/src/main/java/com/github/zuihou/business/productionReadyCenter/dto/MMeterialUpdateDTO.java

@@ -85,4 +85,8 @@ public class MMeterialUpdateDTO implements Serializable {
     private String status;
     @ApiModelProperty(value = "")
     private Integer num;
+
+    private String zoneId;
+
+    private String userId;
 }

imcs-admin-boot/imcs-business-entity/src/main/java/com/github/zuihou/business/productionReadyCenter/dto/MToolClampSaveDTO.java

@@ -103,4 +103,6 @@ public class MToolClampSaveDTO implements Serializable {
     @ApiModelProperty(value = "生产分厂")
     private String factory;
 
+    private String zoneId;
+
 }

imcs-admin-boot/imcs-business-entity/src/main/java/com/github/zuihou/business/productionReadyCenter/dto/MToolClampUpdateDTO.java

@@ -104,4 +104,6 @@ public class MToolClampUpdateDTO implements Serializable {
 
     @ApiModelProperty(value = "生产分厂")
     private String factory;
+
+    private String zoneId;
 }

imcs-admin-boot/imcs-business-entity/src/main/java/com/github/zuihou/business/productionReadyCenter/dto/PlateSaveDTO.java

@@ -1,5 +1,7 @@
 package com.github.zuihou.business.productionReadyCenter.dto;
 
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.github.zuihou.model.RemoteData;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -9,6 +11,8 @@ import org.hibernate.validator.constraints.Length;
 
 import java.io.Serializable;
 
+import static com.baomidou.mybatisplus.annotation.SqlCondition.LIKE;
+
 /**
  * <p>
  * 实体类
@@ -81,4 +85,19 @@ public class PlateSaveDTO implements Serializable {
     @ApiModelProperty(value = "排序(升序)")
     private Long weight;
 
+
+    /**
+     * 排序(升序)
+     */
+    @ApiModelProperty(value = "产线类型1-智能生产单元2-柔性产线")
+    @Excel(name = "产线类型1-智能生产单元2-柔性产线")
+    private String zoneType;
+
+
+    private String zoneId;
+
+
+    @ApiModelProperty(value = "用户ID")
+    private String userId;
+
 }

imcs-admin-boot/imcs-business-entity/src/main/java/com/github/zuihou/business/productionReadyCenter/dto/PlateUpdateDTO.java

@@ -1,5 +1,6 @@
 package com.github.zuihou.business.productionReadyCenter.dto;
 
+import cn.afterturn.easypoi.excel.annotation.Excel;
 import com.github.zuihou.base.entity.SuperEntity;
 import com.github.zuihou.model.RemoteData;
 import io.swagger.annotations.ApiModel;
@@ -87,4 +88,16 @@ public class PlateUpdateDTO implements Serializable {
      */
     @ApiModelProperty(value = "排序(升序)")
     private Long weight;
+
+    /**
+     * 排序(升序)
+     */
+    @ApiModelProperty(value = "产线类型1-智能生产单元2-柔性产线")
+    @Excel(name = "产线类型1-智能生产单元2-柔性产线")
+    private String zoneType;
+
+
+    private String zoneId;
+
+    private String userId;
 }

imcs-admin-boot/imcs-business-entity/src/main/java/com/github/zuihou/business/productionReadyCenter/entity/Plate.java

@@ -116,4 +116,9 @@ public class Plate extends Entity<Long> {
     @Excel(name = "产线类型1-智能生产单元2-柔性产线")
     private String zoneType;
 
+    @ApiModelProperty(value = "产线")
+    @TableField("zone_id")
+    @Excel(name = "产线")
+    private Long zoneId;
+
 }