工装管理

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

@@ -53,6 +53,8 @@ public class MToolClampController extends SuperController<MToolClampService, Lon
 
         MToolClamp module = BeanUtil.toBean(data, MToolClamp.class);
         wrapper.like(MToolClamp::getName, module.getName())
+                .eq(MToolClamp::getNo, module.getNo() )
+                .eq(MToolClamp::getMaterialType, module.getMaterialType() )
                 .eq(MToolClamp::getStatus, module.getStatus())
                 .eq(MToolClamp::getBrand, module.getBrand())
                 .eq(MToolClamp::getCategory, module.getCategory() )

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

@@ -91,7 +91,7 @@ public class MToolClampPageDTO implements Serializable {
      * 物料类型
      */
     @ApiModelProperty(value = "物料类型")
-    private RemoteData<String, String> materialType;
+    private String materialType;
 
     @ApiModelProperty(value = "同步状态 0：未同步 1：已同步")
     private Integer synFlag;

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

@@ -127,11 +127,11 @@ public class MToolClamp extends Entity<Long> {
      * 物料类型
      */
     @ApiModelProperty(value = "物料类型")
-    @Length(max = 4, message = "物料类型长度不能超过4")
+    @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 RemoteData<String, String> materialType;
+    private String materialType;
 
     /**
      * 同步状态 0：未同步 1：已同步
@@ -145,7 +145,7 @@ public class MToolClamp extends Entity<Long> {
     @Builder
     public MToolClamp(Long id, LocalDateTime createTime, Long createUser, LocalDateTime updateTime, Long updateUser,
                       String no, String name, String status, String model, RemoteData<String, String> category, String mapNo, int period,int expiryDate,
-                      int num, String joinDate, RemoteData<String, String> brand, RemoteData<String, String> materialType,int synFlag) {
+                      int num, String joinDate, RemoteData<String, String> brand, String materialType,int synFlag) {
         this.id = id;
         this.createTime = createTime;
         this.createUser = createUser;