From 3b1b7e81331c08db921710923ac3ccc96070e9ae Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Tue, 2 Jul 2024 19:09:13 +0800
Subject: [PATCH] md

---
 .../erp/emis/service/EmisBaseService.java     | 56 +++++++++++++++++--
 1 file changed, 52 insertions(+), 4 deletions(-)

diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
index b3a886e24..4b83786db 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
@@ -1426,11 +1426,59 @@ public class EmisBaseService {
          String packTypeEn="";
          if(!StringUtils.isEmpty(waybill.getPackType())){
              packType=DictUtils.getDictLabel("emis_tab_packing_type",waybill.getPackType());
-             try {
-                 packTypeEn= TransUtils.langTrans(packType,"zh-cn","en");
-             } catch (Exception e) {
-                 e.printStackTrace();
+//             try {
+//                 packTypeEn= TransUtils.langTrans(packType,"zh-cn","en");
+//             } catch (Exception e) {
+//                 e.printStackTrace();
+//             }
+
+             // 包装类型英文翻译
+             /*
+
+                文件
+                1
+                1
+                文件
+                纸箱
+                2
+                2
+                纸箱
+                木箱
+                3
+                3
+                木箱
+                编织袋
+                4
+                4
+                编织袋
+                其它
+                5
+                5
+                其它
+
+             * */
+             String [] packTypeArr = waybill.getPackType().split(",");
+             if(packTypeArr.length>0){
+                 for(String type:packTypeArr){
+                     if("1".equals(type)){
+                         packTypeEn=""+"paper"+","
+                     }
+                     else  if("2".equals(type)){
+                         packTypeEn=""+"carton"+","
+                     }
+                     else  if("3".equals(type)){
+                         packTypeEn=""+"wooden box"+","
+                     }
+                     else  if("4".equals(type)){
+                         packTypeEn=""+"Woven bags"+","
+                     }
+                     else  if("5".equals(type)){
+                         packTypeEn=""+"other"+","
+                     }
+                 }
+                 packTypeEn=StringUtils.removeEnd(packTypeEn,",");
              }
+
          }
          order.put("packType",packType);
          order.put("packTypeEn",packTypeEn);