jcdm-main/src/main/java/com/jcdm/main/bs/batchInfo/domain/BsBatchInfo.java
@@ -42,13 +42,33 @@ @Excel(name = "备注") private String remarks; private String stationCode; private String flag; /** 创建用户 */ private String createUser; /** 修改用户 */ private String updateUser; public void setId(Long id) public String getStationCode() { return stationCode; } public void setStationCode(String stationCode) { this.stationCode = stationCode; } public String getFlag() { return flag; } public void setFlag(String flag) { this.flag = flag; } public void setId(Long id) { this.id = id; } jcdm-main/src/main/java/com/jcdm/main/bs/batchInfo/service/impl/BsBatchInfoServiceImpl.java
@@ -119,7 +119,7 @@ ParentVO parentVO = new ParentVO(); parentVO.setSiteCode("3983"); parentVO.setRecordId(String.valueOf(Instant.now().toEpochMilli())); parentVO.setStationCode("OP165"); parentVO.setStationCode(bsBatchInfo.getStationCode()); parentVO.setProductNum(format.format(new Date())); parentVO.setTotalResult("1"); List<ChildVO> listChildVo = new ArrayList<>(); @@ -136,6 +136,8 @@ CompletableFuture<Void> cp1 = CompletableFuture.runAsync(() -> { HttpResponse execute = HttpRequest.post(Constants.FACTORY_EMS_UAT_GET_RUL+"deviceResultFeedback").body(JSONUtil.toJsonStr(parentVO)).execute(); System.out.println(execute.body()); bsBatchInfo.setFlag("Y"); this.saveOrUpdate(bsBatchInfo); }); }catch (Exception e){ System.out.println(e.getMessage()); jcdm-main/src/main/resources/mapper/bs/batchInfo/BsBatchInfoMapper.xml
@@ -15,10 +15,13 @@ <result property="createUser" column="create_user" /> <result property="updateTime" column="update_time" /> <result property="updateUser" column="update_user" /> <result property="stationCode" column="station_code" /> <result property="flag" column="flag" /> </resultMap> <sql id="selectBsBatchInfoVo"> select id, material_code, material_name, batch, change_time, remarks, create_time, create_user, update_time, update_user from bs_batch_info select station_code, flag, id, material_code, material_name, batch, change_time, remarks, create_time, create_user, update_time, update_user from bs_batch_info </sql> <select id="selectBsBatchInfoList" parameterType="BsBatchInfo" resultMap="BsBatchInfoResult"> @@ -27,6 +30,9 @@ <if test="materialCode != null and materialCode != ''"> and material_code = #{materialCode}</if> <if test="materialName != null and materialName != ''"> and material_name like concat('%', #{materialName}, '%')</if> <if test="batch != null and batch != ''"> and batch = #{batch}</if> <if test="flag != null and flag != ''"> and flag = #{flag}</if> <if test="stationCode != null and stationCode != ''"> and station_code = #{stationCode}</if> </where> </select> @@ -48,7 +54,10 @@ <if test="createUser != null">create_user,</if> <if test="updateTime != null">update_time,</if> <if test="updateUser != null">update_user,</if> </trim> <if test="stationCode != null">station_code,</if> <if test="flag != null">flag,</if> </trim> <trim prefix="values (" suffix=")" suffixOverrides=","> <if test="id != null">#{id},</if> <if test="materialCode != null">#{materialCode},</if> @@ -60,6 +69,8 @@ <if test="createUser != null">#{createUser},</if> <if test="updateTime != null">#{updateTime},</if> <if test="updateUser != null">#{updateUser},</if> <if test="stationCode != null">#{stationCode},</if> <if test="flag != null">#{flag},</if> </trim> </insert> @@ -75,6 +86,8 @@ <if test="createUser != null">create_user = #{createUser},</if> <if test="updateTime != null">update_time = #{updateTime},</if> <if test="updateUser != null">update_user = #{updateUser},</if> <if test="stationCode != null">station_code = #{stationCode},</if> <if test="flag != null">flag = #{flag},</if> </trim> where id = #{id} </update> jcdm-ui/src/views/main/bs/batchInfo/index.vue
@@ -26,6 +26,22 @@ @keyup.enter.native="handleQuery" /> </el-form-item> <el-form-item label="工位" prop="stationCode"> <el-input v-model="queryParams.batch" placeholder="请输入工位" clearable @keyup.enter.native="handleQuery" /> </el-form-item> <!-- <el-form-item label="是否录入" prop="flag">--> <!-- <el-input--> <!-- v-model="queryParams.batch"--> <!-- placeholder="请输入是否录入"--> <!-- clearable--> <!-- @keyup.enter.native="handleQuery"--> <!-- />--> <!-- </el-form-item>--> <el-form-item style="float: right"> <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button> <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button> @@ -96,9 +112,13 @@ </el-table-column> <el-table-column label="物料名称" align="center" prop="materialName"> </el-table-column> <el-table-column label="物料名称" align="center" prop="stationCode"> </el-table-column> <el-table-column label="批次" align="center" prop="batch"> </el-table-column> <el-table-column label="切换时间" align="center" prop="changeTime"> </el-table-column> <el-table-column label="是否录入" align="center" prop="flag"> </el-table-column> <el-table-column label="备注" align="center" prop="remarks"> </el-table-column> @@ -147,6 +167,9 @@ </el-form-item> <el-form-item label="物料名称" prop="materialName"> <el-input v-model="form.materialName" placeholder="请输入物料名称" /> </el-form-item> <el-form-item label="工位" prop="stationCode"> <el-input v-model="form.stationCode" placeholder="请输入工位" /> </el-form-item> <el-form-item label="批次" prop="batch"> <el-input v-model="form.batch" placeholder="请输入批次" /> @@ -237,7 +260,10 @@ createTime: null, createUser: null, updateTime: null, updateUser: null updateUser: null, stationCode: null, flag: null, }; this.resetForm("form"); },
