Merge remote-tracking branch 'origin/master'

mjava-huagao/src/main/java/com/malk/huagao/service/impl/KdYdDeliveryServiceImpl.java

@@ -115,6 +115,7 @@ public class KdYdDeliveryServiceImpl extends ServiceImpl<KdYdDeliveryMapper, KdY
             String xslx = UtilMap.getString(formData, "selectField_mgrn6p2d");
             String bzfs = UtilMap.getString(formData, "selectField_mf6a0h5y");
             String bz = UtilMap.getString(formData, "textareaField_mejnamfb");
+            String ckddh = UtilMap.getString(formData, "textField_mqg2b2g5");
 //            LocalDateTime hhsj = parseTimestamp(UtilMap.getString(formData, "dateField_mf6a0h67"));
             LocalDateTime hhsj = Optional.ofNullable(
                             parseTimestamp(UtilMap.getString(formData, "dateField_mf6a0h67"))
@@ -155,11 +156,15 @@ public class KdYdDeliveryServiceImpl extends ServiceImpl<KdYdDeliveryMapper, KdY
                     String zbq = safeGetString(item, "numberField_mf6a0h6v");
                     String kddh = safeGetString(item, "textField_mf6a0h6w");
                     String mdh = safeGetString(item, "textField_mf6a0h6y");
+                    String sku = safeGetString(item, "textField_mqg2b2g6");
+                    String skuh = safeGetString(item, "textField_mqg2p1zi");
                     LocalDateTime yhrq = parseTimestamp(safeGetString(item, "dateField_mejnamfo"));
 
                     table1Map.put("wlbm", wlbm);
                     table1Map.put("detailId", detailId);
                     table1Map.put("wlmc", wlmc);
+                    table1Map.put("sku", sku);
+                    table1Map.put("skuh", skuh);
                     table1Map.put("ggxh", ggxh);
                     table1Map.put("xsdw", xsdw);
                     table1Map.put("jjsl", jjsl);
@@ -187,6 +192,7 @@ public class KdYdDeliveryServiceImpl extends ServiceImpl<KdYdDeliveryMapper, KdY
             deliveryData.put("djlx", djlx);
             deliveryData.put("orderId", orderId);
             deliveryData.put("rq", rq);
+            deliveryData.put("ckddh", ckddh);
             deliveryData.put("kh", kh);
             deliveryData.put("jsbb", jsbb);
             deliveryData.put("djbh", djbh);

mjava-huagao/src/main/java/com/malk/huagao/service/impl/KdYdMaterialServiceImpl.java

@@ -210,6 +210,7 @@ public class KdYdMaterialServiceImpl extends ServiceImpl<KdYdMaterialMapper, KdY
                     String jbdw = safeGetStringValue(kdYdMaterial, "jbdw");
                     String ssxl = safeGetStringValue(kdYdMaterial, "ssxl");
                     String jx = safeGetStringValue(kdYdMaterial, "jx");
+                    String sku = safeGetStringValue(kdYdMaterial, "sku");
 
                     // 修复：安全处理sd字段
                     Object sdObj = kdYdMaterial.get("sd");
@@ -272,6 +273,7 @@ public class KdYdMaterialServiceImpl extends ServiceImpl<KdYdMaterialMapper, KdY
                     updateFormData.put("dateField_ml4ikfa0", kssj);
                     updateFormData.put("dateField_ml4ikfa1", jzsj);
                     updateFormData.put("textField_mfxbtce6", sjzt);
+                    updateFormData.put("textField_mqg2328v", sku);
 
                     if (sd != null) {
                         updateFormData.put("numberField_mfxbtceb", sd);

mjava-huagao/src/main/java/com/malk/huagao/service/impl/KdYdOrderServiceImpl.java

@@ -159,7 +159,10 @@ public class KdYdOrderServiceImpl extends ServiceImpl<KdYdOrderMapper, KdYdOrder
             String djbh = null;
             if ("edit".equals(type)) {
 //                djbh = UtilMap.getString(formData, "textField_mjs6fuwo");
-                djbh = UtilMap.getString(formData, "textField_miwvnkep");
+//                djbh = UtilMap.getString(formData, "textField_miwvnkep");
+                 djbh = StringUtils.isNotBlank(UtilMap.getString(formData, "textField_mjs6fuwo"))
+                        ? UtilMap.getString(formData, "textField_mjs6fuwo")
+                        : UtilMap.getString(formData, "textField_miwvnkep");
                 actionType = "edit";
             } else {
                 actionType = "add";
@@ -186,6 +189,7 @@ public class KdYdOrderServiceImpl extends ServiceImpl<KdYdOrderMapper, KdYdOrder
             String jshjstr = UtilMap.getString(formData, "numberField_mewfgzkv");
             BigDecimal jshj = toBigDecimal(jshjstr);
             String sfhs = UtilMap.getString(formData, "radioField_mfxv2vg4");
+            String ckddh = UtilMap.getString(formData, "textField_mqg2b2g5");
             String jws = UtilMap.getString(formData, "radioField_mfxv2vgm");
             List<Map> tableField = (List<Map>) formData.get("tableField_mfbx1pqi");
             List<Map> tableFieldPayment = (List<Map>) formData.get("tableField_mhiui6v5");
@@ -201,6 +205,7 @@ public class KdYdOrderServiceImpl extends ServiceImpl<KdYdOrderMapper, KdYdOrder
                     String wlbm = safeGetString(item, "textField_mfbx1pqt");
 //                    String wlbm = "010101010003";
                     String wlmc = safeGetString(item, "textField_mfbx1pqs");
+                    String sku = safeGetString(item, "textField_mqg2b2g6");
                     String tcfpfs = safeGetString(item, "textField_mpqmsz2q");
                     String yjfpfs = safeGetString(item, "textField_mpqmsz2r");
                     String fpxsy = safeGetString(item, "textField_mpqmsz2s");
@@ -228,6 +233,7 @@ public class KdYdOrderServiceImpl extends ServiceImpl<KdYdOrderMapper, KdYdOrder
                     // 设置明细字段
                     table1Map.put("detailId", detailId);
                     table1Map.put("wlbm", wlbm);
+                    table1Map.put("sku", sku);
                     table1Map.put("wlmc", wlmc);
                     table1Map.put("ggxh", ggxh);
                     table1Map.put("xsdw", xsdw);
@@ -293,6 +299,7 @@ public class KdYdOrderServiceImpl extends ServiceImpl<KdYdOrderMapper, KdYdOrder
             // 示例映射，实际需要根据数据库表结构调整
             orderData.put("djlx", djlx);                    // 单据类型
             orderData.put("djbh", djbh);                    // 单据编号
+            orderData.put("ckddh", ckddh);                    // 单据编号
             orderData.put("khmc", khmc);                    // 客户名称
             orderData.put("rq", rq);                        // 日期
             orderData.put("khxypj", khxypj);                // 客户信用评级

mjava-qiwang/src/main/java/com/malk/qiwang/Controller/InvoiceLibraryController.java

@@ -53,7 +53,7 @@ public class InvoiceLibraryController {
     private InvoiceLibraryMapper baseMapper;
     private static final String url = "http://47.103.203.2:9092/qiwang/";
             //员工报销
-//private static final String url = "http://24120b4f.r39.cpolar.top/qiwang/";
+//private static final String url = "http://5862d6b4.r39.cpolar.top/qiwang/";
     @PostMapping("/invoiceLibrary")
     public McR test(@RequestBody Map map)  {
         log.info("map:{}", map);

mjava-qiwang/src/main/java/com/malk/qiwang/Controller/QiWangController.java

@@ -71,7 +71,7 @@ public class QiWangController {
     private static final String bdurl = "D://qiwang//files//";
     private static final String url = "http://47.103.203.2:9092/qiwang/";
 //    private static final String bdurl = "C:\\Users\\EDY\\Desktop\\项目\\琦王\\files\\";
-//private static final String url = "http://24120b4f.r39.cpolar.top/qiwang/";
+//private static final String url = "http://5862d6b4.r39.cpolar.top/qiwang/";
     @PostMapping("/test")
 
     public McR test(@RequestBody Map map) {

mjava-qiwang/src/main/java/com/malk/qiwang/Service/impl/InvoiceLibraryServiceImpl.java

@@ -312,8 +312,6 @@ public class InvoiceLibraryServiceImpl extends ServiceImpl<InvoiceLibraryMapper,
                                                     // 获取税率，供共享发票使用
                                                     Object taxRateObj = invoice.get("taxRate");
                                                     Object kind = invoice.getString("kindName");
-                                                    System.out.println("qqq"+taxRateObj);
-                                                    System.out.println("qqq"+kind);
 
                                                     if (taxRateObj != null) {
                                                         String taxRateStr = String.valueOf(taxRateObj);
@@ -3388,8 +3386,30 @@ public class InvoiceLibraryServiceImpl extends ServiceImpl<InvoiceLibraryMapper,
                     UtilMap.getList(prop, "VatInvoiceItemInfos") != null && !UtilMap.getList(prop, "VatInvoiceItemInfos").isEmpty()
                             ? UtilMap.getList(prop, "VatInvoiceItemInfos")
                             : UtilMap.getList(prop, "VatElectronicItems");
+//            if (!vatInvoiceItemInfos.isEmpty()) {
+//                 taxRate = UtilMap.getString(vatInvoiceItemInfos.get(0), "TaxRate");
+//            }
             if (!vatInvoiceItemInfos.isEmpty()) {
-                 taxRate = UtilMap.getString(vatInvoiceItemInfos.get(0), "TaxRate");
+                String originalTaxRate = UtilMap.getString(vatInvoiceItemInfos.get(0), "TaxRate");
+
+                // 判断是否为有效数字（包括带%号的格式，如"9%"）
+                if (StringUtils.isNotBlank(originalTaxRate)) {
+                    // 移除百分号并尝试解析为数字
+                    String cleanedTaxRate = originalTaxRate.replace("%", "").trim();
+                    try {
+                        // 尝试转换为数字
+                        new BigDecimal(cleanedTaxRate);
+                        taxRate = originalTaxRate; // 保持原值（可能带%）
+                    } catch (NumberFormatException e) {
+                        // 如果不是数字（如"不征税"、"免税"等），赋值为"0"
+                        taxRate = "0";
+                        log.debug("税率格式异常，原始值: {}, 已设置为0", originalTaxRate);
+                    }
+                } else {
+                    taxRate = "0";
+                }
+            } else {
+                taxRate = "0";
             }
             String no = UtilMap.getString(prop, "Number");
             if (nos.contains(no)) {

mjava-siku/src/main/java/com/malk/siku/service/impl/SikuServiceImpl.java

@@ -137,11 +137,18 @@ public class SikuServiceImpl implements SikuService {
             account.put("businessCode",UtilMap.getString(formData,"serialNumberField_mketkvw4"));
 
             Map accountItem = new HashMap();
+            accountItem.put("accountType","BANK");
             accountItem.put("accountName",UtilMap.getString(formData,"textField_mketkvxa"));//账户名称
             accountItem.put("accountNumber",UtilMap.getString(formData,"textField_mketkvxc"));//账号
-//            accountItem.put("bankBranchName",UtilMap.getString(formData,"textField_mketkvx8"));//分支行
-            accountItem.put("accountType","BANK");
-            accountItem.put("bankBranchNo",UtilMap.getString(formData,"textField_mp27zy92"));//联行号
+            accountItem.put("acceptCcy",UtilMap.getString(formData,"textField_mqf1hmt2"));//币别
+
+            String country = UtilMap.getString(formData, "selectField_mqenuvgn");
+            if (!"中国".equals(country)){
+                accountItem.put("bankBranchName",UtilMap.getString(formData,"selectField_mqenuvgo"));//开户银行（境外）
+                accountItem.put("",UtilMap.getString(formData,"textField_mqg2ks6b"));//开户银行编码
+            }else {
+                accountItem.put("bankBranchNo",UtilMap.getString(formData,"textField_mp27zy92"));//联行号
+            }
 
             account.put("accounts",Arrays.asList(accountItem));