#

lsh

2024-12-24 2d52133d69b1c08461754906f1f79970777e3949

#

 src/main/java/com/zy/asrs/controller/BasProcessProceduresController.java

@@ -62,6 +62,10 @@
    @RequestMapping(value = "/basProcessProcedures/add/auth")
    @ManagerAuth
    public R add(BasProcessProcedures basProcessProcedures) {
        BasProcessProcedures boxType = basProcessProceduresService.selectOne(new EntityWrapper<BasProcessProcedures>().eq("box_type", basProcessProcedures.getBoxType()));
        if (!Cools.isEmpty(boxType)){
            return R.error("标识号重复,请检查!!!");
        }
        basProcessProceduresService.insert(basProcessProcedures);
        return R.ok();
    }
@@ -72,6 +76,11 @@
        if (Cools.isEmpty(basProcessProcedures) || null==basProcessProcedures.getId()){
            return R.error();
        }
        BasProcessProcedures boxType = basProcessProceduresService.selectOne(new EntityWrapper<BasProcessProcedures>().eq("box_type", basProcessProcedures.getBoxType()));
        BasProcessProcedures basProcessProcedures1 = basProcessProceduresService.selectById(basProcessProcedures.getId());
        if (!Cools.isEmpty(boxType) && !basProcessProcedures1.equals(boxType)){
            return R.error("标识号重复,请检查!!!");
        }
        basProcessProceduresService.updateById(basProcessProcedures);
        return R.ok();
    }

 src/main/java/com/zy/asrs/controller/BasQualityTestingController.java

@@ -1,6 +1,5 @@
package com.zy.asrs.controller;

import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
@@ -62,6 +61,10 @@
    @RequestMapping(value = "/basQualityTesting/add/auth")
    @ManagerAuth
    public R add(BasQualityTesting basQualityTesting) {
        BasQualityTesting boxType = basQualityTestingService.selectOne(new EntityWrapper<BasQualityTesting>().eq("box_type", basQualityTesting.getBoxType()));
        if (!Cools.isEmpty(boxType)){
            return R.error("标识号重复,请检查!!!");
        }
        basQualityTestingService.insert(basQualityTesting);
        return R.ok();
    }
@@ -72,6 +75,11 @@
        if (Cools.isEmpty(basQualityTesting) || null==basQualityTesting.getId()){
            return R.error();
        }
        BasQualityTesting boxType = basQualityTestingService.selectOne(new EntityWrapper<BasQualityTesting>().eq("box_type", basQualityTesting.getBoxType()));
        BasQualityTesting basQualityTesting1 = basQualityTestingService.selectById(basQualityTesting.getId());
        if (!Cools.isEmpty(boxType) && !basQualityTesting1.equals(boxType)){
            return R.error("标识号重复,请检查!!!");
        }
        basQualityTestingService.updateById(basQualityTesting);
        return R.ok();
    }

 src/main/java/com/zy/asrs/entity/BasProcessProcedures.java

@@ -1,5 +1,7 @@
package com.zy.asrs.entity;

import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.enums.IdType;
import com.core.common.Cools;import com.baomidou.mybatisplus.annotations.TableField;

import io.swagger.annotations.ApiModelProperty;
@@ -17,6 +19,7 @@
     * ID
     */
    @ApiModelProperty(value= "ID")
    @TableId(value = "id", type = IdType.AUTO)
    private Long id;

    /**

 src/main/java/com/zy/asrs/entity/BasQualityTesting.java

@@ -1,5 +1,7 @@
package com.zy.asrs.entity;

import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.enums.IdType;
import com.core.common.Cools;import com.baomidou.mybatisplus.annotations.TableField;

import io.swagger.annotations.ApiModelProperty;
@@ -17,6 +19,7 @@
     * ID
     */
    @ApiModelProperty(value= "ID")
    @TableId(value = "id", type = IdType.AUTO)
    private Long id;

    /**

 src/main/resources/mapper/BasProcessProceduresMapper.xml

@@ -4,7 +4,7 @@

    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.zy.asrs.entity.BasProcessProcedures">
        <id column="id" property="id" />
        <result column="id" property="id" />
        <result column="box_specs" property="boxSpecs" />
        <result column="box_type" property="boxType" />


 src/main/resources/mapper/BasQualityTestingMapper.xml

@@ -4,7 +4,7 @@

    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.zy.asrs.entity.BasQualityTesting">
        <id column="id" property="id" />
        <result column="id" property="id" />
        <result column="box_specs" property="boxSpecs" />
        <result column="box_type" property="boxType" />


 src/main/webapp/views/basProcessProcedures/basProcessProcedures.html

@@ -81,9 +81,9 @@
                    </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">
                        <input class="layui-input" name="boxType" placeholder="请输入工序号">
                        <input class="layui-input" name="boxType" placeholder="请输入工序号" lay-vertype="tips" lay-verify="required">
                    </div>
                </div>


 src/main/webapp/views/basQualityTesting/basQualityTesting.html

@@ -81,9 +81,9 @@
                    </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">
                        <input class="layui-input" name="boxType" placeholder="请输入状态号">
                        <input class="layui-input" name="boxType" placeholder="请输入状态号" lay-vertype="tips" lay-verify="required">
                    </div>
                </div>