Merge remote-tracking branch 'origin/master' into master

imcs-admin-boot/imcs-authority-biz/src/main/java/com/github/zuihou/authority/service/auth/impl/UserServiceImpl.java

@@ -58,6 +58,8 @@ import java.util.Optional;
 import java.util.Set;
 import java.util.stream.Collectors;
 
+import static com.github.zuihou.utils.BizAssert.isFalse;
+
 
 /**
  * <p>
@@ -186,12 +188,17 @@ public class UserServiceImpl extends SuperCacheServiceImpl<UserMapper, User> imp
     @Override
     @Transactional(rollbackFor = Exception.class)
     public User saveUser(User user) {
+        isFalse(check(user), "账号重复，请重新输入");
         user.setPassword(SecureUtil.md5(user.getPassword()));
         user.setPasswordErrorNum(0);
         super.save(user);
         return user;
     }
 
+    public boolean check(User user) {
+        return super.count(Wraps.<User>lbQ().eq(User::getAccount, user.getAccount())) > 0;
+    }
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public boolean reset(UserUpdatePasswordDTO data) {

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,
+        id,create_time,create_user,update_time,update_user,join_date,factory,
         no, name, status, model, category, brand,map_no,period,expiry_date,num,material_type
     </sql>
 

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

@@ -12,6 +12,7 @@ import com.github.zuihou.business.productionReadyCenter.entity.TrayPosition;
 import com.github.zuihou.business.productionReadyCenter.service.MMeterialService;
 import com.github.zuihou.business.productionReadyCenter.service.TrayPositionService;
 import com.github.zuihou.business.productionReadyCenter.service.TrayService;
+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;
@@ -75,4 +76,12 @@ public class MMeterialController extends SuperController<MMeterialService, Long,
         return success(MMeterial);
     }
 
+
+    @ApiOperation(value = "获取原材料", notes = "获取原材料")
+    @PostMapping("/get")
+    public R<MMeterial> getById(@RequestBody MMeterial model) {
+        MMeterial mMeterial = baseService.getById(model.getId());
+        return success(mMeterial);
+    }
+
 }

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

@@ -11,7 +11,9 @@ import com.github.zuihou.business.productionReadyCenter.dto.MMeterialReceiveLogU
 import com.github.zuihou.business.productionReadyCenter.dto.PlatePageDTO;
 import com.github.zuihou.business.productionReadyCenter.entity.MMeterialReceiveLog;
 import com.github.zuihou.business.productionReadyCenter.entity.Plate;
+import com.github.zuihou.business.productionReadyCenter.entity.TrayPosition;
 import com.github.zuihou.business.productionReadyCenter.service.MMeterialReceiveLogService;
+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 io.swagger.annotations.Api;
@@ -19,6 +21,7 @@ import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.validation.annotation.Validated;
 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;
 
@@ -65,4 +68,10 @@ public class MMeterialReceiveLogController extends SuperController<MMeterialRece
         return success(MMeterialReceiveLog);
     }
 
+    @ApiOperation(value = "查询托盘", notes = "查询托盘")
+    @PostMapping("/getBymeterialId")
+    public R<List<MMeterialReceiveLog>> getBymeterialId(@RequestBody MMeterialReceiveLog log) {
+        return success(baseService.list(Wraps.<MMeterialReceiveLog>lbQ().eq(MMeterialReceiveLog::getMeterialId,log.getMeterialId())));
+    }
+
 }

imcs-admin-boot/imcs-business-entity/src/main/java/com/github/zuihou/business/productionReadyCenter/dto/MToolClampSaveDTO.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;
@@ -11,6 +13,8 @@ import javax.validation.constraints.NotEmpty;
 import java.io.Serializable;
 import java.util.List;
 
+import static com.baomidou.mybatisplus.annotation.SqlCondition.LIKE;
+
 /**
  * <p>
  * 实体类
@@ -74,7 +78,7 @@ public class MToolClampSaveDTO implements Serializable {
      * 物料类型（10-原料 20-成品）
      */
     @ApiModelProperty(value = "物料类型（10-原料 20-成品）")
-    private RemoteData<String, String> materialType;
+    private String materialType;
 
     @ApiModelProperty(value = "图号")
     @Length(max = 255, message = "图号长度不能超过255")
@@ -96,4 +100,7 @@ public class MToolClampSaveDTO implements Serializable {
     @ApiModelProperty(value = "同步状态 0：未同步 1：已同步")
     private Integer synFlag;
 
+    @ApiModelProperty(value = "生产分厂")
+    private String factory;
+
 }

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

@@ -97,8 +97,11 @@ public class MToolClampUpdateDTO implements Serializable {
      * 物料类型（10-原料 20-成品）
      */
     @ApiModelProperty(value = "物料类型（10-原料 20-成品）")
-    private RemoteData<String, String> materialType;
+    private String materialType;
 
     @ApiModelProperty(value = "同步状态 0：未同步 1：已同步")
     private Integer synFlag;
+
+    @ApiModelProperty(value = "生产分厂")
+    private String factory;
 }

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

@@ -128,7 +128,6 @@ public class MToolClamp extends Entity<Long> {
      */
     @ApiModelProperty(value = "物料类型")
     @Length(max = 128, message = "物料类型长度不能超过128")
-    @InjectionField(api = DICTIONARY_ITEM_CLASS, method = DICTIONARY_ITEM_METHOD, dictType = DictionaryType.MATERIAL_TYPE)
     @TableField(value = "material_type", condition = LIKE)
     @Excel(name = "物料类型")
     private String materialType;