5-21 订同步添加字段

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

@@ -38,6 +38,25 @@ public class OrderProduct {
 
     String materialCode; // uas物料编号
 
+    String invoiceModel; // 开票型号
+    double saleprice; // 销售标准价
+
+    public String getInvoiceModel() {
+        return invoiceModel;
+    }
+
+    public void setInvoiceModel(String invoiceModel) {
+        this.invoiceModel = invoiceModel;
+    }
+
+    public double getSaleprice() {
+        return saleprice;
+    }
+
+    public void setSaleprice(double saleprice) {
+        this.saleprice = saleprice;
+    }
+
     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 saleprice; // 销售标准价
+
+    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 getSaleprice() {
+        return saleprice;
+    }
+
+    public void setSaleprice(double saleprice) {
+        this.saleprice = saleprice;
+    }
 
     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 saleprice) {
+        this.materialCode = materialCode;
+        this.availableQty = availableQty;
+        this.mpq = mpq;
+        this.moq = moq;
+        this.invoiceModel = invoiceModel;
+        this.saleprice = saleprice;
+    }
+
     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 saleprice; // 销售标准价
+
+    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 getSaleprice() {
+        return saleprice;
+    }
+
+    public void setSaleprice(double saleprice) {
+        this.saleprice = saleprice;
+    }
+
     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).getSaleprice()));
             }
             List<Product> productList = pagingQuery.getProduct();
             for (int i = 0, len = productList.size(); i < len; i += 1) {
@@ -458,12 +458,6 @@ public class ProductTask extends AbstractTask {
                                 "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();
 
                 }