条码设置菜单文字修改

src/main/java/com/neotel/smfcore/core/order/rest/OrderController.java

@@ -103,14 +103,14 @@ public class OrderController {
         String image = "csv";
         String image = "csv";
         String fileType = FileUtil.getExtensionName(orderFile.getOriginalFilename());
         String fileType = FileUtil.getExtensionName(orderFile.getOriginalFilename());
         if (fileType != null && !image.contains(fileType)) {
         if (fileType != null && !image.contains(fileType)) {
-            throw new ValidateException("smfcode.feleFormatError", "文件格式错误！, 仅支持{0}格式", new String[]{image});
+            throw new ValidateException("smfcore.feleFormatError", "文件格式错误！, 仅支持{0}格式", new String[]{image});
         }
         }
         File folder = new File(properties.getPath(), "pos");
         File folder = new File(properties.getPath(), "pos");
         File localFile = FileUtil.upload(orderFile, folder.getAbsolutePath());
         File localFile = FileUtil.upload(orderFile, folder.getAbsolutePath());
         List<LiteOrderItem> liteOrderItems = handleOrderCsv(localFile.getAbsolutePath());
         List<LiteOrderItem> liteOrderItems = handleOrderCsv(localFile.getAbsolutePath());
 
 
         if (liteOrderItems == null || liteOrderItems.size() <= 0) {
         if (liteOrderItems == null || liteOrderItems.size() <= 0) {
-            throw new ValidateException("smfcode.fileError", "文件解析失败");
+            throw new ValidateException("smfcore.fileError", "文件解析失败");
 
 
         }
         }
 
 

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

@@ -249,8 +249,8 @@ public class StoragePosController {
 
 
 
 
     @ApiOperation("解析出库条码")
     @ApiOperation("解析出库条码")
-    @PutMapping("/resolveCode")
-    public CodeDto resolveCode(@RequestParam("blurry") String blurry){
+    @PutMapping("/resolveCode/{blurry}")
+    public CodeDto resolveCode(@PathVariable String blurry){
 
 
         String barcodeStr=blurry;
         String barcodeStr=blurry;
         Barcode barcode=codeResolve.resolveCode(barcodeStr);
         Barcode barcode=codeResolve.resolveCode(barcodeStr);

src/main/java/com/neotel/smfcore/core/system/util/TaskService.java

@@ -594,7 +594,7 @@ public class TaskService {
         }
         }
 
 
         if(availbleStorageList.isEmpty()){
         if(availbleStorageList.isEmpty()){
-           throw new ValidateException("smfcore.noValidStorage","料仓列表中未找到可用的料仓");
+           throw new ValidateException("smfcode.noValidStorage","料仓列表中未找到可用的料仓");
         }
         }
 
 
             availbleStorageList.sort(new Comparator<Storage>() {
             availbleStorageList.sort(new Comparator<Storage>() {

src/main/resources/messages.properties

@@ -78,9 +78,9 @@ smfcore.user=\u7528\u6237\u7BA1\u7406
 smfcore.peoples=\u7528\u6237\u7BA1\u7406
 smfcore.peoples=\u7528\u6237\u7BA1\u7406
 smfcore.role=\u89D2\u8272\u7BA1\u7406
 smfcore.role=\u89D2\u8272\u7BA1\u7406
 smfcode.menuNotExist=\u83DC\u5355{0}\u4E0D\u5B58\u5728
 smfcode.menuNotExist=\u83DC\u5355{0}\u4E0D\u5B58\u5728
-smfcore.noValidStorage=\u6599\u4ED3\u5217\u8868\u4E2D\u672A\u627E\u5230\u53EF\u7528\u7684\u6599\u4ED3
+smfcode.noValidStorage=\u6599\u4ED3\u5217\u8868\u4E2D\u672A\u627E\u5230\u53EF\u7528\u7684\u6599\u4ED3
 smfcode.error.barcode.exist=[{0}}]\u5DF2\u5728{1}}[{2}}]\u4E2D
 smfcode.error.barcode.exist=[{0}}]\u5DF2\u5728{1}}[{2}}]\u4E2D
-smfcode.barcodeSetting=\u6761\u7801\u8BBE\u7F6E
+smfcore.barcodeSetting=\u6761\u7801\u8BBE\u7F6E
 
 
 
 
 
 

src/main/resources/messages_en_US.properties

@@ -78,6 +78,6 @@ smfcore.user=User Management
 smfcore.peoples=User Management
 smfcore.peoples=User Management
 smfcore.role=Role Management
 smfcore.role=Role Management
 smfcode.menuNotExist=Menu{0} does not exist
 smfcode.menuNotExist=Menu{0} does not exist
-smfcore.noValidStorage=No available bin found in bin list
+smfcode.noValidStorage=No available bin found in bin list
 smfcode.error.barcode.exist=[{0}}] is already in {1}}[{2}}]
 smfcode.error.barcode.exist=[{0}}] is already in {1}}[{2}}]
-smfcode.barcodeSetting=Barcode setting
\ No newline at end of file
+smfcore.barcodeSetting=Barcode setting
\ No newline at end of file

src/main/resources/messages_ja_JP.properties

@@ -78,6 +78,6 @@ smfcore.user=\u30E6\u30FC\u30B6\u30FC\u7BA1\u7406
 smfcore.peoples=\u30E6\u30FC\u30B6\u30FC\u7BA1\u7406
 smfcore.peoples=\u30E6\u30FC\u30B6\u30FC\u7BA1\u7406
 smfcore.role=\u5F79\u5272\u7BA1\u7406
 smfcore.role=\u5F79\u5272\u7BA1\u7406
 smfcode.menuNotExist=\u30E1\u30CB\u30E5\u30FC{0}\u304C\u5B58\u5728\u3057\u306A\u3044
 smfcode.menuNotExist=\u30E1\u30CB\u30E5\u30FC{0}\u304C\u5B58\u5728\u3057\u306A\u3044
-smfcore.noValidStorage=\u30D3\u30F3\u30EA\u30B9\u30C8\u306B\u5229\u7528\u53EF\u80FD\u306A\u30D3\u30F3\u304C\u898B\u3064\u304B\u3089\u306A\u3044
+smfcode.noValidStorage=\u30D3\u30F3\u30EA\u30B9\u30C8\u306B\u5229\u7528\u53EF\u80FD\u306A\u30D3\u30F3\u304C\u898B\u3064\u304B\u3089\u306A\u3044
 smfcode.error.barcode.exist=[0}}]\u306F\u3059\u3067\u306B{1}[{2}}\u306B\u5165\u3063\u3066\u3044\u307E\u3059\u3002
 smfcode.error.barcode.exist=[0}}]\u306F\u3059\u3067\u306B{1}[{2}}\u306B\u5165\u3063\u3066\u3044\u307E\u3059\u3002
-smfcode.barcodeSetting=\u30D0\u30FC\u30B3\u30FC\u30C9\u8A2D\u5B9A
\ No newline at end of file
+smfcore.barcodeSetting=\u30D0\u30FC\u30B3\u30FC\u30C9\u8A2D\u5B9A
\ No newline at end of file

src/main/resources/messages_zh_CN.properties

@@ -78,7 +78,7 @@ smfcore.user=\u7528\u6237\u7BA1\u7406
 smfcore.peoples=\u7528\u6237\u7BA1\u7406
 smfcore.peoples=\u7528\u6237\u7BA1\u7406
 smfcore.role=\u89D2\u8272\u7BA1\u7406
 smfcore.role=\u89D2\u8272\u7BA1\u7406
 smfcode.menuNotExist=\u83DC\u5355{0}\u4E0D\u5B58\u5728
 smfcode.menuNotExist=\u83DC\u5355{0}\u4E0D\u5B58\u5728
-smfcore.noValidStorage=\u6599\u4ED3\u5217\u8868\u4E2D\u672A\u627E\u5230\u53EF\u7528\u7684\u6599\u4ED3
+smfcode.noValidStorage=\u6599\u4ED3\u5217\u8868\u4E2D\u672A\u627E\u5230\u53EF\u7528\u7684\u6599\u4ED3
 smfcode.error.barcode.exist=[{0}}]\u5DF2\u5728{1}}[{2}}]\u4E2D
 smfcode.error.barcode.exist=[{0}}]\u5DF2\u5728{1}}[{2}}]\u4E2D
-smfcode.barcodeSetting=\u6761\u7801\u8BBE\u7F6E
+smfcore.barcodeSetting=\u6761\u7801\u8BBE\u7F6E
 
 

src/main/resources/messages_zh_TW.properties

@@ -78,6 +78,6 @@ smfcore.user=\u7528\u6236\u7BA1\u7406
 smfcore.peoples=\u7528\u6236\u7BA1\u7406
 smfcore.peoples=\u7528\u6236\u7BA1\u7406
 smfcore.role=\u89D2\u8272\u7BA1\u7406
 smfcore.role=\u89D2\u8272\u7BA1\u7406
 smfcode.menuNotExist=\u83DC\u55AE{0}\u4E0D\u5B58\u5728
 smfcode.menuNotExist=\u83DC\u55AE{0}\u4E0D\u5B58\u5728
-smfcore.noValidStorage=\u6599\u5009\u5217\u8868\u4E2D\u672A\u627E\u5230\u53EF\u7528\u7684\u6599\u5009
+smfcode.noValidStorage=\u6599\u5009\u5217\u8868\u4E2D\u672A\u627E\u5230\u53EF\u7528\u7684\u6599\u5009
 smfcode.error.barcode.exist=[{0}}]\u5DF2\u5728{1}}[{2}}]\u4E2D
 smfcode.error.barcode.exist=[{0}}]\u5DF2\u5728{1}}[{2}}]\u4E2D
-smfcode.barcodeSetting=\u689D\u78BC\u8A2D\u7F6E
\ No newline at end of file
+smfcore.barcodeSetting=\u689D\u78BC\u8A2D\u7F6E
\ No newline at end of file