瀏覽代碼

批量一键出库_配件生成销售出库单无地址等信息bug修复

hu 4 月之前
父節點
當前提交
163150f01a
共有 1 個文件被更改,包括 10 次插入4 次删除
  1. 10 4
      src/custom/restcontroller/webmanage/sale/order/Order.java

+ 10 - 4
src/custom/restcontroller/webmanage/sale/order/Order.java

@@ -1894,7 +1894,7 @@ public class Order extends Controller {
         JSONArray noneeddeliverys =content.getJSONArray("noneeddeliverys");
 //        String outplace=content.getString("outplace");
         ArrayList<String> sqlList = new ArrayList<>();
-        QuerySQL orderQuerySQL = SQLFactory.createQuerySQL(this, "sa_order","sa_orderid","sys_enterpriseid","sys_enterprise_financeid","rec_contactsid","logisticsmethod");
+        QuerySQL orderQuerySQL = SQLFactory.createQuerySQL(this, "sa_order","sa_orderid","sys_enterpriseid","sys_enterprise_financeid","rec_contactsid","logisticsmethod","invoicetaxno","invoicename","invoiceaddress","contact","address","phonenumber");
         orderQuerySQL.setTableAlias("t1");
         orderQuerySQL.addJoinTable(JOINTYPE.inner, "sa_orderitems", "t2", "t2.sa_orderid=t1.sa_orderid and t1.siteid=t2.siteid",
                 "sa_orderitemsid","itemid","undeliqty","defaultprice","remarks","itemno","itemname","model","price","delivery");
@@ -2077,12 +2077,18 @@ public class Order extends Controller {
                     insertSQL.setDateValue("billdate");
                     insertSQL.setValue("billno", createBillCode("stockbill"));
 
+
+
                     insertSQL.setValue("outplace", orderdetailRows.get(0).getString("outplace"));
                     insertSQL.setValue("delivery", orderdetailRows.get(0).getString("delivery"));
                     insertSQL.setValue("logisticsmethod","");
-                    insertSQL.setValue("invoice_enterprisename",enterprisefinancerowsMap.containsKey(sys_enterpriseid)?enterprisefinancerowsMap.get(sys_enterpriseid).get(0).getString("enterprisename"):"");
-                    insertSQL.setValue("invoice_address",enterprisefinancerowsMap.containsKey(sys_enterpriseid)?enterprisefinancerowsMap.get(sys_enterpriseid).get(0).getString("address"):"");
-                    insertSQL.setValue("invoice_taxno",enterprisefinancerowsMap.containsKey(sys_enterpriseid)?enterprisefinancerowsMap.get(sys_enterpriseid).get(0).getString("taxno"):"");
+                    insertSQL.setValue("invoice_enterprisename", orderdetailRows.get(0).getString("invoicename"));
+                    insertSQL.setValue("invoice_address", orderdetailRows.get(0).getString("invoiceaddress"));
+                    insertSQL.setValue("invoice_taxno", orderdetailRows.get(0).getString("invoicetaxno"));
+                    insertSQL.setValue("name", orderdetailRows.get(0).getString("contact"));
+                    insertSQL.setValue("phonenumber", orderdetailRows.get(0).getString("phonenumber"));
+                    insertSQL.setValue("address", orderdetailRows.get(0).getString("address"));
+
                     insertSQL.setValue("tracknumber", "");
                     insertSQL.setValue("isconfirm", 0);