料盒增加描述功能

src/main/java/com/neotel/smfcore/core/barcode/rest/bean/dto/ComponentDto.java

@@ -116,6 +116,8 @@ public class ComponentDto implements Serializable {
     @ApiModelProperty("展示的图片")
     private String showImg = "";
 
+    @ApiModelProperty("厚度")
+    private String thickness="";
 
     @ApiModelProperty("有效时长(生产日期+此天数为过期日期),设置默认有效期为2年")
     private int validDay = 0;

src/main/java/com/neotel/smfcore/core/barcode/service/po/Barcode.java

 package com.neotel.smfcore.core.barcode.service.po;
 
+import cn.hutool.core.date.DateTime;
 import com.google.common.collect.Lists;
 import com.neotel.smfcore.common.base.BasePo;
 import com.neotel.smfcore.common.utils.DateUtil;
@@ -86,6 +87,9 @@ public class Barcode extends BasePo implements Serializable {
      * 批次
      */
     private String batch="";
+    /**
+     * 等级
+     */
     private String msl;
 
     //备用字段1（配套单号)）或 family
@@ -209,13 +213,20 @@ public class Barcode extends BasePo implements Serializable {
     /**
      * 开包时间
      */
-    private String openTime;
+    private Date openTime;
 
     /**
      * 描述
      */
     private String describe;
-
+    /**
+     * 厚度
+     * 请选择
+     *<2.1mm
+     * 2.1mm~3.1mm
+     * >=3.1mm
+     */
+    private String thickness="";
     /**
      * 添加相关联条码
      *

src/main/java/com/neotel/smfcore/core/device/handler/impl/XLCBoxHandler.java

@@ -17,6 +17,7 @@ import com.neotel.smfcore.core.device.enums.OP_STATUS;
 import com.neotel.smfcore.core.device.rest.dto.XLCPosBarcodeDto;
 import com.neotel.smfcore.core.device.rest.dto.XLCPosDetailDto;
 import com.neotel.smfcore.core.storage.enums.DeviceType;
+import com.neotel.smfcore.core.storage.rest.dto.CheckOutDto;
 import com.neotel.smfcore.core.storage.rest.dto.StoragePosDto;
 import com.neotel.smfcore.core.storage.rest.mapstruct.StoragePosMapper;
 import com.neotel.smfcore.core.storage.rest.query.StoragePosQueryCriteria;
@@ -33,10 +34,8 @@ import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.stereotype.Service;
 import org.springframework.util.ObjectUtils;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.*;

src/main/java/com/neotel/smfcore/core/storage/rest/MaterialBoxController.java

@@ -88,6 +88,27 @@ public class MaterialBoxController {
         }
         return barcodeDto;
     }
+    @ApiOperation("修改料盒描述信息")
+    @PostMapping("updateDescribe")
+    @PreAuthorize("@el.check('materialBox')")
+    public ResultBean updateDescribe(@RequestBody Map<String, String> paramMap) {
+
+        String code = paramMap.get("barcode");//料盒条码
+        String describe = paramMap.get("describe");//物料条码
+
+        Barcode barcode = barcodeManager.findByBarcode(code);
+        if (barcode == null) {
+            throw new ValidateException("smfcode.materialBox.invalid", "未找到料盒信息{0}", new String[]{code});
+        }
+        if(describe==null){
+            throw new ValidateException("smfcode.valueCanotNull","{0}不能为空",new String[]{"describe"} );
+        }
+        barcode.setDescribe(describe);
+        barcodeManager.saveBarcode(barcode);
+        log.info("更改料盒[" + code + "]的描述信息为：" + describe);
+        return ResultBean.newOkResult("");
+    }
+
 
     @ApiOperation("取出物料")
     @PostMapping("exeOut")

src/main/java/com/neotel/smfcore/core/storage/rest/StoragePosController.java

@@ -87,6 +87,7 @@ public class StoragePosController {
         Query query = QueryHelp.getQuery(criteria);
         PageData<StoragePos> pages = storagePosManager.findByPage(query, pageable);
         List<StoragePosDto> StoragePosDtos = storagePosMapper.toDto(pages.getContent());
+
         return new PageData(StoragePosDtos, pages.getTotalElements());
     }
 
@@ -298,7 +299,7 @@ public class StoragePosController {
         return new PageData(StoragePosDtos, pages.getTotalElements());
     }
 
-    @ApiOperation("查找出库")
+    @ApiOperation("出库操作")
     @PutMapping("/checkout")
     public ResultBean checkout(@Validated @RequestBody CheckOutDto checkOutDto) {