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

@@ -22,6 +22,7 @@ import lombok.experimental.Accessors;
 public class ProductionVarietyDetail implements Serializable {
 
     private static final long serialVersionUID = 1L;
+    private Float id;
 
     private Float varietyId;
 

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

@@ -1,8 +1,11 @@
 package com.zjt.service;
 
+import com.baomidou.mybatisplus.core.injector.methods.SelectList;
 import com.zjt.entity.Productionheader;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.List;
+
 /**
  * <p>
  *  服务类
@@ -12,5 +15,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @since 2025-09-25
  */
 public interface IProductionheaderService extends IService<Productionheader> {
-
+List<Productionheader> SelectList();
 }

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

@@ -37,8 +37,6 @@ public class MaterialTypeImp extends BaseService<type> implements MaterialType
             return ReturnDate;
         };
         List<type> materialType= typeMapper.selectAll();
-/*        ReturnDate ReturnDate=new ReturnDate();
-        List<ReturnDate> list= new ArrayList<ReturnDate>();*/
         List<ReturnDate> collect = materialType.parallelStream().map(dataMap).collect(Collectors.toList());
         return JSONArray.toJSON(collect).toString();
     }

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

@@ -6,6 +6,9 @@ import com.zjt.service.IProductionheaderService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
+import java.util.Collections;
+import java.util.List;
+
 /**
  * <p>
  *  服务实现类
@@ -17,4 +20,8 @@ import org.springframework.stereotype.Service;
 @Service
 public class ProductionheaderServiceImpl extends ServiceImpl<ProductionheaderMapper, Productionheader> implements IProductionheaderService {
 
+    @Override
+    public List<Productionheader> SelectList() {
+        return Collections.emptyList();
+    }
 }

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

@@ -10,10 +10,12 @@ import com.zjt.service.MaterialType;
 import javax.annotation.Resource;
 
 @Controller
-@RequestMapping("/pos/user")
+@RequestMapping("/entity")
 public class MyContraller {
     @Resource
     private MaterialType MaterialType;
-
-
+    @RequestMapping("queryVarietyList")
+    public String selectvarietyList() {
+        return "mypackage/varietyList";
+    }
 }

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

@@ -1,6 +1,7 @@
 package com.zjt.web;
 
 
+import com.alibaba.fastjson.JSONArray;
 import com.zjt.entity.ProductionVarietyDetail;
 import com.zjt.service.IProductionVarietyDetailService;
 import com.zjt.service.IProductionVarietyService;
@@ -8,6 +9,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
@@ -20,19 +22,29 @@ import java.util.List;
  * @author xxu
  * @since 2025-09-25
  */
-@Controller
+@RestController
 @RequestMapping("/entity")
 public class ProductionVarietyDetailController {
     @Autowired
     private IProductionVarietyDetailService productionVarietyDetailService;
-    @RequestMapping("varietyList")
+    @RequestMapping("varietyLists")
     public String selectvarietyList() {
-        productionVarietyDetailService.selectvarietyList();
-        return "success";
+        List<ProductionVarietyDetail> productionVarietyDetails = productionVarietyDetailService.selectvarietyList();
+        return  JSONArray.toJSON(productionVarietyDetails).toString();
     }
-    @RequestMapping("varietyDetailsList")
-    public String selectvarietyDetails() {
-        List<ProductionVarietyDetail> productionVarietyDetails = productionVarietyDetailService.selectvarietyDetails(1L);
-        return "mypackage/varietyList";
+    @RequestMapping("varietyDetailsLists")
+    public String selectvarietyDetails(@RequestParam("id") String id) {
+        if(id!=null||id!=""){
+            long l = Long.parseLong(id);
+            List<ProductionVarietyDetail> productionVarietyDetails = productionVarietyDetailService.selectvarietyDetails(l);
+            return  JSONArray.toJSON(productionVarietyDetails).toString();
+        }else{
+            return  JSONArray.toJSON("").toString();
+        }
+    }
+
+    @RequestMapping("productionheader")
+    public String group(@RequestParam("id") String id){
+        return productionVarietyDetailService.group(brand);
     }
 }

src/main/resources/mapper/ProductionVarietyDetailMapper.xml

@@ -9,7 +9,7 @@
     </resultMap>
 
     <sql id="Base_Column_List">
-        variety_id, variety, variety_details
+        id,variety_id, variety, variety_details
     </sql>
     <select id="selectList" resultMap="BaseResultMap">
         select
@@ -25,7 +25,7 @@
     <insert id="insert" parameterType="com.zjt.entity.ProductionVarietyDetail">
     </insert>
     <select id="selectvarietyList" resultMap="BaseResultMap">
-        select variety_id,variety
+        select distinct variety_id,variety
         from production_variety_detail
     </select>
     <select id="selectvarietyDetails" resultMap="BaseResultMap">

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

@@ -12,6 +12,7 @@
     <link rel="icon" href="${basePath!}/static/logo.png">
     <link rel="stylesheet" href="${basePath!}/static/layui/css/layui.css" media="all" />
     <link rel="stylesheet" href="${basePath!}/static/css/public.css" media="all" />
+    <script src="${basePath!}/static/layui/layui.js" charset="utf-8"></script>
     <script src="${basePath!}/static/layui/layui.all.js" charset="utf-8"></script>
     <script src="${basePath!}/static/layui/lay/modules/jquery.js"></script>
 </head>
@@ -24,12 +25,12 @@
             <form class="layui-form" action="">
                 <div class="layui-form-item" id="materialchoose">
                     <div class="layui-form-label">物料信息</div>
-                    <div class="layui-input-inline" style="width: 100px;">
-                        <select name="Variety" id="Variety" class="province-selector" data-value="品类" lay-filter="Variety" onclick="dele()" lay-search="">
+                    <div class="layui-input-inline" style="width: 300px;">
+                        <select name="materialType" id="materialType" class="province-selector" data-value="品类" lay-filter="materialType" onclick="dele()" lay-search="">
                             <option value="">品类</option>
                         </select>
                     </div>
-                    <div class="layui-input-inline" style="width: 100px;">
+                    <div class="layui-input-inline" style="width: 300px;">
                         <select name="brand" id ="brand" class="city-selector" data-value="品牌" lay-filter="brand" onclick="selectbrand()" lay-search="">
                             <option value="">品牌</option>
                         </select>
@@ -50,11 +51,6 @@
                         </select>
                     </div>
                     <div class="layui-input-inline" style="width: 100px;">
-                        <select name="materialRealPrice" id ="materialRealPrice" class="county-selector" data-value="物料价格" lay-filter="materialRealPrice">
-                            <option value="">物料价格</option>
-                        </select>
-                    </div>
-                    <div class="layui-input-inline" style="width: 100px;">
                         <a class="layui-btn layui-btn add" onclick="addtable()">添加</a>
                     </div>
                 </div>
@@ -116,7 +112,7 @@
             </center>
             <div class="layui-form-item">
                 <div class="layui-input-block">
-                    <button class="layui-btn" lay-submit lay-filter="formDemo" onclick="adddata(event)">立即提交</button>
+                    <button class="layui-btn" lay-submit lay-filter="formDemo" onclick="adddata(); return false;">立即提交</button>
                     <button type="reset" class="layui-btn layui-btn-primary">重置</button>
                 </div>
             </div>
@@ -125,61 +121,46 @@
 </fieldset>
 
 <script>
+    layui.use('form', function(){
+        var form = layui.form;
+        form.render();
+    });
     layui.use(['form', 'table', "laydate", 'layer','jquery'], function () {
         var materialdetil=null;
-        var materialRealPrice=null;
         var material=null;
         var form = layui.form;
         var table = layui.table;
         var $ = layui.$ //重点处
             ,layer = layui.layer;
-
-        function handleError(error) {
-            layer.alert('请求失败: ' + error);
-        }
-
         $.ajax({
-            url: 'type',
+            url: 'varietyLists',
             type: 'get',
             success: function (data) {
-                $("#Variety").empty();
-                try {
-                    $.each($.parseJSON(data), function(idx, obj) {
-                        $("#materialType").append("<option value=\""+obj.brandCode+"\">"+obj.brandName+"</option>");
-                    });
-                } catch (e) {
-                    handleError(e.message);
-                }
+                $("#materialType").empty();
+                $.each($.parseJSON(data), function(idx, obj) {
+                    $("#materialType").append("<option value=\""+obj.varietyId+"\">"+obj.variety+"</option>");
+                });
                 layui.form.render("select");
-            },
-            error: function (xhr, status, error) {
-                handleError(error);
-            }
-        });
-
+            },error:function (xhr, status, error) {
+                layer.alert('请求失败: ' + error);
+            }});
         form.on('select(materialType)', function(data){
             $.ajax({
-                url: 'brand',
+                url: 'varietyDetailsLists',
                 type: 'post',
-                data:{'materialTypeCode':data.value},
+                data:{'id':data.value},
                 success: function (data) {
                     $("#brand").empty();
                     $("#brand").append('<option value="">品牌</option>');
-                    try {
-                        $.each($.parseJSON(data), function(idx, obj) {
-                            $("#brand").append("<option value=\""+obj.brandCode+"\">"+obj.brandName+"</option>");
-                        });
-                    } catch (e) {
-                        handleError(e.message);
-                    }
+                    $.each($.parseJSON(data), function(idx, obj) {
+                        $("#brand").append("<option value=\""+obj.id+"\">"+obj.varietyDetails+"</option>");
+                    });
+
                     layui.form.render("select");
-                },
-                error: function (xhr, status, error) {
-                    handleError(error);
-                }
-            });
+                },error:function (xhr, status, error) {
+                    layer.alert('请求失败: ' + error);
+                }});
         });
-
         form.on('select(brand)', function(data){
             $.ajax({
                 url: 'group',
@@ -188,21 +169,15 @@
                 success: function (data) {
                     $("#materialGroup").empty();
                     $("#materialGroup").append('<option value="">物料组</option>');
-                    try {
-                        $.each($.parseJSON(data), function(idx, obj) {
-                            $("#materialGroup").append("<option value=\""+obj.materialGroupCode+"\">"+obj.materialGroupName+"</option>");
-                        });
-                    } catch (e) {
-                        handleError(e.message);
-                    }
+                    $.each($.parseJSON(data), function(idx, obj) {
+                        $("#materialGroup").append("<option value=\""+obj.materialGroupCode+"\">"+obj.materialGroupName+"</option>");
+                    });
+
                     layui.form.render("select");
-                },
-                error: function (xhr, status, error) {
-                    handleError(error);
-                }
-            });
+                },error:function (xhr, status, error) {
+                    layer.alert('请求失败: ' + error);
+                }});
         });
-
         form.on('select(materialGroup)', function(data){
             $.ajax({
                 url: 'price',
@@ -211,19 +186,13 @@
                 success: function (data) {
                     $("#materialdetil").empty();
                     $("#materialdetil").append('<option value="">物料描述</option>');
-                    try {
-                        $.each($.parseJSON(data), function(idx, obj) {
-                            $("#materialdetil").append("<option value=\""+obj.materialCode+"\">"+obj.materialName+"</option>");
-                        });
-                    } catch (e) {
-                        handleError(e.message);
-                    }
+                    $.each($.parseJSON(data), function(idx, obj) {
+                        $("#materialdetil").append("<option value=\""+obj.materialCode+"\">"+obj.materialName+"</option>");
+                    });
                     layui.form.render("select");
-                },
-                error: function (xhr, status, error) {
-                    handleError(error);
-                }
-            });
+                },error:function (xhr, status, error) {
+                    layer.alert('请求失败: ' + error);
+                }});
         });
 
         form.on('select(materialdetil)', function(data){
@@ -234,27 +203,18 @@
                 success: function (data) {
                     $("#materialCode").empty();
                     $("#materialRealPrice").empty();
-                    try {
-                        $.each($.parseJSON(data), function(idx, obj) {
-                            $("#materialCode").append("<option value=\""+obj.materialCode+"\">"+obj.materialCode+"</option>");
-                            $("#materialRealPrice").append("<option value=\""+obj.retailPrice+"\">"+obj.retailPrice+"</option>");
-                        });
-                    } catch (e) {
-                        handleError(e.message);
-                    }
+                    $.each($.parseJSON(data), function(idx, obj) {
+                        $("#materialCode").append("<option value=\""+obj.materialCode+"\">"+obj.materialCode+"</option>");
+                        $("#materialRealPrice").append("<option value=\""+obj.retailPrice+"\">"+obj.retailPrice+"</option>");
+                    });
                     layui.form.render("select");
-                },
-                error: function (xhr, status, error) {
-                    handleError(error);
-                }
-            });
+                },error:function (xhr, status, error) {
+                    layer.alert('请求失败: ' + error);
+                }});
         });
 
+        //因为动态添加的元素class属性是无效的，所以不能用$('.add').click(function(){});
         window.addtable= function(){
-            var selectedCode = $('#materialCode option:selected').text();
-            var selectedDetail = $('#materialdetil option:selected').text();
-            var selectedPrice = $('#materialRealPrice option:selected').text();
-
             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">'+
@@ -269,10 +229,10 @@
                 '<option value="C">采购</option>'+
                 '<option value="T">退货</option>'+
                 '</select></td>'+
-                '<td style = "width: 200px"> <input type="text" name="username" required lay-verify="required"   placeholder="用户名字" autocomplete="off" class="layui-input" readonly="true" value="${currentUser.userName!}"/></td>'+
-                '<td style = "width: 200px"> <input type="text" name="materialCode" required lay-verify="required"   placeholder="物料编码" autocomplete="off" class="layui-input"  readonly="true" value="'+ selectedCode +'"/></td>'+
-                '<td style = "width: 800px"> <input type="text" name="materialDetile"  required lay-verify="required"  placeholder="物料描述" autocomplete="off" class="layui-input"  readonly="true" value="'+ selectedDetail +'"/></td>'+
-                '<td style = "width: 200px"> <input type="text" name="price" required lay-verify="required"   placeholder="价格" autocomplete="off" class="layui-input"  readonly="true" value="'+ selectedPrice +'"/></td>'+
+                '<td style = "width: 200px"> <input type="text" name="username" required lay-verify="required"   placeholder="用户名字" autocomplete="off" class="layui-input" readonly="true" value="${currentUser.userName!}"+"/></td>'+
+                '<td style = "width: 200px"> <input type="text" name="materialCode" required lay-verify="required"   placeholder="物料编码" autocomplete="off" class="layui-input"  readonly="true" value="'+ $('#materialCode option:selected').text()+'"/></td>'+
+                '<td style = "width: 800px"> <input type="text" name="materialDetile"  required lay-verify="required"  placeholder="物料描述" autocomplete="off" class="layui-input"  readonly="true" value="'+$('#materialdetil option:selected').text()+'"/></td>'+
+                '<td style = "width: 200px"> <input type="text" name="price" required lay-verify="required"   placeholder="价格" autocomplete="off" class="layui-input"  readonly="true" value="'+$('#materialRealPrice option:selected').text()+'"/></td>'+
                 '<td style = "width: 100px"> <input type="text" name="NUM" required lay-verify="required"   placeholder="数量" autocomplete="off" class="layui-input" value ="1"/></td>'+
                 '<td style = "width: 300px"> <input type="text" name="SPH"    placeholder="球镜" autocomplete="off" class="layui-input"></td>'+
                 '<td style = "width: 300px"> <input type="text" name="CYL"    placeholder="柱镜" autocomplete="off" class="layui-input"></td>'+
@@ -302,18 +262,29 @@
                 '<td style = "width: 300px"> <input type="text" name="PS"    placeholder="片色" autocomplete="off" class="layui-input"></td>'+
                 '<td style = "width: 300px"> <input type="text" name="MARK"    placeholder="备注" autocomplete="off" class="layui-input"></td>'+
                 '</tr>';
+            //添加到表格最后
             $(html).appendTo($('#table tbody:last'));
-            form.render('select');
-        };
-
+            form.render();
+        }
         window.dele= function (obj){
+            debugger;
             var otr = obj.parentNode.parentNode;
-            var tab =  otr.parentNode;
+//			var tab = document.getElementById("tab");
+//			tab.deleteRow(otr.rowIndex)
+            var tab =  otr.parentNode; //自己的父节点 就是table
             tab.removeChild(otr);
+        }
+        window.deltable= function() {
+            if ($('#table tbody tr').length === 1) {
+                layer.msg('只有一条不允许删除。', {
+                    time : 2000
+                });
+            } else {
+                //删除当前按钮所在的tr
+                $(this).closest('tr').remove();
+            }
         };
-
-        window.adddata= function(event) {
-            event.preventDefault();
+        window.adddata= function() {
             table=document.getElementById("table");
             let tr=table.getElementsByTagName("tr");
             var arrayObj = new Array();
@@ -341,11 +312,15 @@
                         time : 5000
                     });
                 }, error: function (xhr, status, error) {
-                    handleError(error);
+                    layer.alert('请求失败: ' + error);
                 }
             });
-        };
+        }
+        form.on('submit(login)', function (data) {
+            //alert(data.value);
+        });
     });
+
 </script>
 
 </body>