saledetail表增加物料编号，名称，规格来源。

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

@@ -174,8 +174,8 @@ public class DiymallOrderItem {
         this.subtotal = subtotal;
     }
 
-    public String toSqlString(int primaryKey, int saleId, int prodId, String code, int dentNo) {
-        return "INSERT INTO SALEDETAIL (SD_ID,SD_SAID,SD_PRODID,SD_CODE,SD_DETNO,SD_DESCRIPTION,SD_REMARK,SD_QTY,SD_PRICE,SD_TOTAL,SD_PRODNAME,SD_PRODSPEC) VALUES ("
+    public String toSqlString(int primaryKey, int saleId, int prodId, String code, int dentNo, String productCode, String productName, String productSpec) {
+        return "INSERT INTO SALEDETAIL (SD_ID,SD_SAID,SD_PRODID,SD_CODE,SD_DETNO,SD_PRODCODE,SD_PRODNAME,SD_PRODSPEC,SD_DESCRIPTION,SD_REMARK,SD_QTY,SD_PRICE,SD_TOTAL) VALUES ("
                 + primaryKey
                 + ","
                 + saleId
@@ -186,6 +186,14 @@ public class DiymallOrderItem {
                 + "',"
                 + dentNo
                 + ",'"
+
+                + productCode
+                + "','"
+                + productName
+                + "','"
+                + productSpec
+                + "','"
+
                 + StringUtil.nvl(diyTitle, "")
                 + "','"
                 + StringUtil.nvl(diyRemark, "")
@@ -195,10 +203,6 @@ public class DiymallOrderItem {
                 + NumberUtil.nvl(itemPrice, 0)
                 + ", "
                 + NumberUtil.nvl(subtotal, 0)
-                + ",'"
-                + StringUtil.nvl(bottleTypeTitle, "")
-                + "','"
-                + StringUtil.nvl(bottleTitle, "")
-                + "')";
+                + ")";
     }
 }

src/main/java/com/uas/erp/schedular/diymall/task/DiymallApplyTask.java

@@ -71,7 +71,7 @@ public class DiymallApplyTask extends AbstractTask {
                 int productId = saveProduct(bottleTitle, bottleTypeTitle);
                 int saleDetailId = jdbcTemplate.generate("SALEDETAIL_SEQ");
                 // 保存从表数据
-                String sql = diymallOrderItem.toSqlString(saleDetailId, saleId, productId, diymallOrder.getCode(), dentNo);
+                String sql = diymallOrderItem.toSqlString(saleDetailId, saleId, productId, diymallOrder.getCode(), dentNo, String.valueOf(productId), bottleTypeTitle, bottleTitle);
                 sqls.add(sql);
                 dentNo ++;
             }
@@ -95,7 +95,7 @@ public class DiymallApplyTask extends AbstractTask {
         if (StringUtils.isEmpty(prId)) {
             //TODO 插入物料
             productId = jdbcTemplate.generate("PRODUCT_SEQ");
-            String sql = "insert into PRODUCT (PR_ID, PR_SPEC, PR_DETAIL) values ('" + productId + "','"+ bottleTitle + "','" + bottleTypeTitle + "')";
+            String sql = "insert into PRODUCT (PR_ID, PR_CODE, PR_SPEC, PR_DETAIL) values ('" + productId + "','"+ productId + "','" + bottleTitle + "','" + bottleTypeTitle + "')";
             jdbcTemplate.execute(sql);
         } else {
             productId = Integer.parseInt(prId);