|
|
@@ -3,6 +3,7 @@ package com.uas.erp.schedular.mall.task;
|
|
|
import com.alibaba.fastjson.JSON;
|
|
|
import com.alibaba.fastjson.JSONObject;
|
|
|
import com.uas.erp.schedular.b2b.domain.Customer;
|
|
|
+import com.uas.erp.schedular.b2b.domain.Purchase;
|
|
|
import com.uas.erp.schedular.b2b.domain.Vendor;
|
|
|
import com.uas.erp.schedular.diymall.domain.Order;
|
|
|
import com.uas.erp.schedular.diymall.domain.OrderInvoice;
|
|
|
@@ -301,7 +302,7 @@ public class OrderTask extends AbstractTask {
|
|
|
int purchaseId = jdbcTemplate.getInt("select purchase_seq.nextval from dual");
|
|
|
String insertMainSql = "insert into purchase(pu_id,pu_code,pu_date,pu_kind,pu_currency,pu_rate,pu_refcode,pu_vendcode,pu_vendname,pu_receivecode,pu_receivename,pu_vendoruu,"
|
|
|
+ "pu_paymentscode,pu_payments,pu_buyercode,pu_buyername,pu_departmentcode,pu_departmentname,pu_shipaddresscode,pu_pocode,pu_status,pu_statuscode,"
|
|
|
- + "pu_recordman,pu_indate,pu_auditman,pu_auditdate,pu_getprice,pu_isadvance,pu_sendstatus) values(?,?,sysdate,'代运营订单','RMB','1',?,?,?,?,?,?,?,?,'ADMIN','管理员','B15','优软云运营组',?,?,'已审核','AUDITED','ADMIN',sysdate,'ADMIN',sysdate,'0','unadvance','已上传')";
|
|
|
+ + "pu_recordman,pu_indate,pu_auditman,pu_auditdate,pu_getprice,pu_isadvance,PU_SENDSTATUS) values(?,?,sysdate,'代运营订单','RMB','1',?,?,?,?,?,?,?,?,'ADMIN','管理员','B15','优软云运营组',?,?,'已审核','AUDITED','ADMIN',sysdate,'ADMIN',sysdate,'0','unadvance','已上传')";
|
|
|
//供应商资料生成逻辑
|
|
|
Vendor vendor = getVendorByUUOrName(order.getCode(), order.getSellerEnuu(), order.getSellerName());
|
|
|
if (null == vendor) {
|
|
|
@@ -329,6 +330,9 @@ public class OrderTask extends AbstractTask {
|
|
|
jdbcTemplate.execute(insertMainSql, purchaseId, purchaseCode, saleCode, vendor.getVe_code(), vendor.getVe_name(), vendor.getVe_apvendcode(), vendor.getVe_apvendname(), vendor.getVe_uu(),
|
|
|
vendor.getVe_paymentcode(), vendor.getVe_payment(), order.getOrderDeliveryAddr().getDeliveryAddress(), order.getCode());
|
|
|
jdbcTemplate.batchExecute(insertDetailSqlList);
|
|
|
+ String sendStatus = jdbcTemplate.getString("SELECT PU_SENDSTATUS FROM PURCHASE WHERE PU_ID = ?", purchaseId);
|
|
|
+ LOGGER.info("生成的采购订单id={},上传状态={}", purchaseId, sendStatus);
|
|
|
+ jdbcTemplate.execute("UPDATE PURCHASE SET PU_SENDSTATUS = '已上传' WHERE PU_ID = ?", purchaseId);
|
|
|
return true;
|
|
|
}
|
|
|
|