出库策略默认效率优先

src/main/java/com/neotel/smfcore/core/device/util/DataCache.java

@@ -204,6 +204,11 @@ public class DataCache {
     public CHECKOUT_TYPE getCheckOutType(){
     public CHECKOUT_TYPE getCheckOutType(){
 //        String outType = getSettings().getOutType();
 //        String outType = getSettings().getOutType();
         String outType = getCache(Constants.CACHE_CheckOutType);
         String outType = getCache(Constants.CACHE_CheckOutType);
+        if(ObjectUtil.isEmpty(outType)){
+            outType=CHECKOUT_TYPE.EFFICIENCY.name();
+            updateCache(Constants.CACHE_CheckOutType,outType);
+            log.info("未配置 出库策略配置类型，默认为"+outType);
+        }
         return CHECKOUT_TYPE.valueOf(outType);
         return CHECKOUT_TYPE.valueOf(outType);
     }
     }
 
 

src/main/java/com/neotel/smfcore/core/system/rest/SettingsController.java

@@ -85,7 +85,7 @@ public class SettingsController {
     @GetMapping("/checkoutSettings")
     @GetMapping("/checkoutSettings")
     @PreAuthorize("@el.check('outSetting')")
     @PreAuthorize("@el.check('outSetting')")
     public Map<String,String> getCheckOutSettings() {
     public Map<String,String> getCheckOutSettings() {
-        String outSet = dataCache.getCache(Constants.CACHE_CheckOutType);
+        String outSet = dataCache.getCheckOutType().name();
         Map<String, String> map = new HashMap<>();
         Map<String, String> map = new HashMap<>();
         map.put("checkOutType", outSet);
         map.put("checkOutType", outSet);
         return map;
         return map;

src/main/java/com/neotel/smfcore/security/rest/UserController.java

@@ -242,7 +242,7 @@ public class UserController {
     @ApiOperation("修改用户组")
     @ApiOperation("修改用户组")
     @PutMapping(value = "/updateGroup")
     @PutMapping(value = "/updateGroup")
     @PreAuthorize("@el.check('user:edit')")
     @PreAuthorize("@el.check('user:edit')")
-    public ResponseEntity<Object> updateGroup(@RequestBody UserDto userDto) {
+    public ResultBean updateGroup(@RequestBody UserDto userDto) {
         User resources=userMapper.toEntity(userDto);
         User resources=userMapper.toEntity(userDto);
         if (resources.getId() == null) {
         if (resources.getId() == null) {
             throw new ValidateException("smfcore.valueCanotNull","{0}不能为空",new String[]{"ID"} );
             throw new ValidateException("smfcore.valueCanotNull","{0}不能为空",new String[]{"ID"} );
@@ -250,7 +250,7 @@ public class UserController {
         }
         }
         User user = userManager.get(resources.getId());
         User user = userManager.get(resources.getId());
         userManager.updateGroups(resources);
         userManager.updateGroups(resources);
-        return new ResponseEntity<>(HttpStatus.OK);
+        return new ResultBean().newOkResult("ok");
     }
     }