add

src/main/java/com/zjt/entity/ProductionVarietyTd.java

@@ -7,6 +7,8 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
+import javax.persistence.Column;
+
 /**
  * <p>
  * 
@@ -22,11 +24,11 @@ import lombok.experimental.Accessors;
 public class ProductionVarietyTd implements Serializable {
 
     private static final long serialVersionUID = 1L;
-
+    @Column(name = "variety")
     private String variety;
-
+    @Column(name = "variety_id")
     private Float varietyId;
-
+    @Column(name = "td")
     private Integer td;
 
 

src/main/java/com/zjt/entity/Productionheader.java

@@ -72,11 +72,11 @@ public class Productionheader implements Serializable {
     @Column(name = "attribute")
     private String attribute;
 
-    @ApiModelProperty(value = "光度范围")
+    @ApiModelProperty(value = "光度说明")
     @Column(name = "diopter_range")
     private String diopterRange;
 
-    @ApiModelProperty(value = "范围说明")
+    @ApiModelProperty(value = "光度范围")
     @Column(name = "range_description")
     private String rangeDescription;
 
@@ -89,8 +89,12 @@ public class Productionheader implements Serializable {
     private String pupillaryHeight;
 
     @ApiModelProperty(value = "单眼瞳距（右）")
-    @Column(name = "single_eye_pupillary_distance")
-    private String singleEyePupillaryDistance;
+    @Column(name = "single_eye_pupillary_distance_right")
+    private String singleEyePupillaryDistanceRight;
+
+    @ApiModelProperty(value = "单眼瞳距（左）")
+    @Column(name = "single_eye_pupillary_distance_left")
+    private String singleEyePupillaryDistanceLeft;
 
     @ApiModelProperty(value = "镜眼距")
     @Column(name = "lens_edge_distance")

src/main/java/com/zjt/entity/SaleorderHeader.java

@@ -1,21 +1,34 @@
 package com.zjt.entity;
 
 
-public class SaleorderHeader {
+import io.swagger.annotations.ApiModel;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import javax.persistence.Column;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.Date;
+
+@EqualsAndHashCode
+@Accessors(chain = true)
+@ApiModel(value = "销售订单表")
+public class SaleorderHeader implements Serializable {
+    private static final long serialVersionUID = 1L;
     private String orderNumber;        // 订单编号
     private String variety;            // 品种
     private String details;            // 明细
-    private String color;              // 颜色
+    private String colour;              // 颜色
     private String position;           // 位置
     private String sphericalLens;      // 球镜
     private String cylindricalLens;    // 柱镜
     private String axis;               // 轴位
     private String channel;            // 通道
-    private String add;                // ADD
+    private String addNum;                // ADD
     private String remarks;            // 备注
     private String retailPrice;        // 零售价
-    private String diopterRange;       // 光度范围
-    private String diopterDescription; // 光度说明
+    private String diopterRange; // 光度说明
+    private String rangeDescription;       // 光度范围
     private String singleEyePupillaryDistance; // 单眼瞳距
     private String singleEyePupillaryDistanceRight; // 单眼右瞳距
     private String singleEyePupillaryDistanceLeft; // 单眼左瞳距
@@ -23,18 +36,24 @@ public class SaleorderHeader {
     private String frontAngle;         // 前倾角
     private String frameSurface;       // 镜架面
     private String habitReadingDistance; // 习惯阅读距离
-    private String nearUse;            // 近用
+    private String nearUsePupillaryDistance;            // 近用
     private String nvb;                // NVB
     private String mainVision;         // 主视
     private String ercd;               // ERCO
-    private String productCode;        // 商品编码
-    private String productName;        // 商品名称
-
+    private String materialCode;        // 商品编码
+    private String materialDetile;        // 商品名称
+    @Column(name = "create_time")
+    private Date createTime;
+    @Column(name = "update_time")
+    private Date updateTime;
     // 构造函数
     public SaleorderHeader() {
     }
 
-    // getter和setter方法
+    public static long getSerialVersionUID() {
+        return serialVersionUID;
+    }
+
     public String getOrderNumber() {
         return orderNumber;
     }
@@ -59,12 +78,12 @@ public class SaleorderHeader {
         this.details = details;
     }
 
-    public String getColor() {
-        return color;
+    public String getColour() {
+        return colour;
     }
 
-    public void setColor(String color) {
-        this.color = color;
+    public void setColour(String colour) {
+        this.colour = colour;
     }
 
     public String getPosition() {
@@ -107,12 +126,12 @@ public class SaleorderHeader {
         this.channel = channel;
     }
 
-    public String getAdd() {
-        return add;
+    public String getAddNum() {
+        return addNum;
     }
 
-    public void setAdd(String add) {
-        this.add = add;
+    public void setAddNum(String addNum) {
+        this.addNum = addNum;
     }
 
     public String getRemarks() {
@@ -139,12 +158,12 @@ public class SaleorderHeader {
         this.diopterRange = diopterRange;
     }
 
-    public String getDiopterDescription() {
-        return diopterDescription;
+    public String getRangeDescription() {
+        return rangeDescription;
     }
 
-    public void setDiopterDescription(String diopterDescription) {
-        this.diopterDescription = diopterDescription;
+    public void setRangeDescription(String rangeDescription) {
+        this.rangeDescription = rangeDescription;
     }
 
     public String getSingleEyePupillaryDistance() {
@@ -203,12 +222,13 @@ public class SaleorderHeader {
         this.habitReadingDistance = habitReadingDistance;
     }
 
-    public String getNearUse() {
-        return nearUse;
+
+    public String getNearUsePupillaryDistance() {
+        return nearUsePupillaryDistance;
     }
 
-    public void setNearUse(String nearUse) {
-        this.nearUse = nearUse;
+    public void setNearUsePupillaryDistance(String nearUsePupillaryDistance) {
+        this.nearUsePupillaryDistance = nearUsePupillaryDistance;
     }
 
     public String getNvb() {
@@ -235,20 +255,71 @@ public class SaleorderHeader {
         this.ercd = ercd;
     }
 
-    public String getProductCode() {
-        return productCode;
+    public String getMaterialCode() {
+        return materialCode;
+    }
+
+    public void setMaterialCode(String materialCode) {
+        this.materialCode = materialCode;
+    }
+
+    public String getMaterialDetile() {
+        return materialDetile;
+    }
+
+    public void setMaterialDetile(String materialDetile) {
+        this.materialDetile = materialDetile;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
     }
 
-    public void setProductCode(String productCode) {
-        this.productCode = productCode;
+    public Date getUpdateTime() {
+        return updateTime;
     }
 
-    public String getProductName() {
-        return productName;
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
     }
 
-    public void setProductName(String productName) {
-        this.productName = productName;
+    @Override
+    public String toString() {
+        return "SaleorderHeader{" +
+                "orderNumber='" + orderNumber + '\'' +
+                ", variety='" + variety + '\'' +
+                ", details='" + details + '\'' +
+                ", colour='" + colour + '\'' +
+                ", position='" + position + '\'' +
+                ", sphericalLens='" + sphericalLens + '\'' +
+                ", cylindricalLens='" + cylindricalLens + '\'' +
+                ", axis='" + axis + '\'' +
+                ", channel='" + channel + '\'' +
+                ", addNum='" + addNum + '\'' +
+                ", remarks='" + remarks + '\'' +
+                ", retailPrice='" + retailPrice + '\'' +
+                ", diopterRange='" + diopterRange + '\'' +
+                ", rangeDescription='" + rangeDescription + '\'' +
+                ", singleEyePupillaryDistance='" + singleEyePupillaryDistance + '\'' +
+                ", singleEyePupillaryDistanceRight='" + singleEyePupillaryDistanceRight + '\'' +
+                ", singleEyePupillaryDistanceLeft='" + singleEyePupillaryDistanceLeft + '\'' +
+                ", lensEdgeDistance='" + lensEdgeDistance + '\'' +
+                ", frontAngle='" + frontAngle + '\'' +
+                ", frameSurface='" + frameSurface + '\'' +
+                ", habitReadingDistance='" + habitReadingDistance + '\'' +
+                ", nearUsePupillaryDistance='" + nearUsePupillaryDistance + '\'' +
+                ", nvb='" + nvb + '\'' +
+                ", mainVision='" + mainVision + '\'' +
+                ", ercd='" + ercd + '\'' +
+                ", materialCode='" + materialCode + '\'' +
+                ", materialDetile='" + materialDetile + '\'' +
+                ", createTime=" + createTime +
+                ", updateTime=" + updateTime +
+                '}';
     }
 }
 

src/main/java/com/zjt/mapper/ProductionVarietyTdMapper.java

@@ -3,6 +3,8 @@ package com.zjt.mapper;
 import com.zjt.entity.ProductionVarietyTd;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
+import java.util.List;
+
 /**
  * <p>
  *  Mapper 接口
@@ -13,4 +15,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface ProductionVarietyTdMapper extends BaseMapper<ProductionVarietyTd> {
 
+    List<ProductionVarietyTd> selectChannel(long varietyId);
 }

src/main/java/com/zjt/mapper/SaleorderHeaderMapper.java

@@ -0,0 +1,9 @@
+package com.zjt.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zjt.entity.SaleorderHeader;
+
+public interface SaleorderHeaderMapper extends BaseMapper<SaleorderHeader> {
+
+    void insertSh(SaleorderHeader saleorderHeader);
+}

src/main/java/com/zjt/service/IProductionVarietyDetailService.java

@@ -1,9 +1,7 @@
 package com.zjt.service;
 
-import com.zjt.entity.ProductionVarietyDetail;
+import com.zjt.entity.*;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.zjt.entity.ProductionVarietyDetailColour;
-import com.zjt.entity.Productionheader;
 
 import java.util.List;
 
@@ -22,4 +20,8 @@ public interface IProductionVarietyDetailService extends IService<ProductionVari
     List<Productionheader> selectProductionheader(long varietyDetailId);
 
     List<ProductionVarietyDetailColour> selectColour(long varietyDetailId);
+
+    List<ProductionVarietyTd> selectChannel(long varietyId);
+
+    void insertSh(SaleorderHeader saleorderHeader);
 }

src/main/java/com/zjt/service/impl/ProductionVarietyDetailServiceImpl.java

@@ -1,12 +1,8 @@
 package com.zjt.service.impl;
 
-import com.zjt.entity.ProductionVarietyDetail;
-import com.zjt.entity.ProductionVarietyDetailColour;
-import com.zjt.entity.Productionheader;
+import com.zjt.entity.*;
+import com.zjt.mapper.*;
 import com.zjt.mapper.ProductionVarietyDetailColourMapper;
-import com.zjt.mapper.ProductionVarietyDetailMapper;
-import com.zjt.mapper.ProductionVarietyMapper;
-import com.zjt.mapper.ProductionheaderMapper;
 import com.zjt.service.IProductionVarietyDetailService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
@@ -30,7 +26,11 @@ public class ProductionVarietyDetailServiceImpl extends ServiceImpl<ProductionVa
     @Resource
     ProductionheaderMapper ProductionheaderMapper;
     @Resource
-    com.zjt.mapper.ProductionVarietyDetailColourMapper ProductionVarietyDetailColourMapper;
+    ProductionVarietyDetailColourMapper ProductionVarietyDetailColourMapper;
+    @Resource
+    ProductionVarietyTdMapper ProductionVarietyTdMapper;
+    @Resource
+    SaleorderHeaderMapper SaleorderHeaderMapper;
     @Override
     public List<ProductionVarietyDetail> selectvarietyList() {
         List<ProductionVarietyDetail> productionVarietyDetails = ProductionVarietyDetailMapper.selectvarietyList();
@@ -55,5 +55,16 @@ public class ProductionVarietyDetailServiceImpl extends ServiceImpl<ProductionVa
         return ProductionVarietyDetailColour;
     }
 
+    @Override
+    public List<ProductionVarietyTd> selectChannel(long varietyId) {
+        List<ProductionVarietyTd> ProductionVarietyTd=ProductionVarietyTdMapper.selectChannel(varietyId);
+        return ProductionVarietyTd;
+    }
+
+    @Override
+    public void insertSh(SaleorderHeader saleorderHeader) {
+        SaleorderHeaderMapper.insertSh(saleorderHeader);
+    }
+
 
 }

src/main/java/com/zjt/web/ProductionVarietyDetailController.java

@@ -3,9 +3,7 @@ package com.zjt.web;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
-import com.zjt.entity.ProductionVarietyDetail;
-import com.zjt.entity.ProductionVarietyDetailColour;
-import com.zjt.entity.Productionheader;
+import com.zjt.entity.*;
 import com.zjt.service.IProductionVarietyDetailService;
 import com.zjt.service.IProductionVarietyService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -15,7 +13,11 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.servlet.http.HttpSession;
+import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.List;
+import java.util.function.Consumer;
 
 /**
  * <p>
@@ -50,6 +52,7 @@ public class ProductionVarietyDetailController {
         if(id!=null||id!=""){
             long l = Long.parseLong(id);
             List<Productionheader> productionVarietyDetails = productionVarietyDetailService.selectProductionheader(l);
+            System.out.println("输出的值为："+productionVarietyDetails);
             return  JSONArray.toJSON(productionVarietyDetails).toString();
         }else{
             return  JSONArray.toJSON("").toString();
@@ -65,4 +68,36 @@ public class ProductionVarietyDetailController {
             return  JSONArray.toJSON("").toString();
         }
     }
+    @RequestMapping("selectChannel")
+    public String selectChannel(@RequestParam("id") String id){
+        if(id!=null||id!=""){
+            long l = Long.parseLong(id);
+            List<ProductionVarietyTd>  ProductionVarietyTdDetails= productionVarietyDetailService.selectChannel(l);
+            return  JSONArray.toJSON(ProductionVarietyTdDetails).toString();
+        }else{
+            return  JSONArray.toJSON("").toString();
+        }
+    }
+    @RequestMapping("insert")
+    public String insert(@RequestParam("list") String userList, HttpSession session) {
+        List<SaleorderHeader> SaleorderHeaders = JSON.parseArray(userList, SaleorderHeader.class);
+        Tuser user = (Tuser) session.getAttribute("currentUser");
+        SimpleDateFormat df = new SimpleDateFormat("yyyyMMddHHmmss");
+        String s = user.getId() + "" + df.format(new Date());
+
+        Consumer<SaleorderHeader> consumer = productionVarietyDetailService::insertSh;
+
+        SaleorderHeaders.stream()
+                .filter(a -> a.getMaterialCode() != null && a.getPosition() != null)
+                .map(a -> {
+                    a.setOrderNumber(s);
+//                    a.setUsername(user.getTrueName());
+                    a.setCreateTime(new Date());
+//                    a.setStore(user.getUserName());
+                    return a;
+                })
+                .forEach(consumer);
+
+        return "mypackage/varietyList";
+    }
 }

src/main/resources/mapper/ProductionVarietyTdMapper.xml

@@ -1,5 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.zjt.mapper.ProductionVarietyTdMapper">
-
+    <resultMap id="BaseResultMap" type="com.zjt.entity.ProductionVarietyTd">
+        <id column="variety_detail_id" jdbcType="FLOAT" property="varietyDetailId" />
+        <result column="variety_id" jdbcType="VARCHAR" property="varietyId" />
+        <result column="variety" jdbcType="VARCHAR" property="variety" />
+        <result column="td" jdbcType="VARCHAR" property="td" />
+    </resultMap>
+    <select id="selectChannel" resultMap="BaseResultMap">
+        select * from production_variety_td
+        where variety_id=#{varietyId}
+    </select>
 </mapper>

src/main/resources/mapper/ProductionheaderMapper.xml

@@ -7,6 +7,30 @@
         <result column="variety_id" jdbcType="VARCHAR" property="varietyId" />
         <result column="product_code" jdbcType="VARCHAR" property="productCode" />
         <result column="product_name" jdbcType="VARCHAR" property="productName" />
+        <result column="series" jdbcType="VARCHAR" property="series" />
+        <result column="product1" jdbcType="VARCHAR" property="product1" />
+        <result column="product" jdbcType="VARCHAR" property="product" />
+        <result column="design" jdbcType="VARCHAR" property="design" />
+        <result column="refractive_index" jdbcType="VARCHAR" property="refractiveIndex" />
+        <result column="coating" jdbcType="VARCHAR" property="coating" />
+        <result column="color" jdbcType="VARCHAR" property="color" />
+        <result column="attribute" jdbcType="VARCHAR" property="attribute" />
+        <result column="diopter_range" jdbcType="VARCHAR" property="diopterRange" />
+        <result column="range_description" jdbcType="VARCHAR" property="rangeDescription" />
+        <result column="retail_price" jdbcType="VARCHAR" property="retailPrice" />
+        <result column="pupillary_height" jdbcType="VARCHAR" property="pupillaryHeight" />
+        <result column="single_eye_pupillary_distance_right" jdbcType="VARCHAR" property="singleEyePupillaryDistanceRight" />
+        <result column="lens_edge_distance" jdbcType="VARCHAR" property="lensEdgeDistance" />
+        <result column="front_angle" jdbcType="VARCHAR" property="frontAngle" />
+        <result column="frame_surface" jdbcType="VARCHAR" property="frameSurface" />
+        <result column="habit_reading_distance" jdbcType="VARCHAR" property="habitReadingDistance" />
+        <result column="near_use_pupillary_distance" jdbcType="VARCHAR" property="nearUsePupillaryDistance" />
+        <result column="nvb" jdbcType="VARCHAR" property="nvb" />
+        <result column="main_vision" jdbcType="VARCHAR" property="mainVision" />
+        <result column="ercd" jdbcType="VARCHAR" property="ercd" />
+        <result column="STATUS" jdbcType="VARCHAR" property="status" />
+        <result column="create_Time" jdbcType="VARCHAR" property="createTime" />
+        <result column="update_Time" jdbcType="VARCHAR" property="updateTime" />
     </resultMap>
     <sql id="Base_Column_List">
         variety_detail_id, variety_id, product_code, product_name

src/main/resources/mapper/SaleorderHeaderMapper.xml

@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.zjt.mapper.SaleorderHeaderMapper">
+    <resultMap id="BaseResultMap" type="com.zjt.entity.SaleorderHeader">
+        <result column="order_number" property="orderNumber" jdbcType="VARCHAR"></result>
+        <result column="variety" property="variety" jdbcType="VARCHAR"></result>
+        <result column="details" property="details" jdbcType="VARCHAR"></result>
+        <result column="colour" property="colour" jdbcType="VARCHAR"></result>
+        <result column="position" property="position" jdbcType="VARCHAR"></result>
+        <result column="spherical_lens" property="sphericalLens" jdbcType="VARCHAR"></result>
+        <result column="cylindrical_lens" property="cylindricalLens" jdbcType="VARCHAR"></result>
+        <result column="axis" property="axis" jdbcType="VARCHAR"></result>
+        <result column="channel" property="channel" jdbcType="VARCHAR"></result>
+        <result column="add_num" property="addNum" jdbcType="VARCHAR"></result>
+        <result column="remarks" property="remarks" jdbcType="VARCHAR"></result>
+        <result column="retail_price" property="retailPrice" jdbcType="VARCHAR"></result>
+        <result column="diopter_range" property="diopterRange" jdbcType="VARCHAR"></result>
+        <result column="range_description" property="rangeDescription" jdbcType="VARCHAR"></result>
+        <result column="single_eye_pupillary_distance" property="singleEyePupillaryDistance" jdbcType="VARCHAR"></result>
+        <result column="single_eye_pupillary_distance_right" property="singleEyePupillaryDistanceRight" jdbcType="VARCHAR"></result>
+        <result column="single_eye_pupillary_distance_left" property="singleEyePupillaryDistanceLeft" jdbcType="VARCHAR"></result>
+        <result column="lens_edge_distance" property="lensEdgeDistance" jdbcType="VARCHAR"></result>
+        <result column="front_angle" property="frontAngle" jdbcType="VARCHAR"></result>
+        <result column="frame_surface" property="frameSurface" jdbcType="VARCHAR"></result>
+        <result column="habit_reading_distance" property="habitReadingDistance" jdbcType="VARCHAR"></result>
+        <result column="near_use_pupillary_distance" property="nearUsePupillaryDistance" jdbcType="VARCHAR"></result>
+        <result column="nvb" property="nvb" jdbcType="VARCHAR"></result>
+        <result column="main_vision" property="mainVision" jdbcType="VARCHAR"></result>
+        <result column="ercd" property="ercd" jdbcType="VARCHAR"></result>
+        <result column="material_code" property="materialCode" jdbcType="VARCHAR"></result>
+        <result column="materia_detile" property="materialDetile" jdbcType="VARCHAR"></result>
+        <result column="create_time" property="createTime" jdbcType="TIMESTAMP"></result>
+        <result column="update_time" property="updateTime" jdbcType="TIMESTAMP"></result>
+    </resultMap>
+
+    <insert id="insertSh" parameterType="com.zjt.entity.SaleorderHeader">
+        INSERT INTO saleorderheader (
+            order_number,
+            variety,
+            details,
+            colour,
+            position,
+            spherical_lens,
+            cylindrical_lens,
+            axis,
+            channel,
+            add_num,
+            remarks,
+            retail_price,
+            diopter_range,
+            range_description,
+            single_eye_pupillary_distance,
+            single_eye_pupillary_distance_right,
+            single_eye_pupillary_distance_left,
+            lens_edge_distance,
+            front_angle,
+            frame_surface,
+            habit_reading_distance,
+            near_use_pupillary_distance,
+            nvb,
+            main_vision,
+            ercd,
+            material_code,
+            materia_detile,
+            create_time,
+            update_time
+        ) VALUES (
+                     #{orderNumber,jdbcType=VARCHAR},
+                     #{variety,jdbcType=VARCHAR},
+                     #{details,jdbcType=VARCHAR},
+                     #{colour,jdbcType=VARCHAR},
+                     #{position,jdbcType=VARCHAR},
+                     #{sphericalLens,jdbcType=VARCHAR},
+                     #{cylindricalLens,jdbcType=VARCHAR},
+                     #{axis,jdbcType=VARCHAR},
+                     #{channel,jdbcType=VARCHAR},
+                     #{addNum,jdbcType=VARCHAR},
+                     #{remarks,jdbcType=VARCHAR},
+                     #{retailPrice,jdbcType=VARCHAR},
+                     #{diopterRange,jdbcType=VARCHAR},
+                     #{rangeDescription,jdbcType=VARCHAR},
+                     #{singleEyePupillaryDistance,jdbcType=VARCHAR},
+                     #{singleEyePupillaryDistanceRight,jdbcType=VARCHAR},
+                     #{singleEyePupillaryDistanceLeft,jdbcType=VARCHAR},
+                     #{lensEdgeDistance,jdbcType=VARCHAR},
+                     #{frontAngle,jdbcType=VARCHAR},
+                     #{frameSurface,jdbcType=VARCHAR},
+                     #{habitReadingDistance,jdbcType=VARCHAR},
+                     #{nearUsePupillaryDistance,jdbcType=VARCHAR},
+                     #{nvb,jdbcType=VARCHAR},
+                     #{mainVision,jdbcType=VARCHAR},
+                     #{ercd,jdbcType=VARCHAR},
+                     #{materialCode,jdbcType=VARCHAR},
+                     #{materialDetile,jdbcType=VARCHAR},
+                     #{createTime,jdbcType=TIMESTAMP},
+                     #{updateTime,jdbcType=TIMESTAMP}
+                 )
+    </insert>
+</mapper>

src/main/resources/templates/mypackage/varietyList.ftl

@@ -142,8 +142,7 @@
                     $("#brand").empty();
                     $("#brand").append('<option value="">品牌</option>');
                     $.each($.parseJSON(data), function(idx, obj) {
-                        $("#brand").append("<option value=\""+obj.id+"\">"+obj.varietyDetails+"</option>");
-                    });
+                        $("#brand").append("<option value=\""+obj.id+"\" data-variety-id=\""+obj.varietyId+"\">"+obj.varietyDetails+"</option>");                    });
 
                     layui.form.render("select");
                 },error:function (xhr, status, error) {
@@ -173,7 +172,6 @@
                 type: 'post',
                 data:{'id':data.value},
                 success: function (data) {
-                    layer.alert('请求失败: ' + data);
                     $("#productName").empty();$("#productCode").empty();$("#varietyDetailId").empty();
 
                 // $("#productName").append('<option value="">物料描述</option>');
@@ -207,21 +205,97 @@
                     layer.alert('请求失败: ' + error);
                 }});
         });
+        function fillRowData(rowElement, data) {
+            var fieldMapping = {
+                'productCode': 'productCode',
+                'productName': 'productName',
+                'color': 'color',
+                'position': 'position',//镜片位置
+                'sphericalLens': 'sphericalLens',
+                'cylindricalLens': 'cylindricalLens',
+                'axis': 'axis',
+                'channel': 'channel',
+                'add': 'add',
+                'remarks': 'remarks',
+                'retailPrice': 'retailPrice',
+                'rangeDescription': 'rangeDescription',
+                'singleEyePupillaryDistanceRight': 'singleEyePupillaryDistanceRight',
+                'pupillaryHeight': 'pupillaryHeight',
+                'lensEdgeDistance': 'lensEdgeDistance',
+                'frontAngle': 'frontAngle',
+                'frameSurface': 'frameSurface',
+                'diopterRange': 'diopterRange',
+                'habitReadingDistance': 'habitReadingDistance',
+                'nearUsePupillaryDistance': 'nearUsePupillaryDistance',
+                'nvb': 'nvb',
+                'mainVision': 'mainVision',
+                'ercd': 'ercd',
+            };
 
+            $.each(fieldMapping, function(inputName, dataField) {
+                if (data[dataField]) {
+                    rowElement.find('input[name="' + inputName + '"]').val(data[dataField]);
+                }
+            });
+        }
         //因为动态添加的元素class属性是无效的，所以不能用$('.add').click(function(){});
         window.addtable= function(){
-            var selectedVarietyDetailId = $('#productName option:selected').data('variety-detail-id') ||
-                $('#productCode option:selected').data('variety-detail-id');
-            layer.alert(selectedVarietyDetailId);
+            var html = '<tr>'+
+                '<td style = "width: 100px"><input type="button" class="layui-btn layui-btn-radius" onclick="dele(this)" value="删除" /></td>'+
+                '<td style = "width: 200px"> <input type="text" name="materialCode" required lay-verify="required"   placeholder="物料编码" autocomplete="off" class="layui-input"  readonly="true" value="'+ $('#productCode option:selected').text()+'"/></td>'+
+                '<td style = "width: 500px"> <input type="text" name="materialDetile"  required lay-verify="required"  placeholder="物料描述" autocomplete="off" class="layui-input"  readonly="true" value="'+$('#productName option:selected').text()+'"/></td>'+
+                '<td style = "width: 100px">' +
+                '<select name="colour" class="county-selector"  placeholder="颜色" lay-filter="productName">'+
+                '</select></td>'+
+                '<td style="width:200px">'+
+                '<select name="position" placeholder="位置" lay-verify="required">'+
+                '<option value="">--请选择--</option>'+
+                '<option value="L">L</option>'+
+                '<option value="R">R</option>'+
+                '</select></td>'+
+                '<td style = "width: 150px"> <input type="text" name="sphericalLens"    placeholder="球镜" autocomplete="off" class="layui-input"></td>'+
+                '<td style = "width: 150px"> <input type="text" name="cylindricalLens"    placeholder="柱镜" autocomplete="off" class="layui-input"></td>'+
+                '<td style = "width: 150px"> <input type="text" name="axis"    placeholder="轴位" autocomplete="off" class="layui-input"></td>'+
+                '<td style = "width: 100px">' +
+                '<select name="channel" class="county-selector"  placeholder="通道" lay-filter="productName">'+
+                '</select></td>'+
+                '<td style = "width: 150px"> <input type="text" name="addNum"    placeholder="下加光" autocomplete="off" class="layui-input"></td>'+
+                '<td style = "width: 300px"> <input type="text" name="remarks"    placeholder="备注" autocomplete="off" class="layui-input"></td>'+
+                '<td style = "width: 150px"> <input type="text" name="retailPrice" required lay-verify="required"   placeholder="零售价" autocomplete="off" class="layui-input" /></td>'+
+                '<td style = "width: 300px"> <input type="text" name="rangeDescription"    placeholder="光度范围" autocomplete="off" class="layui-input"></td>'+
+                '<td style = "width: 150px"> <input type="text" name="diopterRange"    placeholder="光度说明" autocomplete="off" class="layui-input"></td>'+
+                '<td style = "width: 150px"> <input type="text" name="singleEyePupillaryDistance"    placeholder="单眼瞳距" autocomplete="off" class="layui-input"></td>'+
+                '<td style = "width: 150px"> <input type="text" name="pupillaryHeight"    placeholder="单眼瞳高" autocomplete="off" class="layui-input"></td>'+
+                '<td style = "width: 150px"> <input type="text" name="lensEdgeDistance"    placeholder="镜眼距离" autocomplete="off" class="layui-input"></td>'+
+                '<td style = "width: 150px"> <input type="text" name="frontAngle"    placeholder="前倾角" autocomplete="off" class="layui-input"></td>'+
+                '<td style = "width: 150px"> <input type="text" name="frameSurface"    placeholder="镜架面弯" autocomplete="off" class="layui-input"></td>'+
+                '<td style = "width: 150px"> <input type="text" name="habitReadingDistance"    placeholder="习惯阅读距离" autocomplete="off" class="layui-input"></td>'+
+                '<td style = "width: 150px"> <input type="text" name="nearUsePupillaryDistance"    placeholder="近用瞳距" autocomplete="off" class="layui-input"></td>'+
+                '<td style = "width: 150px"> <input type="text" name="nvb"    placeholder="NVB" autocomplete="off" class="layui-input"></td>'+
+                '<td style = "width: 75px"> <input type="text" name="mainVision"    placeholder="主视眼" autocomplete="off" class="layui-input"></td>'+
+                '<td style = "width: 150px"> <input type="text" name="ercd"    placeholder="ERCD" autocomplete="off" class="layui-input"></td>'+
+
+                '</tr>';
+            //添加到表格最后
+            $(html).appendTo($('#table tbody:last'));
+
+            var newRow = $('#table tbody tr:last');
+            var varietyId = $('#brand option:selected').data('variety-id');
+            var selectedVarietyDetailId = $('#productName option:selected').data('variety-id');
+            var selectedVarietyDetailId = $('#productName option:selected').data('variety-detail-id');
+            var currentRowColourId = 'colour_' + Date.now();
+            var currentRowChannelId = 'channel_' + Date.now();
+            newRow.find('select[name="colour"]').attr('id', currentRowColourId);
+            newRow.find('select[name="channel"]').attr('id', currentRowChannelId);
             $.ajax({
                 url: 'selectColour',
                 type: 'post',
                 data:{'id':selectedVarietyDetailId},
                 success: function (data) {
-                    $("#colour").empty();
-                    $("#colour").append('<option value="">颜色</option>');
+                    $("#" + currentRowColourId).empty();
+                    $("#" + currentRowColourId).append('<option value="">颜色</option>');
                     $.each($.parseJSON(data), function(idx, obj) {
-                        $("#colour").append("<option value=\""+obj.id+"\">"+obj.colour+"</option>");
+                        $("#" + currentRowColourId).append("<option value=\""+obj.colour+"\">"+obj.colour+"</option>");
                     });
 
                     layui.form.render("select");
@@ -229,58 +303,36 @@
                     layer.alert('请求失败: ' + error);
                 }});
             $.ajax({
-                url: 'productionheader',
+                url:'selectChannel',
                 type: 'post',
-                data:{'id':selectedVarietyDetailId},
+                data:{'id':varietyId},
                 success: function (data) {
-                    layer.alert('请求失败: ' + data);
-                    $("#productName").empty();$("#productCode").empty();$("#varietyDetailId").empty();
-
+                    $("#" + currentRowChannelId).empty();  // 使用当前行的唯一ID
+                    $("#" + currentRowChannelId).append('<option value="">通道</option>');  // 添加默认选项
                     $.each($.parseJSON(data), function(idx, obj) {
-                        $("#productName").append("<option value=\""+obj.productName+"\" data-variety-detail-id=\""+obj.varietyDetailId+"\">"+obj.productName+"</option>");
-                        $("#productCode").append("<option value=\""+obj.productCode+"\" data-variety-detail-id=\""+obj.varietyDetailId+"\">"+obj.productCode+"</option>");
-
+                        $("#" + currentRowChannelId).append("<option value=\""+obj.td+"\">"+obj.td+"</option>");  // 使用当前行的唯一ID
                     });
-                    layui.form.render("select");
+                    layui.form.render("select");  // 重新渲染表单
+                },
+                error:function (xhr, status, error) {
+                    layer.alert('请求失败: ' + error);
+                }
+            })
+            $.ajax({
+                url: 'productionheader',
+                type: 'post',
+                data:{'id':selectedVarietyDetailId},
+                success: function (data) {
+                    var parsedData = $.parseJSON(data);
+                    if (parsedData && parsedData.length > 0) {
+                        // 使用第一个对象的数据填充行
+                        var rowData = parsedData[0];
+                        fillRowData(newRow, rowData);
+                    }
                 },error:function (xhr, status, error) {
                     layer.alert('请求失败: ' + error);
                 }});
-            var html = '<tr>'+
-                '<td style = "width: 100px"><input type="button" class="layui-btn layui-btn-radius" onclick="dele(this)" value="删除" /></td>'+
-                '<td style = "width: 200px"> <input type="text" name="materialCode" required lay-verify="required"   placeholder="物料编码" autocomplete="off" class="layui-input"  readonly="true" value="'+ $('#productCode option:selected').text()+'"/></td>'+
-                '<td style = "width: 500px"> <input type="text" name="materialDetile"  required lay-verify="required"  placeholder="物料描述" autocomplete="off" class="layui-input"  readonly="true" value="'+$('#productName option:selected').text()+'"/></td>'+
-                '<td style = "width: 100px">' +
-                '<select name="colour" id ="colour" class="county-selector"  placeholder="颜色" lay-filter="productName">'+
-                '</select></td>'+
-                '<td style="width:200px">'+
-                '<select name="WZ" lay-verify="required">'+
-                '<option value="">--请选择--</option>'+
-                '<option value="L">L</option>'+
-                '<option value="R">R</option>'+
-                '</select></td>'+
-                '<td style = "width: 150px"> <input type="text" name="SPH"    placeholder="球镜" autocomplete="off" class="layui-input"></td>'+
-                '<td style = "width: 150px"> <input type="text" name="CYL"    placeholder="柱镜" autocomplete="off" class="layui-input"></td>'+
-                '<td style = "width: 150px"> <input type="text" name="AXIS"    placeholder="轴位" autocomplete="off" class="layui-input"></td>'+
-                '<td style = "width: 150"> <input type="text" name="YULIU1"    placeholder="通道" autocomplete="off" class="layui-input"></td>'+
-                '<td style = "width: 150px"> <input type="text" name="XADD"    placeholder="下加光" autocomplete="off" class="layui-input"></td>'+
-                '<td style = "width: 300px"> <input type="text" name="MARK"    placeholder="备注" autocomplete="off" class="layui-input"></td>'+
-                '<td style = "width: 150px"> <input type="text" name="NUM" required lay-verify="required"   placeholder="零售价" autocomplete="off" class="layui-input" /></td>'+
-                '<td style = "width: 300px"> <input type="text" name="CVA"    placeholder="光度范围" autocomplete="off" class="layui-input"></td>'+
-                '<td style = "width: 150px"> <input type="text" name="SD"    placeholder="光度说明" autocomplete="off" class="layui-input"></td>'+
-                '<td style = "width: 150px"> <input type="text" name="PDFOD"    placeholder="单眼瞳距" autocomplete="off" class="layui-input"></td>'+
-                '<td style = "width: 150px"> <input type="text" name="PH"    placeholder="单眼瞳高" autocomplete="off" class="layui-input"></td>'+
-                '<td style = "width: 150px"> <input type="text" name="FRAMEBRIDGEWIDTH"    placeholder="镜眼距离" autocomplete="off" class="layui-input"></td>'+
-                '<td style = "width: 150px"> <input type="text" name="OPTICBC"    placeholder="前倾角" autocomplete="off" class="layui-input"></td>'+
-                '<td style = "width: 150px"> <input type="text" name="FRAMESHAPE"    placeholder="镜架面弯" autocomplete="off" class="layui-input"></td>'+
-                '<td style = "width: 150px"> <input type="text" name="FRAMEHEIGHT"    placeholder="习惯阅读距离" autocomplete="off" class="layui-input"></td>'+
-                '<td style = "width: 150px"> <input type="text" name="PRISM"    placeholder="近用瞳距" autocomplete="off" class="layui-input"></td>'+
-                '<td style = "width: 150px"> <input type="text" name="RS"    placeholder="NVB" autocomplete="off" class="layui-input"></td>'+
-                '<td style = "width: 75px"> <input type="text" name="LRS"    placeholder="主视眼" autocomplete="off" class="layui-input"></td>'+
-                '<td style = "width: 150px"> <input type="text" name="CRS"    placeholder="ERCD" autocomplete="off" class="layui-input"></td>'+
 
-                '</tr>';
-            //添加到表格最后
-            $(html).appendTo($('#table tbody:last'));
             form.render();
         }
         window.dele= function (obj){
@@ -304,6 +356,11 @@
         window.adddata= function() {
             table=document.getElementById("table");
             let tr=table.getElementsByTagName("tr");
+
+/*            let productCode=table.getElementsByName("materialCode");
+            let productName=table.getElementsByName("materialDetile");
+            let colour=table.getElementsByName("colour");*/
+
             var arrayObj = new Array();
             for (var i=0; i<tr.length; i++){
                 let target=tr[i].querySelectorAll("[name]"),obj={};