uid出库导出增加供应商字段

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

@@ -512,6 +512,7 @@ public class StoragePosController {
                 header.add(Lists.newArrayList(MessageUtils.getText("smfcore.storagePos.proDate",locale,"生产日期")));
                 header.add(Lists.newArrayList(MessageUtils.getText("smfcore.storagePos.expireDate",locale,"过期时间")));
                 header.add(Lists.newArrayList(MessageUtils.getText("smfcore.storagePos.batch",locale,"物料批次")));
+                header.add(Lists.newArrayList(MessageUtils.getText("smfcore.storagePos.provider",locale,"供应商")));
                 header.add(Lists.newArrayList(MessageUtils.getText("smfcore.storagePos.posName",locale,"库位号")));
                 header.add(Lists.newArrayList(MessageUtils.getText("smfcore.storagePos.lockName",locale,"工单号")));
                 header.add(Lists.newArrayList(MessageUtils.getText("smfcore.storagePos.amount",locale,"数量")));
@@ -547,6 +548,7 @@ public class StoragePosController {
                     data.add(proDate);
                     data.add(expireDate);
                     data.add(barcode.getBatch());
+                    data.add(barcode.getProvider());
                     data.add(pos.getPosName());
                     data.add(barcode.getLockName());
                     data.add(barcode.getAmount());
@@ -576,6 +578,7 @@ public class StoragePosController {
                             subData.add(subCodeProDate);
                             subData.add(subCodeExpireDate);
                             subData.add(subCode.getBatch());
+                            subData.add(subCode.getProvider());
                             subData.add(pos.getPosName()+"("+barcode.getBarcode()+")");
                             subData.add(subCode.getLockName());
                             subData.add(subCode.getAmount());

src/main/resources/messages.properties

@@ -188,6 +188,7 @@ smfcore.storagePos.lockName=\u5DE5\u5355\u53F7
 smfcore.storagePos.amount=\u6570\u91CF
 smfcore.storagePos.putInTime=\u9996\u6B21\u5165\u5E93\u65F6\u95F4
 smfcore.storagePos.putInDate=\u5165\u5E93\u65F6\u95F4
+smfcore.storagePos.provider=\u4F9B\u5E94\u5546
 smfcore.inventory.partNumber=\u7269\u6599\u7F16\u53F7
 smfcore.inventory.count=\u6570\u91CF
 smfcore.inventory.lockReel=\u9501\u5B9A

src/main/resources/messages_de_DE.properties

@@ -451,4 +451,5 @@ smfcore.reelPosMove.paramerror=Incomplete Parameter
 smfcore.reelPosMove.posIsNull=Lagerort [{1}] ist leer
 smfcore.liteOrder.exist=Bedarfsauftrag {0} existiert bereits
 smfcore.reelPosMove.barcodeError=Der Barcode des Lagerorts {0} ist {1}, nicht identisch mit dem Umzugscode {1}
-smfcore.barcode.notFindFeerder=Stationsinformation [{0}] nicht gefunden
\ No newline at end of file
+smfcore.barcode.notFindFeerder=Stationsinformation [{0}] nicht gefunden
+smfcore.storagePos.provider=Lieferant

src/main/resources/messages_en_US.properties

@@ -452,4 +452,5 @@ smfcore.reelPosMove.paramerror=Incomplete parameters
 smfcore.reelPosMove.posIsNull=Location [{1}] is empty
 smfcore.liteOrder.exist=Requirement order {0} already exists
 smfcore.reelPosMove.barcodeError=Location {0} barcode is {1}, inconsistent with the transfer barcode {1}
-smfcore.barcode.notFindFeerder=Station information [{0}] not found
\ No newline at end of file
+smfcore.barcode.notFindFeerder=Station information [{0}] not found
+smfcore.storagePos.provider=Provider

src/main/resources/messages_fr_FR.properties

@@ -451,4 +451,5 @@ smfcore.reelPosMove.paramerror=Param\u00E8tres incomplets
 smfcore.reelPosMove.posIsNull=L'emplacement [{1}] est vide
 smfcore.liteOrder.exist=Le bon de commande {0} existe d\u00E9j\u00E0
 smfcore.reelPosMove.barcodeError=Le code-barres de l'emplacement {0} est {1}, incompatible avec le code-barres de transfert {1}
-smfcore.barcode.notFindFeerder=Informations de station [{0}] non trouv\u00E9es
\ No newline at end of file
+smfcore.barcode.notFindFeerder=Informations de station [{0}] non trouv\u00E9es
+smfcore.storagePos.provider=Fournisseur

src/main/resources/messages_ja_JP.properties

@@ -448,4 +448,5 @@ smfcore.reelPosMove.paramerror=\u30D1\u30E9\u30E1\u30FC\u30BF\u304C\u4E0D\u5B8C\
 smfcore.reelPosMove.posIsNull=\u5EAB\u4F4D [{1}] \u304C\u7A7A\u3067\u3059
 smfcore.liteOrder.exist=\u8981\u6C42\u5358 {0} \u306F\u65E2\u306B\u5B58\u5728\u3057\u307E\u3059
 smfcore.reelPosMove.barcodeError=\u5EAB\u4F4D {0} \u306E\u30D0\u30FC\u30B3\u30FC\u30C9\u306F {1} \u3067\u3001\u79FB\u5EAB\u30D0\u30FC\u30B3\u30FC\u30C9 {1} \u3068\u4E0D\u4E00\u81F4\u3067\u3059
-smfcore.barcode.notFindFeerder=[{0}]\u30B9\u30C6\u30FC\u30B7\u30E7\u30F3\u60C5\u5831\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093
\ No newline at end of file
+smfcore.barcode.notFindFeerder=[{0}]\u30B9\u30C6\u30FC\u30B7\u30E7\u30F3\u60C5\u5831\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093
+smfcore.storagePos.provider=\u4F9B\u7D66\u8005

src/main/resources/messages_zh_CN.properties

@@ -448,4 +448,5 @@ smfcore.reelPosMove.paramerror=\u53C2\u6570\u4E0D\u5B8C\u6574
 smfcore.reelPosMove.posIsNull=\u5E93\u4F4D[{1}]\u4E3A\u7A7A
 smfcore.liteOrder.exist=\u9700\u6C42\u5355{0}\u5DF2\u5B58\u5728
 smfcore.reelPosMove.barcodeError=\u5E93\u4F4D{0}\u6761\u7801\u4E3A{1}\uFF0C\u4E0E\u79FB\u5E93\u6761\u7801{1}\u4E0D\u4E00\u81F4
-smfcore.barcode.notFindFeerder=\u672A\u627E\u5230[{0}]\u7AD9\u4F4D\u4FE1\u606F
\ No newline at end of file
+smfcore.barcode.notFindFeerder=\u672A\u627E\u5230[{0}]\u7AD9\u4F4D\u4FE1\u606F
+smfcore.storagePos.provider=\u4F9B\u5E94\u5546

src/main/resources/messages_zh_TW.properties

@@ -448,4 +448,5 @@ smfcore.reelPosMove.paramerror=\u53C3\u6578\u4E0D\u5B8C\u6574
 smfcore.reelPosMove.posIsNull=\u5EAB\u4F4D [{1}] \u70BA\u7A7A
 smfcore.liteOrder.exist=\u9700\u6C42\u55AE {0} \u5DF2\u5B58\u5728
 smfcore.reelPosMove.barcodeError=\u5EAB\u4F4D {0} \u689D\u78BC\u70BA {1}\uFF0C\u8207\u79FB\u5EAB\u689D\u78BC {1} \u4E0D\u4E00\u81F4
-smfcore.barcode.notFindFeerder=\u672A\u627E\u5230[{0}]\u7AD9\u4F4D\u8CC7\u8A0A
\ No newline at end of file
+smfcore.barcode.notFindFeerder=\u672A\u627E\u5230[{0}]\u7AD9\u4F4D\u8CC7\u8A0A
+smfcore.storagePos.provider=\u4F9B\u7D66\u8005