Changes

src/main/java/com/tyson/controller/YiDaController.java

@@ -1795,7 +1795,8 @@ public class YiDaController {
             String start_time = CusutUtil.getNowDate();
             JSONObject object = new JSONObject(dingUtil.getYidaById(id));
             JSONArray attachmentField_l6u528kj = new JSONArray(object.get("attachmentField_l6u528kj").toString());
-            JSONArray jsonArray = dingUtil.downloadFjs(attachmentField_l6u528kj, "/usr/_HIH3WEB_IMG_CACHE/");
+            JSONArray jsonArray = dingUtil.downloadFjs(attachmentField_l6u528kj, "/home/_HIH3WEB_IMG_CACHE/");
+//            JSONArray jsonArray = dingUtil.downloadFjs(attachmentField_l6u528kj, "/usr/_HIH3WEB_IMG_CACHE/");
 //            JSONArray jsonArray = dingUtil.downloadFjs(attachmentField_l6u528kj, "/Users/malk/Desktop/_HIH3WEB_IMG_CACHE/");
 //                     JSONArray jsonArray = dingUtil.downloadFjs(attachmentField_l6u528kj, "E://usr//_HIH3WEB_IMG_CACHE//");
             String textareaField_l6uh2vlo = "";
@@ -1980,6 +1981,17 @@ public class YiDaController {
 
 
                                 JSONArray tableField_l6ujr47b = new JSONArray();
+                                if(type.equals("61")){
+                                    JSONObject itemObject = new JSONObject();
+                                    itemObject.put("numberField_l6ujr47g", has(invoicesJSONObject, "fare").toString());//单价
+                                    itemObject.put("numberField_mifoh2ng", has(invoicesJSONObject, "fuel_surcharge").toString());//燃油附加费
+                                    itemObject.put("textField_l6vvuq3e", has(invoicesJSONObject, "tax_rate").toString());//税率
+                                    itemObject.put("numberField_l6vu65fp", has(invoicesJSONObject, "in_tax").toString());//税额
+                                    itemObject.put("numberField_l6ujr47f", has(invoicesJSONObject, "total").toString());//金额
+                                    itemObject.put("numberField_mifoh2ng", has(invoicesJSONObject, "other_taxes").toString());//其他税费
+                                    itemObject.put("numberField_mifoh2ni", has(invoicesJSONObject, "caac_development_fund").toString());//民航发展基金
+                                    tableField_l6ujr47b.put(itemObject);
+                                }
 
                                 //验真参数
                                 try {
@@ -2036,7 +2048,7 @@ public class YiDaController {
                                     }
                                     if (type.equals("01") || type.equals("02") || type.equals("03") || type.equals("04")
                                             || type.equals("15") || type.equals("14") || type.equals("11") || type.equals("10")
-                                            || type.equals("08") || type.equals("16") || type.equals("21") || type.equals("22") || type.equals("08xdp") || type.equals("08xdpp") || type.equals("61")) {
+                                            || type.equals("08") || type.equals("16") || type.equals("21") || type.equals("22") || type.equals("08xdp") || type.equals("08xdpp")) {
                                         String post = HttpUtil.post(HXAPI_COMMONCHECKINVOICE, null, yanzObj.toString(), null);
                                         if (!post.equals("")) {
 //                                            System.out.println(post);
@@ -2055,23 +2067,13 @@ public class YiDaController {
                                                     for (int k = 0; k < items.length(); k++) {
                                                         JSONObject itemObject = new JSONObject();
                                                         JSONObject item = items.getJSONObject(k);
-                                                        if(type.equals("61")){
-                                                            itemObject.put("numberField_l6ujr47g", has(item, "fare").toString());//单价
-                                                            itemObject.put("numberField_mifoh2ng", has(item, "fuel_surcharge").toString());//燃油附加费
-                                                            itemObject.put("textField_l6vvuq3e", has(item, "tax_rate").toString());//税率
-                                                            itemObject.put("numberField_l6vu65fp", has(item, "in_tax").toString());//税额
-                                                            itemObject.put("numberField_l6ujr47f", has(item, "total").toString());//金额
-                                                            itemObject.put("numberField_mifoh2ng", has(item, "other_taxes").toString());//其他税费
-                                                            itemObject.put("numberField_mifoh2ni", has(item, "caac_development_fund").toString());//民航发展基金
-                                                        }else{
-                                                            itemObject.put("textField_l6ujr47c", has(item, "goodsName").toString());//名称
-                                                            itemObject.put("numberField_l6ujr47e", has(item, "num").toString());//数量
-                                                            itemObject.put("textField_lam8efux", has(item, "unit").toString());//单位
-                                                            itemObject.put("numberField_l6ujr47g", has(item, "taxUnitPrice").toString());//单价
-                                                            itemObject.put("textField_l6vvuq3e", has(item, "taxRate").toString());//税率
-                                                            itemObject.put("numberField_l6vu65fp", has(item, "taxAmount").toString());//税额
-                                                            itemObject.put("numberField_l6ujr47f", has(item, "detailAmount").toString());//金额
-                                                        }
+                                                        itemObject.put("textField_l6ujr47c", has(item, "goodsName").toString());//名称
+                                                        itemObject.put("numberField_l6ujr47e", has(item, "num").toString());//数量
+                                                        itemObject.put("textField_lam8efux", has(item, "unit").toString());//单位
+                                                        itemObject.put("numberField_l6ujr47g", has(item, "taxUnitPrice").toString());//单价
+                                                        itemObject.put("textField_l6vvuq3e", has(item, "taxRate").toString());//税率
+                                                        itemObject.put("numberField_l6vu65fp", has(item, "taxAmount").toString());//税额
+                                                        itemObject.put("numberField_l6ujr47f", has(item, "detailAmount").toString());//金额
                                                         tableField_l6ujr47b.put(itemObject);
                                                         if (k == 0) {
                                                             if ("".equals(createJson.getString("textField_l6vvuq3f"))) {