Browse Source

5-21 业务员编号

zhaoy 7 years ago
parent
commit
37ca951f87

+ 14 - 7
src/main/java/com/uas/erp/schedular/mall/task/ProductTask.java

@@ -451,13 +451,20 @@ public class ProductTask extends AbstractTask {
                 for(int n = 0, len = orderProductList.size() ; n < len ; n ++){
                     OrderProduct orderProduct = orderProductList.get(n);
 
-                    String productSql = "select * from product where pr_code = '" + orderProduct.getMaterialCode() + "'";
-                    com.uas.erp.schedular.publicproduct.domain.Prod product = jdbcTemplate.queryForBean(productSql, com.uas.erp.schedular.publicproduct.domain.Prod.class);
-                    if (!ObjectUtils.isEmpty(product)) {
-                        String DetailSql = "insert into saleDetail( sd_id , sd_said , sd_detno, SD_PRODID , SD_PRODCODE , SD_QTY , SD_PRICE , SD_TAXRATE , SD_DELIVERY) " +
-                                "values(saleDetail_seq.nextval, " + saleId + ", " + (detno++) + "," + product.getPr_id() + ", '" + product.getPr_code() + "', " + orderProduct.getAmount() +", " +  orderProduct.getUnitPrice() +", " +  "13" +", " +  "sysdate + " + orderProduct.getMaxDelivery() + ")";
+                    String prodSql = "select * from product where pr_code = '" + orderProduct.getMaterialCode() + "'";
+                    com.uas.erp.schedular.publicproduct.domain.Prod prod = jdbcTemplate.queryForBean(prodSql, com.uas.erp.schedular.publicproduct.domain.Prod.class);
+                    if (!ObjectUtils.isEmpty(prod)) {
+                        String DetailSql = "insert into saleDetail( sd_id , sd_said , sd_code, sd_detno, SD_PRODID , SD_PRODCODE , SD_QTY , SD_PRICE , SD_TAXRATE , SD_DELIVERY) " +
+                                "values(saleDetail_seq.nextval, " + saleId + ", '" + code + "'," + (detno++) + "," + prod.getPr_id() + ", '" + prod.getPr_code() + "', " + orderProduct.getAmount() +", " +  orderProduct.getUnitPrice() +", " +  "13" +", " +  "sysdate + " + orderProduct.getMaxDelivery() + ")";
                         detailList.add(DetailSql);
                     }
+//                    Product product = jdbcTemplate.queryForBean("select pr_zxdhl,pr_zxbzs,getsaleprice_hkd(pr_code) saleprice,pr_remark_sale from product where pr_code='" + orderProduct.getMaterialCode() + "'",
+////                            Product.class);
+////                    product.getMoq();
+////                    product.getMpq();
+////                    product.getSaleprice();
+////                    product.getRemarkSale();
+
                 }
 
                 boolean exists = !ObjectUtils.isEmpty(customer);
@@ -472,9 +479,9 @@ public class ProductTask extends AbstractTask {
 
                 if(exists){
                     String sql = "insert into 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_SELLER , SA_DEPARTMENTCODE , SA_DEPARTMENTNAME , SA_TOPLACE , SA_POCODE , SA_STATUS , SA_STATUSCODE, SA_RECORDER , SA_RECORDDATE ," +
+                            "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) values ('" + saleId + "','"+ code + "',sysdate,'商城订单','RMB','1','" + customer.getCu_code() +"','" + customer.getCu_name() +"', '" + customer.getCu_code() + "','" + customer.getCu_name() + "', " +
-                            "'C18060102','深圳优软商城科技有限公司','" + pa_code +"','" + pa_name +"','周连军','1202', " +
+                            "'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() + "')";
                     int count = jdbcTemplate.getInt("SELECT COUNT(*) FROM SALE WHERE SA_POCODE = ?", order.getCode());

+ 2 - 2
src/test/java/com/uas/erp/test/TestProduct.java

@@ -40,7 +40,7 @@ public class TestProduct {
         master.setMa_name("YHND_SZ");
 
         ContextHolder.setMaster(master);
-        //productTask.getMallProductToErpProduct();
+        productTask.getMallProductToErpProduct();
         System.out.println("success...");
     }
 
@@ -55,7 +55,7 @@ public class TestProduct {
         master.setMa_name("YHND_SZ");
 
         ContextHolder.setMaster(master);
-//        productTask.getOrdersByPage();
+        productTask.getOrdersByPage();
         System.out.println("success...");
     }
 }