Merge remote-tracking branch 'origin/master'

src/main/java/com/uas/erp/schedular/diymall/domain/OrderProduct.java

@@ -38,6 +38,16 @@ public class OrderProduct {
 
     String materialCode; // uas物料编号
 
+    String invoiceModel; // 开票型号
+
+    public String getInvoiceModel() {
+        return invoiceModel;
+    }
+
+    public void setInvoiceModel(String invoiceModel) {
+        this.invoiceModel = invoiceModel;
+    }
+
     public String getCode() {
         return code;
     }

src/main/java/com/uas/erp/schedular/mall/domain/ProductUpdate.java

@@ -9,8 +9,45 @@ import java.util.Objects;
  */
 public class ProductUpdate {
 
-    private String materialCode; // 物料编号
-    private Integer availableQty; // 剩余库存
+    String materialCode; // 物料编号
+    Integer availableQty; // 剩余库存
+
+    Integer mpq; // 最小包装数量
+    Integer moq; // 最小起订量
+    String invoiceModel; // 开票型号
+    double price; // 销售标准价
+
+    public Integer getMpq() {
+        return mpq;
+    }
+
+    public void setMpq(Integer mpq) {
+        this.mpq = mpq;
+    }
+
+    public Integer getMoq() {
+        return moq;
+    }
+
+    public void setMoq(Integer moq) {
+        this.moq = moq;
+    }
+
+    public String getInvoiceModel() {
+        return invoiceModel;
+    }
+
+    public void setInvoiceModel(String invoiceModel) {
+        this.invoiceModel = invoiceModel;
+    }
+
+    public double getPrice() {
+        return price;
+    }
+
+    public void setPrice(double price) {
+        this.price = price;
+    }
 
     public String getMaterialCode() {
         return materialCode;
@@ -33,6 +70,15 @@ public class ProductUpdate {
         this.availableQty = availableQty;
     }
 
+    public ProductUpdate(String materialCode, Integer availableQty, Integer mpq, Integer moq, String invoiceModel, double price) {
+        this.materialCode = materialCode;
+        this.availableQty = availableQty;
+        this.mpq = mpq;
+        this.moq = moq;
+        this.invoiceModel = invoiceModel;
+        this.price = price;
+    }
+
     public ProductUpdate() {
     }
 

src/main/java/com/uas/erp/schedular/mall/domain/Stock.java

@@ -13,6 +13,43 @@ public class Stock {
     private Integer tss_amount;     //库存数量
     private Date tss_date;          //生成时间
 
+    Integer mpq; // 最小包装数量
+    Integer moq; // 最小起订量
+    String invoiceModel; // 开票型号
+    double price; // 销售标准价
+
+    public Integer getMpq() {
+        return mpq;
+    }
+
+    public void setMpq(Integer mpq) {
+        this.mpq = mpq;
+    }
+
+    public Integer getMoq() {
+        return moq;
+    }
+
+    public void setMoq(Integer moq) {
+        this.moq = moq;
+    }
+
+    public String getInvoiceModel() {
+        return invoiceModel;
+    }
+
+    public void setInvoiceModel(String invoiceModel) {
+        this.invoiceModel = invoiceModel;
+    }
+
+    public double getPrice() {
+        return price;
+    }
+
+    public void setPrice(double price) {
+        this.price = price;
+    }
+
     public String getTss_prodcode() {
         return tss_prodcode;
     }

src/main/java/com/uas/erp/schedular/mall/task/ProductTask.java

@@ -289,8 +289,8 @@ public class ProductTask extends AbstractTask {
     @TaskMapping(title = "库存同步", cron = "0 0 3 * * ?")
     public void getMallProductToErpProduct() throws NoSuchAlgorithmException, InvalidKeyException, UnsupportedEncodingException {
         //查询中间表 库存取整
-        List<Stock> stock = jdbcTemplate.queryForBeanList("select TSS_PRODCODE,round(tss_amount,0) tss_amount, TSS_DATE FROM TT_SHOP_STOCK",
-                Stock.class);
+        List<Stock> stock = jdbcTemplate.queryForBeanList("select TSS_PRODCODE,round(tss_amount,0) tss_amount, TSS_DATE ,pr_zxdhl moq,pr_zxbzs mpq,getsaleprice_hkd(pr_code) saleprice,pr_remark_sale invoiceModel" +
+                        "FROM TT_SHOP_STOCK LEFT JOIN PRODUCT ON TSS_PRODCODE=pr_code",Stock.class);
         String jsons = JSON.toJSONString(stock);
 
         if (!CollectionUtils.isEmpty(stock)) {
@@ -316,7 +316,7 @@ public class ProductTask extends AbstractTask {
             List<ProductUpdate> productUpdate1 = new ArrayList<>();
             List<ProductUpdate> productUpdate2 = new ArrayList<>();
             for (int i = 0, len = stock.size(); i < len; i += 1) {
-                productUpdate1.add(new ProductUpdate(stock.get(i).getTss_prodcode(),stock.get(i).getTss_amount()));
+                productUpdate1.add(new ProductUpdate(stock.get(i).getTss_prodcode(),stock.get(i).getTss_amount(),stock.get(i).getMpq(),stock.get(i).getMoq(),stock.get(i).getInvoiceModel(),stock.get(i).getPrice()));
             }
             List<Product> productList = pagingQuery.getProduct();
             for (int i = 0, len = productList.size(); i < len; i += 1) {
@@ -402,7 +402,7 @@ public class ProductTask extends AbstractTask {
         // 按页数拿数据
         GetOrdersByPage getOrdersByPage = null;
         List<Order> orders = null;
-        Integer page = totalCount/pageSize;
+        Integer page = Double.valueOf(Math.ceil(totalCount/pageSize.doubleValue())).intValue();
         if(totalCount/pageSize < 1){
             page = 1;
         }
@@ -429,10 +429,10 @@ public class ProductTask extends AbstractTask {
 
                 // 取销售id 和销售编号
                 int saleId = jdbcTemplate.getInt("select sale_seq.nextval from sale");
-                String code = jdbcTemplate.generateCode("sale",2);
+                String code = jdbcTemplate.generateCode("Sale",2);
 
                 //customer  cu_uu cu_name
-                Customer customer = jdbcTemplate.queryForBean("select * from CUSTOMER where CU_UU = ? and CU_AUDITSTATUS = '已审核'",
+                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'");
@@ -451,13 +451,14 @@ 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);
                     }
+
                 }
 
                 boolean exists = !ObjectUtils.isEmpty(customer);
@@ -467,14 +468,22 @@ public class ProductTask extends AbstractTask {
                             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)" +
+                                "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);
+                        exists=true;
                     }
                 }
 
                 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());
@@ -503,13 +512,6 @@ public class ProductTask extends AbstractTask {
                             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);
                 }
 
             }

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...");
     }
 }