工单出库策略bug修改

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

@@ -175,7 +175,7 @@ public class DataCache {
             List<Settings> allSettings = settingsDao.findAll();
             if(allSettings == null || allSettings.isEmpty()){
                 settings = new Settings();
-                settings.setOutType(CHECKOUT_TYPE.EFFICIENCY.name());
+//                settings.setOutType(CHECKOUT_TYPE.EFFICIENCY.name());
                 settings = settingsDao.save(settings);
             }else{
                 settings = allSettings.get(0);
@@ -192,7 +192,8 @@ public class DataCache {
      * 出库方式
      */
     public CHECKOUT_TYPE getCheckOutType(){
-        String outType = getSettings().getOutType();
+//        String outType = getSettings().getOutType();
+        String outType = getCache(Constants.CACHE_CheckOutType);
         return CHECKOUT_TYPE.valueOf(outType);
     }
 

src/main/java/com/neotel/smfcore/core/system/service/po/Settings.java

@@ -19,10 +19,10 @@ public class Settings extends BasePo implements Serializable {
      * 指定软件是为哪个客户单独定制的
      */
     private String productCustom = "";
-    /**
-     * 出库方式
-     */
-    private String outType;
+//    /**
+//     * 出库方式
+//     */
+//    private String outType;
 
     /**
      * 打印条码的纸张宽度（条码为方形,大小是长宽中最小的）

src/main/resources/messages.properties

@@ -149,3 +149,13 @@ smfcore.solderPasteManage=\u5E93\u5B58
 smfcore.solderPasteData=\u8FFD\u6EAF\u6027
 smfcore.solderPasteSetting=\u8BBE\u7F6E
 smfcore.orderSetting=\u5DE5\u5355\u8BBE\u7F6E
+smfcore.enterCorrectFolder=\u8BF7\u8F93\u5165\u6B63\u786E\u7684\u6587\u4EF6\u5939
+smfcore.taskHasEnd=\u4EFB\u52A1{0}\u5DF2\u53D6\u6D88\u6216\u5DF2\u7ED3\u675F
+smfcore.virtual.notFound=\u672A\u627E\u5230\u865A\u62DF\u4ED3
+smfcore.virtual.pos.notInStorage=\u865A\u62DF\u4ED3[{0}]\u4E2D\u672A\u627E\u5230\u5E93\u4F4D[{1}] 
+smfcore.virtual.msg.outConfirm=[{0}]\u51FA\u5E93\u5B8C\u6210
+smfcore.cancelPutInTask.fail=\u5BA2\u6237\u7AEF\u53D6\u6D88\u5165\u5E93\u4EFB\u52A1[{0}]\u5931\u8D25:{1}
+smfcore.cancelOutTask.taskHasEnd=\u5BA2\u6237\u7AEF\u53D6\u6D88\u51FA\u5E93\u4EFB\u52A1[{0}]\u5931\u8D25:\u4EFB\u52A1\u5DF2\u7ED3\u675F\u6216\u5DF2\u53D6\u6D88
+smfcore.cancelOutTask.fail=\u5BA2\u6237\u7AEF\u53D6\u6D88\u51FA\u5E93\u4EFB\u52A1[{0}]\u5931\u8D25:{1}
+smfcore.observability=\u53EF\u89C2\u6D4B\u6027
+smfcore.materialChart=\u7269\u6599\u8FFD\u8E2A
\ No newline at end of file

src/main/resources/messages_en_US.properties

@@ -149,3 +149,13 @@ smfcore.solderPasteManage=Inventory
 smfcore.solderPasteData=Traceability
 smfcore.solderPasteSetting=Setting
 smfcore.orderSetting=Order Setting
+smfcore.enterCorrectFolder=Please enter the correct folder
+smfcore.taskHasEnd=Task {0} has been cancelled or has ended 
+smfcore.virtual.notFound=No virtual warehouse found
+smfcore.virtual.pos.notInStorage=Library position [{1}] not found in virtual bin [{0}] 
+smfcore.virtual.msg.outConfirm=[{0}]Out of storage completed
+smfcore.cancelPutInTask.fail=Client cancelled inbound task [{0}] failed:{1}
+smfcore.cancelOutTask.taskHasEnd=Client cancelled outgoing task [{0}] failed:Task is finished or cancelled
+smfcore.cancelOutTask.fail=Client cancelled outgoing task [{0}] failed:{1}
+smfcore.observability=Observability 
+smfcore.materialChart=Material Tracking

src/main/resources/messages_ja_JP.properties

@@ -135,17 +135,27 @@ smfcore.shelf.msg.noTask=\u5009\u5EAB\u306E\u4F4D\u7F6E[{0}]\u306B\u5BFE\u5FDC\u
 smfcore.shelf.msg.scanPos=\u307E\u305A\u306F\u30E9\u30A4\u30D6\u30E9\u30EA\u30B3\u30FC\u30C9\u3092\u30B9\u30AD\u30E3\u30F3\u3057\u3066\u304F\u3060\u3055\u3044
 smfcore.shelf.msg.inOk=\u64CD\u4F5C\u306F\u6210\u529F\u3057\u3066\u3044\u307E\u3059\u304C\u3001\u53CE\u7D0D\u30B9\u30DA\u30FC\u30B9\u306B\u300C{0}\u300D\u3092\u5165\u308C\u3066\u304F\u3060\u3055\u3044
 smfcore.label.noReel=\u6750\u6599\u304C\u898B\u3064\u304B\u3089\u306A\u3044
-smfcore.msd=MSD\u7BA1\u7406
-smfcore.msdManage=MSD\u5E93\u5B58
-smfcore.msdData=MSD\u8FFD\u6EAF\u6027
-smfcore.msdSetting=MSD\u8BBE\u7F6E
+smfcore.msd=MSD\u306E\u7BA1\u7406
+smfcore.msdManage=MSD\u30A4\u30F3\u30D9\u30F3\u30C8\u30EA\u30FC
+smfcore.msdData=MSD\u30C8\u30EC\u30FC\u30B5\u30D3\u30EA\u30C6\u30A3
+smfcore.msdSetting=MSD\u306E\u8A2D\u5B9A
 smfcore.translation=\u30EA\u30BD\u30FC\u30B9\u306E\u7FFB\u8A33
 smfcore.languageCanotNull=\u8A00\u8A9E\u30BF\u30A4\u30D7\u306F\u7A7A\u3067\u306F\u3042\u308A\u307E\u305B\u3093
 smfcore.noLanguageSetAccess=\u8A00\u8A9E\u3092\u7DE8\u96C6\u3059\u308B\u6A29\u9650\u304C\u306A\u3044
 smfcore.languageCanotRemoveAll=\u3059\u3079\u3066\u306E\u8A00\u8A9E\u3092\u524A\u9664\u3067\u304D\u306A\u3044
-smfcore.solderPaste=\u9521\u818F\u7BA1\u7406
-smfcore.solderPasteKanban=\u8BBE\u5907\u6982\u89C8
-smfcore.solderPasteManage=\u5E93\u5B58
-smfcore.solderPasteData=\u8FFD\u6EAF\u6027
-smfcore.solderPasteSetting=\u8BBE\u7F6E
-smfcore.orderSetting=\u5DE5\u5355\u8BBE\u7F6E
\ No newline at end of file
+smfcore.solderPaste=\u306F\u3093\u3060\u30DA\u30FC\u30B9\u30C8\u306E\u7BA1\u7406
+smfcore.solderPasteKanban=\u6A5F\u5668\u6982\u8981
+smfcore.solderPasteManage=\u30A4\u30F3\u30D9\u30F3\u30C8\u30EA\u30FC
+smfcore.solderPasteData=\u9061\u53CA
+smfcore.solderPasteSetting=\u8A2D\u5B9A
+smfcore.orderSetting=\u30EF\u30FC\u30AF\u30AA\u30FC\u30C0\u30FC\u306E\u8A2D\u5B9A
+smfcore.enterCorrectFolder=\u6B63\u3057\u3044\u30D5\u30A9\u30EB\u30C0\u3092\u5165\u529B\u3057\u3066\u304F\u3060\u3055\u3044 
+smfcore.taskHasEnd=\u30BF\u30B9\u30AF{0}\u304C\u30AD\u30E3\u30F3\u30BB\u30EB\u3055\u308C\u305F\u304B\u7D42\u4E86\u3057\u305F 
+smfcore.virtual.notFound=\u30D0\u30FC\u30C1\u30E3\u30EB\u30A6\u30A8\u30A2\u30CF\u30A6\u30B9\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093
+smfcore.virtual.pos.notInStorage=\u4EEE\u60F3\u30D3\u30F3[{0}] [{1}]\u306B\u30B9\u30C8\u30EC\u30FC\u30B8\u9818\u57DF\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093 
+smfcore.virtual.msg.outConfirm=[{0}]\u30A2\u30A6\u30C8\u30AA\u30D6\u30B9\u30C8\u30EC\u30FC\u30B8\u5B8C\u4E86
+smfcore.cancelPutInTask.fail=\u30AF\u30E9\u30A4\u30A2\u30F3\u30C8\u304C\u767A\u4FE1\u30BF\u30B9\u30AF[{0}]\u3092\u30AD\u30E3\u30F3\u30BB\u30EB\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F:{1}
+smfcore.cancelOutTask.taskHasEnd=\u30AF\u30E9\u30A4\u30A2\u30F3\u30C8\u304C\u9001\u4FE1\u30BF\u30B9\u30AF\u3092\u30AD\u30E3\u30F3\u30BB\u30EB\u3057\u305F [{0}] \u5931\u6557:\u30BF\u30B9\u30AF\u304C\u7D42\u4E86\u307E\u305F\u306F\u30AD\u30E3\u30F3\u30BB\u30EB\u3055\u308C\u305F
+smfcore.cancelOutTask.fail=\u30AF\u30E9\u30A4\u30A2\u30F3\u30C8\u304C\u767A\u4FE1\u30BF\u30B9\u30AF[{0}]\u3092\u30AD\u30E3\u30F3\u30BB\u30EB\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F:{1}
+smfcore.observability=\u89B3\u6E2C\u53EF\u80FD\u6027
+smfcore.materialChart=\u30DE\u30C6\u30EA\u30A2\u30EB\u30C8\u30E9\u30C3\u30AD\u30F3\u30B0
\ No newline at end of file

src/main/resources/messages_zh_CN.properties

@@ -148,4 +148,14 @@ smfcore.solderPasteKanban=\u8BBE\u5907\u6982\u89C8
 smfcore.solderPasteManage=\u5E93\u5B58
 smfcore.solderPasteData=\u8FFD\u6EAF\u6027
 smfcore.solderPasteSetting=\u8BBE\u7F6E
-smfcore.orderSetting=\u5DE5\u5355\u8BBE\u7F6E
\ No newline at end of file
+smfcore.orderSetting=\u5DE5\u5355\u8BBE\u7F6E
+smfcore.enterCorrectFolder=\u8BF7\u8F93\u5165\u6B63\u786E\u7684\u6587\u4EF6\u5939
+smfcore.taskHasEnd=\u4EFB\u52A1{0}\u5DF2\u53D6\u6D88\u6216\u5DF2\u7ED3\u675F
+smfcore.virtual.notFound=\u672A\u627E\u5230\u865A\u62DF\u4ED3
+smfcore.virtual.pos.notInStorage=\u865A\u62DF\u4ED3[{0}]\u4E2D\u672A\u627E\u5230\u5E93\u4F4D[{1}] 
+smfcore.virtual.msg.outConfirm=[{0}]\u51FA\u5E93\u5B8C\u6210 
+smfcore.cancelPutInTask.fail=\u5BA2\u6237\u7AEF\u53D6\u6D88\u5165\u5E93\u4EFB\u52A1[{0}]\u5931\u8D25:{1}
+smfcore.cancelOutTask.taskHasEnd=\u5BA2\u6237\u7AEF\u53D6\u6D88\u51FA\u5E93\u4EFB\u52A1[{0}]\u5931\u8D25:\u4EFB\u52A1\u5DF2\u7ED3\u675F\u6216\u5DF2\u53D6\u6D88
+smfcore.cancelOutTask.fail=\u5BA2\u6237\u7AEF\u53D6\u6D88\u51FA\u5E93\u4EFB\u52A1[{0}]\u5931\u8D25:{1}
+smfcore.observability=\u53EF\u89C2\u6D4B\u6027
+smfcore.materialChart=\u7269\u6599\u8FFD\u8E2A
\ No newline at end of file

src/main/resources/messages_zh_TW.properties

@@ -148,4 +148,14 @@ smfcore.solderPasteKanban=\u8A2D\u5099\u6982\u89BD
 smfcore.solderPasteManage=\u5EAB\u5B58
 smfcore.solderPasteData=\u8FFD\u6EAF\u6027
 smfcore.solderPasteSetting=\u8A2D\u7F6E
-smfcore.orderSetting=\u5DE5\u5355\u8A2D\u7F6E
\ No newline at end of file
+smfcore.orderSetting=\u5DE5\u5355\u8A2D\u7F6E
+smfcore.enterCorrectFolder=\u8ACB\u8F38\u5165\u6B63\u78BA\u7684\u6587\u4EF6\u593E
+smfcore.taskHasEnd=\u4EFB\u52D9{0}\u5DF2\u53D6\u6D88\u6216\u5DF2\u7D50\u675F
+smfcore.virtual.notFound=\u672A\u627E\u5230\u865B\u64EC\u5009
+smfcore.virtual.pos.notInStorage=\u865B\u64EC\u5009[{0}]\u4E2D\u70BA\u627E\u5230\u5EAB\u4F4D[{1}] 
+smfcore.virtual.msg.outConfirm=[{0}]\u51FA\u5EAB\u5B8C\u6210
+smfcore.cancelPutInTask.fail=\u5BA2\u6236\u7AEF\u53D6\u6D88\u5165\u5EAB\u4EFB\u52D9[{0}]\u5931\u6557:{1}
+smfcore.cancelOutTask.taskHasEnd=\u5BA2\u6236\u7AEF\u53D6\u6D88\u51FA\u5EAB\u4EFB\u52D9[{0}]\u5931\u6557:\u4EFB\u52D9\u5DF2\u7D50\u675F\u6216\u5DF2\u53D6\u6D88
+smfcore.cancelOutTask.fail=\u5BA2\u6236\u7AEF\u53D6\u6D88\u51FA\u5EAB\u4EFB\u52D9[{0}]\u5931\u6557:{1}
+smfcore.observability=\u53EF\u89C0\u6E2C\u6027
+smfcore.materialChart=\u7269\u6599\u8FFD\u8E64
\ No newline at end of file