diff --git a/ruoyi-admin/src/main/java/com/ruoyi/api/domain/RequestEnter.java b/ruoyi-admin/src/main/java/com/ruoyi/api/domain/RequestEnter.java index 4cdadbd..9707e8f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/api/domain/RequestEnter.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/api/domain/RequestEnter.java @@ -9,5 +9,6 @@ import lombok.NoArgsConstructor; @NoArgsConstructor public class RequestEnter { private String trayCode; - private String spec; + private String size; + private String entranceId; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToWmsServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToWmsServiceImpl.java index 2887388..40a3078 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToWmsServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToWmsServiceImpl.java @@ -3,6 +3,7 @@ package com.ruoyi.api.service.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.convert.Convert; import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.ObjUtil; import cn.hutool.core.util.StrUtil; import com.ruoyi.api.domain.ReMaterialParam; import com.ruoyi.api.domain.RequestEnter; @@ -20,6 +21,7 @@ import com.ruoyi.bas.container.service.IBasContainerService; import com.ruoyi.bas.tag.domain.BasTag; import com.ruoyi.bas.tag.service.IBasTagService; import com.ruoyi.bas.taskNo.service.IBasTaskNoService; +import com.ruoyi.bas.warehouse.domain.BasWarehouse; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.utils.MessageUtils; import com.ruoyi.common.utils.SecurityUtils; @@ -40,6 +42,7 @@ import com.ruoyi.out.tagTask.service.ITagTaskService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import java.util.Date; import java.util.List; @@ -77,6 +80,7 @@ public class ToWmsServiceImpl implements IToWmsService { @Override + @Transactional(rollbackFor = Exception.class) public AjaxResult requestEnterByTrayCode(RequestEnter requestEnter) { if (StrUtil.isEmpty(requestEnter.getTrayCode())) { return AjaxResult.error("托盘条码不能为空"); @@ -92,36 +96,88 @@ public class ToWmsServiceImpl implements IToWmsService { String v = split[3].substring(2); String hz = split[4].substring(3); String ph = split[5].substring(3); - String nw = split[6].substring(5); - String gw = split[7].substring(5); - String bm = split[8].substring(2, split[8].length() - 1); - String[] decode = ProcodeUtils.decode(bm); + String nw = split[6].substring(5, split[6].length() - 2); + String gw = split[7].substring(5, split[7].length() - 2); + String productId = split[8].substring(10); + String bm = split[9].substring(2, split[9].length() - 1); + String[] decode = ProcodeUtils.decode(bm); String erpBill = decode[0]; String xh = decode[1]; String jx = decode[2]; String fx = decode[3]; String xlh = decode[4]; - log.info("二维码详情 model:{},color:{},serial:{},v:{},hz:{},ph:{},nw:{},gw:{},erpBill:{},xh:{},jx:{},fx:{},xlh:{}", model, color, serial, v, hz, ph, nw, gw,erpBill, xh, jx, fx, xlh); + log.info("二维码详情 productId:{} model:{},color:{},serial:{},v:{},hz:{},ph:{},nw:{},gw:{},erpBill:{},xh:{},jx:{},fx:{},xlh:{}",productId, model, color, serial, v, hz, ph, nw, gw, erpBill, xh, jx, fx, xlh); BasProduct basProductParam = new BasProduct(); - basProductParam.setSpare4(xlh); + basProductParam.setProductId(productId); List basProducts = basProductService.selectBasProductList(basProductParam); if (CollUtil.isEmpty(basProducts)) { return AjaxResult.error("物料信息不存在"); } BasProduct basProduct = basProducts.get(0); - if (!basProduct.getSpec().equals(requestEnter.getSpec())){ + /*if (!basProduct.getSpec().equals(requestEnter.getSize())) { return AjaxResult.error("规格不一致"); - } + }*/ + + //生成作业 MydoJob mydoJob = new MydoJob(); - mydoJob.setJobId(basJobIdService.getJobId("RK")); mydoJob.setStatus("1"); - mydoJob.setTaskNo(Convert.toStr(basTaskNoService.getTaskNo("1"))); - mydoJob.setDepartmentId(Convert.toStr(SecurityUtils.getDeptId())); - mydoJob.setTrayCode(requestEnter.getTrayCode()); + //mydoJob.setDepartmentId(Convert.toStr(SecurityUtils.getDeptId())); + mydoJob.setInOrOut("1"); + mydoJob.setExecutionPhase("1"); + mydoJob.setTrayCode(basJobIdService.getJobId("TP")); + mydoJob.setWarehouseId("01"); + BasCargoSpace basCargoSpaceParam = new BasCargoSpace(); + //todo 根据包装方式 主要包装方式 描述 长 宽 高 包装材积 判断巷道1 还是巷道2 + switch (requestEnter.getSize()) { + case "1": + mydoJob.setRoadwayId("1"); + break; + case "2": + mydoJob.setRoadwayId("2"); + break; + case "4": + break; + default: + return AjaxResult.error("规格不存在"); + } + //根据巷道查找货位 + basCargoSpaceParam.setWarehouseId(mydoJob.getWarehouseId()); + basCargoSpaceParam.setRoadwayId(mydoJob.getRoadwayId()); + BasCargoSpace basCargoSpace = basCargoSpaceService.selectEmptyCargoSpaceByWarehouseId(basCargoSpaceParam); + if (ObjUtil.isNull(basCargoSpace)) { + return AjaxResult.error("没有货位"); + } + mydoJob.setCargoSpaceId(basCargoSpace.getCargoSpaceId()); + mydoJob.setEntranceId(requestEnter.getEntranceId()); + mydoJobService.insertMydoJob(mydoJob); + //生成子作业 + MydoJobDetail mydoJobDetail = new MydoJobDetail(); + mydoJobDetail.setJobDetailId(mydoJob.getJobId() + "-1"); + mydoJobDetail.setJobId(mydoJob.getJobId()); + mydoJobDetail.setCreateTime(new Date()); + mydoJobDetail.setProductGuid(basProduct.getProductGuid()); + mydoJobDetail.setProductId(basProduct.getProductId()); + mydoJobDetail.setInQuantity("1"); + mydoJobDetail.setSpare1(xh); + mydoJobDetail.setSpare2(nw); + mydoJobDetail.setSpare3(color); + mydoJobDetail.setSpare4(xlh); + mydoJobDetail.setSpare5(v); + mydoJobDetail.setSpare6(hz); + mydoJobDetail.setSpare7(ph); + mydoJobDetail.setSpare8(gw); + mydoJobDetail.setSpare9(fx); + mydoJobDetail.setUnit(jx); + mydoJobDetail.setSpec(basProduct.getSpec()); + mydoJobDetailService.insertMydoJobDetail(mydoJobDetail); + + //修改货位状态 + basCargoSpace.setStatus("3"); + basCargoSpaceService.updateBasCargoSpace(basCargoSpace); return AjaxResult.success(); } @@ -246,7 +302,10 @@ public class ToWmsServiceImpl implements IToWmsService { //重新分配货位 MydoJob mydoJob = mydoJobService.selectMydoJobByJobId(reMaterialParam.getJobId()); String warehouseId = mydoJob.getWarehouseId(); - BasCargoSpace basCargoSpace = basCargoSpaceService.selectEmptyCargoSpaceByWarehouseId(warehouseId); + BasCargoSpace basCargoSpaceParam = new BasCargoSpace(); + basCargoSpaceParam.setWarehouseId(warehouseId); + basCargoSpaceParam.setRoadwayId(mydoJob.getRoadwayId()); + BasCargoSpace basCargoSpace = basCargoSpaceService.selectEmptyCargoSpaceByWarehouseId(basCargoSpaceParam); if (basCargoSpace == null) { log.error("没有空货位"); return AjaxResult.error(MessageUtils.message("error.message20")); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/bas/cargoSpace/mapper/BasCargoSpaceMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/bas/cargoSpace/mapper/BasCargoSpaceMapper.java index 187f725..511fe1e 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/bas/cargoSpace/mapper/BasCargoSpaceMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/bas/cargoSpace/mapper/BasCargoSpaceMapper.java @@ -2,6 +2,7 @@ package com.ruoyi.bas.cargoSpace.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.ruoyi.bas.cargoSpace.domain.BasCargoSpace; +import com.ruoyi.bas.warehouse.domain.BasWarehouse; import java.util.List; import java.util.Map; @@ -74,5 +75,5 @@ public interface BasCargoSpaceMapper extends BaseMapper * @param warehouseId * @return */ - BasCargoSpace selectEmptyCargoSpaceByWarehouseId(String warehouseId); + BasCargoSpace selectEmptyCargoSpaceByWarehouseId(BasCargoSpace basWarehouse); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/bas/cargoSpace/service/IBasCargoSpaceService.java b/ruoyi-admin/src/main/java/com/ruoyi/bas/cargoSpace/service/IBasCargoSpaceService.java index c307f37..479b9b5 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/bas/cargoSpace/service/IBasCargoSpaceService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/bas/cargoSpace/service/IBasCargoSpaceService.java @@ -2,6 +2,7 @@ package com.ruoyi.bas.cargoSpace.service; import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.bas.cargoSpace.domain.BasCargoSpace; +import com.ruoyi.bas.warehouse.domain.BasWarehouse; import java.util.List; @@ -66,5 +67,5 @@ public interface IBasCargoSpaceService extends IService * @param warehouseId * @return */ - BasCargoSpace selectEmptyCargoSpaceByWarehouseId(String warehouseId); + BasCargoSpace selectEmptyCargoSpaceByWarehouseId(BasCargoSpace basWarehouse); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/bas/cargoSpace/service/impl/BasCargoSpaceServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/bas/cargoSpace/service/impl/BasCargoSpaceServiceImpl.java index 7f6b185..4dda0e8 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/bas/cargoSpace/service/impl/BasCargoSpaceServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/bas/cargoSpace/service/impl/BasCargoSpaceServiceImpl.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.bas.cargoSpace.domain.BasCargoSpace; import com.ruoyi.bas.cargoSpace.mapper.BasCargoSpaceMapper; import com.ruoyi.bas.cargoSpace.service.IBasCargoSpaceService; +import com.ruoyi.bas.warehouse.domain.BasWarehouse; import com.ruoyi.common.annotation.DataScope; import jakarta.annotation.Resource; import org.springframework.stereotype.Service; @@ -96,8 +97,8 @@ public class BasCargoSpaceServiceImpl extends ServiceImpl mydoJobDetails = mydoJobDetailService.selectMydoJobDetailList(param); - BasCargoSpace basCargoSpace = basCargoSpaceService.selectBasCargoSpaceByCargoSpaceId(job.getCargoSpaceId()); - if (CollUtil.isNotEmpty(mydoJobDetails)) { - List list = new ArrayList<>(); - for (MydoJobDetail mydoJobDetail : mydoJobDetails) { - //正常库存 - list.add(getStockByInStockinDetail(mydoJobDetail, job, "1")); + + //入库任务 + MydoJobDetail param = new MydoJobDetail(); + param.setJobId(jobId); + List mydoJobDetails = mydoJobDetailService.selectMydoJobDetailList(param); + BasCargoSpace basCargoSpace = basCargoSpaceService.selectBasCargoSpaceByCargoSpaceId(job.getCargoSpaceId()); + if (CollUtil.isNotEmpty(mydoJobDetails)) { + List list = new ArrayList<>(); + for (MydoJobDetail mydoJobDetail : mydoJobDetails) { + if ("2".equals(mydoJob.getInOrOut()) || "3".equals(mydoJob.getInOrOut())) { + //修改单据实际数量 2-退料入库 3-其它入库 + String inOrOutDId = mydoJobDetail.getInOrOutDId(); + InStockinDetail inStockinDetail = inStockinDetailService.selectInStockinDetailByStockinDetailId(inOrOutDId); + inStockinDetail.setAssignNum(Convert.toStr(Convert.toBigDecimal(inStockinDetail.getAssignNum()).add(Convert.toBigDecimal(mydoJobDetail.getInQuantity())))); + inStockinDetailService.updateInStockinDetail(inStockinDetail); } - //修改货位状态 - basCargoSpace.setStatus("2"); - basCargoSpace.setTrayCode(job.getTrayCode()); - basCargoSpace.setCargoSpaceId(job.getCargoSpaceId()); - basCargoSpaceService.updateBasCargoSpace(basCargoSpace); - //插入库存信息 - basStockService.insertBasStockList(list); - //结束任务 - mydoJob.setStatus("4"); - mydoJob.setFinishTime(DateUtil.formatDateTime(DateUtil.date())); - updateMydoJob(mydoJob); - // 插入任务历史表 删除任务 - insertHistory(mydoJob.getJobId()); - return AjaxResult.success(); - } else { - return AjaxResult.warn(MessageUtils.message("warn.message2")); + //正常库存 + list.add(getStockByInStockinDetail(mydoJobDetail, job, "1")); } - } else if ("2".equals(job.getInOrOut()) || "3".equals(job.getInOrOut())) { - //ctu物料入库 高架库入库 - //入库作业 - MydoJobDetail param = new MydoJobDetail(); - param.setJobId(jobId); - List mydoJobDetails = mydoJobDetailService.selectMydoJobDetailList(param); - BasCargoSpace basCargoSpace = basCargoSpaceService.selectBasCargoSpaceByCargoSpaceId(job.getCargoSpaceId()); - if (CollUtil.isNotEmpty(mydoJobDetails)) { - List list = new ArrayList<>(); - //查找是否存在异常信息 - OutExceptionRecord outExceptionRecordParam = new OutExceptionRecord(); - outExceptionRecordParam.setTrayCode(job.getTrayCode()); - outExceptionRecordParam.setWarehouseId(job.getWarehouseId()); - List outExceptionRecords = outExceptionRecordService.selectOutExceptionRecordList(outExceptionRecordParam); - for (MydoJobDetail mydoJobDetail : mydoJobDetails) { - if (job.getJobId().startsWith("RK")){ - //修改单据实际数量 物料入库 高架库入库 - String inOrOutDId = mydoJobDetail.getInOrOutDId(); - InStockinDetail inStockinDetail = inStockinDetailService.selectInStockinDetailByStockinDetailId(inOrOutDId); - inStockinDetail.setAssignNum(Convert.toStr(Convert.toBigDecimal(inStockinDetail.getAssignNum()).add(Convert.toBigDecimal(mydoJobDetail.getInQuantity())))); - inStockinDetailService.updateInStockinDetail(inStockinDetail); - } - Optional first = outExceptionRecords.stream().filter(x -> x.getTrayCode().equals(job.getTrayCode()) && x.getProductId().equals(mydoJobDetail.getProductId())).findFirst(); - if (first.isPresent()) { - //生成异常库存 - BasStock stockByInStockinDetail = getStockByInStockinDetail(mydoJobDetail, job, "3"); - list.add(stockByInStockinDetail); - //修改异常记录中的库存id - OutExceptionRecord outExceptionRecord = first.get(); - outExceptionRecord.setStockId(stockByInStockinDetail.getStockId()); - outExceptionRecordService.updateOutExceptionRecord(outExceptionRecord); - } else { - //正常库存 - list.add(getStockByInStockinDetail(mydoJobDetail, job, "1")); - } - } - //删除异常库存记录 - List collect = outExceptionRecords.stream().map(OutExceptionRecord::getOutGuid).collect(Collectors.toList()); - if (CollUtil.isNotEmpty(collect)) { - for (Long id : collect) { - outExceptionRecordService.deleteOutExceptionRecordByOutGuid(id); - } + //修改货位状态 + basCargoSpace.setStatus("2"); + basCargoSpace.setTrayCode(job.getTrayCode()); + basCargoSpace.setCargoSpaceId(job.getCargoSpaceId()); + basCargoSpaceService.updateBasCargoSpace(basCargoSpace); - } - //修改货位状态 - basCargoSpace.setStatus("2"); - basCargoSpace.setTrayCode(job.getTrayCode()); - basCargoSpace.setCargoSpaceId(job.getCargoSpaceId()); - basCargoSpaceService.updateBasCargoSpace(basCargoSpace); + //插入库存信息 + basStockService.insertBasStockList(list); - //插入库存信息 - basStockService.insertBasStockList(list); + //结束任务 + mydoJob.setStatus("4"); + mydoJob.setFinishTime(DateUtil.formatDateTime(DateUtil.date())); + updateMydoJob(mydoJob); + // 插入任务历史表 删除任务 + insertHistory(mydoJob.getJobId()); - //结束任务 - mydoJob.setStatus("4"); - mydoJob.setFinishTime(DateUtil.formatDateTime(DateUtil.date())); - updateMydoJob(mydoJob); - // 插入任务历史表 删除任务 - insertHistory(mydoJob.getJobId()); - return AjaxResult.success(); - } else { - return AjaxResult.warn(MessageUtils.message("warn.message2")); - } - } else if ("5".equals(job.getInOrOut()) || "6".equals(job.getInOrOut())) { - //盘点 ctu入库 高架库入库 - //入库作业 - MydoJobDetail param = new MydoJobDetail(); - param.setJobId(jobId); - List mydoJobDetails = mydoJobDetailService.selectMydoJobDetailList(param); - BasCargoSpace basCargoSpace = basCargoSpaceService.selectBasCargoSpaceByCargoSpaceId(job.getCargoSpaceId()); - if (CollUtil.isNotEmpty(mydoJobDetails)) { - List list = new ArrayList<>(); + //todo 插入回传表 - - //查询盘点信息中的异常信息 - CheckDifferenceRecord checkDifferenceRecordParam = new CheckDifferenceRecord(); - checkDifferenceRecordParam.setTrayCode(job.getTrayCode()); - checkDifferenceRecordParam.setWarehouseId(job.getWarehouseId()); - List checkDifferenceRecords = checkDifferenceRecordService.selectCheckDifferenceRecordList(checkDifferenceRecordParam); - for (MydoJobDetail mydoJobDetail : mydoJobDetails) { - //如果存在盘点异常信息 根据托盘条码和物料id 筛选异常信息 - Optional first = checkDifferenceRecords.stream().filter(x -> x.getTrayCode().equals(job.getTrayCode()) && x.getProductId().equals(mydoJobDetail.getProductId())).findFirst(); - if (first.isPresent()) { - //生成盘点待审批库存 - BasStock stockByInStockinDetail = getStockByInStockinDetail(mydoJobDetail, job, "2"); - list.add(stockByInStockinDetail); - //修改异常记录中的库存id - CheckDifferenceRecord checkDifferenceRecord = first.get(); - checkDifferenceRecord.setStockId(stockByInStockinDetail.getStockId()); - checkDifferenceRecordService.updateCheckDifferenceRecord(checkDifferenceRecord); - - } else { - //正常库存 - list.add(getStockByInStockinDetail(mydoJobDetail, job, "1")); - } - - } - - //修改货位状态 - basCargoSpace.setStatus("2"); - basCargoSpace.setTrayCode(job.getTrayCode()); - basCargoSpace.setCargoSpaceId(job.getCargoSpaceId()); - basCargoSpaceService.updateBasCargoSpace(basCargoSpace); - - //插入库存信息 - basStockService.insertBasStockList(list); - - //结束任务 - mydoJob.setStatus("4"); - mydoJob.setFinishTime(DateUtil.formatDateTime(DateUtil.date())); - updateMydoJob(mydoJob); - // 插入任务历史表 删除任务 - insertHistory(mydoJob.getJobId()); - return AjaxResult.success(); - } else { - return AjaxResult.warn(MessageUtils.message("warn.message2")); - } + return AjaxResult.success(); } else { - return AjaxResult.warn(MessageUtils.message("warn.message3")); + return AjaxResult.warn("不存在子作业"); } - } private BasStock getStockByInStockinDetail(MydoJobDetail mydoJobDetail, MydoJob mydoJob, String productStatus) { @@ -432,7 +317,7 @@ public class MydoJobServiceImpl implements IMydoJobService { MydoJob job = selectMydoJobByJobId(jobId); BasWarehouse basWarehouse = basWarehouseService.selectBasWarehouseByWarehouseId(job.getWarehouseId()); - if("2".equals(basWarehouse.getWarehouseType()) && Integer.parseInt(job.getStatus())<3){ + if ("2".equals(basWarehouse.getWarehouseType()) && Integer.parseInt(job.getStatus()) < 3) { log.error("只能完成正执行的作业"); return AjaxResult.error(MessageUtils.message("error.message14")); } @@ -487,9 +372,9 @@ public class MydoJobServiceImpl implements IMydoJobService { insertHistory(jobId); //通知wcs AjaxResult ajaxResult = iToWcsService.cancelTaskByTaskNo(job.getTaskNo()); - if (ajaxResult.isSuccess()){ + if (ajaxResult.isSuccess()) { return AjaxResult.success(); - }else { + } else { throw new RuntimeException(Convert.toStr(ajaxResult.get("msg"))); } } @@ -503,7 +388,7 @@ public class MydoJobServiceImpl implements IMydoJobService { } @Override - public AjaxResult pointOut(String[] stockIds,String exitId) { + public AjaxResult pointOut(String[] stockIds, String exitId) { HashMap map = new HashMap<>(); String msg = ""; String Stringbuilder = ""; diff --git a/ruoyi-admin/src/main/resources/mapper/bas/cargoSpace/BasCargoSpaceMapper.xml b/ruoyi-admin/src/main/resources/mapper/bas/cargoSpace/BasCargoSpaceMapper.xml index 1d4db7c..dfb6150 100644 --- a/ruoyi-admin/src/main/resources/mapper/bas/cargoSpace/BasCargoSpaceMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/bas/cargoSpace/BasCargoSpaceMapper.xml @@ -180,8 +180,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" diff --git a/ruoyi-admin/src/main/resources/mapper/job/MydoJobDetailMapper.xml b/ruoyi-admin/src/main/resources/mapper/job/MydoJobDetailMapper.xml index 3792dac..7229496 100644 --- a/ruoyi-admin/src/main/resources/mapper/job/MydoJobDetailMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/job/MydoJobDetailMapper.xml @@ -228,6 +228,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" spare2, spare3, spare4, + spare5, + spare6, + spare7, + spare8, + spare9, + spec, + unit, pick_quantity, @@ -257,6 +264,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{spare2}, #{spare3}, #{spare4}, + #{spare5}, + #{spare6}, + #{spare7}, + #{spare8}, + #{spare9}, + #{spec}, + #{unit}, #{pick_quantity}, diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java index 5b6f16d..cbb7999 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java @@ -104,7 +104,7 @@ public class SecurityConfig // 静态资源，可匿名访问 .requestMatchers(HttpMethod.GET, "/", "/*.html", "/**.html", "/**.css", "/**.js", "/profile/**").permitAll() .requestMatchers("/swagger-ui.html", "/v3/api-docs/**", "/swagger-ui/**", "/druid/**").permitAll() - .requestMatchers("/api/**").permitAll() + .requestMatchers("/api/**","/api2wms/**").permitAll() // 除上面外的所有请求全部需要鉴权认证 .anyRequest().authenticated(); }) diff --git a/ruoyi-ui/src/views/bas/BasProductCode/index.vue b/ruoyi-ui/src/views/bas/BasProductCode/index.vue index f22e247..9fd9a2f 100644 --- a/ruoyi-ui/src/views/bas/BasProductCode/index.vue +++ b/ruoyi-ui/src/views/bas/BasProductCode/index.vue @@ -106,6 +106,7 @@ :correctLevel="2" error-correction-level="M" /> +
{{ previewData.spare4 }}
@@ -163,6 +164,7 @@ :correctLevel="2" error-correction-level="M" /> +
{{ previewData.spare4 }}
@@ -239,6 +241,7 @@ import {addBasProductCode, delBasProductCode, listBasProductCode, updateBasProdu // 常量配置 const FORM_FIELDS = [ + { prop: 'spare4', label: '品号', placeholder: '请输入品号', required: true }, { prop: 'model', label: '型号', placeholder: '请输入型号', required: true }, { prop: 'serial', label: '序列号', placeholder: '请输入序列号', required: true }, { prop: 'color', label: '颜色', placeholder: '请输入颜色', required: true }, @@ -253,6 +256,7 @@ const FORM_FIELDS = [ ] const TABLE_COLUMNS = [ + { prop: 'spare4', label: '品号', width: 140 }, { prop: 'model', label: '型号', width: 120 }, { prop: 'color', label: '颜色', width: 100 }, { prop: 'serial', label: '序列号', width: 150 }, @@ -284,7 +288,8 @@ const DEFAULT_FORM = { type: '1', spare1: '', spare2: '', - spare3: '' + spare3: '', + spare4: '' } const DEFAULT_PREVIEW_DATA = { @@ -345,8 +350,8 @@ export default { return "MODEL:" + this.previewData.model + " COLOR:" + this.previewData.color + " SERIAL:" + this.previewData.serial + " V:" + this.previewData.v + " Hz:" + this.previewData.hz + " PH:" + this.previewData.ph - + " N.W.:" + this.previewData.nW + " G.W.:" + this.previewData.gW - + " @:" + bm + "@" + + " N.W.:" + this.previewData.nW + " G.W.:" + this.previewData.gW+" ITEM_CODE:"+this.previewData.spare4+ " @:" + bm + "@" + }, // 是否有选中项 hasSelection() { @@ -849,6 +854,15 @@ export default { padding: 0; background-color: transparent; border: none; + text-align: center; +} + +.qrcode-label { + margin-top: 8px; + font-size: 14px; + font-weight: 600; + color: #303133; + text-align: center; } /* 响应式设计 */ diff --git a/ruoyi-ui/src/views/in/job/index.vue b/ruoyi-ui/src/views/in/job/index.vue index 6186933..d24f1e8 100644 --- a/ruoyi-ui/src/views/in/job/index.vue +++ b/ruoyi-ui/src/views/in/job/index.vue @@ -128,7 +128,7 @@ - +