提示文字bug修改

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

@@ -264,7 +264,7 @@ public class ThirdBoxHandler extends BaseDeviceHandler{
     //比较料仓容量，若不一样时返回一个新库位号
     protected StoragePos UsePosProcess(DataLog task,Map<String,Integer>  posCapMap) {
         try {
-            if (task == null || (!task.isCheckOutTask())||posCapMap==null||posCapMap.size()<=0) {
+            if (task == null || task.isCheckOutTask()||posCapMap==null||posCapMap.size()<=0) {
                 return null;
             }
             Storage storage = dataCache.getStorage(task.getCid());

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

@@ -6,36 +6,23 @@ import com.neotel.smfcore.common.csv.CsvReader;
 import com.neotel.smfcore.common.excel.ExcelReader;
 import com.neotel.smfcore.common.exception.ValidateException;
 import com.neotel.smfcore.common.utils.Constants;
-import com.neotel.smfcore.common.utils.DateUtil;
 import com.neotel.smfcore.common.utils.FileUtil;
-import com.neotel.smfcore.common.utils.QueryHelp;
 import com.neotel.smfcore.core.device.util.DataCache;
-import com.neotel.smfcore.core.language.service.bean.LanguageInfo;
-import com.neotel.smfcore.core.language.service.po.LanguageMsg;
+import com.neotel.smfcore.core.language.util.MessageUtils;
 import com.neotel.smfcore.core.storage.enums.DeviceType;
 import com.neotel.smfcore.core.storage.service.po.Storage;
 import com.neotel.smfcore.core.system.bean.OrderSetting;
-import com.neotel.smfcore.core.system.rest.bean.dto.SettingsDto;
 import com.neotel.smfcore.core.system.rest.bean.dto.SysSettingsDto;
-import com.neotel.smfcore.core.system.rest.bean.mapstruct.SettingsMapper;
 import com.neotel.smfcore.core.system.service.po.Settings;
 import com.neotel.smfcore.core.system.util.DbBackupService;
 import com.neotel.smfcore.security.annotation.AnonymousAccess;
 import com.neotel.smfcore.security.bean.FileProperties;
-import com.neotel.smfcore.security.rest.bean.dto.MenuDto;
-import com.neotel.smfcore.security.rest.bean.query.UserQueryCriteria;
-import com.neotel.smfcore.security.service.po.Menu;
-import com.neotel.smfcore.security.service.po.User;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.data.mongodb.core.aggregation.BooleanOperators;
-import org.springframework.data.mongodb.core.query.Query;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -96,18 +83,20 @@ public class SettingsController {
     @ApiOperation("修改系统设置信息")
     @PutMapping("/sysSettings")
     @PreAuthorize("@el.check('sysSetting')")
-    public ResultBean updateSysSettings(@Validated @RequestBody SysSettingsDto sysSettingsDto) {
+    public ResultBean updateSysSettings(@Validated @RequestBody SysSettingsDto sysSettingsDto,HttpServletRequest servletRequest) {
         dataCache.updateCache(Constants.CACHE_StopOut, sysSettingsDto.isStopOut());
         dataCache.updateCache(Constants.CACHE_StartJob, sysSettingsDto.isStartJob());
-        dataCache.updateCache(Constants.CACHE_SluggishDay,sysSettingsDto.getSluggishDay());
-        dataCache.updateCache(Constants.CACHE_ExpiresDay,sysSettingsDto.getExpiresDay());
-        dataCache.updateCache(Constants.CACHE_CapacityWarn,sysSettingsDto.getCapacityWarn());
-        dataCache.updateCache(Constants.BACKUP_MONTH_KEY,sysSettingsDto.getBackUpMonth());
-        dataCache.updateCache(Constants.CACHE_SAME_BARCODE_SETTINGS,sysSettingsDto.getSameBarcodeSettings());
-        log.info("更改系统设置：stopout=" + sysSettingsDto.isStopOut() + ",stopjob=" + sysSettingsDto.isStartJob()+",sluggishDay="+sysSettingsDto.getSluggishDay()
-                +",expiresDay="+sysSettingsDto.getExpiresDay()+",capacityWarn="+sysSettingsDto.getCapacityWarn()+",backUpMonth="+sysSettingsDto.getBackUpMonth()+
-                " ,sameBarcodeSettings="+sysSettingsDto.getSameBarcodeSettings());
-        return ResultBean.newOkResult("保存成功");
+        dataCache.updateCache(Constants.CACHE_SluggishDay, sysSettingsDto.getSluggishDay());
+        dataCache.updateCache(Constants.CACHE_ExpiresDay, sysSettingsDto.getExpiresDay());
+        dataCache.updateCache(Constants.CACHE_CapacityWarn, sysSettingsDto.getCapacityWarn());
+        dataCache.updateCache(Constants.BACKUP_MONTH_KEY, sysSettingsDto.getBackUpMonth());
+        dataCache.updateCache(Constants.CACHE_SAME_BARCODE_SETTINGS, sysSettingsDto.getSameBarcodeSettings());
+        log.info("更改系统设置：stopout=" + sysSettingsDto.isStopOut() + ",stopjob=" + sysSettingsDto.isStartJob() + ",sluggishDay=" + sysSettingsDto.getSluggishDay()
+                + ",expiresDay=" + sysSettingsDto.getExpiresDay() + ",capacityWarn=" + sysSettingsDto.getCapacityWarn() + ",backUpMonth=" + sysSettingsDto.getBackUpMonth() +
+                " ,sameBarcodeSettings=" + sysSettingsDto.getSameBarcodeSettings());
+
+        String msg = MessageUtils.getText("smfcore.saveOk", servletRequest.getLocale(), "保存成功");
+        return ResultBean.newOkResult(msg);
 
     }
 

src/main/resources/messages.properties

@@ -341,6 +341,7 @@ smfcore.selfAudit.pause=\u76D8\u70B9{0}\u5DF2\u6682\u505C
 smfcore.updatePass.hasNoAccess=\u6CA1\u6709\u64CD\u4F5C\u6743\u9650
 smfcore.selfAudit.noPos=\u76D8\u70B9{0}\u672A\u627E\u5230\u5E93\u4F4D\u53F7
 smfcore.task.updatePutInFail=\u5165\u5E93\u4EFB\u52A1{0}[{1}]\u4E0D\u80FD\u66F4\u65B0\u72B6\u6001\u4E3A{2}
+smfcore.saveOk=\u4FDD\u5B58\u6210\u529F
 #smfclient.nlp.onlyOneTray=\u4E0D\u53EF\u540C\u65F6\u653E\u5165\u591A\u76D8\u7269\u6599:{0}
 #smfclient.nlp.cannotFindPos={0}\u672A\u627E\u5230\u5E93\u4F4D:{1}
 #smfclient.nlp.inputOk={0}\u5165\u5E93\u5230{1}\u6210\u529F

src/main/resources/messages_en_US.properties

@@ -340,4 +340,5 @@ smfcore.selfAudit.notFind=self audit is not found
 smfcore.selfAudit.pause=self audit {0} has Paused
 smfcore.updatePass.hasNoAccess=No operating rights
 smfcore.selfAudit.noPos=Self Audit{0}No depot number found
-smfcore.task.updatePutInFail=Cannot update the status of the inbound task {0}[{1}] to {2}
\ No newline at end of file
+smfcore.task.updatePutInFail=Cannot update the status of the inbound task {0}[{1}] to {2}
+smfcore.saveOk=save successfully
\ No newline at end of file

src/main/resources/messages_ja_JP.properties

@@ -337,4 +337,5 @@ smfcore.selfAudit.notFind=\u30A4\u30F3\u30D9\u30F3\u30C8\u30EA\u60C5\u5831\u304C
 smfcore.selfAudit.pause=\u30BB\u30EB\u30D5\u30C6\u30B9\u30C8{0}\u304C\u4E2D\u65AD\u3055\u308C\u307E\u3057\u305F
 smfcore.updatePass.hasNoAccess=\u64CD\u4F5C\u6A29\u306A\u3057
 smfcore.selfAudit.noPos=\u76D8\u70B9{0}\u672A\u627E\u5230\u5E93\u4F4D\u53F7
-smfcore.task.updatePutInFail=\u5165\u5E93\u4EFB\u52A1{0}[{1}]\u4E0D\u80FD\u66F4\u65B0\u72B6\u6001\u4E3A{2}
\ No newline at end of file
+smfcore.task.updatePutInFail=\u5165\u5E93\u4EFB\u52A1{0}[{1}]\u4E0D\u80FD\u66F4\u65B0\u72B6\u6001\u4E3A{2}
+smfcore.saveOk=\u4FDD\u5B58\u6210\u529F
\ No newline at end of file

src/main/resources/messages_zh_CN.properties

@@ -337,4 +337,5 @@ smfcore.selfAudit.notFind=\u672A\u627E\u5230\u76D8\u70B9\u4FE1\u606F
 smfcore.selfAudit.pause=\u76D8\u70B9{0}\u5DF2\u6682\u505C
 smfcore.updatePass.hasNoAccess=\u6CA1\u6709\u64CD\u4F5C\u6743\u9650
 smfcore.selfAudit.noPos=\u76D8\u70B9{0}\u672A\u627E\u5230\u5E93\u4F4D\u53F7
-smfcore.task.updatePutInFail=\u5165\u5E93\u4EFB\u52A1{0}[{1}]\u4E0D\u80FD\u66F4\u65B0\u72B6\u6001\u4E3A{2}
\ No newline at end of file
+smfcore.task.updatePutInFail=\u5165\u5E93\u4EFB\u52A1{0}[{1}]\u4E0D\u80FD\u66F4\u65B0\u72B6\u6001\u4E3A{2}
+smfcore.saveOk=\u4FDD\u5B58\u6210\u529F
\ No newline at end of file

src/main/resources/messages_zh_TW.properties

@@ -338,4 +338,5 @@ smfcore.selfAudit.notFind=\u672A\u627E\u5230\u76E4\u9EDE\u4FE1\u606F
 smfcore.selfAudit.pause=\u76E4\u9EDE{0}\u5DF2\u66AB\u505C
 smfcore.updatePass.hasNoAccess=\u6C92\u6709\u64CD\u4F5C\u6B0A\u9650
 smfcore.selfAudit.noPos=\u76E4\u9EDE{0}\u672A\u627E\u5230\u5EAB\u4F4D\u865F
-smfcore.task.updatePutInFail=\u5165\u5EAB\u4EFB\u52D9{0}[{1}]\u4E0D\u80FD\u66F4\u65B0\u72C0\u614B\u70BA{2}
\ No newline at end of file
+smfcore.task.updatePutInFail=\u5165\u5EAB\u4EFB\u52D9{0}[{1}]\u4E0D\u80FD\u66F4\u65B0\u72C0\u614B\u70BA{2}
+smfcore.saveOk=\u4FDD\u5B58\u6210\u529F
\ No newline at end of file