diff --git a/ruoyi-admin/src/main/java/com/ruoyi/api/service/IToWcsService.java b/ruoyi-admin/src/main/java/com/ruoyi/api/service/IToWcsService.java index cdaa065..10c7e59 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/api/service/IToWcsService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/api/service/IToWcsService.java @@ -12,12 +12,32 @@ import java.util.HashMap; */ public interface IToWcsService { - + /** + * 推送CTU出库任务 + */ void pushOutMydoJob(); - + /** + * 推送agv搬运作业 + * @return + */ AjaxResult pushAgvMoveJob(GenAgvSchedulingTaskRequest genAgvSchedulingTaskRequest); + /** + * 推送流利架入库任务 + */ void pushInMydoJob(); + /** + * 出库作业确认 + * @param outMydojobMakeSureParam + * @return + */ AjaxResult outMydojobMakeSure(HashMap outMydojobMakeSureParam); + + /** + * 取消任务 + * @param taskNo + * @return + */ + AjaxResult cancelTaskByTaskNo(String taskNo); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToWcsServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToWcsServiceImpl.java index 280cfcf..c7b67f8 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToWcsServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToWcsServiceImpl.java @@ -30,6 +30,7 @@ import org.springframework.stereotype.Service; import java.util.ArrayList; import java.util.HashMap; import java.util.List; +import java.util.Map; /** * 作业统计 Service 实现 @@ -45,6 +46,7 @@ public class ToWcsServiceImpl implements IToWcsService { public static final String PUSH_IN_MYDO_JOB = "http://localhost:8081/agv/wcs2Wms/api/receiveInMydoJob"; public static final String PUSH_AGV_MOVE_JOB = "http://localhost:8081/api/receiveAgvMoveJob"; public static final String OUT_MYDOJOB_MS = "http://localhost:8081/wcs2Wms/api/outMydojobMakesure"; + public static final String CANCEL_MYDOJOB = "http://localhost:8081/wcs2Wms/api/cancelMydoJob"; @Override @@ -104,4 +106,15 @@ public class ToWcsServiceImpl implements IToWcsService { } return AjaxResult.error(requestLog.getDuration()); } + + @Override + public AjaxResult cancelTaskByTaskNo(String taskNo) { + Map map = new HashMap<>(); + map.put("taskNo", taskNo); + RequestLog requestLog = requestLogService.getRequestLog(CANCEL_MYDOJOB, JSONUtil.toJsonStr(map), "取消任务"); + if ("1".equals(requestLog.getIsSuccessful())){ + return AjaxResult.success(); + } + return AjaxResult.error(); + } } 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 9e92a53..0102b49 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 @@ -150,31 +150,34 @@ public class ToWmsServiceImpl implements IToWmsService { return AjaxResult.error(MessageUtils.message("warn.message")); } MydoJob outJob = outMydoJobs.get(0); - //查询拣选工位绑定的电子标签 - BasTag tagParam = new BasTag(); - tagParam.setPickAdd(wmsJobRequest.getPickSsj()); - tagParam.setSpare3("1"); - List tags = iBasTagService.selectBasTagList(tagParam); - if (tags.isEmpty()){ - return AjaxResult.error(MessageUtils.message("error.message4")); - } - BasTag basTag = tags.get(0); - basTag.setTrayCode(outJob.getTrayCode()); - iBasTagService.updateBasTag(basTag); - //同步电子标签 - MydoJobDetail param = new MydoJobDetail(); - param.setJobId(outMydoJobs.get(0).getJobId()); - List mydoJobDetails = mydoJobDetailService.selectMydoJobDetailList(param); - for (MydoJobDetail mydoJobDetail : mydoJobDetails) { - TagTask tagTask = new TagTask(); - tagTask.setTagId(basTag.getId()); - tagTask.setJobDetailId(mydoJobDetail.getJobDetailId()); - tagTask.setProductId(mydoJobDetail.getProductId()); - tagTask.setNum(mydoJobDetail.getOutQuantity()); - tagTask.setStatus("0"); - tagTask.setColor("0"); - tagTask.setFloor("0"); - tagTaskService.insertTagTask(tagTask); + //料箱出库 需同步电子标签 + if("23".equals(outJob.getInOut())){ + //查询拣选工位绑定的电子标签 + BasTag tagParam = new BasTag(); + tagParam.setPickAdd(wmsJobRequest.getPickSsj()); + tagParam.setSpare3("1"); + List tags = iBasTagService.selectBasTagList(tagParam); + if (tags.isEmpty()){ + return AjaxResult.error(MessageUtils.message("error.message4")); + } + BasTag basTag = tags.get(0); + basTag.setTrayCode(outJob.getTrayCode()); + iBasTagService.updateBasTag(basTag); + //同步电子标签 + MydoJobDetail param = new MydoJobDetail(); + param.setJobId(outMydoJobs.get(0).getJobId()); + List mydoJobDetails = mydoJobDetailService.selectMydoJobDetailList(param); + for (MydoJobDetail mydoJobDetail : mydoJobDetails) { + TagTask tagTask = new TagTask(); + tagTask.setTagId(basTag.getId()); + tagTask.setJobDetailId(mydoJobDetail.getJobDetailId()); + tagTask.setProductId(mydoJobDetail.getProductId()); + tagTask.setNum(mydoJobDetail.getOutQuantity()); + tagTask.setStatus("0"); + tagTask.setColor("0"); + tagTask.setFloor("0"); + tagTaskService.insertTagTask(tagTask); + } } break; case "3": diff --git a/ruoyi-admin/src/main/java/com/ruoyi/check/DifferenceRecordFinish/controller/CheckDifferenceRecordFinishController.java b/ruoyi-admin/src/main/java/com/ruoyi/check/DifferenceRecordFinish/controller/CheckDifferenceRecordFinishController.java index 5a517e9..c33cb13 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/check/DifferenceRecordFinish/controller/CheckDifferenceRecordFinishController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/check/DifferenceRecordFinish/controller/CheckDifferenceRecordFinishController.java @@ -2,6 +2,8 @@ package com.ruoyi.check.DifferenceRecordFinish.controller; import java.util.List; import javax.servlet.http.HttpServletResponse; + +import com.ruoyi.check.difference.domain.CheckDifferenceRecord; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -23,7 +25,7 @@ import com.ruoyi.common.core.page.TableDataInfo; /** * 盘点差异历史Controller - * + * * @author gw * @date 2025-06-25 */ @@ -37,12 +39,12 @@ public class CheckDifferenceRecordFinishController extends BaseController /** * 查询盘点差异历史列表 */ - @PreAuthorize("@ss.hasPermi('check:DifferenceRecordFinish:list')") + @PreAuthorize("@ss.hasPermi('check:difference:list')") @GetMapping("/list") public TableDataInfo list(CheckDifferenceRecordFinish checkDifferenceRecordFinish) { startPage(); - List list = checkDifferenceRecordFinishService.selectCheckDifferenceRecordFinishList(checkDifferenceRecordFinish); + List list = checkDifferenceRecordFinishService.selectCheckDifferenceRecordFinishList(checkDifferenceRecordFinish); return getDataTable(list); } @@ -54,8 +56,8 @@ public class CheckDifferenceRecordFinishController extends BaseController @PostMapping("/export") public void export(HttpServletResponse response, CheckDifferenceRecordFinish checkDifferenceRecordFinish) { - List list = checkDifferenceRecordFinishService.selectCheckDifferenceRecordFinishList(checkDifferenceRecordFinish); - ExcelUtil util = new ExcelUtil(CheckDifferenceRecordFinish.class); + List list = checkDifferenceRecordFinishService.selectCheckDifferenceRecordFinishList(checkDifferenceRecordFinish); + ExcelUtil util = new ExcelUtil(CheckDifferenceRecord.class); util.exportExcel(response, list, "盘点差异历史数据"); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/check/DifferenceRecordFinish/domain/CheckDifferenceRecordFinish.java b/ruoyi-admin/src/main/java/com/ruoyi/check/DifferenceRecordFinish/domain/CheckDifferenceRecordFinish.java index 05dd8ba..8fea08f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/check/DifferenceRecordFinish/domain/CheckDifferenceRecordFinish.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/check/DifferenceRecordFinish/domain/CheckDifferenceRecordFinish.java @@ -7,7 +7,7 @@ import com.ruoyi.common.core.domain.BaseEntity; /** * 盘点差异历史对象 check_difference_record_finish - * + * * @author gw * @date 2025-06-25 */ @@ -70,142 +70,161 @@ public class CheckDifferenceRecordFinish extends BaseEntity @Excel(name = "审核状态") private String status; - public void setCheckGuid(String checkGuid) + private String warehouseId; + private String warehouseName; + + public String getWarehouseId() { + return warehouseId; + } + + public void setWarehouseId(String warehouseId) { + this.warehouseId = warehouseId; + } + + public String getWarehouseName() { + return warehouseName; + } + + public void setWarehouseName(String warehouseName) { + this.warehouseName = warehouseName; + } + + public void setCheckGuid(String checkGuid) { this.checkGuid = checkGuid; } - public String getCheckGuid() + public String getCheckGuid() { return checkGuid; } - public void setStockId(String stockId) + public void setStockId(String stockId) { this.stockId = stockId; } - public String getStockId() + public String getStockId() { return stockId; } - public void setTrayCode(String trayCode) + public void setTrayCode(String trayCode) { this.trayCode = trayCode; } - public String getTrayCode() + public String getTrayCode() { return trayCode; } - public void setCargoSpaceId(String cargoSpaceId) + public void setCargoSpaceId(String cargoSpaceId) { this.cargoSpaceId = cargoSpaceId; } - public String getCargoSpaceId() + public String getCargoSpaceId() { return cargoSpaceId; } - public void setProductId(String productId) + public void setProductId(String productId) { this.productId = productId; } - public String getProductId() + public String getProductId() { return productId; } - public void setLotNo(String lotNo) + public void setLotNo(String lotNo) { this.lotNo = lotNo; } - public String getLotNo() + public String getLotNo() { return lotNo; } - public void setSupplier(String supplier) + public void setSupplier(String supplier) { this.supplier = supplier; } - public String getSupplier() + public String getSupplier() { return supplier; } - public void setCustomer(String customer) + public void setCustomer(String customer) { this.customer = customer; } - public String getCustomer() + public String getCustomer() { return customer; } - public void setOldQuantity(String oldQuantity) + public void setOldQuantity(String oldQuantity) { this.oldQuantity = oldQuantity; } - public String getOldQuantity() + public String getOldQuantity() { return oldQuantity; } - public void setNewQuantity(String newQuantity) + public void setNewQuantity(String newQuantity) { this.newQuantity = newQuantity; } - public String getNewQuantity() + public String getNewQuantity() { return newQuantity; } - public void setRecordType(Long recordType) + public void setRecordType(Long recordType) { this.recordType = recordType; } - public Long getRecordType() + public Long getRecordType() { return recordType; } - public void setProductGuid(String productGuid) + public void setProductGuid(String productGuid) { this.productGuid = productGuid; } - public String getProductGuid() + public String getProductGuid() { return productGuid; } - public void setCheckStockDetailId(String checkStockDetailId) + public void setCheckStockDetailId(String checkStockDetailId) { this.checkStockDetailId = checkStockDetailId; } - public String getCheckStockDetailId() + public String getCheckStockDetailId() { return checkStockDetailId; } - public void setStatus(String status) + public void setStatus(String status) { this.status = status; } - public String getStatus() + public String getStatus() { return status; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/check/DifferenceRecordFinish/mapper/CheckDifferenceRecordFinishMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/check/DifferenceRecordFinish/mapper/CheckDifferenceRecordFinishMapper.java index 6e71cc4..8d73ac1 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/check/DifferenceRecordFinish/mapper/CheckDifferenceRecordFinishMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/check/DifferenceRecordFinish/mapper/CheckDifferenceRecordFinishMapper.java @@ -2,34 +2,35 @@ package com.ruoyi.check.DifferenceRecordFinish.mapper; import java.util.List; import com.ruoyi.check.DifferenceRecordFinish.domain.CheckDifferenceRecordFinish; +import com.ruoyi.check.difference.domain.CheckDifferenceRecord; /** * 盘点差异历史Mapper接口 - * + * * @author gw * @date 2025-06-25 */ -public interface CheckDifferenceRecordFinishMapper +public interface CheckDifferenceRecordFinishMapper { /** * 查询盘点差异历史 - * + * * @param checkGuid 盘点差异历史主键 * @return 盘点差异历史 */ - public CheckDifferenceRecordFinish selectCheckDifferenceRecordFinishByCheckGuid(String checkGuid); + public CheckDifferenceRecord selectCheckDifferenceRecordFinishByCheckGuid(String checkGuid); /** * 查询盘点差异历史列表 - * + * * @param checkDifferenceRecordFinish 盘点差异历史 * @return 盘点差异历史集合 */ - public List selectCheckDifferenceRecordFinishList(CheckDifferenceRecordFinish checkDifferenceRecordFinish); + public List selectCheckDifferenceRecordFinishList(CheckDifferenceRecordFinish checkDifferenceRecordFinish); /** * 新增盘点差异历史 - * + * * @param checkDifferenceRecordFinish 盘点差异历史 * @return 结果 */ @@ -37,7 +38,7 @@ public interface CheckDifferenceRecordFinishMapper /** * 修改盘点差异历史 - * + * * @param checkDifferenceRecordFinish 盘点差异历史 * @return 结果 */ @@ -45,7 +46,7 @@ public interface CheckDifferenceRecordFinishMapper /** * 删除盘点差异历史 - * + * * @param checkGuid 盘点差异历史主键 * @return 结果 */ @@ -53,7 +54,7 @@ public interface CheckDifferenceRecordFinishMapper /** * 批量删除盘点差异历史 - * + * * @param checkGuids 需要删除的数据主键集合 * @return 结果 */ diff --git a/ruoyi-admin/src/main/java/com/ruoyi/check/DifferenceRecordFinish/service/ICheckDifferenceRecordFinishService.java b/ruoyi-admin/src/main/java/com/ruoyi/check/DifferenceRecordFinish/service/ICheckDifferenceRecordFinishService.java index 90871a3..ca745c0 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/check/DifferenceRecordFinish/service/ICheckDifferenceRecordFinishService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/check/DifferenceRecordFinish/service/ICheckDifferenceRecordFinishService.java @@ -2,34 +2,35 @@ package com.ruoyi.check.DifferenceRecordFinish.service; import java.util.List; import com.ruoyi.check.DifferenceRecordFinish.domain.CheckDifferenceRecordFinish; +import com.ruoyi.check.difference.domain.CheckDifferenceRecord; /** * 盘点差异历史Service接口 - * + * * @author gw * @date 2025-06-25 */ -public interface ICheckDifferenceRecordFinishService +public interface ICheckDifferenceRecordFinishService { /** * 查询盘点差异历史 - * + * * @param checkGuid 盘点差异历史主键 * @return 盘点差异历史 */ - public CheckDifferenceRecordFinish selectCheckDifferenceRecordFinishByCheckGuid(String checkGuid); + public CheckDifferenceRecord selectCheckDifferenceRecordFinishByCheckGuid(String checkGuid); /** * 查询盘点差异历史列表 - * + * * @param checkDifferenceRecordFinish 盘点差异历史 * @return 盘点差异历史集合 */ - public List selectCheckDifferenceRecordFinishList(CheckDifferenceRecordFinish checkDifferenceRecordFinish); + public List selectCheckDifferenceRecordFinishList(CheckDifferenceRecordFinish checkDifferenceRecordFinish); /** * 新增盘点差异历史 - * + * * @param checkDifferenceRecordFinish 盘点差异历史 * @return 结果 */ @@ -37,7 +38,7 @@ public interface ICheckDifferenceRecordFinishService /** * 修改盘点差异历史 - * + * * @param checkDifferenceRecordFinish 盘点差异历史 * @return 结果 */ @@ -45,7 +46,7 @@ public interface ICheckDifferenceRecordFinishService /** * 批量删除盘点差异历史 - * + * * @param checkGuids 需要删除的盘点差异历史主键集合 * @return 结果 */ @@ -53,7 +54,7 @@ public interface ICheckDifferenceRecordFinishService /** * 删除盘点差异历史信息 - * + * * @param checkGuid 盘点差异历史主键 * @return 结果 */ diff --git a/ruoyi-admin/src/main/java/com/ruoyi/check/DifferenceRecordFinish/service/impl/CheckDifferenceRecordFinishServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/check/DifferenceRecordFinish/service/impl/CheckDifferenceRecordFinishServiceImpl.java index 3beb6c1..e9bbb33 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/check/DifferenceRecordFinish/service/impl/CheckDifferenceRecordFinishServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/check/DifferenceRecordFinish/service/impl/CheckDifferenceRecordFinishServiceImpl.java @@ -1,6 +1,8 @@ package com.ruoyi.check.DifferenceRecordFinish.service.impl; import java.util.List; + +import com.ruoyi.check.difference.domain.CheckDifferenceRecord; import com.ruoyi.common.utils.DateUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -10,43 +12,43 @@ import com.ruoyi.check.DifferenceRecordFinish.service.ICheckDifferenceRecordFini /** * 盘点差异历史Service业务层处理 - * + * * @author gw * @date 2025-06-25 */ @Service -public class CheckDifferenceRecordFinishServiceImpl implements ICheckDifferenceRecordFinishService +public class CheckDifferenceRecordFinishServiceImpl implements ICheckDifferenceRecordFinishService { @Autowired private CheckDifferenceRecordFinishMapper checkDifferenceRecordFinishMapper; /** * 查询盘点差异历史 - * + * * @param checkGuid 盘点差异历史主键 * @return 盘点差异历史 */ @Override - public CheckDifferenceRecordFinish selectCheckDifferenceRecordFinishByCheckGuid(String checkGuid) + public CheckDifferenceRecord selectCheckDifferenceRecordFinishByCheckGuid(String checkGuid) { return checkDifferenceRecordFinishMapper.selectCheckDifferenceRecordFinishByCheckGuid(checkGuid); } /** * 查询盘点差异历史列表 - * + * * @param checkDifferenceRecordFinish 盘点差异历史 * @return 盘点差异历史 */ @Override - public List selectCheckDifferenceRecordFinishList(CheckDifferenceRecordFinish checkDifferenceRecordFinish) + public List selectCheckDifferenceRecordFinishList(CheckDifferenceRecordFinish checkDifferenceRecordFinish) { return checkDifferenceRecordFinishMapper.selectCheckDifferenceRecordFinishList(checkDifferenceRecordFinish); } /** * 新增盘点差异历史 - * + * * @param checkDifferenceRecordFinish 盘点差异历史 * @return 结果 */ @@ -59,7 +61,7 @@ public class CheckDifferenceRecordFinishServiceImpl implements ICheckDifferenceR /** * 修改盘点差异历史 - * + * * @param checkDifferenceRecordFinish 盘点差异历史 * @return 结果 */ @@ -71,7 +73,7 @@ public class CheckDifferenceRecordFinishServiceImpl implements ICheckDifferenceR /** * 批量删除盘点差异历史 - * + * * @param checkGuids 需要删除的盘点差异历史主键 * @return 结果 */ @@ -83,7 +85,7 @@ public class CheckDifferenceRecordFinishServiceImpl implements ICheckDifferenceR /** * 删除盘点差异历史信息 - * + * * @param checkGuid 盘点差异历史主键 * @return 结果 */ diff --git a/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/service/impl/MydoJobServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/service/impl/MydoJobServiceImpl.java index a3f1925..37d893b 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/service/impl/MydoJobServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/service/impl/MydoJobServiceImpl.java @@ -12,6 +12,7 @@ import cn.hutool.core.collection.CollUtil; import cn.hutool.core.convert.Convert; import cn.hutool.core.date.DateTime; import cn.hutool.core.date.DateUtil; +import com.ruoyi.api.service.IToWcsService; import com.ruoyi.bas.basJobId.service.IBasJobIdService; import com.ruoyi.bas.cargoSpace.domain.BasCargoSpace; import com.ruoyi.bas.cargoSpace.service.IBasCargoSpaceService; @@ -78,6 +79,8 @@ public class MydoJobServiceImpl implements IMydoJobService { private PdaService pdaService; @Autowired private IBasWarehouseService basWarehouseService; + @Autowired + private IToWcsService iToWcsService; /** @@ -181,7 +184,7 @@ public class MydoJobServiceImpl implements IMydoJobService { //插入历史表 insertHistory(mydoJob.getJobId()); - return AjaxResult.success(); + } else { MydoJobDetail param = new MydoJobDetail(); param.setJobId(jobId); @@ -200,9 +203,14 @@ public class MydoJobServiceImpl implements IMydoJobService { updateMydoJob(mydoJob); //插入历史表 insertHistory(mydoJob.getJobId()); - return AjaxResult.success(); } - + //通知wcs + AjaxResult ajaxResult = iToWcsService.cancelTaskByTaskNo(job.getTaskNo()); + if (!ajaxResult.isSuccess()){ + return AjaxResult.success(); + }else { + throw new RuntimeException(Convert.toStr(ajaxResult.get("msg"))); + } } /** @@ -418,13 +426,13 @@ public class MydoJobServiceImpl implements IMydoJobService { MydoJob job = selectMydoJobByJobId(jobId); BasWarehouse basWarehouse = basWarehouseService.selectBasWarehouseByWarehouseId(job.getWarehouseId()); - if("1".equals(basWarehouse.getWarehouseType()) && Integer.parseInt(job.getStatus())<3){ + if("2".equals(basWarehouse.getWarehouseType()) && Integer.parseInt(job.getStatus())<3){ log.error("只能完成正执行的作业"); return AjaxResult.error(); } TrayCodeMakeSure trayCodeMakeSure = new TrayCodeMakeSure(); trayCodeMakeSure.setTrayCode(job.getTrayCode()); - pdaService.outMakeSure(trayCodeMakeSure); + pdaService.outMakeSure(trayCodeMakeSure); } return AjaxResult.success(); } @@ -470,14 +478,21 @@ public class MydoJobServiceImpl implements IMydoJobService { job.setFinishTime(DateUtil.formatDateTime(DateUtil.date())); updateMydoJob(job); insertHistory(jobId); + //通知wcs + AjaxResult ajaxResult = iToWcsService.cancelTaskByTaskNo(job.getTaskNo()); + if (!ajaxResult.isSuccess()){ + return AjaxResult.success(); + }else { + throw new RuntimeException(Convert.toStr(ajaxResult.get("msg"))); + } } - return AjaxResult.success(); } catch (Exception e) { TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); log.error("任务处理异常", e); return AjaxResult.error(); } + return AjaxResult.error(); } @Override diff --git a/ruoyi-admin/src/main/java/com/ruoyi/out/outStockout/service/impl/OutStockoutServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/out/outStockout/service/impl/OutStockoutServiceImpl.java index 2cfb765..e2a8d35 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/out/outStockout/service/impl/OutStockoutServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/out/outStockout/service/impl/OutStockoutServiceImpl.java @@ -182,7 +182,7 @@ public class OutStockoutServiceImpl implements IOutStockoutService } } } - if (stringBuilder.length()>0){ + if (!stringBuilder.isEmpty()){ return AjaxResult.warn(stringBuilder.toString()); } return AjaxResult.success(); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/pda/service/PdaServiceImp.java b/ruoyi-admin/src/main/java/com/ruoyi/pda/service/PdaServiceImp.java index 6a169c8..d98aa2a 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/pda/service/PdaServiceImp.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/pda/service/PdaServiceImp.java @@ -124,7 +124,7 @@ public class PdaServiceImp implements PdaService { if ("10".equals(result)) { return AjaxResult.success(map.get("v_resultmsg").toString()); } else { - return AjaxResult.error(map.get("v_resultmsg").toString()); + throw new RuntimeException(map.get("v_resultmsg").toString()); } } @@ -146,7 +146,7 @@ public class PdaServiceImp implements PdaService { if ("10".equals(result)) { return AjaxResult.success(map.get("v_resultmsg").toString()); } else { - return AjaxResult.error(map.get("v_resultmsg").toString()); + throw new RuntimeException(map.get("v_resultmsg").toString()); } } @@ -162,7 +162,7 @@ public class PdaServiceImp implements PdaService { if ("10".equals(result)) { return AjaxResult.success(map.get("v_resultmsg").toString()); } else { - return AjaxResult.warn(map.get("v_resultmsg").toString()); + throw new RuntimeException(map.get("v_resultmsg").toString()); } } @@ -177,7 +177,7 @@ public class PdaServiceImp implements PdaService { if ("10".equals(result)) { return AjaxResult.success(map.get("v_resultmsg").toString()); } else { - return AjaxResult.warn(map.get("v_resultmsg").toString()); + throw new RuntimeException(map.get("v_resultmsg").toString()); } } @@ -211,7 +211,7 @@ public class PdaServiceImp implements PdaService { if ("10".equals(result)) { return AjaxResult.success(map.get("v_resultmsg").toString()); } else { - return AjaxResult.warn(map.get("v_resultmsg").toString()); + throw new RuntimeException(map.get("v_resultmsg").toString()); } } @@ -227,7 +227,7 @@ public class PdaServiceImp implements PdaService { if ("10".equals(result)) { return AjaxResult.success(map.get("v_resultmsg").toString()); } else { - return AjaxResult.warn(map.get("v_resultmsg").toString()); + throw new RuntimeException(map.get("v_resultmsg").toString()); } } @@ -296,12 +296,17 @@ public class PdaServiceImp implements PdaService { //修改拣选数量 for (MydoJobDetail mydoJobDetail : mydoJobDetailList) { //修改拣选数量 - //MydoJobDetail mydoJobDetailOld = mydoJobDetailService.selectMydoJobDetailByJobDetailId(mydoJobDetail.getJobDetailId()); - /*BigDecimal oldPickQuantity = Convert.toBigDecimal(mydoJobDetailOld.getPickQuantity()); - BigDecimal newPickQuantity = Convert.toBigDecimal(mydoJobDetail.getOutQuantity());*/ mydoJobDetail.setPickQuantity(mydoJobDetail.getOutQuantity()); mydoJobDetailService.updateMydoJobDetail(mydoJobDetail); updateTagTaskStatus(mydoJobDetail,basWarehouse); + + //修改单据实际数量 + String inOrOutDId = mydoJobDetail.getInOrOutDId(); + OutStockoutDetail outStockoutDetail = outStockoutDetailService.selectOutStockoutDetailByStockoutDetailId(inOrOutDId); + outStockoutDetail.setAssignNum(outStockoutDetail.getAssignNum().add(Convert.toBigDecimal(mydoJobDetail.getPickQuantity()))); + outStockoutDetailService.updateOutStockoutDetail(outStockoutDetail); + //修改电子标签 + updateTagTaskStatus(mydoJobDetail, basWarehouse); } //判断拣选数量是否等于出库数量 MydoJobDetail mydoJobDetailParam = new MydoJobDetail(); @@ -316,10 +321,10 @@ public class PdaServiceImp implements PdaService { String result = map.get("v_result").toString(); if ("10".equals(result)) { //通知wcs 出库确认 - deleteTagTask(trayCodeMakeSure, basWarehouse); + deleteTagTask(trayCodeMakeSure, basWarehouse,mydoJob); return AjaxResult.success(map.get("v_resultmsg").toString()); } else { - return AjaxResult.warn(map.get("v_resultmsg").toString()); + throw new RuntimeException(map.get("v_resultmsg").toString()); } } else { return AjaxResult.success(); @@ -394,10 +399,10 @@ public class PdaServiceImp implements PdaService { pdaMapper.outMakeSure(map); String result = map.get("v_result").toString(); if ("10".equals(result)) { - deleteTagTask(trayCodeMakeSure, basWarehouse); + deleteTagTask(trayCodeMakeSure, basWarehouse,mydoJob); return AjaxResult.success(map.get("v_resultmsg").toString()); } else { - return AjaxResult.warn(map.get("v_resultmsg").toString()); + throw new RuntimeException(map.get("v_resultmsg").toString()); } } else { return AjaxResult.success(); @@ -443,10 +448,9 @@ public class PdaServiceImp implements PdaService { pdaMapper.checkMakeSure(map); String result = map.get("v_result").toString(); if ("10".equals(result)) { - deleteTagTask(trayCodeMakeSure, basWarehouse); return AjaxResult.success(map.get("v_resultmsg").toString()); } else { - return AjaxResult.warn(map.get("v_resultmsg").toString()); + throw new RuntimeException(map.get("v_resultmsg").toString()); } } return AjaxResult.success(); @@ -477,8 +481,8 @@ public class PdaServiceImp implements PdaService { * @param trayCodeMakeSure * @param basWarehouse */ - private void deleteTagTask(TrayCodeMakeSure trayCodeMakeSure, BasWarehouse basWarehouse) { - if ("2".equals(basWarehouse.getWarehouseType())) { + private void deleteTagTask(TrayCodeMakeSure trayCodeMakeSure, BasWarehouse basWarehouse,MydoJob mydoJob) { + if ("2".equals(basWarehouse.getWarehouseType())&&"23".equals(mydoJob.getInOrOut())) { BasTag basTag = basTagService.selectBasTagByTrayCode(trayCodeMakeSure.getTrayCode()); basTag.setTrayCode(""); basTagService.updateBasTag(basTag); @@ -491,17 +495,21 @@ public class PdaServiceImp implements PdaService { .map(TagTask::getId) .toArray(Long[]::new)); } - //通知wcs出库确认成功 - HashMap outMydojobMakeSureParam = new HashMap<>(); - outMydojobMakeSureParam.put("trayCode", trayCodeMakeSure.getTrayCode()); - AjaxResult ajaxResult = iToWcsService.outMydojobMakeSure(outMydojobMakeSureParam); - if (!ajaxResult.isSuccess()){ - throw new RuntimeException(ajaxResult.toString()); + if (mydoJob.getExitId().startsWith("fluent")){ + //通知wcs出库确认成功 + HashMap outMydojobMakeSureParam = new HashMap<>(); + outMydojobMakeSureParam.put("trayCode", trayCodeMakeSure.getTrayCode()); + AjaxResult ajaxResult = iToWcsService.outMydojobMakeSure(outMydojobMakeSureParam); + if (!ajaxResult.isSuccess()){ + throw new RuntimeException(ajaxResult.toString()); + } } + } } @Override + @Transactional(rollbackFor = Exception.class) public AjaxResult outException(TrayCodeMakeSure trayCodeMakeSure) { //判断任务是否存在 MydoJob mydoJobParam = new MydoJob(); @@ -559,7 +567,8 @@ public class PdaServiceImp implements PdaService { if ("10".equals(result)) { return AjaxResult.success(map.get("v_resultmsg").toString()); } else { - return AjaxResult.warn(map.get("v_resultmsg").toString()); + //return AjaxResult.warn(map.get("v_resultmsg").toString()); + throw new RuntimeException(map.get("v_resultmsg").toString()); } } @@ -574,7 +583,7 @@ public class PdaServiceImp implements PdaService { if ("10".equals(result)) { return AjaxResult.success(map.get("v_resultmsg").toString()); } else { - return AjaxResult.warn(map.get("v_resultmsg").toString()); + throw new RuntimeException(map.get("v_resultmsg").toString()); } } diff --git a/ruoyi-admin/src/main/resources/mapper/check/CheckDifferenceRecordFinishMapper.xml b/ruoyi-admin/src/main/resources/mapper/check/CheckDifferenceRecordFinishMapper.xml index 0761dce..5eb4ac6 100644 --- a/ruoyi-admin/src/main/resources/mapper/check/CheckDifferenceRecordFinishMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/check/CheckDifferenceRecordFinishMapper.xml @@ -3,49 +3,90 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - select check_guid, stock_id, tray_code, cargo_space_id, product_id, lot_no, supplier, customer, old_quantity, new_quantity, record_type, create_time, product_guid, check_stock_detail_id, status from check_difference_record_finish + select r.check_guid, + r.check_stock_detail_id, + r.stock_id, + r.tray_code, + r.cargo_space_id, + r.product_id, + r.lot_no, + r.supplier, + r.customer, + r.old_quantity, + r.new_quantity, + r.record_type, + r.create_time, + r.product_guid, + r.status, + r.warehouse_id, + w.warehouse_name, + bp.product_name, + bp.spare1 as englishDesc, + bp.spare2 as netWeight, + bp.spare5 as length, + bp.spare6 as width, + bp.spare7 as height, + bp.spare8 as volume, + bcs.cargo_space_name + from check_difference_record_finish r + left join bas_warehouse w on r.warehouse_id = w.warehouse_id + left join bas_product bp on r.product_id = bp.product_id + left join bas_cargo_space bcs on r.cargo_space_id = bcs.cargo_space_id - - - and stock_id = #{stockId} - and tray_code = #{trayCode} - and cargo_space_id = #{cargoSpaceId} - and product_id = #{productId} - and lot_no = #{lotNo} - and supplier = #{supplier} - and customer = #{customer} - and old_quantity = #{oldQuantity} - and new_quantity = #{newQuantity} - and record_type = #{recordType} - and product_guid = #{productGuid} - and check_stock_detail_id = #{checkStockDetailId} - and status = #{status} + + and r.stock_id = #{stockId} + and r.tray_code = #{trayCode} + and r.cargo_space_id = #{cargoSpaceId} + and r.product_id = #{productId} + and r.lot_no = #{lotNo} + and r.supplier = #{supplier} + and r.customer = #{customer} + and r.old_quantity = #{oldQuantity} + and r.new_quantity = #{newQuantity} + and r.record_type = #{recordType} + and r.product_guid = #{productGuid} + and r.check_stock_detail_id = #{checkStockDetailId} + and r.status = #{status} - - where check_guid = #{checkGuid} @@ -114,9 +155,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - delete from check_difference_record_finish where check_guid in + delete from check_difference_record_finish where check_guid in #{checkGuid} - \ No newline at end of file + diff --git a/ruoyi-ui/src/lang/zh.js b/ruoyi-ui/src/lang/zh.js index 7953aae..a265122 100644 --- a/ruoyi-ui/src/lang/zh.js +++ b/ruoyi-ui/src/lang/zh.js @@ -1,7 +1,7 @@ // import "core-js/fn/symbol"; // import { assign } from 'core-js/core/object' import 'core-js/features/symbol' -import { status } from 'nprogress' +import {status} from 'nprogress' // import { Dialog } from 'element-ui' export default { @@ -87,7 +87,7 @@ export default { password: '密码', code: '验证码', rememberMe: '记住密码', - bottom:'Copyright © 2025 ForTucky All Rights Reserved.400-1882-319', + bottom: 'Copyright © 2025 ForTucky All Rights Reserved.400-1882-319', accountLogin: '账户登录' }, tagsView: { @@ -170,8 +170,8 @@ export default { inputSupplierNo: '请输入供应商编码', stockSource: '单据来源', inputStockSource: '请输入单据来源', - inputMaterialDesc:'请输入物料描述', - inputLotNo:'请输入批号', + inputMaterialDesc: '请输入物料描述', + inputLotNo: '请输入批号', warehouseId: '仓库', selectWarehouseId: '请选择仓库', status: '单据状态', @@ -201,13 +201,13 @@ export default { totalPrice: '总价格', totalNetWeight: '总净重', grossWeight: '毛重', - deleteInfo1:'是否确认删除收货单据编号为"', - deleteInfo2:'"的数据项？', - deleteSuccess:'删除成功', - selectInspection:'请选择需要质检的记录', - selectNoInspection:'未找到需要质检的记录', - inspectionSuccess:'质检成功', - inspectionFail:'质检失败：', + deleteInfo1: '是否确认删除收货单据编号为"', + deleteInfo2: '"的数据项？', + deleteSuccess: '删除成功', + selectInspection: '请选择需要质检的记录', + selectNoInspection: '未找到需要质检的记录', + inspectionSuccess: '质检成功', + inspectionFail: '质检失败：', }, // ***************入库单据管理************* inStockin: { @@ -219,16 +219,16 @@ export default { finishDate: '完成日期', scanNum: '扫码数量', assignNum: '实际数量', - invalidateSuccess:'作废成功', - alreadyReviewed:'单据已审核，请勿重复审核', - onlyUnreviewedCanInvalidate:'只有未审核的单据可以作废', - reviewSuccess:'审核成功', - confirmSuccess:'确认成功', - onlyUnconfirmedCanConfirm:'单据未执行完成', - printSuccess:'打印成功', - selectPrintData:'请选择要打印的数据', - printFail:'打印控件未安装或启动失败', - printFail1:'打印失败', + invalidateSuccess: '作废成功', + alreadyReviewed: '单据已审核，请勿重复审核', + onlyUnreviewedCanInvalidate: '只有未审核的单据可以作废', + reviewSuccess: '审核成功', + confirmSuccess: '确认成功', + onlyUnconfirmedCanConfirm: '单据未执行完成', + printSuccess: '打印成功', + selectPrintData: '请选择要打印的数据', + printFail: '打印控件未安装或启动失败', + printFail1: '打印失败', }, // ***************入库作业管理************* inJob: { @@ -291,10 +291,10 @@ export default { englishDesc: '英文描述', cartonNo: '箱号', packingMethod: '包装方式', - createTime:"创建时间", - selectPrintData:"请选择要操作的数据", - selectOnePrintData:"请选择一条任务", - operaSuccess:"操作成功", + createTime: "创建时间", + selectPrintData: "请选择要操作的数据", + selectOnePrintData: "请选择一条任务", + operaSuccess: "操作成功", }, // ***************新建出库单据************** addOutStockout: { @@ -333,13 +333,13 @@ export default { status: '单据状态', customerNo: '客户编码', customerName: '客户名称', - productName:'物资名称', + productName: '物资名称', createManId: '建单人', createDate: '创建时间', startDate: '开始时间', finishDate: '确认时间', warehouseId: '仓库编号', - warehouseName:'仓库名称', + warehouseName: '仓库名称', stockoutDetailId: '出库子单编号', productId: '物资编码', materialDesc: '物料描述', @@ -368,21 +368,21 @@ export default { selectOutType: '请选择出库类型', selectStatus: '请选择单据状态', inputCustomerNo: '请输入客户编码', - inputCustomerName:'请输入客户名称', - inputProductName:'请输入物资名称', + inputCustomerName: '请输入客户名称', + inputProductName: '请输入物资名称', selectStartDate: '请选择创建开始时间', selectFinishDate: '请选择创建结束时间', - auditTitle:'单据审核', - selectExit:'出口', - pleaseSelectExit:'请选择出口', - pleaseSelectData:'请选择至少一条数据', - alreadyAudited:'单据已审核，请勿重复审核', - alreadyCancelFail:'单据已审核，无法作废', - onlyOneCanAutoAllocation:'请选择一条数据', - auditStockOut:'"请选择审核状态为审核通过单据"', - alreadyAuditStockOut:'"单据已审核"', - confirmExit:'提交', - cancelExit:'取消', + auditTitle: '单据审核', + selectExit: '出口', + pleaseSelectExit: '请选择出口', + pleaseSelectData: '请选择至少一条数据', + alreadyAudited: '单据已审核，请勿重复审核', + alreadyCancelFail: '单据已审核，无法作废', + onlyOneCanAutoAllocation: '请选择一条数据', + auditStockOut: '请选择审核状态为审核通过单据', + alreadyAuditStockOut: '"单据已审核"', + confirmExit: '提交', + cancelExit: '取消', }, productAndStock: { @@ -425,7 +425,7 @@ export default { selectStartTime: '请选择开始时间', finishTime: '结束时间', selectFinishTime: '请选择结束时间', - createTime:'创建时间', + createTime: '创建时间', // 位置信息 warehouse: '仓库', @@ -437,7 +437,7 @@ export default { // 物料信息 materialCode: '物料编码', - materialDesc:'物料名称', + materialDesc: '物料名称', stockId: '库存ID', lotNo: '批次号', outQuantity: '出库数量', @@ -484,13 +484,13 @@ export default { materialExistWarning: '所选物资已存在，请重新选择', quantityExceedError: '数量不能大于库存数量', saveSuccess: '单据{msg}保存成功', - lotNo:'批次号', + lotNo: '批次号', cargoSpaceName: '货位名称', trayCode: '托盘码', inputTrayCode: '请输入托盘码', inputCargoSpaceName: '请输入货位名称', - selectTrayCode:"选择托盘", - trayDetail:"物资详情", + selectTrayCode: "选择托盘", + trayDetail: "物资详情", close: '关闭', }, //***************盘点单据管理*************** @@ -539,14 +539,14 @@ export default { confirmSuccess: '确认成功', onlyReviewedCanConfirm: '只有已审核的单据可以确认', cargoSpaceName: '货位名称', - autoAllocation:'自动分配', - autoAllocationSuccess:"自动分配成功", - checkPort:'盘点出口', + autoAllocation: '自动分配', + autoAllocationSuccess: "自动分配成功", + checkPort: '盘点出口', departmentName: '部门名称', - auditTitle:'审核单据', - selectExit:'选择出口', - pleaseSelectExit:'请选择出口', - defaultExit:'人工出口' + auditTitle: '审核单据', + selectExit: '选择出口', + pleaseSelectExit: '请选择出口', + defaultExit: '人工出口' }, // ***************盘点入库作业************* checkJobIn: { @@ -611,17 +611,17 @@ export default { statusRequired: '任务状态不能为空', taskNoRequired: '任务号不能为空', selectData: '请选择要操作的数据', - materialDesc:"物料描述", - englishDesc:"英文描述", - cartonNo:"箱号", - packingMethod:"包装方式", - netWeight:"净重", - totalNetWeight:"总净重", - grossWeight:"毛重", - onlyOneCanAutoAllocation:"请选择一条分配单据", - selectDataRequired:'请选择要操作的数据', - selectOneDataRequired:'请选择一条任务', - operaSuccess:'操作成功', + materialDesc: "物料描述", + englishDesc: "英文描述", + cartonNo: "箱号", + packingMethod: "包装方式", + netWeight: "净重", + totalNetWeight: "总净重", + grossWeight: "毛重", + onlyOneCanAutoAllocation: "请选择一条分配单据", + selectDataRequired: '请选择要操作的数据', + selectOneDataRequired: '请选择一条任务', + operaSuccess: '操作成功', }, // **************盘点出库作业**************** checkJobOut: { @@ -681,14 +681,14 @@ export default { finishSuccess: '手动完成成功', confirmInvalid: '是否确认手动作废编号为"{jobIds}"的数据项?', invalidSuccess: '手动作废成功', - materialDesc:"物料描述", - englishDesc:"英文描述", - cartonNo:"箱号", - packingMethod:"包装方式", - netWeight:"净重", - totalNetWeight:"总净重", - grossWeight:"毛重", - onlyOneCanAutoAllocation:"请选择一条分配单据", + materialDesc: "物料描述", + englishDesc: "英文描述", + cartonNo: "箱号", + packingMethod: "包装方式", + netWeight: "净重", + totalNetWeight: "总净重", + grossWeight: "毛重", + onlyOneCanAutoAllocation: "请选择一条分配单据", outQuantity: '出库数量', pickQuantity: '拣货数量', department: '部门', @@ -697,12 +697,12 @@ export default { }, // ****************盘点差异管理***************** checkDifference: { - warehouseId:'仓库', - unaudited:'未审核', - audited:'已审核', - inputStatus:'请选择审核状态', - status:'审核状态', - audit:'审核', + warehouseId: '仓库', + unaudited: '未审核', + audited: '已审核', + inputStatus: '请选择审核状态', + status: '审核状态', + audit: '审核', createTime: '创建时间', checkGuid: '盘点id', checkStockDetailId: '盘点单据id', @@ -735,11 +735,12 @@ export default { inputOldQuantity: '请输入原值', inputNewQuantity: '请输入新值', inputProductGuid: '请输入物料guid', - inputRecordType:'请选择操作方式', - confirmNotPass:'是否确认不通过盘点差异编号为', - confirmNPass:'是否确认通过盘点差异编号为', - deleteSuccess:'审核不通过成功', - auditSuccess:'审核成功', + inputRecordType: '请选择操作方式', + confirmNotPass: '是否确认不通过盘点差异编号为', + confirmNPass: '是否确认通过盘点差异编号为', + deleteSuccess: '审核不通过成功', + auditSuccess: '审核成功', + confirmPass: '是否确认通过盘点差异编号为' }, // ********************库存信息************* stockManagement: { @@ -770,12 +771,12 @@ export default { export: '导出', confirm: '确定', selectExitTitle: '选择出口', - selectExit:'选择出口', - pleaseSelectExit:'请选择出口', - confirmExit:'确认', - cancelExit:'取消', - selectAtLeastOneRow:'请至少选择一条数据', - manualExit:'人工出口', + selectExit: '选择出口', + pleaseSelectExit: '请选择出口', + confirmExit: '确认', + cancelExit: '取消', + selectAtLeastOneRow: '请至少选择一条数据', + manualExit: '人工出口', cancel: '取消', search: '搜索', reset: '重置', @@ -803,26 +804,25 @@ export default { editSuccess: '修改成功', deleteSuccess: '删除成功', confirmDelete: '是否确认删除库存信息编号为"{stockIds}"的数据项？', - materialDesc:'物料描述', - inputMaterialDesc:'请选择物料', - materialInDesc:'物料描述', - englishDesc:'英文描述', - netWeight:'净重', - length:'长', - width:'宽', - height:'高', - volume:'体积', - productId:'物料编码', + materialDesc: '物料描述', + inputMaterialDesc: '请选择物料', + materialInDesc: '物料描述', + englishDesc: '英文描述', + netWeight: '净重', + length: '长', + width: '宽', + height: '高', + volume: '体积', + productId: '物料编码', cargoSpaceStatus: '锁定状态', cargoSpaceStockStatus: '货位状态', - deleteConfirm:"删除库存", - designatedStorageLocationForOutboundShipment:"指定货位出库", - confirmPointOut:'确认出库' + deleteConfirm: "删除库存", + designatedStorageLocationForOutboundShipment: "指定货位出库", + confirmPointOut: '确认出库' }, - searchViewStockSecure: { stockId: '库存ID', cargoSpaceId: '货位ID', @@ -862,11 +862,11 @@ export default { editSuccess: '修改成功', deleteSuccess: '删除成功', deleteConfirm: '是否确认删除安全库存查询编号为"{stockIds}"的数据项？', - search:'搜索', - reset:'重置', - export:'导出' + search: '搜索', + reset: '重置', + export: '导出' }, - // *************供应商管理*************** + // *************供应商管理*************** BasSupplier: { // 字段 supplierNo: '供应商编号', @@ -1100,7 +1100,7 @@ export default { deleteSuccess: '删除成功', confirmDelete: '您确定要删除ID为' + '{whGuids}' + '的操作记录吗？', fileName: '记录{time}', - createTime: '创建时间', + createTime: '创建时间', }, // **************库存冻结记录************** stockFreeze: { @@ -1161,10 +1161,10 @@ export default { editSuccess: '修改成功', deleteSuccess: '删除成功', deleteConfirm: '是否确认删除所选库存冻结记录？', - createTime: '创建时间', - oldStatus: '原状态', - currStatus: '新状态', - cargoSpaceName: '货位名称', + createTime: '创建时间', + oldStatus: '原状态', + currStatus: '新状态', + cargoSpaceName: '货位名称', }, menu: { @@ -1194,56 +1194,56 @@ export default { //********************KPI分析******************** KPIAnalysis: 'KPI分析', - // 入库分析 - KPIAnalysis_StockIn: '入库分析', - // 出库分析 - KPIAnalysis_StockOut: '出库分析', - // 巷道分布 - KPIAnalysis_Roadway: '巷道分布', - // 货位分析 - KPIAnalysis_CargoSpace: '货位分析', - // 库存平面图 - KPIAnalysis_CargoPlan: '库存平面图', + // 入库分析 + KPIAnalysis_StockIn: '入库分析', + // 出库分析 + KPIAnalysis_StockOut: '出库分析', + // 巷道分布 + KPIAnalysis_Roadway: '巷道分布', + // 货位分析 + KPIAnalysis_CargoSpace: '货位分析', + // 库存平面图 + KPIAnalysis_CargoPlan: '库存平面图', //********************系统监控******************** SystemMonitor: '系统监控', - // 在线用户 - SystemMonitor_Online: '在线用户', - // 定时任务 - SystemMonitor_ScheduledTask: '定时任务', - // 数据监控 - SystemMonitor_DataMonitor: '数据监控', - // 服务监控 - SystemMonitor_ServiceMonitor: '服务监控', - // 缓存监控 - SystemMonitor_CacheMonitor: '缓存监控', - // 缓存列表 - SystemMonitor_CacheList: '缓存列表', + // 在线用户 + SystemMonitor_Online: '在线用户', + // 定时任务 + SystemMonitor_ScheduledTask: '定时任务', + // 数据监控 + SystemMonitor_DataMonitor: '数据监控', + // 服务监控 + SystemMonitor_ServiceMonitor: '服务监控', + // 缓存监控 + SystemMonitor_CacheMonitor: '缓存监控', + // 缓存列表 + SystemMonitor_CacheList: '缓存列表', //********************系统管理******************** - SystemManagement: '系统管理', - //用户管理 - UserManagement: '用户管理', - //角色管理 - RoleManagement: '角色管理', - //菜单管理 - MenuManagement: '菜单管理', - //部门管理 - DepartmentManagement: '部门管理', - //岗位管理 - PostManagement: '岗位管理', - //字典管理 - DictionaryManagement: '字典管理', - //参数管理 - ConfigManagement: '参数管理', - //通知公告 - NoticeManagement: '通知公告', - //日志管理 - LogManagement: '日志管理', - //操作日志 - LogManagement_OperationLog: '操作日志', - //登录日志 - LogManagement_LoginLog: '操作日志', + SystemManagement: '系统管理', + //用户管理 + UserManagement: '用户管理', + //角色管理 + RoleManagement: '角色管理', + //菜单管理 + MenuManagement: '菜单管理', + //部门管理 + DepartmentManagement: '部门管理', + //岗位管理 + PostManagement: '岗位管理', + //字典管理 + DictionaryManagement: '字典管理', + //参数管理 + ConfigManagement: '参数管理', + //通知公告 + NoticeManagement: '通知公告', + //日志管理 + LogManagement: '日志管理', + //操作日志 + LogManagement_OperationLog: '操作日志', + //登录日志 + LogManagement_LoginLog: '操作日志', // ****************盘点管理****************** @@ -1259,362 +1259,362 @@ export default { stockOperationRecords: '库存操作记录', stockFreezeRecord: '库存冻结记录', // ***************基础信息**************** - basicInformation:'基础信息', - customerManagement:'客户管理', - supplierManagement:'供应商管理', - materialManagement:'物料管理', - basicPointLocation:'基础点位', - basstandPosition:'台位配送', + basicInformation: '基础信息', + customerManagement: '客户管理', + supplierManagement: '供应商管理', + materialManagement: '物料管理', + basicPointLocation: '基础点位', + basstandPosition: '台位配送', //*************** 查询统计************* - queryStatistics:'查询统计', - inventoryDetailQuery:'库存明细查询', - inventorySummaryQuery:'库存汇总查询', - inboundDocumentHistory:'入库单据历史', - outboundDocumentHistory:'出库单据历史', - inboundTaskFlow:'入库作业流水', - outboundTaskFlow:'出库作业流水', - flatInventoryFlow:'平库入库流水', - flatOutboundFlow:'平库出库流水', - safetyStockInquiry:'安全库存查询', - warningInventoryInquiry:'库存预警报表', + queryStatistics: '查询统计', + inventoryDetailQuery: '库存明细查询', + inventorySummaryQuery: '库存汇总查询', + inboundDocumentHistory: '入库单据历史', + outboundDocumentHistory: '出库单据历史', + inboundTaskFlow: '入库作业流水', + outboundTaskFlow: '出库作业流水', + flatInventoryFlow: '平库入库流水', + flatOutboundFlow: '平库出库流水', + safetyStockInquiry: '安全库存查询', + warningInventoryInquiry: '库存预警报表', userManagement: { -userQuery: ' 用户查询 ', -userAdd: ' 用户新增 ', -userModify: ' 用户修改 ', -userDelete: ' 用户删除 ', -userExport: ' 用户导出 ', -userImport: ' 用户导入 ', -resetPassword: ' 重置密码 ' -}, -roleManagement: { -roleQuery: ' 角色查询 ', -roleAdd: ' 角色新增 ', -roleModify: ' 角色修改 ', -roleDelete: ' 角色删除 ', -roleExport: ' 角色导出 ' -}, -menuManagement: { -menuQuery: ' 菜单查询 ', -menuAdd: ' 菜单新增 ', -menuModify: ' 菜单修改 ', -menuDelete: ' 菜单删除 ' -}, -departmentManagement: { -departmentQuery: ' 部门查询 ', -departmentAdd: ' 部门新增 ', -departmentModify: ' 部门修改 ', -departmentDelete: ' 部门删除 ' -}, -positionManagement: { -positionQuery: ' 岗位查询 ', -positionAdd: ' 岗位新增 ', -positionModify: ' 岗位修改 ', -positionDelete: ' 岗位删除 ', -positionExport: ' 岗位导出 ' -}, -dictionaryManagement: { -dictionaryQuery: ' 字典查询 ', -dictionaryAdd: ' 字典新增 ', -dictionaryModify: ' 字典修改 ', -dictionaryDelete: ' 字典删除 ', -dictionaryExport: ' 字典导出 ' -}, -parameterManagement: { -parameterQuery: ' 参数查询 ', -parameterAdd: ' 参数新增 ', -parameterModify: ' 参数修改 ', -parameterDelete: ' 参数删除 ', -parameterExport: ' 参数导出 ' -}, -announcementManagement: { -announcementQuery: ' 公告查询 ', -announcementAdd: ' 公告新增 ', -announcementModify: ' 公告修改 ', -announcementDelete: ' 公告删除 ' -}, -operationLogManagement: { -operationQuery: ' 操作查询 ', -operationDelete: ' 操作删除 ', -logExport: ' 日志导出 ' -}, -loginLogManagement: { -loginQuery: ' 登录查询 ', -loginDelete: ' 登录删除 ', -logExport: ' 日志导出 ', -accountUnlock: ' 账户解锁 ' -}, -onlineUserManagement: { -onlineQuery: ' 在线查询 ', -batchForceLogout: ' 批量强退 ', -singleForceLogout: ' 单条强退 ' -}, -taskManagement: { -taskQuery: ' 任务查询 ', -taskAdd: ' 任务新增 ', -taskModify: ' 任务修改 ', -taskDelete: ' 任务删除 ', -statusModify: ' 状态修改 ', -taskExport: ' 任务导出 ' -}, -codeGenerationManagement: { -generationQuery: ' 生成查询 ', -generationModify: ' 生成修改 ', -generationDelete: ' 生成删除 ', -importCode: ' 导入代码 ', -previewCode: ' 预览代码 ', -generateCode: ' 生成代码 ' -}, -outboundMainOrderManagement: { -outboundMainOrderQuery: ' 出库主单查询 ', -outboundMainOrderAdd: ' 出库主单新增 ', -outboundMainOrderModify: ' 出库主单修改 ', -outboundMainOrderDelete: ' 出库主单删除 ', -outboundMainOrderExport: ' 出库主单导出 ', -documentStatusModify: ' 单据状态修改 ', -autoAllocate: ' 自动分配 ', -manualAllocate: ' 手动分配 ' -}, -customerManagementInfo: { -customerQuery: ' 客户管理查询 ', -customerAdd: ' 客户管理新增 ', -customerModify: ' 客户管理修改 ', -customerDelete: ' 客户管理删除 ', -customerExport: ' 客户管理导出 ' -}, -inboundDocumentManagement: { -inboundDocumentQuery: ' 入库单据查询 ', -inboundDocumentAdd: ' 入库单据新增 ', -inboundDocumentStatusModify: ' 入库单据状态修改 ', -inboundDocumentDelete: ' 入库单据删除 ', -inboundDocumentExport: ' 入库单据导出 ' -}, -outboundSubOrderManagement: { -outboundSubOrderQuery: ' 出库子单查询 ', -outboundSubOrderAdd: ' 出库子单新增 ', -outboundSubOrderModify: ' 出库子单修改 ', -outboundSubOrderDelete: ' 出库子单删除 ', -outboundSubOrderExport: ' 出库子单导出 ' -}, -supplierManagementInfo: { -supplierQuery: ' 供应商管理查询 ', -supplierAdd: ' 供应商管理新增 ', -supplierModify: ' 供应商管理修改 ', -supplierDelete: ' 供应商管理删除 ', -supplierExport: ' 供应商管理导出 ' -}, -receivingDocumentManagement: { -receivingDocumentQuery: ' 收货单据查询 ', -receivingDocumentAdd: ' 收货单据新增 ', -receivingDocumentModify: ' 收货单据修改 ', -receivingDocumentDelete: ' 收货单据删除 ', -receivingDocumentExport: ' 收货单据导出 ', -deleteReceivingSubDocument: ' 删除收货子单据 ', -addInboundDocument: ' 新增入库单据 ', -qualityInspectionButton: ' 质检按钮 ' -}, -materialManagementInfo: { -materialQuery: ' 物料管理查询 ', -materialAdd: ' 物料管理新增 ', -materialModify: ' 物料管理修改 ', -materialDelete: ' 物料管理删除 ', -materialExport: ' 物料管理导出 ' -}, -selfBuiltReceivingDocument: { -selfBuiltReceivingDocument: ' 自建收货单据 ', -importMaterial: ' 导入物料 ' -}, -warehouseAreaManagement: { -warehouseAreaQuery: ' 库区管理查询 ', -warehouseAreaAdd: ' 库区管理新增 ', -warehouseAreaModify: ' 库区管理更改 ', -warehouseAreaDelete: ' 库区管理移除 ', -warehouseAreaExport: ' 库区管理导出 ' -}, -locationManagement: { -locationQuery: ' 货位管理查询 ', -locationAdd: ' 货位管理新增 ', -locationModify: ' 货位管理更改 ', -locationDelete: ' 货位管理移除 ', -locationExport: ' 货位管理导出 ' -}, -stockGoodsAvailableForOutbound: { -availableStockGoods: ' 可出库的库存物资信息 ', -saveDocument: ' 保存单据 ' -}, -availableStockGoodsQuery: { -availableStockGoodsQuery: ' 可出库的库存物资信息查询 ', -availableStockGoodsExport: ' 可出库的库存物资信息导出 ' -}, -taskTableManagement: { -taskTableQuery: ' 任务表查询 ', -taskTableAdd: ' 任务表新增 ', -taskTableModify: ' 任务表修改 ', -taskTableDelete: ' 任务表删除 ', -taskTableExport: ' 任务表导出 ', -manualAbandon: ' 手动作废 ', -manualComplete: ' 手动完成 ' -}, -inventoryInformationManagement: { -inventoryQuery: ' 库存信息查询 ', -inventoryAdd: ' 库存信息新增 ', -inventoryModify: ' 库存信息修改 ', -inventoryDelete: ' 库存信息删除 ', -inventoryExport: ' 库存信息导出 ' -}, -inventoryOperationRecordManagement: { -inventoryOperationRecordQuery: ' 库存操作记录查询 ', -inventoryOperationRecordAdd: ' 库存操作记录新增 ', -inventoryOperationRecordModify: ' 库存操作记录修改 ', -inventoryOperationRecordDelete: ' 库存操作记录删除 ', -inventoryOperationRecordExport: ' 库存操作记录导出 ' -}, -inventoryFreezeRecordManagement: { -inventoryFreezeRecordQuery: ' 库存冻结记录查询 ', -inventoryFreezeRecordAdd: ' 库存冻结记录新增 ', -inventoryFreezeRecordModify: ' 库存冻结记录修改 ', -inventoryFreezeRecordDelete: ' 库存冻结记录删除 ', -inventoryFreezeRecordExport: ' 库存冻结记录导出 ' -}, -inboundDocumentHistoryInfo: { -inboundDocumentHistoryQuery: ' 入库单据历史查询 ', -inboundDocumentHistoryExport: ' 入库单据历史导出 ' -}, -inventoryDetailQueryInfo: { -inventoryDetailQuery: ' 库存明细查询查询 ', -inventoryDetailExport: ' 库存明细查询导出 ' -}, -inventorySummaryQueryInfo: { -inventorySummaryQuery: ' 库存汇总查询查询 ', -inventorySummaryExport: ' 库存汇总查询导出 ' -}, -outboundDocumentHistoryInfo: { -outboundDocumentHistoryQuery: ' 出库单据历史查询 ', -outboundDocumentHistoryExport: ' 出库单据历史导出 ' -}, -inventoryCheckDifference: { -inventoryCheckDifferenceQuery: ' 盘点差异查询 ', -inventoryCheckDifferenceAdd: ' 盘点差异新增 ', -inventoryCheckDifferenceModify: ' 盘点差异修改 ', -inventoryCheckDifferenceDelete: ' 盘点差异删除 ', -inventoryCheckDifferenceExport: ' 盘点差异导出 ', -approvalButton: ' 审核按钮 ', -approvalReject: ' 审核不通过 ' -}, -inboundOperationFlow: { -inboundOperationFlowQuery: ' 入库作业流水查询 ', -inboundOperationFlowExport: ' 入库作业流水导出 ' -}, -outboundOperationFlow: { -outboundOperationFlowQuery: ' 出库作业流水查询 ', -outboundOperationFlowExport: ' 出库作业流水导出 ' -}, -inventoryCheckDocument: { -inventoryCheckDocumentQuery: ' 盘库单据主信息查询 ', -inventoryCheckDocumentAdd: ' 盘库单据主信息新增 ', -inventoryCheckDocumentModify: ' 盘库单据主信息修改 ', -inventoryCheckDocumentDelete: ' 盘库单据主信息删除 ', -inventoryCheckDocumentExport: ' 盘库单据主信息导出 ', -autoAllocate: ' 自动分配 ' -}, -flatWarehouseInboundFlow: { -flatWarehouseInboundFlowQuery: ' 平库入库流水查询 ', -flatWarehouseInboundFlowExport: ' 平库入库流水导出 ' -}, -flatWarehouseOutboundFlow: { -flatWarehouseOutboundFlowQuery: ' 平库出库流水查询 ', -flatWarehouseOutboundFlowExport: ' 平库出库流水导出 ' -}, -basicPointManagement: { -basicPointQuery: ' 基础点位查询 ', -basicPointAdd: ' 基础点位新增 ', -basicPointModify: ' 基础点位修改 ', -basicPointDelete: ' 基础点位删除 ', -basicPointExport: ' 基础点位导出 ', -bindMaterial: ' 绑定物料 ', -bindMaterialButton: ' 绑定物料按钮 ', -unbindMaterial: ' 解绑物料 ' -}, -safetyStockQuery: { -safetyStockQuery: ' 安全库存查询查询 ', -safetyStockExport: ' 安全库存查询导出 ' -}, -warningStockQuery: { -warningStockQuery: ' 预警库存查询查询 ', -warningStockExport: ' 预警库存查询导出 ' -}, -taskCompletionManagement: { -manualComplete: ' 手动完成 ', -manualAbandon: ' 手动作废 ' -}, -documentOperation: { -saveDocument: ' 保存单据 ', -selectMaterial: ' 选择物资 ' -}, -taskStatusManagement: { -manualAbandon: ' 手动作废 ', -manualComplete: ' 手动完成 ' -}, -warehouseInOutManagement: { -warehouseInOutQuery: ' 仓库出入管理查询 ', -warehouseInOutAdd: ' 仓库出入管理新增 ', -warehouseInOutModify: ' 仓库出入管理修改 ', -warehouseInOutDelete: ' 仓库出入管理删除 ', -warehouseInOutExport: ' 仓库出入管理导出 ' -}, -containerManagement: { -addContainer: ' 新增容器 ', -editContainer: ' 编辑容器 ', -findContainer: ' 查找容器 ', -removeContainer: ' 移除容器 ' -}, -palletAndMaterialManagement: { -queryBoundPalletMaterials: ' 查询绑盘物料 ', -bindMaterialButton: ' 绑定物料按钮 ', -queryDocumentMaterials: ' 查询单据物料 ', -queryEmptyPalletInventory: ' 查询空托盘库存 ', -unbindMaterial: ' 解绑物料 ', -queryPendingTasks: ' 查询待执行任务 ', -inventoryCheckConfirm: ' 盘点确认 ', -outboundConfirm: ' 出库确认 ', -queryFlatWarehouseInboundOrders: ' 查询平库入库单 ', -queryFlatWarehouseOutboundOrders: ' 查询平库出库单 ', -qualityInspection: ' 质检 ', -queryOutboundConfirmationIntermediateTable: ' 查询出库确认中间表 ', -queryShelfDetailTable: ' 查询料架明细表 ' -}, -outboundAbnormalityManagement: { -outboundAbnormalityQuery: ' 出库异常查询 ', -outboundAbnormalityAdd: ' 出库异常新增 ', -outboundAbnormalityModify: ' 出库异常修改 ', -outboundAbnormalityDelete: ' 出库异常删除 ', -outboundAbnormalityExport: ' 出库异常导出 ' -}, -interfaceRecordManagement: { -interfaceRecordQuery: ' 接口记录查询 ', -interfaceRecordAdd: ' 接口记录新增 ', -interfaceRecordModify: ' 接口记录修改 ', -interfaceRecordDelete: ' 接口记录删除 ', -interfaceRecordExport: ' 接口记录导出 ' -}, -designatedOutbound: { -designatedOutbound: ' 指定出库 ' -}, -barcodeGenerationRuleManagement: { -barcodeGenerationRuleQuery: ' 条码生成规则查询 ', -barcodeGenerationRuleAdd: ' 条码生成规则新增 ', -barcodeGenerationRuleModify: ' 条码生成规则修改 ', -barcodeGenerationRuleDelete: ' 条码生成规则删除 ', -barcodeGenerationRuleExport: ' 条码生成规则导出 ', -generatePrintData: ' 生成打印数据 ' -}, -barcodeInformationManagement: { -barcodeInformationQuery: ' 条码信息查询 ', -barcodeInformationAdd: ' 条码信息新增 ', -barcodeInformationModify: ' 条码信息修改 ', -barcodeInformationDelete: ' 条码信息删除 ', -barcodeInformationExport: ' 条码信息导出 ', -barcodeInformationPrint: ' 条码信息打印 ' -} + userQuery: ' 用户查询 ', + userAdd: ' 用户新增 ', + userModify: ' 用户修改 ', + userDelete: ' 用户删除 ', + userExport: ' 用户导出 ', + userImport: ' 用户导入 ', + resetPassword: ' 重置密码 ' + }, + roleManagement: { + roleQuery: ' 角色查询 ', + roleAdd: ' 角色新增 ', + roleModify: ' 角色修改 ', + roleDelete: ' 角色删除 ', + roleExport: ' 角色导出 ' + }, + menuManagement: { + menuQuery: ' 菜单查询 ', + menuAdd: ' 菜单新增 ', + menuModify: ' 菜单修改 ', + menuDelete: ' 菜单删除 ' + }, + departmentManagement: { + departmentQuery: ' 部门查询 ', + departmentAdd: ' 部门新增 ', + departmentModify: ' 部门修改 ', + departmentDelete: ' 部门删除 ' + }, + positionManagement: { + positionQuery: ' 岗位查询 ', + positionAdd: ' 岗位新增 ', + positionModify: ' 岗位修改 ', + positionDelete: ' 岗位删除 ', + positionExport: ' 岗位导出 ' + }, + dictionaryManagement: { + dictionaryQuery: ' 字典查询 ', + dictionaryAdd: ' 字典新增 ', + dictionaryModify: ' 字典修改 ', + dictionaryDelete: ' 字典删除 ', + dictionaryExport: ' 字典导出 ' + }, + parameterManagement: { + parameterQuery: ' 参数查询 ', + parameterAdd: ' 参数新增 ', + parameterModify: ' 参数修改 ', + parameterDelete: ' 参数删除 ', + parameterExport: ' 参数导出 ' + }, + announcementManagement: { + announcementQuery: ' 公告查询 ', + announcementAdd: ' 公告新增 ', + announcementModify: ' 公告修改 ', + announcementDelete: ' 公告删除 ' + }, + operationLogManagement: { + operationQuery: ' 操作查询 ', + operationDelete: ' 操作删除 ', + logExport: ' 日志导出 ' + }, + loginLogManagement: { + loginQuery: ' 登录查询 ', + loginDelete: ' 登录删除 ', + logExport: ' 日志导出 ', + accountUnlock: ' 账户解锁 ' + }, + onlineUserManagement: { + onlineQuery: ' 在线查询 ', + batchForceLogout: ' 批量强退 ', + singleForceLogout: ' 单条强退 ' + }, + taskManagement: { + taskQuery: ' 任务查询 ', + taskAdd: ' 任务新增 ', + taskModify: ' 任务修改 ', + taskDelete: ' 任务删除 ', + statusModify: ' 状态修改 ', + taskExport: ' 任务导出 ' + }, + codeGenerationManagement: { + generationQuery: ' 生成查询 ', + generationModify: ' 生成修改 ', + generationDelete: ' 生成删除 ', + importCode: ' 导入代码 ', + previewCode: ' 预览代码 ', + generateCode: ' 生成代码 ' + }, + outboundMainOrderManagement: { + outboundMainOrderQuery: ' 出库主单查询 ', + outboundMainOrderAdd: ' 出库主单新增 ', + outboundMainOrderModify: ' 出库主单修改 ', + outboundMainOrderDelete: ' 出库主单删除 ', + outboundMainOrderExport: ' 出库主单导出 ', + documentStatusModify: ' 单据状态修改 ', + autoAllocate: ' 自动分配 ', + manualAllocate: ' 手动分配 ' + }, + customerManagementInfo: { + customerQuery: ' 客户管理查询 ', + customerAdd: ' 客户管理新增 ', + customerModify: ' 客户管理修改 ', + customerDelete: ' 客户管理删除 ', + customerExport: ' 客户管理导出 ' + }, + inboundDocumentManagement: { + inboundDocumentQuery: ' 入库单据查询 ', + inboundDocumentAdd: ' 入库单据新增 ', + inboundDocumentStatusModify: ' 入库单据状态修改 ', + inboundDocumentDelete: ' 入库单据删除 ', + inboundDocumentExport: ' 入库单据导出 ' + }, + outboundSubOrderManagement: { + outboundSubOrderQuery: ' 出库子单查询 ', + outboundSubOrderAdd: ' 出库子单新增 ', + outboundSubOrderModify: ' 出库子单修改 ', + outboundSubOrderDelete: ' 出库子单删除 ', + outboundSubOrderExport: ' 出库子单导出 ' + }, + supplierManagementInfo: { + supplierQuery: ' 供应商管理查询 ', + supplierAdd: ' 供应商管理新增 ', + supplierModify: ' 供应商管理修改 ', + supplierDelete: ' 供应商管理删除 ', + supplierExport: ' 供应商管理导出 ' + }, + receivingDocumentManagement: { + receivingDocumentQuery: ' 收货单据查询 ', + receivingDocumentAdd: ' 收货单据新增 ', + receivingDocumentModify: ' 收货单据修改 ', + receivingDocumentDelete: ' 收货单据删除 ', + receivingDocumentExport: ' 收货单据导出 ', + deleteReceivingSubDocument: ' 删除收货子单据 ', + addInboundDocument: ' 新增入库单据 ', + qualityInspectionButton: ' 质检按钮 ' + }, + materialManagementInfo: { + materialQuery: ' 物料管理查询 ', + materialAdd: ' 物料管理新增 ', + materialModify: ' 物料管理修改 ', + materialDelete: ' 物料管理删除 ', + materialExport: ' 物料管理导出 ' + }, + selfBuiltReceivingDocument: { + selfBuiltReceivingDocument: ' 自建收货单据 ', + importMaterial: ' 导入物料 ' + }, + warehouseAreaManagement: { + warehouseAreaQuery: ' 库区管理查询 ', + warehouseAreaAdd: ' 库区管理新增 ', + warehouseAreaModify: ' 库区管理更改 ', + warehouseAreaDelete: ' 库区管理移除 ', + warehouseAreaExport: ' 库区管理导出 ' + }, + locationManagement: { + locationQuery: ' 货位管理查询 ', + locationAdd: ' 货位管理新增 ', + locationModify: ' 货位管理更改 ', + locationDelete: ' 货位管理移除 ', + locationExport: ' 货位管理导出 ' + }, + stockGoodsAvailableForOutbound: { + availableStockGoods: ' 可出库的库存物资信息 ', + saveDocument: ' 保存单据 ' + }, + availableStockGoodsQuery: { + availableStockGoodsQuery: ' 可出库的库存物资信息查询 ', + availableStockGoodsExport: ' 可出库的库存物资信息导出 ' + }, + taskTableManagement: { + taskTableQuery: ' 任务表查询 ', + taskTableAdd: ' 任务表新增 ', + taskTableModify: ' 任务表修改 ', + taskTableDelete: ' 任务表删除 ', + taskTableExport: ' 任务表导出 ', + manualAbandon: ' 手动作废 ', + manualComplete: ' 手动完成 ' + }, + inventoryInformationManagement: { + inventoryQuery: ' 库存信息查询 ', + inventoryAdd: ' 库存信息新增 ', + inventoryModify: ' 库存信息修改 ', + inventoryDelete: ' 库存信息删除 ', + inventoryExport: ' 库存信息导出 ' + }, + inventoryOperationRecordManagement: { + inventoryOperationRecordQuery: ' 库存操作记录查询 ', + inventoryOperationRecordAdd: ' 库存操作记录新增 ', + inventoryOperationRecordModify: ' 库存操作记录修改 ', + inventoryOperationRecordDelete: ' 库存操作记录删除 ', + inventoryOperationRecordExport: ' 库存操作记录导出 ' + }, + inventoryFreezeRecordManagement: { + inventoryFreezeRecordQuery: ' 库存冻结记录查询 ', + inventoryFreezeRecordAdd: ' 库存冻结记录新增 ', + inventoryFreezeRecordModify: ' 库存冻结记录修改 ', + inventoryFreezeRecordDelete: ' 库存冻结记录删除 ', + inventoryFreezeRecordExport: ' 库存冻结记录导出 ' + }, + inboundDocumentHistoryInfo: { + inboundDocumentHistoryQuery: ' 入库单据历史查询 ', + inboundDocumentHistoryExport: ' 入库单据历史导出 ' + }, + inventoryDetailQueryInfo: { + inventoryDetailQuery: ' 库存明细查询查询 ', + inventoryDetailExport: ' 库存明细查询导出 ' + }, + inventorySummaryQueryInfo: { + inventorySummaryQuery: ' 库存汇总查询查询 ', + inventorySummaryExport: ' 库存汇总查询导出 ' + }, + outboundDocumentHistoryInfo: { + outboundDocumentHistoryQuery: ' 出库单据历史查询 ', + outboundDocumentHistoryExport: ' 出库单据历史导出 ' + }, + inventoryCheckDifference: { + inventoryCheckDifferenceQuery: ' 盘点差异查询 ', + inventoryCheckDifferenceAdd: ' 盘点差异新增 ', + inventoryCheckDifferenceModify: ' 盘点差异修改 ', + inventoryCheckDifferenceDelete: ' 盘点差异删除 ', + inventoryCheckDifferenceExport: ' 盘点差异导出 ', + approvalButton: ' 审核按钮 ', + approvalReject: ' 审核不通过 ' + }, + inboundOperationFlow: { + inboundOperationFlowQuery: ' 入库作业流水查询 ', + inboundOperationFlowExport: ' 入库作业流水导出 ' + }, + outboundOperationFlow: { + outboundOperationFlowQuery: ' 出库作业流水查询 ', + outboundOperationFlowExport: ' 出库作业流水导出 ' + }, + inventoryCheckDocument: { + inventoryCheckDocumentQuery: ' 盘库单据主信息查询 ', + inventoryCheckDocumentAdd: ' 盘库单据主信息新增 ', + inventoryCheckDocumentModify: ' 盘库单据主信息修改 ', + inventoryCheckDocumentDelete: ' 盘库单据主信息删除 ', + inventoryCheckDocumentExport: ' 盘库单据主信息导出 ', + autoAllocate: ' 自动分配 ' + }, + flatWarehouseInboundFlow: { + flatWarehouseInboundFlowQuery: ' 平库入库流水查询 ', + flatWarehouseInboundFlowExport: ' 平库入库流水导出 ' + }, + flatWarehouseOutboundFlow: { + flatWarehouseOutboundFlowQuery: ' 平库出库流水查询 ', + flatWarehouseOutboundFlowExport: ' 平库出库流水导出 ' + }, + basicPointManagement: { + basicPointQuery: ' 基础点位查询 ', + basicPointAdd: ' 基础点位新增 ', + basicPointModify: ' 基础点位修改 ', + basicPointDelete: ' 基础点位删除 ', + basicPointExport: ' 基础点位导出 ', + bindMaterial: ' 绑定物料 ', + bindMaterialButton: ' 绑定物料按钮 ', + unbindMaterial: ' 解绑物料 ' + }, + safetyStockQuery: { + safetyStockQuery: ' 安全库存查询查询 ', + safetyStockExport: ' 安全库存查询导出 ' + }, + warningStockQuery: { + warningStockQuery: ' 预警库存查询查询 ', + warningStockExport: ' 预警库存查询导出 ' + }, + taskCompletionManagement: { + manualComplete: ' 手动完成 ', + manualAbandon: ' 手动作废 ' + }, + documentOperation: { + saveDocument: ' 保存单据 ', + selectMaterial: ' 选择物资 ' + }, + taskStatusManagement: { + manualAbandon: ' 手动作废 ', + manualComplete: ' 手动完成 ' + }, + warehouseInOutManagement: { + warehouseInOutQuery: ' 仓库出入管理查询 ', + warehouseInOutAdd: ' 仓库出入管理新增 ', + warehouseInOutModify: ' 仓库出入管理修改 ', + warehouseInOutDelete: ' 仓库出入管理删除 ', + warehouseInOutExport: ' 仓库出入管理导出 ' + }, + containerManagement: { + addContainer: ' 新增容器 ', + editContainer: ' 编辑容器 ', + findContainer: ' 查找容器 ', + removeContainer: ' 移除容器 ' + }, + palletAndMaterialManagement: { + queryBoundPalletMaterials: ' 查询绑盘物料 ', + bindMaterialButton: ' 绑定物料按钮 ', + queryDocumentMaterials: ' 查询单据物料 ', + queryEmptyPalletInventory: ' 查询空托盘库存 ', + unbindMaterial: ' 解绑物料 ', + queryPendingTasks: ' 查询待执行任务 ', + inventoryCheckConfirm: ' 盘点确认 ', + outboundConfirm: ' 出库确认 ', + queryFlatWarehouseInboundOrders: ' 查询平库入库单 ', + queryFlatWarehouseOutboundOrders: ' 查询平库出库单 ', + qualityInspection: ' 质检 ', + queryOutboundConfirmationIntermediateTable: ' 查询出库确认中间表 ', + queryShelfDetailTable: ' 查询料架明细表 ' + }, + outboundAbnormalityManagement: { + outboundAbnormalityQuery: ' 出库异常查询 ', + outboundAbnormalityAdd: ' 出库异常新增 ', + outboundAbnormalityModify: ' 出库异常修改 ', + outboundAbnormalityDelete: ' 出库异常删除 ', + outboundAbnormalityExport: ' 出库异常导出 ' + }, + interfaceRecordManagement: { + interfaceRecordQuery: ' 接口记录查询 ', + interfaceRecordAdd: ' 接口记录新增 ', + interfaceRecordModify: ' 接口记录修改 ', + interfaceRecordDelete: ' 接口记录删除 ', + interfaceRecordExport: ' 接口记录导出 ' + }, + designatedOutbound: { + designatedOutbound: ' 指定出库 ' + }, + barcodeGenerationRuleManagement: { + barcodeGenerationRuleQuery: ' 条码生成规则查询 ', + barcodeGenerationRuleAdd: ' 条码生成规则新增 ', + barcodeGenerationRuleModify: ' 条码生成规则修改 ', + barcodeGenerationRuleDelete: ' 条码生成规则删除 ', + barcodeGenerationRuleExport: ' 条码生成规则导出 ', + generatePrintData: ' 生成打印数据 ' + }, + barcodeInformationManagement: { + barcodeInformationQuery: ' 条码信息查询 ', + barcodeInformationAdd: ' 条码信息新增 ', + barcodeInformationModify: ' 条码信息修改 ', + barcodeInformationDelete: ' 条码信息删除 ', + barcodeInformationExport: ' 条码信息导出 ', + barcodeInformationPrint: ' 条码信息打印 ' + } }, @@ -1763,83 +1763,83 @@ barcodeInformationPrint: ' 条码信息打印 ' //=====================基础信息:容器管理===================== bas_ContainerManagement: { //--------------标题-------------- - addContainerItem: '添加容器管理', - editContainerItem: '修改容器管理', + addContainerItem: '添加容器管理', + editContainerItem: '修改容器管理', - //--------------子页面标题-------------- - addContainerDetailsItem: '添加容器明细', - editContainerDetailsItem: '修改容器明细', + //--------------子页面标题-------------- + addContainerDetailsItem: '添加容器明细', + editContainerDetailsItem: '修改容器明细', //--------------字段名-------------- - containerId: '容器编号', - portName: '点位名称', - status: '容器状态', - productTypeQuantity: '物料种类', - capacity: '容量', - createTime: '创建时间', - updateTime: '更新时间', - operationMan: '操作人', - operation: '人工操作', + containerId: '容器编号', + portName: '点位名称', + status: '容器状态', + productTypeQuantity: '物料种类', + capacity: '容量', + createTime: '创建时间', + updateTime: '更新时间', + operationMan: '操作人', + operation: '人工操作', - //--------------子页面字段-------------- - id: '序号', - productId: '物料编码', - productName: '物料名称', - quantity: '数量', - unit: '单位', + //--------------子页面字段-------------- + id: '序号', + productId: '物料编码', + productName: '物料名称', + quantity: '数量', + unit: '单位', //--------------文本框输入提示-------------- - placeholderContainerId: '请输入容器编号', - placeholderPortName: '请选择点位名称', - placeholderStatus: '请选择容器状态', - placeholderProductTypeQuantity: '请输入物料种类', - placeholderCapacity: '请选择料架容量', - placeholderOperationMan: '请输入操作人', + placeholderContainerId: '请输入容器编号', + placeholderPortName: '请选择点位名称', + placeholderStatus: '请选择容器状态', + placeholderProductTypeQuantity: '请输入物料种类', + placeholderCapacity: '请选择料架容量', + placeholderOperationMan: '请输入操作人', - //--------------子页面输入提示-------------- - placeholderProductId: '请输入物料编码', - placeholderProductName: '请输入物料名称', - placeholderQuantity: '请输入数量', - placeholderUnit: '请输入单位', + //--------------子页面输入提示-------------- + placeholderProductId: '请输入物料编码', + placeholderProductName: '请输入物料名称', + placeholderQuantity: '请输入数量', + placeholderUnit: '请输入单位', //--------------交互按钮-------------- - btnSearch: '搜索', - btnReset: '重置', - btnAdd: '新增', - btnEdit: '修改', - btnDelete: '删除', - btnExport: '导出', - btnImport: '导入', - btnSubmit: '提交', - btnConfirm: '确定', - btnCancel: '取消', - btnClose: '关闭', - btnRemark: '备注', - btnAddOrBinding: '新增/绑定', - btnDeleteOrUnbinding: '删除/解绑', - btnDetails:'详情', + btnSearch: '搜索', + btnReset: '重置', + btnAdd: '新增', + btnEdit: '修改', + btnDelete: '删除', + btnExport: '导出', + btnImport: '导入', + btnSubmit: '提交', + btnConfirm: '确定', + btnCancel: '取消', + btnClose: '关闭', + btnRemark: '备注', + btnAddOrBinding: '新增/绑定', + btnDeleteOrUnbinding: '删除/解绑', + btnDetails: '详情', //--------------交互文本-------------- - //--------------提示信息-------------- - addSuccessInfo: '新增成功', - editSuccessInfo: '编辑成功', - deleteSuccessInfo: '删除成功', + //--------------提示信息-------------- + addSuccessInfo: '新增成功', + editSuccessInfo: '编辑成功', + deleteSuccessInfo: '删除成功', - //---getList--- - textErrorForGetPortName: '获取点位名称失败！', - textErrorForRequestException: '请求异常，请检查网络！', + //---getList--- + textErrorForGetPortName: '获取点位名称失败！', + textErrorForRequestException: '请求异常，请检查网络！', - //---handleDelete--- - textDeleteConfirm1: '是否确认删除容器管理编号为"', - textDeleteConfirm2: '"的数据项？', + //---handleDelete--- + textDeleteConfirm1: '是否确认删除容器管理编号为"', + textDeleteConfirm2: '"的数据项？', - //---子页面--- - textDeleteDetailsConfirm1: '是否确认删除容器物料明细编号为"', - textDeleteDetailsConfirm2: '"的数据项？', + //---子页面--- + textDeleteDetailsConfirm1: '是否确认删除容器物料明细编号为"', + textDeleteDetailsConfirm2: '"的数据项？', //--------------其他-------------- - lblWidthSearch: '68px', - lblWidthDialog: '80px', + lblWidthSearch: '68px', + lblWidthDialog: '80px', }, @@ -1902,37 +1902,37 @@ barcodeInformationPrint: ' 条码信息打印 ' editUserItem: '修改用户', //--------------提示文本-------------- - //---布局--- - textDragOrClick1: '将文件拖到此处，或', - textDragOrClick2: '点击上传', - textUpdateExistingData: '是否更新已经存在的用户数据？', - textUploadTip: '仅允许导入xls、xlsx格式文件。', - textDownloadTemplate: '下载模板', + //---布局--- + textDragOrClick1: '将文件拖到此处，或', + textDragOrClick2: '点击上传', + textUpdateExistingData: '是否更新已经存在的用户数据？', + textUploadTip: '仅允许导入xls、xlsx格式文件。', + textDownloadTemplate: '下载模板', - //---函数：handleStatusChange--- - textEnable: '启用', - textDisable: '禁用', - textUserConfirm1:"确认要\"", - textUserConfirm2:"\"用户吗？", - textSuccess: '成功', + //---函数：handleStatusChange--- + textEnable: '启用', + textDisable: '禁用', + textUserConfirm1: "确认要\"", + textUserConfirm2: "\"用户吗？", + textSuccess: '成功', - //---函数：handleResetPwd--- - textInputPassword1: '请输入', - textInputPassword2: '的新密码', - textTips: '提示', - textConfirm: '确认', - textCancel: '取消', - textResetPassword: '修改成功，新密码是：', + //---函数：handleResetPwd--- + textInputPassword1: '请输入', + textInputPassword2: '的新密码', + textTips: '提示', + textConfirm: '确认', + textCancel: '取消', + textResetPassword: '修改成功，新密码是：', - //---函数：handleDelete--- - textDeleteConfirm1: '是否确认删除用户编号为"', - textDeleteConfirm2: '"的数据项？', + //---函数：handleDelete--- + textDeleteConfirm1: '是否确认删除用户编号为"', + textDeleteConfirm2: '"的数据项？', - //---函数：handleImport--- - textImportTitle: '导入成功', + //---函数：handleImport--- + textImportTitle: '导入成功', - //---函数：textUploadTitle--- - textImportResult: '导入结果', + //---函数：textUploadTitle--- + textImportResult: '导入结果', //--------------操作提示-------------- addSuccessInfo: '新增成功', @@ -1963,41 +1963,41 @@ barcodeInformationPrint: ' 条码信息打印 ' //------------------------------------------------------------------------ //分配角色 - basInfo:'基本信息', - roleInfo:'角色信息', - roleId:'角色编号', - roleName:'角色名称', - roleKey:'权限字符', + basInfo: '基本信息', + roleInfo: '角色信息', + roleId: '角色编号', + roleName: '角色名称', + roleKey: '权限字符', //个人信息 - userInfo:'个人信息', - roleGroup:'所属角色', - basDetail:'基本资料', - resetPwd:'修改密码', + userInfo: '个人信息', + roleGroup: '所属角色', + basDetail: '基本资料', + resetPwd: '修改密码', //基本资料---用户信息 - male:'男', - female:'女', + male: '男', + female: '女', //基本资料---修改密码 - oldPassword:'旧密码', - newPassword:'新密码', - confirmPassword:'确认密码', - placecholderOldPassword:'请输入旧密码', - placecholderNewPassword:'请输入新密码', - placecholderConfirmPassword:'再次确认密码', + oldPassword: '旧密码', + newPassword: '新密码', + confirmPassword: '确认密码', + placecholderOldPassword: '请输入旧密码', + placecholderNewPassword: '请输入新密码', + placecholderConfirmPassword: '再次确认密码', - checkPasswordIsSame:'两次输入的密码不一致', - oldPasswordIsNull:'旧密码不能为空', - newPasswordIsNull:'新密码不能为空', - passwordFormat1:"长度在 6 到 20 个字符", - passwordFormat2:"不能包含非法字符：< > \" ' \\\ |", - confirmPasswordIsNull:'确认密码不能为空', + checkPasswordIsSame: '两次输入的密码不一致', + oldPasswordIsNull: '旧密码不能为空', + newPasswordIsNull: '新密码不能为空', + passwordFormat1: "长度在 6 到 20 个字符", + passwordFormat2: "不能包含非法字符：< > \" ' \\\ |", + confirmPasswordIsNull: '确认密码不能为空', //上传头像 - avatarTitle:'点击上传头像', - updateAvatar:'修改头像', - errorMessage:'文件格式错误，请上传图片类型,如：JPG，PNG后缀的文件。' + avatarTitle: '点击上传头像', + updateAvatar: '修改头像', + errorMessage: '文件格式错误，请上传图片类型,如：JPG，PNG后缀的文件。' }, @@ -2060,7 +2060,7 @@ barcodeInformationPrint: ' 条码信息打印 ' //---复选框--- cbxExpandOrCollapse: '展开/折叠', cbxAllOrNone: '全选/全不选', - cbxInherite:'父子联动', + cbxInherite: '父子联动', txtLoading: '加载中,请稍候...', //输入框 @@ -2076,8 +2076,8 @@ barcodeInformationPrint: ' 条码信息打印 ' //---函数：handleStatusChange--- textEnable: '启用', textDisable: '禁用', - textUserConfirm1:"确认要\"", - textUserConfirm2:"\"角色吗？", + textUserConfirm1: "确认要\"", + textUserConfirm2: "\"角色吗？", textSuccess: '成功', //---handleDelete--- @@ -2107,7 +2107,7 @@ barcodeInformationPrint: ' 条码信息打印 ' nickName: '用户昵称', email: '邮箱', phoneNumber: '手机号码', - textSelectRole:'请选择要分配的用户', + textSelectRole: '请选择要分配的用户', placeholderUserName: '用户名称', placeholderPhoneNumber: '手机号码', @@ -2117,13 +2117,13 @@ barcodeInformationPrint: ' 条码信息打印 ' btnCancelAuthorizations: '批量取消授权', btnCancelAuthorization: '取消授权', - //---cancelAuthUser--- - textConfirmCancelRole1: '确认要取消该用户"', - textConfirmCancelRole2: '"角色吗？', - cancelSuccessInfo: '取消授权成功', + //---cancelAuthUser--- + textConfirmCancelRole1: '确认要取消该用户"', + textConfirmCancelRole2: '"角色吗？', + cancelSuccessInfo: '取消授权成功', - //---cancelAuthUserAll--- - textConfirmCancelSelectedRole: '是否取消选中用户授权数据项？', + //---cancelAuthUserAll--- + textConfirmCancelSelectedRole: '是否取消选中用户授权数据项？', placeholderStatus: '请选择状态', }, @@ -2211,7 +2211,7 @@ barcodeInformationPrint: ' 条码信息打印 ' //---复选框--- cbxExpandOrCollapse: '展开/折叠', cbxAllOrNone: '全选/全不选', - cbxInherite:'父子联动', + cbxInherite: '父子联动', txtLoading: '加载中,请稍候...', //输入框 tbxRemark: '备注', @@ -2261,13 +2261,13 @@ barcodeInformationPrint: ' 条码信息打印 ' parentDept: '上级部门', setOrderNum: '显示排序', - leader : '负责人', + leader: '负责人', phoneNumber: '联系电话', email: '邮箱', //--------------二级窗口操作提示-------------- placeholderParentDept: '请选择上级部门', - placeholderLeader : '请输入负责人', + placeholderLeader: '请输入负责人', placeholderPhoneNumber: '请输入联系电话', placeholderEmail: '请输入邮箱', @@ -2329,7 +2329,7 @@ barcodeInformationPrint: ' 条码信息打印 ' //--------------二级窗口操作提示-------------- placeholderPostSort: '请选择岗位顺序', - placeholderStatus : '请选择岗位状态', + placeholderStatus: '请选择岗位状态', placeholderRemark: '请输入备注信息', //--------------交互按钮-------------- @@ -2384,11 +2384,11 @@ barcodeInformationPrint: ' 条码信息打印 ' placeholderDateEnd: '结束时间', //--------------二级窗口标题-------------- - addDictTypeItem: '新增字典类型', - editDictTypeItem: '编辑字典类型', + addDictTypeItem: '新增字典类型', + editDictTypeItem: '编辑字典类型', - //--------------二级窗口操作提示-------------- - placeholderRemark: '请输入内容', + //--------------二级窗口操作提示-------------- + placeholderRemark: '请输入内容', //--------------交互按钮-------------- btnSearch: '搜索', @@ -2406,9 +2406,9 @@ barcodeInformationPrint: ' 条码信息打印 ' //--------------提示文本-------------- - //---handleDelete--- - textDeleteConfirm1: '是否确认删除字典类型为"', - textDeleteConfirm2: '"的数据项？', + //---handleDelete--- + textDeleteConfirm1: '是否确认删除字典类型为"', + textDeleteConfirm2: '"的数据项？', //--------------操作提示-------------- addSuccessInfo: '新增成功', @@ -2422,24 +2422,24 @@ barcodeInformationPrint: ' 条码信息打印 ' //-------------------------------------------------------------- // 子页面data - dictCode:'字典编码', - dictLabel:'字典标签', - dictValue:'字典键值', - dictSort:'字典排序', + dictCode: '字典编码', + dictLabel: '字典标签', + dictValue: '字典键值', + dictSort: '字典排序', - placeholderDictLabel:'请输入字典标签', - placeholderDictValue:'请输入数据键值', - placeholderCssClass:'请输入样式属性', + placeholderDictLabel: '请输入字典标签', + placeholderDictValue: '请输入数据键值', + placeholderCssClass: '请输入样式属性', - cssClass:'样式属性', - listClass:'回显样式', + cssClass: '样式属性', + listClass: '回显样式', - optionDefault:'默认', - optionPrimary:'主要', - optionSuccess:'成功', - optionInfo:'信息', - optionWarning:'警告', - optionDanger:'危险', + optionDefault: '默认', + optionPrimary: '主要', + optionSuccess: '成功', + optionInfo: '信息', + optionWarning: '警告', + optionDanger: '危险', heckDictLabelIsNull: '数据标签不能为空', heckDictValueIsNull: '数据键值不能为空', @@ -2449,13 +2449,13 @@ barcodeInformationPrint: ' 条码信息打印 ' editDictItem: '修改字典数据', //---handleDelete--- - textDeleteDictCodeConfirm1: '是否确认删除字典编码为"', - textDeleteDictCodeConfirm2: '"的数据项？', + textDeleteDictCodeConfirm1: '是否确认删除字典编码为"', + textDeleteDictCodeConfirm2: '"的数据项？', }, // ***************系统管理：参数设置************* - systemManagement_ConfigManagement:{ + systemManagement_ConfigManagement: { //--------------数据表标题-------------- configId: '参数主键', configName: '参数名称', @@ -2475,11 +2475,11 @@ barcodeInformationPrint: ' 条码信息打印 ' placeholderDateEnd: '结束时间', //--------------二级窗口标题-------------- - addConfigItem: '新增参数', - editConfigItem: '修改参数', + addConfigItem: '新增参数', + editConfigItem: '修改参数', - //--------------二级窗口操作提示-------------- - placeholderRemark: '请输入内容', + //--------------二级窗口操作提示-------------- + placeholderRemark: '请输入内容', //--------------交互按钮-------------- btnSearch: '搜索', @@ -2496,9 +2496,9 @@ barcodeInformationPrint: ' 条码信息打印 ' //--------------提示文本-------------- - //---handleDelete--- - textDeleteConfirm1: '是否确认删除参数编号为"', - textDeleteConfirm2: '"的数据项？', + //---handleDelete--- + textDeleteConfirm1: '是否确认删除参数编号为"', + textDeleteConfirm2: '"的数据项？', //--------------操作提示-------------- addSuccessInfo: '新增成功', @@ -2519,7 +2519,7 @@ barcodeInformationPrint: ' 条码信息打印 ' }, // ***************系统管理：通知公告************* - systemManagement_Notice:{ + systemManagement_Notice: { //--------------数据表标题-------------- noticeId: '序号', noticeType: '公告类型', @@ -2538,16 +2538,16 @@ barcodeInformationPrint: ' 条码信息打印 ' placeholderDateEnd: '结束时间', //--------------二级窗口-------------- - //--------------标题-------------- - addNoticeItem: '新增公告', - editNoticeItem: '修改公告', + //--------------标题-------------- + addNoticeItem: '新增公告', + editNoticeItem: '修改公告', - //--------------交互框标签-------------- - noticeContent:"公告内容", + //--------------交互框标签-------------- + noticeContent: "公告内容", - //--------------二级窗口操作提示-------------- - placeholderRemark: '请输入内容', - placeholderNoticeContent: '请输入内容', + //--------------二级窗口操作提示-------------- + placeholderRemark: '请输入内容', + placeholderNoticeContent: '请输入内容', //--------------交互按钮-------------- btnSearch: '搜索', @@ -2564,9 +2564,9 @@ barcodeInformationPrint: ' 条码信息打印 ' //--------------提示文本-------------- - //---handleDelete--- - textDeleteConfirm1: '是否确认删除公告编号为"', - textDeleteConfirm2: '"的数据项？', + //---handleDelete--- + textDeleteConfirm1: '是否确认删除公告编号为"', + textDeleteConfirm2: '"的数据项？', //--------------操作提示-------------- addSuccessInfo: '新增成功', @@ -2586,47 +2586,47 @@ barcodeInformationPrint: ' 条码信息打印 ' // ***************系统管理：日志管理-操作日志************* // ***************views/monitor/operlog************* - systemManagement_LogManagement_Operation:{ + systemManagement_LogManagement_Operation: { //--------------数据表标题-------------- - operId: '日志编号', - title: '系统模块', - businessType: '操作类型', - operName: '操作人员', - operIp: '操作地址', - operLocation: '操作地点', - status: '操作状态', - operTime: '操作日期', - costTime: '消耗时间', - unitMillisecond: '毫秒', - operation: '消耗时间', - details: '明细', + operId: '日志编号', + title: '系统模块', + businessType: '操作类型', + operName: '操作人员', + operIp: '操作地址', + operLocation: '操作地点', + status: '操作状态', + operTime: '操作日期', + costTime: '消耗时间', + unitMillisecond: '毫秒', + operation: '消耗时间', + details: '明细', - //--------------当前页面交互框操作提示-------------- - placeholderOpenIp: '请输入日志编号', - placeholderTitle: '请输入系统模块', - placeholderBusinessType: '请选择公告类型', - placeholderOperName: '请选择操作人员', - placeholderStatus: '请选择操作状态', - placeholderOperTime: '操作日期', - placeholderDateStart: '开始时间', - placeholderDateEnd: '结束时间', + //--------------当前页面交互框操作提示-------------- + placeholderOpenIp: '请输入日志编号', + placeholderTitle: '请输入系统模块', + placeholderBusinessType: '请选择公告类型', + placeholderOperName: '请选择操作人员', + placeholderStatus: '请选择操作状态', + placeholderOperTime: '操作日期', + placeholderDateStart: '开始时间', + placeholderDateEnd: '结束时间', //--------------二级窗口-------------- - //--------------标题-------------- - logDetails: '日志明细', + //--------------标题-------------- + logDetails: '日志明细', - //--------------交互框标签-------------- - noticeContent:"公告内容", - loginInfo: '登录信息', - requestInfo: '请求信息', - requestUrl: '请求地址', - requestMethod: '请求方式', - method:'方法', - requestParam: '请求参数', - responseParam: '响应参数', - statusNormal: '响应正常', - statusFail: '响应失败', - errorMsg:'异常信息', + //--------------交互框标签-------------- + noticeContent: "公告内容", + loginInfo: '登录信息', + requestInfo: '请求信息', + requestUrl: '请求地址', + requestMethod: '请求方式', + method: '方法', + requestParam: '请求参数', + responseParam: '响应参数', + statusNormal: '响应正常', + statusFail: '响应失败', + errorMsg: '异常信息', //--------------交互按钮-------------- btnSearch: '搜索', @@ -2643,8 +2643,8 @@ barcodeInformationPrint: ' 条码信息打印 ' //--------------提示文本-------------- - //---handleClean--- - textDeleteConfirm: '是否确认清空所有操作日志数据项？"', + //---handleClean--- + textDeleteConfirm: '是否确认清空所有操作日志数据项？"', //--------------操作提示-------------- addSuccessInfo: '新增成功', @@ -2660,26 +2660,26 @@ barcodeInformationPrint: ' 条码信息打印 ' // ***************系统管理：日志管理-登录日志************* // ***************views/monitor/logininfor************* - systemManagement_LogManagement_Login:{ + systemManagement_LogManagement_Login: { //--------------数据表标题-------------- - infoId: '访问编号', - userName: '用户名称', - ipAddress: '登录地址', - loginLocation: '登录地点', - operLocation: '操作地点', - browser: '浏览器', - os: '操作系统', - status: '登录状态', - loginTime: '登录日期', - message: '操作信息', + infoId: '访问编号', + userName: '用户名称', + ipAddress: '登录地址', + loginLocation: '登录地点', + operLocation: '操作地点', + browser: '浏览器', + os: '操作系统', + status: '登录状态', + loginTime: '登录日期', + message: '操作信息', - //--------------当前页面交互框操作提示-------------- - placeholderIpAddress: '请输入登录地址', - placeholderUserName: '请输入用户名称', - placeholderStatus: '请选择登录状态', - placeholderLoginTime: '登录时间', - placeholderDateStart: '开始时间', - placeholderDateEnd: '结束时间', + //--------------当前页面交互框操作提示-------------- + placeholderIpAddress: '请输入登录地址', + placeholderUserName: '请输入用户名称', + placeholderStatus: '请选择登录状态', + placeholderLoginTime: '登录时间', + placeholderDateStart: '开始时间', + placeholderDateEnd: '结束时间', //--------------交互按钮-------------- btnSearch: '搜索', @@ -2696,16 +2696,16 @@ barcodeInformationPrint: ' 条码信息打印 ' btnUnlocked: '解锁', //--------------提示文本-------------- - //---函数：handleDelete--- - textDeleteConfirm1: '是否确认删除访问编号为"', - textDeleteConfirm2: '"的数据项？', + //---函数：handleDelete--- + textDeleteConfirm1: '是否确认删除访问编号为"', + textDeleteConfirm2: '"的数据项？', - //---函数：handleUnlock--- - textUnlockConfirm1: '是否确认解锁访问编号为"', - textUnlockConfirm2: '"的数据项？', + //---函数：handleUnlock--- + textUnlockConfirm1: '是否确认解锁访问编号为"', + textUnlockConfirm2: '"的数据项？', - //---函数：handleClean--- - textCleanConfirm: '是否确认清空所有登录日志数据项？', + //---函数：handleClean--- + textCleanConfirm: '是否确认清空所有登录日志数据项？', //--------------操作提示-------------- addSuccessInfo: '新增成功', @@ -2721,23 +2721,23 @@ barcodeInformationPrint: ' 条码信息打印 ' }, // ***************系统监控：在线用户************* - monitor_Online:{ + monitor_Online: { //--------------数据表标题-------------- - num: '序号', - tokenId: '会话编号', - userName: '登录名称', - deptName: '部门名称', - ipAddress: '主机', - loginLocation: '登录地点', - browser: '浏览器', - os: '操作系统', - loginTime: '登录日期', - message: '操作信息', - operation: '操作', + num: '序号', + tokenId: '会话编号', + userName: '登录名称', + deptName: '部门名称', + ipAddress: '主机', + loginLocation: '登录地点', + browser: '浏览器', + os: '操作系统', + loginTime: '登录日期', + message: '操作信息', + operation: '操作', - //--------------当前页面交互框操作提示-------------- - placeholderIpAddress: '请输入登录地址', - placeholderUserName: '请输入用户名称', + //--------------当前页面交互框操作提示-------------- + placeholderIpAddress: '请输入登录地址', + placeholderUserName: '请输入用户名称', //--------------交互按钮-------------- btnSearch: '搜索', @@ -2745,9 +2745,9 @@ barcodeInformationPrint: ' 条码信息打印 ' btnForceLogout: '强制退出', //--------------提示文本-------------- - //---函数：handleForceLogout--- - textForceLogoutConfirm1: '是否强制退出用户名为"', - textForceLogoutConfirm2: '"的用户？', + //---函数：handleForceLogout--- + textForceLogoutConfirm1: '是否强制退出用户名为"', + textForceLogoutConfirm2: '"的用户？', //--------------其他-------------- lblWidthSearch: '68px', @@ -2755,23 +2755,23 @@ barcodeInformationPrint: ' 条码信息打印 ' }, // ***************系统监控：定时任务************* - Monitor_ScheduledTask:{ + Monitor_ScheduledTask: { //--------------数据表标题-------------- - jobId: '任务编号', - jobName: '任务名称', - jobGroup: '任务组名', - invokeTarget: '调用目标字符串', - cronExpression: 'cron执行表达式', - status: '状态', - operation: '操作', + jobId: '任务编号', + jobName: '任务名称', + jobGroup: '任务组名', + invokeTarget: '调用目标字符串', + cronExpression: 'cron执行表达式', + status: '状态', + operation: '操作', - //--------------当前页面交互框操作提示-------------- - placeholderJobName: '请输入任务名称', - placeholderJobGroup: '请选择任务组名', + //--------------当前页面交互框操作提示-------------- + placeholderJobName: '请输入任务名称', + placeholderJobGroup: '请选择任务组名', - //---------------二级窗口操作提示------------------ - placeholderInvokeTarget: '请输入调用目标字符串', - placeholderCronExpression: '请输入Cron执行表达式', + //---------------二级窗口操作提示------------------ + placeholderInvokeTarget: '请输入调用目标字符串', + placeholderCronExpression: '请输入Cron执行表达式', //--------------交互按钮-------------- btnSearch: '搜索', @@ -2783,7 +2783,7 @@ barcodeInformationPrint: ' 条码信息打印 ' btnExport: '导出', btnSubmit: '确定', btnCancel: '取消', - btnMore: '更多', + btnMore: '更多', btnLog: '日志', btnDetails: '详情', btnClose: '关闭', @@ -2795,47 +2795,47 @@ barcodeInformationPrint: ' 条码信息打印 ' btnJobLog: '调度日志', //--------------提示文本-------------- - //---二级窗口标题--- - titleAddJob: '添加任务', - titleEditJob: '修改任务', + //---二级窗口标题--- + titleAddJob: '添加任务', + titleEditJob: '修改任务', - //---标签--- - nextValidTime:'下次执行时间', - execStrategy:'执行策略', - allowParallel:'是否并发', - createTime:'创建时间', + //---标签--- + nextValidTime: '下次执行时间', + execStrategy: '执行策略', + allowParallel: '是否并发', + createTime: '创建时间', - //---二级窗口--- - textInvokeMethod: '调用方法', - textInvokeMethodTip1: "Bean调用示例：ryTask.ryParams('ry')", - textInvokeMethodTip2: "Class类调用示例：com.ruoyi.quartz.task.RyTask.ryParams('ry')", - textInvokeMethodTip3: "参数说明：支持字符串，布尔类型，长整型，浮点型，整型", + //---二级窗口--- + textInvokeMethod: '调用方法', + textInvokeMethodTip1: "Bean调用示例：ryTask.ryParams('ry')", + textInvokeMethodTip2: "Class类调用示例：com.ruoyi.quartz.task.RyTask.ryParams('ry')", + textInvokeMethodTip3: "参数说明：支持字符串，布尔类型，长整型，浮点型，整型", - textJobStatusNormal: '正常', - textJobStatusPause: '暂停', + textJobStatusNormal: '正常', + textJobStatusPause: '暂停', - textDefaultStrategy: '默认策略', - textExecStrategyTip1: '立即执行', - textExecStrategyTip2: '执行一次', - textExecStrategyTip3: '放弃执行', + textDefaultStrategy: '默认策略', + textExecStrategyTip1: '立即执行', + textExecStrategyTip2: '执行一次', + textExecStrategyTip3: '放弃执行', - textIsParallelTip1: '允许', - textIsParallelTip2: '禁止', + textIsParallelTip1: '允许', + textIsParallelTip2: '禁止', - //---函数：handleStatusChange--- - textEnable: '启用', - textDisable: '停用', - textChangeConfirm1: '确认要"', - textChangeConfirm2: '"任务吗？', - textSuccess: '成功', + //---函数：handleStatusChange--- + textEnable: '启用', + textDisable: '停用', + textChangeConfirm1: '确认要"', + textChangeConfirm2: '"任务吗？', + textSuccess: '成功', - //---函数：handleRun--- - textExecConfirm1: '确认要立即执行一次"', - textExecConfirm2: '"任务吗？', + //---函数：handleRun--- + textExecConfirm1: '确认要立即执行一次"', + textExecConfirm2: '"任务吗？', - //---函数：handleDelete--- - textDeleteConfirm1: '是否确认删除定时任务编号为"', - textDeleteConfirm2: '"的数据项？', + //---函数：handleDelete--- + textDeleteConfirm1: '是否确认删除定时任务编号为"', + textDeleteConfirm2: '"的数据项？', //--------------操作提示-------------- addSuccessInfo: '新增成功', @@ -2871,15 +2871,15 @@ barcodeInformationPrint: ' 条码信息打印 ' optionFail: '失败', //---函数：handleDelete--- - textDeleteJobLogConfirm1: '是否确认删除定时日志编号为"', - textDeleteJobLogConfirm2: '"的数据项？', + textDeleteJobLogConfirm1: '是否确认删除定时日志编号为"', + textDeleteJobLogConfirm2: '"的数据项？', //---函数：handleClean--- - textClearJobLogConfirm: '是否确认清空所有调度日志数据项？', + textClearJobLogConfirm: '是否确认清空所有调度日志数据项？', }, // ***************系统监控：服务监控*************** - Monitor_Service:{ + Monitor_Service: { property: '属性', value: '值', memory: '内存', @@ -2896,13 +2896,13 @@ barcodeInformationPrint: ' 条码信息打印 ' memory_Free: '剩余内存', memory_Usage: '使用率', - server_Information: '服务器信息', + server_Information: '服务器信息', server_Name: "服务器名称", server_Ip: "服务器IP", server_OS: "操作系统", server_OSArch: "系统架构", - jvm_Information: '服务器信息', + jvm_Information: '服务器信息', jvm_Name: "服务器名称", jvm_Version: "服务器版本", jvm_StartTime: "启动时间", @@ -2925,7 +2925,7 @@ barcodeInformationPrint: ' 条码信息打印 ' }, // ***************系统监控：缓存监控*************** - Monitor_Cache:{ + Monitor_Cache: { basInfomation: '基本信息', redisVersion: 'Redis版本', redisMode: '运行模式', @@ -2949,15 +2949,15 @@ barcodeInformationPrint: ' 条码信息打印 ' commandStats: '命令统计', memoryUsedInfo: "内存信息", - command: "命令", - peakValue: "峰值", + command: "命令", + peakValue: "峰值", cacheMemoryUsed: "内存消耗", textLoading: "正在加载缓存监控数据，请稍候！", }, // ***************系统监控：缓存列表*************** - Monitor_CacheList:{ + Monitor_CacheList: { cacheList: '缓存列表', Id: '序号', cacheName: '缓存名称', @@ -2974,9 +2974,9 @@ barcodeInformationPrint: ' 条码信息打印 ' refreshKeySuccessInfo: "刷新键名列表成功", clearAllCacheSuccessInfo: "清理全部缓存成功", - textSuccess:']成功', - textClearCacheName:'清理缓存名称[', - textClearCacheKey:'清理缓存键名[', + textSuccess: ']成功', + textClearCacheName: '清理缓存名称[', + textClearCacheKey: '清理缓存键名[', btnRefresh: '刷新', btnClearAll: '清理全部', @@ -2984,7 +2984,7 @@ barcodeInformationPrint: ' 条码信息打印 ' }, // ***************KPI分析：入库分析*************** - KPIAnalysis_StockIn:{ + KPIAnalysis_StockIn: { warehouse: '仓库', yearMonth: '年月', @@ -2997,12 +2997,12 @@ barcodeInformationPrint: ' 条码信息打印 ' textChartStockIn: '入库分析', textYAxisName: '数量', - lblWidthSearch:'68px' + lblWidthSearch: '68px' }, // ***************KPI分析：出库分析*************** - KPIAnalysis_StockOut:{ + KPIAnalysis_StockOut: { warehouse: '仓库', yearMonth: '年月', @@ -3015,12 +3015,12 @@ barcodeInformationPrint: ' 条码信息打印 ' textChartStockOut: '出库分析', textYAxisName: '数量', - lblWidthSearch:'68px' + lblWidthSearch: '68px' }, // ***************KPI分析：巷道分析*************** - KPIAnalysis_Roadway:{ + KPIAnalysis_Roadway: { warehouse: '仓库', dateStart: '开始时间', dateEnd: '结束时间', @@ -3037,12 +3037,12 @@ barcodeInformationPrint: ' 条码信息打印 ' quantityOfStockIn: '入库数量', quantityOfStockOut: '出库数量', - lblWidthSearch:'68px' + lblWidthSearch: '68px' }, // ***************KPI分析：货位分析*************** - KPIAnalysis_CargoSpace:{ + KPIAnalysis_CargoSpace: { warehouse: '仓库', placeholderWarehouse: '请选择仓库', @@ -3060,17 +3060,17 @@ barcodeInformationPrint: ' 条码信息打印 ' roadway2: '巷道2', roadway3: '巷道3', roadway4: '巷道4', - config:'生成的系列配置', + config: '生成的系列配置', textChartCargoSpace: '货位分析', textValue: '数量', - lblWidthSearch:'68px' + lblWidthSearch: '68px' }, // ***************KPI分析：库存平面图*************** - KPIAnalysis_CargoPlan:{ + KPIAnalysis_CargoPlan: { warehouse: '仓库', raodway: '巷道', row: '排', @@ -3085,13 +3085,13 @@ barcodeInformationPrint: ' 条码信息打印 ' legendOccupied: '满位', legendStockInAssigned: '入库已分配', legendStockOutAssigned: '出库已分配', - legendStockInException:'入库需盘点', - legendStockOutException:'出库需盘点', + legendStockInException: '入库需盘点', + legendStockOutException: '出库需盘点', //---formatTooltip--- failGetCargoSpace: '获取货位信息失败', - lblWidthSearch:'68px' + lblWidthSearch: '68px' }, @@ -3620,15 +3620,15 @@ barcodeInformationPrint: ' 条码信息打印 ' cancel: '取 消' }, // ***************产品基础表添加字段************** - basproduct1:{ - englishName:"英文名称", - netWeightPerUnit:"单件净重", - long:"长MM", - wide:"宽MM", - tall:"高MM", - volume:"体积m³", - price:"价格", - notes:"描述" + basproduct1: { + englishName: "英文名称", + netWeightPerUnit: "单件净重", + long: "长MM", + wide: "宽MM", + tall: "高MM", + volume: "体积m³", + price: "价格", + notes: "描述" }, // ***************客户管理************** basCustomer: { @@ -3715,12 +3715,12 @@ barcodeInformationPrint: ' 条码信息打印 ' reviewing: '审核中', executing: '正执行', // 饼图 - emptyLocation:"空货位", - fullLocation:"满货位", - inboundAllocated:"入库已分配", - outboundAllocated:"出库已分配", - inboundNeedCheck:"入库需盘点", - outboundNeedCheck:"出库需盘点", + emptyLocation: "空货位", + fullLocation: "满货位", + inboundAllocated: "入库已分配", + outboundAllocated: "出库已分配", + inboundNeedCheck: "入库需盘点", + outboundNeedCheck: "出库需盘点", }, basstandPosition: { positionType: '点位类型', diff --git a/ruoyi-ui/src/views/check/difference/index.vue b/ruoyi-ui/src/views/check/difference/index.vue index 2e61aa7..898a2bf 100644 --- a/ruoyi-ui/src/views/check/difference/index.vue +++ b/ruoyi-ui/src/views/check/difference/index.vue @@ -374,7 +374,7 @@ export default { /** 审核按钮操作 */ handleAudit() { const checkGuids = this.ids - this.$modal.confirm(this.$t('checkDifference.confirmPass') + checkGuids.length).then(function() { + this.$modal.confirm(this.$t('checkDifference.confirmPass') + checkGuids).then(function() { return auditDifference(checkGuids) }).then(() => { this.getList() diff --git a/ruoyi-ui/src/views/out/outStockoutManage.vue b/ruoyi-ui/src/views/out/outStockoutManage.vue index 4cfc570..bbfd993 100644 --- a/ruoyi-ui/src/views/out/outStockoutManage.vue +++ b/ruoyi-ui/src/views/out/outStockoutManage.vue @@ -377,7 +377,7 @@ export default { } // 如果是审核操作(status=2)，显示弹窗选择出口 - if (status === 2) { + if (status === 2 || status === 3) { this.currentAuditStatus = status // 根据选中单据的仓库ID设置出口选项 this.setExitOptionsByWarehouse() @@ -412,7 +412,9 @@ export default { } const stockoutIds = this.selectedRows.map(row => row.stockoutId) let outstock = this.selectedRows[0] - if (outstock.status !== "2") { + console.log(outstock.status !== "2") + console.log(outstock.status !== "3") + if (outstock.status !== "2" && outstock.status !== "3") { this.$modal.msgError(this.$t('outStockoutManage.auditStockOut')) return }