Merge remote-tracking branch 'origin/master'

src/main/java/com/uas/erp/schedular/database/SqlTemplate.java

@@ -118,6 +118,9 @@ public class SqlTemplate {
                     parsedValue = DateUtil.parseDateToOracleString(Constant.YMD_HMS, (Date) value);
                 } else if (value instanceof Number || value instanceof Boolean) {
                     parsedValue = String.valueOf(value);
+                } else if (value.toString().contains("'")) {
+                    // 如果存在英文'，要进行转换处理，不然不能用sql语句存入数据库
+                    parsedValue = "'" + String.valueOf(value).replaceAll("'", "''") + "'";
                 } else {
                     parsedValue = "'" + value + "'";
                 }

src/main/resources/database/template/deputyOrder.xml

@@ -74,23 +74,23 @@
                 v_sale.sa_a14_user := ${order.shipdate};
                 v_sale.sa_a16_user := ${order.deliverymethod};
                 v_sale.sa_a15_user := ${order.pickupmethod};
-                v_sale.sa_a11_user := replace(${order.tervendaddress}, '''', '''''');
+                v_sale.sa_a11_user := ${order.tervendaddress};
                 v_sale.sa_a9_user := ${order.companyname};
                 v_sale.sa_a10_user := ${order.requirepaydate};
                 v_sale.sa_a8_user := ${order.bankname};
                 v_sale.sa_a6_user := ${order.bankaccount};
-                v_sale.sa_a7_user := replace(${order.bankaddress}, '''', '''''');
+                v_sale.sa_a7_user := ${order.bankaddress};
                 v_sale.sa_a5_user := ${order.bankcode};
                 v_sale.sa_a4_user := ${order.otherdata};
                 v_sale.sa_a3_user := ${order.legalrepresent};
                 v_sale.sa_a24_user := ${order.deliverydate};
                 v_sale.sa_a22_user := ${order.paydate};
                 v_sale.sa_payername := ${order.paycomname};
-                v_sale.sa_payeraddress := replace(${order.paycomaddress}, '''', '''''');
+                v_sale.sa_payeraddress := ${order.paycomaddress};
                 v_sale.sa_a13_user := ${order.riskmethod};
                 v_sale.sa_a12_user := ${order.taxpaymentmethod};
                 v_sale.sa_a2_user := ${order.enfax};
-                v_sale.sa_a25_user := replace(${order.paycomaddress}, '''', '''''');
+                v_sale.sa_a25_user := ${order.paycomaddress};
                 v_sale.sa_a10_user_2 := ${order.actualpaydate};
                 insert into sale values v_sale;
             </block>
@@ -99,9 +99,9 @@
                 v_pr_code := 'PROD'||to_char(sysdate,'yymmdd')||v_sd_id;
 
                 insert into product (pr_id, pr_detail, pr_spec, pr_speccs, pr_unit, pr_recordman, pr_docdate, pr_status, pr_statuscode, pr_remark,
-                pr_code, pr_orispeccode, pr_brand) values (product_seq.nextval, replace(${item.prodname}, '''', ''''''),
-                replace(${item.prodcode}, '''', ''''''), replace(${item.prodspec}, '''', ''''''), 'PCS', '系统', sysdate, '已审核', 'AUDITED',
-                v_sale.sa_code||'平台代采订单产生', v_pr_code, replace(${item.prodcode}, '''', ''''''), replace(${item.prodbrand}, '''', ''''''));
+                pr_code, pr_orispeccode, pr_brand) values (product_seq.nextval, ${item.prodname},
+                ${item.prodcode}, ${item.prodspec}, 'PCS', '系统', sysdate, '已审核', 'AUDITED',
+                v_sale.sa_code||'平台代采订单产生', v_pr_code, ${item.prodcode}, ${item.prodbrand});
 
                 insert into saledetail (sd_id, sd_said, sd_detno, sd_code, sd_prodcode, sd_qty, sd_price, sd_total,sd_remark,
                 sd_delivery, SD_COSTINGPRICE) values (v_sd_id, v_sale.sa_id, ${item.detno}, v_sale.sa_code, v_pr_code, ${item.amount},