#

LSH

2023-12-01 2f54d40d80be4635d1f22b2f02c735d383060875

#

 src/main/java/com/zy/crm/manager/controller/PlanTypeController.java

@@ -11,7 +11,9 @@
import com.core.common.R;
import com.core.domain.KeyValueVo;
import com.zy.crm.common.web.BaseController;
import com.zy.crm.manager.entity.OrderProductType;
import com.zy.crm.manager.entity.PlanType;
import com.zy.crm.manager.service.OrderProductTypeService;
import com.zy.crm.manager.service.PlanTypeService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -23,6 +25,8 @@

    @Autowired
    private PlanTypeService planTypeService;
    @Autowired
    private OrderProductTypeService orderProductTypeService;

    @GetMapping(value = "/planType/{id}/auth")
    @ManagerAuth
@@ -91,6 +95,12 @@
    @RequestMapping(value = "/planType/add/auth")
    @ManagerAuth(memo = "添加规划单类型")
    public R add(PlanType planType) {
        int OPTCOUNT = planTypeService.selectCount(new EntityWrapper<PlanType>().eq("order_product_type_id", planType.getOrderProductTypeId()));
        if (OPTCOUNT!=0) return R.error("重复添加");
        OrderProductType orderProductType = orderProductTypeService.selectById(planType.getOrderProductTypeId());
        planType.setName(orderProductType.getName());
        planType.setType(orderProductType.getType());
        planType.setOrderProductTypeId(planType.getOrderProductTypeId());
        planType.setHostId(getHostId());
        planType.setCreateBy(getUserId());
        planType.setCreateTime(new Date());

 src/main/java/com/zy/crm/manager/entity/Cstmr.java

@@ -7,6 +7,7 @@
import com.core.common.Cools;
import com.core.common.SpringUtils;
import com.zy.crm.manager.service.CstmrTypeService;
import com.zy.crm.manager.service.OrderProductTypeService;
import com.zy.crm.system.entity.Dept;
import com.zy.crm.system.entity.Dic;
import com.zy.crm.system.entity.Host;
@@ -204,11 +205,18 @@
    private String industry;

    /**
     * 产品类别
     * 产品类别  废弃
     */
    @ApiModelProperty(value= "产品类别")
    @TableField("product_category")
    private String productCategory;

    /**
     * 产品类型
     */
    @ApiModelProperty(value= "产品类型")
    @TableField("order_product_type_id")
    private Long orderProductTypeId;

    /**
     * 企业信用代码
@@ -375,6 +383,16 @@
        return null;
    }

    public String getOrderProductTypeId$(){
        if (this.orderProductTypeId==null) return null;
        OrderProductTypeService orderProductTypeService = SpringUtils.getBean(OrderProductTypeService.class);
        OrderProductType orderProductType = orderProductTypeService.selectById(this.orderProductTypeId);
        if (!Cools.isEmpty(orderProductType)){
            return String.valueOf(orderProductType.getName());
        }
        return null;
    }


    public void setType0(String type0){
        if (Cools.isEmpty(type0)) {

 src/main/java/com/zy/crm/manager/entity/Order.java

@@ -198,7 +198,7 @@
    private String transactionRate;

    /**
     * 添加人员
     * 产品类型
     */
    @ApiModelProperty(value= "产品类型")
    @TableField("order_product_type_id")

 src/main/java/com/zy/crm/manager/entity/PlanType.java

@@ -6,6 +6,7 @@
import com.baomidou.mybatisplus.enums.IdType;
import com.core.common.Cools;
import com.core.common.SpringUtils;
import com.zy.crm.manager.service.OrderProductTypeService;
import com.zy.crm.system.entity.Host;
import com.zy.crm.system.entity.User;
import com.zy.crm.system.service.HostService;
@@ -61,6 +62,12 @@
    private String formId;

    /**
     * 产品类型ID
     */
    @ApiModelProperty(value= "产品类型ID")
    @TableField("order_product_type_id")
    private Long orderProductTypeId;
    /**
     * 表单配置
     */
    @ApiModelProperty(value= "表单配置")

 src/main/resources/application.yml

@@ -17,12 +17,12 @@
    name: @pom.build.finalName@
  datasource:
    driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
#    url: jdbc:sqlserver://192.168.4.15:1433;databasename=zy_crm
#    username: sa
#    password: sa@123
    url: jdbc:sqlserver://127.0.0.1:51433;databasename=zy_crm
    url: jdbc:sqlserver://127.0.0.1:1433;databasename=zy_crm
    username: sa
    password: Zoneyung@zy56$
    password: sa@123
#    url: jdbc:sqlserver://127.0.0.1:51433;databasename=zy_crm
#    username: sa
#    password: Zoneyung@zy56$
#    url: jdbc:sqlserver://47.97.1.152:51433;databasename=zy_crm
#    username: sa
#    password: Zoneyung@zy56$

 src/main/resources/mapper/CstmrMapper.xml

@@ -32,6 +32,7 @@
        <result column="memo" property="memo" />
        <result column="industry" property="industry" />
        <result column="product_category" property="productCategory" />
        <result column="order_product_type_id" property="orderProductTypeId" />
        <result column="credit_code" property="creditCode" />
        <result column="issue_time" property="issueTime" />
        <result column="company_type" property="companyType" />

 src/main/resources/mapper/PlanTypeMapper.xml

@@ -18,6 +18,7 @@
        <result column="update_by" property="updateBy" />
        <result column="update_time" property="updateTime" />
        <result column="memo" property="memo" />
        <result column="order_product_type_id" property="orderProductTypeId" />

    </resultMap>


 src/main/webapp/static/js/cstmr/cstmr.js

@@ -149,7 +149,7 @@
            ,{field: 'remarks', align: 'left',title: '备注', hide: false, templet:function(d){return emptyShow(d.remarks)}}
            ,{field: 'cstmrType$', align: 'left',title: '客户类别', hide: false}
            ,{field: 'industry', align: 'left',title: '客户行业', hide: false}
            ,{field: 'productCategory', align: 'left',title: '产品类别', hide: false}
            ,{field: 'orderProductTypeId$', align: 'left',title: '产品类型', hide: false}
            ,{field: 'userId$', align: 'left',title: '添加人员', hide: true}
            ,{field: 'deptId$', align: 'left',title: '所属部门', hide: true}
            ,{field: 'rela', align: 'left',title: '客户关系', hide: true}

 src/main/webapp/static/js/cstmr/cstmr2.js

@@ -149,7 +149,7 @@
            ,{field: 'remarks', align: 'left',title: '备注', hide: false, templet:function(d){return emptyShow(d.remarks)}}
            ,{field: 'cstmrType$', align: 'left',title: '客户类别', hide: false}
            ,{field: 'industry', align: 'left',title: '客户行业', hide: false}
            ,{field: 'productCategory', align: 'left',title: '产品类别', hide: false}
            ,{field: 'orderProductTypeId$', align: 'left',title: '产品类型', hide: false}
            ,{field: 'userId$', align: 'left',title: '添加人员', hide: true}
            ,{field: 'createTime$', align: 'left',title: '添加时间', hide: false}
            ,{field: 'deptId$', align: 'left',title: '所属部门', hide: true}

 src/main/webapp/views/cstmr/cstmr.html

@@ -179,23 +179,17 @@
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label layui-form-required">产品类别: </label>
                    <div class="layui-input-block">
                        <select name="productCategory" lay-vertype="tips" lay-verify="required">
                            <option value="">请选择类别</option>
                            <option value="立体库（货架）">立体库（货架）</option>
                            <option value="立体库（集成）">立体库（集成）</option>
                            <option value="四向穿梭库/两向穿梭库">四向穿梭库/两向穿梭库</option>
                            <option value="阁楼货架/钢平台">阁楼货架/钢平台</option>
                            <option value="周转容器">周转容器</option>
                            <option value="平库">平库</option>
                            <option value="货架增补">货架增补</option>
                            <option value="集成增补">集成增补</option>
                            <option value="货架其它">货架其它</option>
                            <option value="集成其它">集成其它</option>
                    <label class="layui-form-label layui-form-required">产品类型: </label>
                    <div class="layui-input-block cool-auto-complete">
                        <input class="layui-input" name="orderProductTypeId" placeholder="请输入产品类型" style="display: none">
                        <input id="orderProductTypeId$" name="orderProductTypeId$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="请输入产品类型" onfocus=this.blur()>
                        <div class="cool-auto-complete-window">
                            <input class="cool-auto-complete-window-input" data-key="orderProductTypeQueryBydirector" onkeyup="autoLoad(this.getAttribute('data-key'))">
                            <select class="cool-auto-complete-window-select" data-key="orderProductTypeQueryBydirectorSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
                        </select>
                    </div>
                </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label layui-form-required">区分: </label>
                    <div class="layui-input-block">

 src/main/webapp/views/cstmr/cstmr2.html

@@ -192,23 +192,17 @@
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label layui-form-required">产品类别: </label>
                    <div class="layui-input-block">
                        <select name="productCategory" lay-vertype="tips" lay-verify="required">
                            <option value="">请选择类别</option>
                            <option value="立体库（货架）">立体库（货架）</option>
                            <option value="立体库（集成）">立体库（集成）</option>
                            <option value="四向穿梭库/两向穿梭库">四向穿梭库/两向穿梭库</option>
                            <option value="阁楼货架/钢平台">阁楼货架/钢平台</option>
                            <option value="周转容器">周转容器</option>
                            <option value="平库">平库</option>
                            <option value="货架增补">货架增补</option>
                            <option value="集成增补">集成增补</option>
                            <option value="货架其它">货架其它</option>
                            <option value="集成其它">集成其它</option>
                    <label class="layui-form-label layui-form-required">产品类型: </label>
                    <div class="layui-input-block cool-auto-complete">
                        <input class="layui-input" name="orderProductTypeId" placeholder="请输入产品类型" style="display: none">
                        <input id="orderProductTypeId$" name="orderProductTypeId$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="请输入产品类型" onfocus=this.blur()>
                        <div class="cool-auto-complete-window">
                            <input class="cool-auto-complete-window-input" data-key="orderProductTypeQueryBydirector" onkeyup="autoLoad(this.getAttribute('data-key'))">
                            <select class="cool-auto-complete-window-select" data-key="orderProductTypeQueryBydirectorSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
                        </select>
                    </div>
                </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label layui-form-required">区分: </label>
                    <div class="layui-input-block">

 src/main/webapp/views/cstmr/cstmr_more.html

@@ -140,7 +140,7 @@
                            <div class="layui-inline layui-col-md6">
                                <label class="layui-form-label">产品类别:</label>
                                <div class="layui-input-block">
                                    <input name="productCategory" class="layui-input" disabled />
                                    <input name="orderProductTypeId$" class="layui-input" disabled />
                                </div>
                            </div>
                            <div class="layui-inline layui-col-md12">

 src/main/webapp/views/orderProductType/orderProductType.html

@@ -64,28 +64,15 @@
        <div class="layui-row">
            <div class="layui-col-md12">
                <div class="layui-form-item">
                    <label class="layui-form-label layui-form-required">类型名称</label>
                    <label class="layui-form-label layui-form-required">类型名称: </label>
                    <div class="layui-input-block">
                        <!--                    <input class="layui-input" name="name" placeholder="请输入类型名称" lay-verType="tips" lay-verify="required" required/>-->
                        <select name="name" lay-verType="tips" lay-verify="required" required>
                            <option value="">请选择类型</option>
                            <option value="立体库（货架）">立体库（货架）</option>
                            <option value="立体库（集成）">立体库（集成）</option>
                            <option value="四向穿梭库/两向穿梭库">四向穿梭库/两向穿梭库</option>
                            <option value="阁楼货架/钢平台">阁楼货架/钢平台</option>
                            <option value="周转容器">周转容器</option>
                            <option value="平库">平库</option>
                            <option value="货架增补">货架增补</option>
                            <option value="集成增补">集成增补</option>
                            <option value="货架其它">货架其它</option>
                            <option value="集成其它">集成其它</option>
                        </select>
                        <input class="layui-input" name="name" placeholder="请输入产品类型名称" autocomplete="off" lay-verify="required" required>
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">区分: </label>
                    <label class="layui-form-label layui-form-required">区分: </label>
                    <div class="layui-input-block">
                        <select name="type">
                        <select name="type" lay-verType="tips" lay-verify="required" required>
                            <option value="">请选择区分</option>
                            <option value="1">货架</option>
                            <option value="2">集成</option>

 src/main/webapp/views/planType/planType.html

@@ -7,6 +7,7 @@
    <title>弹窗实例</title>
    <link rel="stylesheet" href="../../static/layui/css/layui.css" media="all">
    <link rel="stylesheet" href="../../static/css/admin.css?v=318" media="all">
    <link rel="stylesheet" href="../../static/css/cool.css" media="all">

    <link rel="stylesheet" href="../../static/layui/lay/modules/formDesigner/cron.css" />
    <link rel="stylesheet" href="../../static/layui/lay/modules/formDesigner/labelGeneration.css" />
@@ -86,33 +87,27 @@
        <div class="layui-col-md12">
            <div class="layui-form-item">
                <label class="layui-form-label layui-form-required">类型名称</label>
                <div class="layui-input-block">
                <div class="layui-input-block cool-auto-complete">
<!--                    <input class="layui-input" name="name" placeholder="请输入类型名称" lay-verType="tips" lay-verify="required" required/>-->
                    <select name="name" lay-verType="tips" lay-verify="required" required>
                        <option value="">请选择类型</option>
                        <option value="立体库（货架）">立体库（货架）</option>
                        <option value="立体库（集成）">立体库（集成）</option>
                        <option value="四向穿梭库/两向穿梭库">四向穿梭库/两向穿梭库</option>
                        <option value="阁楼货架/钢平台">阁楼货架/钢平台</option>
                        <option value="周转容器">周转容器</option>
                        <option value="平库">平库</option>
                        <option value="货架增补">货架增补</option>
                        <option value="集成增补">集成增补</option>
                        <option value="货架其它">货架其它</option>
                        <option value="集成其它">集成其它</option>
                    <input class="layui-input" name="orderProductTypeId" placeholder="请输入产品类型(只显示10个，未查询到请搜索)" style="display: none">
                    <input id="orderProductTypeId$" name="orderProductTypeId$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="请输入产品类型(只显示10个，未查询到请搜索)" onfocus=this.blur()>
                    <div class="cool-auto-complete-window">
                        <input class="cool-auto-complete-window-input" data-key="orderProductTypeQueryBydirector" onkeyup="autoLoad(this.getAttribute('data-key'))">
                        <select class="cool-auto-complete-window-select" data-key="orderProductTypeQueryBydirectorSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
                    </select>
                </div>
            </div>
            <div class="layui-form-item">
                <label class="layui-form-label layui-form-required">区分: </label>
                <div class="layui-input-block">
                    <select name="type" lay-verType="tips" lay-verify="required" required>
                        <option value="">请选择区分</option>
                        <option value="1">货架</option>
                        <option value="2">集成</option>
                    </select>
                </div>
            </div>
<!--            <div class="layui-form-item">-->
<!--                <label class="layui-form-label layui-form-required">区分: </label>-->
<!--                <div class="layui-input-block">-->
<!--                    <select name="type" lay-verType="tips" lay-verify="required" required>-->
<!--                        <option value="">请选择区分</option>-->
<!--                        <option value="1">货架</option>-->
<!--                        <option value="2">集成</option>-->
<!--                    </select>-->
<!--                </div>-->
<!--            </div>-->
            <div class="layui-form-item">
                <label class="layui-form-label">类型标识</label>
                <div class="layui-input-block">