修改物料类别，调整物料信息页面

yuyou_x

2024-02-01 49b484da5f9d4cde8e47764891a5e112b2883e5d

修改物料类别，调整物料信息页面

 HTML/views/BaseSetting/Customer.html

@@ -54,6 +54,7 @@
                                <option value=""></option>
                                <option value="0">客户</option>
                                <option value="1">供应商</option>
                                <option value="2">货主</option>
                            </select>
                        </div>
                    </div>
@@ -187,6 +188,8 @@
                                    return "客户";
                                } else if(d.Type ==1){
                                    return "供货商";
                                } else if(d.Type ==2){
                                    return "货主";
                                }else{
                                    return "";
                                }

 HTML/views/BaseSetting/CustomerFrom.html

@@ -34,6 +34,7 @@
                        <option value=""></option>
                        <option value="0">客户</option>
                        <option value="1">供应商</option>
                        <option value="2">货主</option>
                    </select>
                </div>
            </div>

 HTML/views/BaseSetting/Materials.html

@@ -59,7 +59,7 @@
                                    <option value="1">包材</option>
                                    <option value="2">成品</option>
                                    <option value="3">耗材</option>
                                    <option value="4">半成品</option>
                                    <option value="4">中间品</option>
                                </select>
                            </div>
                        </div>
@@ -93,7 +93,7 @@
                                    <option value=""></option>
                                    <option value="0">常温</option>
                                    <option value="1">低温</option>
                                    <option value="3">干燥通风</option>
                                    <!-- <option value="3">干燥通风</option> -->
                                </select>
                            </div>
                        </div>
@@ -144,7 +144,7 @@
                        {{# } else if(d.Type=='3') { }}
                            <p>耗材</p>
                        {{# } else if(d.Type=='4') { }}
                            <p>半成品</p>
                            <p>中间品</p>
                        {{# } }}
                    </script>


 HTML/views/BaseSetting/MaterialsForm.html

@@ -64,7 +64,7 @@
                            <option value="1">包材</option>
                            <option value="2">成品</option>
                            <option value="3">耗材</option>
                            <option value="4">半成品</option>
                            <option value="4">中间品</option>
                        </select>
                    </div>
                </div>
@@ -89,9 +89,9 @@
                    </div>
                </div>
                <div class="layui-inline">
                    <label class="layui-form-label">规格</label>
                    <label class="layui-form-label">规格/型号</label>
                    <div class="layui-input-block" style="width: 182px;">
                        <input type="text" name="Standard" placeholder="请输入规格" lay-verify="" autocomplete="off" class="layui-input">
                        <input type="text" name="Standard" placeholder="请输入规格/型号" lay-verify="" autocomplete="off" class="layui-input">
                    </div>
                </div>
            </div>
@@ -123,7 +123,7 @@
                            <option value=""></option>
                            <option value="0">常温</option>
                            <option value="1">低温</option>
                            <option value="3">干燥通风</option>
                            <!-- <option value="3">干燥通风</option> -->
                        </select>
                    </div>
                </div>

 HTML/views/SystemSettings/Category.html

@@ -177,7 +177,7 @@
                            title: '序号', type: 'numbers', fixed: 'left', width:65
                        }, 
                        {
                            field: 'CategoryNo', title: '类别编号', align: 'center', fixed: 'left',width:100
                            field: 'CategoryNo', title: '类别编码', align: 'center', fixed: 'left',width:100
                        }, 
                        {
                            field: 'CategoryName', title: '类别名称', align: 'center',width:100

 HTML/views/SystemSettings/CategoryForm.html

@@ -11,9 +11,9 @@
    <body>
        <div class="layui-form" lay-filter="layuiadmin-app-form-list" id="layuiadmin-app-form-list" style="padding: 20px 30px 0 0;">
            <div class="layui-form-item">
                <label class="layui-form-label">类别编号</label>
                <label class="layui-form-label">类别编码</label>
                <div class="layui-input-block">
                    <input type="text" name="CategoryNo" placeholder="请输入类别编号" lay-verify="required" autocomplete="off" class="layui-input">
                    <input type="text" name="CategoryNo" placeholder="请输入类别编码" lay-verify="required" autocomplete="off" class="layui-input">
                </div>
            </div>
            <div class="layui-form-item">

 Wms/WMS.BLL/SysServer/MaterialCategoryServer.cs

@@ -60,7 +60,7 @@
                {
                    Id = a.Id,

                    CategoryNo = a.CategoryNo, //类别号
                    CategoryNo = a.CategoryNo, //类别编码
                    CategoryName = a.CategoryName, //类别名称

                    AreaNo = a.AreaNo, //区域号
@@ -215,7 +215,7 @@
                Db.BeginTran();
                SysMaterialCategory list = new SysMaterialCategory()
                {
                    CategoryNo = category.CategoryNo, //类别号
                    CategoryNo = category.CategoryNo, //类别编码
                    CategoryName = category.CategoryName, //类别名称

                    AreaNo = category.AreaNo, //区域编码
@@ -256,6 +256,8 @@
                string msg = "";
                //获取类别信息
                var categoryInfo = Db.Queryable<SysMaterialCategory>().First(a => a.IsDel == "0" && a.Id == category.Id);
                //获取类别对应物料信息
                var matelist = Db.Queryable<SysMaterials>().Where(a=>a.IsDel == "0" && a.CategoryNo == categoryInfo.CategoryNo).ToList();
                //获取区域信息
                var area = Db.Queryable<SysStorageArea>().First(a => category.AreaNo.Contains(a.AreaNo) && a.IsDel == "0");

@@ -265,16 +267,21 @@
                }

                Db.BeginTran();
                categoryInfo.CategoryNo = category.CategoryNo; //类别号
                categoryInfo.CategoryNo = category.CategoryNo; //类别编码
                categoryInfo.CategoryName = category.CategoryName; //类别名称
                categoryInfo.AreaNo = category.AreaNo; //区域编码
                categoryInfo.Demo = category.Demo; //备注
                categoryInfo.UpdateUser = category.CreateUser; //更改人
                categoryInfo.UpdateTime = Db.GetDate(); //更改时间


                Db.Updateable(categoryInfo).ExecuteCommand();

                foreach (var item in matelist)
                {
                    item.CategoryNo = categoryInfo.CategoryNo;
                }
                Db.Updateable(matelist).ExecuteCommand();

                Db.CommitTran();

                msg = "编辑类别信息成功！";