Browse Source

不生成客户资料

chenw 6 years ago
parent
commit
3c50bed8df
1 changed files with 29 additions and 54 deletions
  1. 29 54
      src/main/java/com/uas/erp/schedular/mall/task/ProductTask.java

+ 29 - 54
src/main/java/com/uas/erp/schedular/mall/task/ProductTask.java

@@ -459,10 +459,6 @@ public class ProductTask extends AbstractTask {
                 int saleId = jdbcTemplate.getInt("select sale_seq.nextval from sale");
                 String code = jdbcTemplate.generateCode("Sale",2);
 
-                //customer  cu_uu cu_name
-                Customer customer = jdbcTemplate.queryForBean("select * from CUSTOMER where CU_UU = ? and CU_UU <> 0 and CU_AUDITSTATUS = '已审核'",
-                        Customer.class, order.getEnuu());
-
                 Map<String, Object> payment = jdbcTemplate.queryForMap("select PA_CODE,PA_NAME from customer  left join payments on CU_PAYMENTID = pa_id where cu_code = 'C18060102'");
                 Object pa_code  = "";
                 Object pa_name = "";
@@ -489,59 +485,38 @@ public class ProductTask extends AbstractTask {
 
                 }
 
-                boolean exists = !ObjectUtils.isEmpty(customer);
-
-                if(!exists){
-                    customer = jdbcTemplate.queryForBean("select * from CUSTOMER where CU_NAME = ? and CU_AUDITSTATUS = '已审核'",
-                            Customer.class, order.getBuyerEnName());
-                    if(!ObjectUtils.isEmpty(customer)){
-                        exists=true;
-                    }else{
-                        String customerCode = jdbcTemplate.generateCode("Customer!Base",2);
-                        String customerSql = "insert into customer(cu_id,cu_code,cu_name,cu_shortname,cu_businesscode,cu_uu,cu_paymentscode,cu_payments,cu_sellercode,cu_sellername,cu_servicecode," +
-                                "cu_servicename,cu_agenttype,cu_cop,cu_enablecredit,cu_shipment,cu_email,cu_tel,cu_contact,cu_recordman,cu_recorddate,cu_auditman,cu_auditdate,CU_AUDITSTATUS)" +
-                                "values(CUSTOMER_SEQ.NEXTVAL,'" + customerCode + "','" + order.getBuyerEnName() + "','" + order.getBuyerName() + "','" + null + "','" + order.getEnuu() + "','SK004','款到发货','ADMIN','ADMIN','ADMIN','ADMIN'," +
-                                "'普通客户','深圳怡海能达','否','快递','" + order.getBuyerEmail() + "','" + order.getBuyerMobile() + "','" + null + "','ADMIN',sysdate,'ADMIN',sysdate,'已审核')";
-                        jdbcTemplate.execute(customerSql);
-                        customer = jdbcTemplate.queryForBean("select * from CUSTOMER WHERE CU_CODE = ?", Customer.class, customerCode);
-                        exists=true;
+                String sql = "insert into mall$SALE (SA_ID , SA_CODE , SA_DATE , SA_KIND , SA_CURRENCY , SA_RATE , SA_CUSTCODE , SA_CUSTNAME , sa_shcustcode, sa_shcustname, SA_APCUSTCODE , SA_APCUSTNAME ," +
+                        "SA_PAYMENTSCODE , SA_PAYMENTS , SA_SELLERCODE, SA_SELLER , SA_DEPARTMENTCODE , SA_DEPARTMENTNAME , SA_TOPLACE , SA_POCODE , SA_STATUS , SA_STATUSCODE, SA_RECORDER , SA_RECORDDATE ," +
+                        "SA_AUDITMAN , SA_AUDITDATE , SA_UPDATEMAN , SA_UPDATEDATE , SA_TOTAL, sa_need1 , sa_need2, SA_MALLSTATUS) values ('" + saleId + "','"+ code + "',sysdate,'商城订单','RMB','1','C18060102','深圳优软商城科技有限公司', 'C18060102','深圳优软商城科技有限公司', " +
+                        "'C18060102','深圳优软商城科技有限公司','" + pa_code +"','" + pa_name +"','SZ0017','周连军','1202', " +
+                        "'研发二部','"+ order.getOrderDeliveryAddr().getDeliveryAddress() + "','" + order.getCode() + "','" + status + "','" + statusCode + "','ADMIN',sysdate,'ADMIN',sysdate, " +
+                        "'ADMIN',sysdate,0,'" + order.getBuyerName() +"','" + order.getBuyerMobile() + "','"+ mallStatus +"')";
+                int count = jdbcTemplate.getInt("SELECT COUNT(*) FROM SALE WHERE SA_POCODE = ?", order.getCode());
+                if (count > 0) {
+                    if ("已结案".equals(status)) {
+                        jdbcTemplate.execute("UPDATE mall$SALE SET SA_STATUS = ?, SA_STATUSCODE = ? WHERE SA_POCODE = ?", status, statusCode, order.getCode());
                     }
-                }
-
-                if(exists){
-                    String sql = "insert into mall$SALE (SA_ID , SA_CODE , SA_DATE , SA_KIND , SA_CURRENCY , SA_RATE , SA_CUSTCODE , SA_CUSTNAME , sa_shcustcode, sa_shcustname, SA_APCUSTCODE , SA_APCUSTNAME ," +
-                            "SA_PAYMENTSCODE , SA_PAYMENTS , SA_SELLERCODE, SA_SELLER , SA_DEPARTMENTCODE , SA_DEPARTMENTNAME , SA_TOPLACE , SA_POCODE , SA_STATUS , SA_STATUSCODE, SA_RECORDER , SA_RECORDDATE ," +
-                            "SA_AUDITMAN , SA_AUDITDATE , SA_UPDATEMAN , SA_UPDATEDATE , SA_TOTAL, sa_need1 , sa_need2, SA_MALLSTATUS) values ('" + saleId + "','"+ code + "',sysdate,'商城订单','RMB','1','C18060102','深圳优软商城科技有限公司', 'C18060102','深圳优软商城科技有限公司', " +
-                            "'C18060102','深圳优软商城科技有限公司','" + pa_code +"','" + pa_name +"','SZ0017','周连军','1202', " +
-                            "'研发二部','"+ order.getOrderDeliveryAddr().getDeliveryAddress() + "','" + order.getCode() + "','" + status + "','" + statusCode + "','ADMIN',sysdate,'ADMIN',sysdate, " +
-                            "'ADMIN',sysdate,0,'" + order.getBuyerName() +"','" + order.getBuyerMobile() + "','"+ mallStatus +"')";
-                    int count = jdbcTemplate.getInt("SELECT COUNT(*) FROM SALE WHERE SA_POCODE = ?", order.getCode());
-                    if (count > 0) {
-                        if ("已结案".equals(status)) {
-                            jdbcTemplate.execute("UPDATE mall$SALE SET SA_STATUS = ?, SA_STATUSCODE = ? WHERE SA_POCODE = ?", status, statusCode, order.getCode());
+                }else {
+                    if (detailList.size() > 0) {
+                        jdbcTemplate.execute(sql);
+                        jdbcTemplate.batchExecute(detailList);
+                        jdbcTemplate.execute("UPDATE mall$SALE SET SA_TOTAL = (select SUM(SD_PRICE*SD_QTY) FROM SALEDETAIL where sd_said = ?) WHERE SA_ID = ?", saleId, saleId);
+                        if (0 == data) {
+                            jdbcTemplate.execute("UPDATE CONFIGS SET data = 1 WHERE code = 'mallSaleOrder' and caller = 'mallOrder!YHND'");
                         }
+                        loggingOrder.setStatus("成功");
+                        loggingOrder.setOrderNumber(code);
+                        loggingOrder.setRemark("销售订单生成成功");
+                        String logOrderSql = "insert into LOGORDER(LO_ID, ORDERCODE , STATUS , SALESTIME , ORDERNUMBER , REMARK)" +
+                                "values(LOGORDER_SEQ.NEXTVAL,'" + order.getCode() + "', '" + loggingOrder.getStatus() + "', sysdate,'" + loggingOrder.getOrderNumber() + "', '" + loggingOrder.getRemark() + "')";
+                        jdbcTemplate.execute(logOrderSql);
                     }else {
-                        if (detailList.size() > 0) {
-                            jdbcTemplate.execute(sql);
-                            jdbcTemplate.batchExecute(detailList);
-                            jdbcTemplate.execute("UPDATE mall$SALE SET SA_TOTAL = (select SUM(SD_PRICE*SD_QTY) FROM SALEDETAIL where sd_said = ?) WHERE SA_ID = ?", saleId, saleId);
-                            if (0 == data) {
-                                jdbcTemplate.execute("UPDATE CONFIGS SET data = 1 WHERE code = 'mallSaleOrder' and caller = 'mallOrder!YHND'");
-                            }
-                            loggingOrder.setStatus("成功");
-                            loggingOrder.setOrderNumber(code);
-                            loggingOrder.setRemark("销售订单生成成功");
-                            String logOrderSql = "insert into LOGORDER(LO_ID, ORDERCODE , STATUS , SALESTIME , ORDERNUMBER , REMARK)" +
-                                    "values(LOGORDER_SEQ.NEXTVAL,'" + order.getCode() + "', '" + loggingOrder.getStatus() + "', sysdate,'" + loggingOrder.getOrderNumber() + "', '" + loggingOrder.getRemark() + "')";
-                            jdbcTemplate.execute(logOrderSql);
-                        }else {
-                            loggingOrder.setStatus("失败");
-                            loggingOrder.setOrderNumber("");
-                            loggingOrder.setRemark("未找到匹配的物料资料");
-                            String logOrderSql = "insert into LOGORDER(LO_ID, ORDERCODE , STATUS , SALESTIME , ORDERNUMBER , REMARK)" +
-                                    "values(LOGORDER_SEQ.NEXTVAL,'" + order.getCode() + "', '" + loggingOrder.getStatus() + "', sysdate,'" + loggingOrder.getOrderNumber() + "', '" + loggingOrder.getRemark() + "')";
-                            jdbcTemplate.execute(logOrderSql);
-                        }
+                        loggingOrder.setStatus("失败");
+                        loggingOrder.setOrderNumber("");
+                        loggingOrder.setRemark("未找到匹配的物料资料");
+                        String logOrderSql = "insert into LOGORDER(LO_ID, ORDERCODE , STATUS , SALESTIME , ORDERNUMBER , REMARK)" +
+                                "values(LOGORDER_SEQ.NEXTVAL,'" + order.getCode() + "', '" + loggingOrder.getStatus() + "', sysdate,'" + loggingOrder.getOrderNumber() + "', '" + loggingOrder.getRemark() + "')";
+                        jdbcTemplate.execute(logOrderSql);
                     }
                 }