1.工单详情增加站位编号

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

@@ -376,6 +376,7 @@ public class OrderController {
             header.add(Lists.newArrayList(MessageUtils.getText("smfcore.order.MPN",locale,"MPN")));
             header.add(Lists.newArrayList(MessageUtils.getText("smfcore.order.MPN",locale,"MPN")));
             header.add(Lists.newArrayList(MessageUtils.getText("smfcore.order.side",locale,"面别")));
             header.add(Lists.newArrayList(MessageUtils.getText("smfcore.order.side",locale,"面别")));
             header.add(Lists.newArrayList(MessageUtils.getText("smfcore.order.tableNo",locale,"台车号")));
             header.add(Lists.newArrayList(MessageUtils.getText("smfcore.order.tableNo",locale,"台车号")));
+            header.add(Lists.newArrayList(MessageUtils.getText("smfcore.order.slotNum",locale,"站位编号")));
             header.add(Lists.newArrayList(MessageUtils.getText("smfcore.order.feederInfo",locale,"站位信息")));
             header.add(Lists.newArrayList(MessageUtils.getText("smfcore.order.feederInfo",locale,"站位信息")));
             header.add(Lists.newArrayList(MessageUtils.getText("smfcore.order.needReelCount",locale,"需求盘数")));
             header.add(Lists.newArrayList(MessageUtils.getText("smfcore.order.needReelCount",locale,"需求盘数")));
             header.add(Lists.newArrayList(MessageUtils.getText("smfcore.order.outReelCount",locale,"已出盘数")));
             header.add(Lists.newArrayList(MessageUtils.getText("smfcore.order.outReelCount",locale,"已出盘数")));
@@ -405,6 +406,7 @@ public class OrderController {
                 data.add(orderItem.getMpn());
                 data.add(orderItem.getMpn());
                 data.add(orderItem.getSide());
                 data.add(orderItem.getSide());
                 data.add(orderItem.getTableNo());
                 data.add(orderItem.getTableNo());
+                data.add(orderItem.getSlotNum());
                 data.add(orderItem.getFeederInfo());
                 data.add(orderItem.getFeederInfo());
                 data.add(orderItem.getNeedReelCount());
                 data.add(orderItem.getNeedReelCount());
                 data.add(orderItem.getOutReelCount());
                 data.add(orderItem.getOutReelCount());

src/main/java/com/neotel/smfcore/core/order/rest/bean/dto/OrderItemDto.java

@@ -69,6 +69,9 @@ public class OrderItemDto {
 
 
     private int totalOutReelCount = 0;
     private int totalOutReelCount = 0;
 
 
+    @ApiModelProperty("站位编号")
+    private String slotNum = "";
+
 //    Inventory Quantity
 //    Inventory Quantity
 //    Inventory Reel / Bundle count
 //    Inventory Reel / Bundle count
 //    Insufficient Quantity
 //    Insufficient Quantity

src/main/resources/messages.properties

@@ -435,4 +435,5 @@ smfcore.equipment.view.ncgroup=Neo Counter
 smfcore.virtual.boxInPos=[{0}]\u5DF2\u5728\u5E93\u4F4D[{1}]\u4E2D,\u8BF7\u5148\u53D6\u51FA
 smfcore.virtual.boxInPos=[{0}]\u5DF2\u5728\u5E93\u4F4D[{1}]\u4E2D,\u8BF7\u5148\u53D6\u51FA
 smfcore.virtual.quantityError=\u53D6\u51FA\u6570\u91CF\u5E94\u4E3A[{0}]
 smfcore.virtual.quantityError=\u53D6\u51FA\u6570\u91CF\u5E94\u4E3A[{0}]
 smfcode.virtual.enter=\u8BF7\u626B\u63CF\u6216\u8F93\u5165\u6761\u7801\u540E\u6309\u56DE\u8F66\u786E\u8BA4
 smfcode.virtual.enter=\u8BF7\u626B\u63CF\u6216\u8F93\u5165\u6761\u7801\u540E\u6309\u56DE\u8F66\u786E\u8BA4
-smfcore.auth.expire=\u6388\u6743\u5DF2\u8FC7\u671F
\ No newline at end of file
+smfcore.auth.expire=\u6388\u6743\u5DF2\u8FC7\u671F
+smfcore.order.slotNum=\u7AD9\u4F4D\u7F16\u53F7
\ No newline at end of file

src/main/resources/messages_de_DE.properties

@@ -425,4 +425,5 @@ smfcore.equipment.view.ncgroup=Neo Counter
 smfcore.virtual.boxInPos=[{0}] befindet sich bereits im Lagerplatz [{1}]. Bitte entnehmen Sie es zuerst
 smfcore.virtual.boxInPos=[{0}] befindet sich bereits im Lagerplatz [{1}]. Bitte entnehmen Sie es zuerst
 smfcore.virtual.quantityError=Die zu entnehmende Menge sollte [{0}] betragen
 smfcore.virtual.quantityError=Die zu entnehmende Menge sollte [{0}] betragen
 smfcode.virtual.enter=Bitte scannen Sie den Barcode oder geben Sie ihn ein und best\u00E4tigen Sie mit Enter
 smfcode.virtual.enter=Bitte scannen Sie den Barcode oder geben Sie ihn ein und best\u00E4tigen Sie mit Enter
-smfcore.auth.expire=Die Autorisierung ist abgelaufen
\ No newline at end of file
+smfcore.auth.expire=Die Autorisierung ist abgelaufen
+smfcore.order.slotNum=Standnummer
\ No newline at end of file

src/main/resources/messages_en_US.properties

@@ -426,4 +426,5 @@ smfcore.equipment.view.ncgroup=Neo Counter
 smfcore.virtual.boxInPos=[{0}] is already in location [{1}]. Please remove it first
 smfcore.virtual.boxInPos=[{0}] is already in location [{1}]. Please remove it first
 smfcore.virtual.quantityError=The quantity to be removed should be [{0}]
 smfcore.virtual.quantityError=The quantity to be removed should be [{0}]
 smfcode.virtual.enter=Please scan or enter the barcode, then press Enter
 smfcode.virtual.enter=Please scan or enter the barcode, then press Enter
-smfcore.auth.expire=Authorization has expired
\ No newline at end of file
+smfcore.auth.expire=Authorization has expired
+smfcore.order.slotNum=Station Number
\ No newline at end of file

src/main/resources/messages_fr_FR.properties

@@ -425,4 +425,5 @@ smfcore.equipment.view.ncgroup=Neo Counter
 smfcore.virtual.boxInPos=[{0}] est d\u00E9j\u00E0 dans l'emplacement [{1}]. Veuillez d'abord le retirer
 smfcore.virtual.boxInPos=[{0}] est d\u00E9j\u00E0 dans l'emplacement [{1}]. Veuillez d'abord le retirer
 smfcore.virtual.quantityError=La quantit\u00E9 \u00E0 retirer doit \u00EAtre [{0}]
 smfcore.virtual.quantityError=La quantit\u00E9 \u00E0 retirer doit \u00EAtre [{0}]
 smfcode.virtual.enter=Veuillez scanner ou saisir le code-barres, puis appuyer sur Entr\u00E9e
 smfcode.virtual.enter=Veuillez scanner ou saisir le code-barres, puis appuyer sur Entr\u00E9e
-smfcore.auth.expire=L'autorisation a expir\u00E9
\ No newline at end of file
+smfcore.auth.expire=L'autorisation a expir\u00E9
+smfcore.order.slotNum=num\u00E9ro de position
\ No newline at end of file

src/main/resources/messages_ja_JP.properties

@@ -422,4 +422,5 @@ smfcore.equipment.view.ncgroup=Neo Counter
 smfcore.virtual.boxInPos=[{0}] \u306F\u65E2\u306B\u30ED\u30B1\u30FC\u30B7\u30E7\u30F3 [{1}] \u306B\u3042\u308A\u307E\u3059\u3002\u5148\u306B\u53D6\u308A\u51FA\u3057\u3066\u304F\u3060\u3055\u3044
 smfcore.virtual.boxInPos=[{0}] \u306F\u65E2\u306B\u30ED\u30B1\u30FC\u30B7\u30E7\u30F3 [{1}] \u306B\u3042\u308A\u307E\u3059\u3002\u5148\u306B\u53D6\u308A\u51FA\u3057\u3066\u304F\u3060\u3055\u3044
 smfcore.virtual.quantityError=\u53D6\u308A\u51FA\u3057\u6570\u91CF\u306F[{0}]\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
 smfcore.virtual.quantityError=\u53D6\u308A\u51FA\u3057\u6570\u91CF\u306F[{0}]\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
 smfcode.virtual.enter=\u30D0\u30FC\u30B3\u30FC\u30C9\u3092\u30B9\u30AD\u30E3\u30F3\u3001\u307E\u305F\u306F\u5165\u529B\u5F8C\u3001Enter\u30AD\u30FC\u3092\u62BC\u3057\u3066\u304F\u3060\u3055\u3044
 smfcode.virtual.enter=\u30D0\u30FC\u30B3\u30FC\u30C9\u3092\u30B9\u30AD\u30E3\u30F3\u3001\u307E\u305F\u306F\u5165\u529B\u5F8C\u3001Enter\u30AD\u30FC\u3092\u62BC\u3057\u3066\u304F\u3060\u3055\u3044
-smfcore.auth.expire = \u8A8D\u8A3C\u304C\u671F\u9650\u5207\u308C\u3067\u3059
\ No newline at end of file
+smfcore.auth.expire = \u8A8D\u8A3C\u304C\u671F\u9650\u5207\u308C\u3067\u3059
+smfcore.order.slotNum = \u30B9\u30BF\u30F3\u30C9\u756A\u53F7
\ No newline at end of file

src/main/resources/messages_zh_CN.properties

@@ -422,4 +422,5 @@ smfcore.equipment.view.ncgroup=Neo Counter
 smfcore.virtual.boxInPos=[{0}]\u5DF2\u5728\u5E93\u4F4D[{1}]\u4E2D,\u8BF7\u5148\u53D6\u51FA
 smfcore.virtual.boxInPos=[{0}]\u5DF2\u5728\u5E93\u4F4D[{1}]\u4E2D,\u8BF7\u5148\u53D6\u51FA
 smfcore.virtual.quantityError=\u53D6\u51FA\u6570\u91CF\u5E94\u4E3A[{0}]
 smfcore.virtual.quantityError=\u53D6\u51FA\u6570\u91CF\u5E94\u4E3A[{0}]
 smfcode.virtual.enter=\u8BF7\u626B\u63CF\u6216\u8F93\u5165\u6761\u7801\u540E\u6309\u56DE\u8F66\u786E\u8BA4
 smfcode.virtual.enter=\u8BF7\u626B\u63CF\u6216\u8F93\u5165\u6761\u7801\u540E\u6309\u56DE\u8F66\u786E\u8BA4
-smfcore.auth.expire=\u6388\u6743\u5DF2\u8FC7\u671F
\ No newline at end of file
+smfcore.auth.expire=\u6388\u6743\u5DF2\u8FC7\u671F
+smfcore.order.slotNum=\u7AD9\u4F4D\u7F16\u53F7
\ No newline at end of file

src/main/resources/messages_zh_TW.properties

@@ -422,4 +422,5 @@ smfcore.equipment.view.ncgroup=Neo Counter
 smfcore.virtual.boxInPos=[{0}]\u5DF2\u5728\u5EAB\u4F4D[{1}]\u4E2D,\u8ACB\u5148\u53D6\u51FA
 smfcore.virtual.boxInPos=[{0}]\u5DF2\u5728\u5EAB\u4F4D[{1}]\u4E2D,\u8ACB\u5148\u53D6\u51FA
 smfcore.virtual.quantityError=\u53D6\u51FA\u6578\u91CF\u61C9\u70BA[{0}]
 smfcore.virtual.quantityError=\u53D6\u51FA\u6578\u91CF\u61C9\u70BA[{0}]
 smfcode.virtual.enter=\u8ACB\u6383\u63CF\u6216\u8F38\u5165\u689D\u78BC\u5F8C\u6309\u56DE\u8ECA\u78BA\u8A8D
 smfcode.virtual.enter=\u8ACB\u6383\u63CF\u6216\u8F38\u5165\u689D\u78BC\u5F8C\u6309\u56DE\u8ECA\u78BA\u8A8D
-smfcore.auth.expire = \u6388\u6B0A\u5DF2\u904E\u671F
\ No newline at end of file
+smfcore.auth.expire = \u6388\u6B0A\u5DF2\u904E\u671F
+smfcore.order.slotNum = \u7AD9\u4F4D\u7DE8\u865F
\ No newline at end of file