From 866fdb4ac90dcb0e6ebad43dae981fd058f2036b Mon Sep 17 00:00:00 2001 From: liuhanqing Date: Tue, 28 Oct 2025 11:38:57 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E7=BB=9F=E8=AE=A1-=E5=BA=93?= =?UTF-8?q?=E5=AD=98=E9=A2=84=E8=AD=A6=20=E5=85=A5=E5=BA=93=E4=BD=9C?= =?UTF-8?q?=E4=B8=9A=E6=B5=81=E6=B0=B4=20=E5=87=BA=E5=BA=93=E4=BD=9C?= =?UTF-8?q?=E4=B8=9A=E6=B5=81=E6=B0=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ViewInJobFlowController.java | 16 +- .../ViewInJobFlow/domain/ViewInJobFlow.java | 1160 ++++-------- .../mapper/ViewInJobFlowMapper.java | 16 +- .../service/IViewInJobFlowService.java | 16 +- .../impl/ViewInJobFlowServiceImpl.java | 22 +- .../controller/ViewOutJobFlowController.java | 40 +- .../ViewOutJobFlow/domain/ViewOutJobFlow.java | 1168 ++++-------- .../mapper/ViewOutJobFlowMapper.java | 40 +- .../service/IViewOutJobFlowService.java | 40 +- .../impl/ViewOutJobFlowServiceImpl.java | 46 +- .../ViewStockWarningController.java | 40 +- .../domain/ViewStockWarning.java | 1243 +------------ .../mapper/ViewStockWarningMapper.java | 40 +- .../service/IViewStockWarningService.java | 40 +- .../impl/ViewStockWarningServiceImpl.java | 46 +- .../mapper/search/ViewInJobFlowMapper.xml | 480 ++--- .../mapper/search/ViewOutJobFlowMapper.xml | 490 ++--- .../mapper/search/ViewStockWarningMapper.xml | 451 +---- ruoyi-ui/src/api/search/ViewInJobFlow.js | 8 +- ruoyi-ui/src/api/search/ViewOutJobFlow.js | 18 +- ruoyi-ui/src/api/search/ViewStockWarning.js | 18 +- .../src/views/search/StockSummary/index.vue | 271 ++- .../src/views/search/ViewInJobFlow/index.vue | 1619 ++++++---------- .../src/views/search/ViewOutJobFlow/index.vue | 1631 ++++++----------- .../views/search/ViewStockDetail/index.vue | 6 +- .../views/search/ViewStockWarning/index.vue | 1337 +------------- .../views/search/ViewStockinHistory/index.vue | 22 +- .../search/ViewStockoutHistory/index.vue | 36 +- 28 files changed, 2809 insertions(+), 7551 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewInJobFlow/controller/ViewInJobFlowController.java b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewInJobFlow/controller/ViewInJobFlowController.java index 89a024a..5b70e1f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewInJobFlow/controller/ViewInJobFlowController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewInJobFlow/controller/ViewInJobFlowController.java @@ -24,8 +24,8 @@ import com.ruoyi.common.core.page.TableDataInfo; /** * 入库作业流水Controller * - * @author gw - * @date 2025-09-22 + * @author ruoyi + * @date 2025-10-28 */ @RestController @RequestMapping("/search/ViewInJobFlow") @@ -63,10 +63,10 @@ public class ViewInJobFlowController extends BaseController * 获取入库作业流水详细信息 */ @PreAuthorize("@ss.hasPermi('search:ViewInJobFlow:query')") - @GetMapping(value = "/{jobId}") - public AjaxResult getInfo(@PathVariable("jobId") String jobId) + @GetMapping(value = "/{jobDetailId}") + public AjaxResult getInfo(@PathVariable("jobDetailId") String jobDetailId) { - return success(viewInJobFlowService.selectViewInJobFlowByJobId(jobId)); + return success(viewInJobFlowService.selectViewInJobFlowByJobDetailId(jobDetailId)); } /** @@ -96,9 +96,9 @@ public class ViewInJobFlowController extends BaseController */ @PreAuthorize("@ss.hasPermi('search:ViewInJobFlow:remove')") @Log(title = "入库作业流水", businessType = BusinessType.DELETE) - @DeleteMapping("/{jobIds}") - public AjaxResult remove(@PathVariable String[] jobIds) + @DeleteMapping("/{jobDetailIds}") + public AjaxResult remove(@PathVariable String[] jobDetailIds) { - return toAjax(viewInJobFlowService.deleteViewInJobFlowByJobIds(jobIds)); + return toAjax(viewInJobFlowService.deleteViewInJobFlowByJobDetailIds(jobDetailIds)); } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewInJobFlow/domain/ViewInJobFlow.java b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewInJobFlow/domain/ViewInJobFlow.java index 0132339..c2eb64c 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewInJobFlow/domain/ViewInJobFlow.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewInJobFlow/domain/ViewInJobFlow.java @@ -1,1011 +1,595 @@ package com.ruoyi.search.ViewInJobFlow.domain; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.ToString; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.core.domain.BaseEntity; -import java.util.Date; - /** * 入库作业流水对象 view_in_job_flow * - * @author gw - * @date 2025-09-22 + * @author ruoyi + * @date 2025-10-28 */ public class ViewInJobFlow extends BaseEntity { private static final long serialVersionUID = 1L; - /** 作业ID */ - @Excel(name = "作业ID") - private String jobId; - - /** 子作业ID */ - @Excel(name = "子作业ID") + /** 子任务编码 */ + @Excel(name = "子任务编码") private String jobDetailId; - /** 作业类型 */ - @Excel(name = "作业类型",dictType = "in_job_type") - private String inOrOut; + /** 任务编码 */ + @Excel(name = "任务编码") + private String jobId; /** 任务号 */ @Excel(name = "任务号") private String taskNo; - /** 订单号 */ - @Excel(name = "订单号") - private String lineId; + /** 状态 */ + @Excel(name = "状态") + private String status; + + /** 任务类型 */ + @Excel(name = "任务类型") + private Long inOrOut; + + /** 托盘条码 */ + @Excel(name = "托盘条码") + private String trayCode; + + /** 开始时间 */ + @Excel(name = "开始时间") + private String startTime; + + /** 结束时间 */ + @Excel(name = "结束时间") + private String finishTime; + + /** 入口 */ + @Excel(name = "入口") + private String entranceId; + + /** 仓库编码 */ + @Excel(name = "仓库编码") + private String warehouseId; /** 物料编码 */ @Excel(name = "物料编码") private String productId; - /** 品名 */ + /** 物料名称 */ @Excel(name = "物料名称") private String productName; - /** 巷道ID */ - @Excel(name = "巷道ID") - private String roadwayId; - - /** 货位名称 */ - @Excel(name = "货位名称") - private String cargoSpaceName; - - /** 状态 */ - @Excel(name = "状态",dictType = "mydo_job_status") - private String status; - - /** 入口ID */ - @Excel(name = "入口ID") - private String entranceId; - - /** 批号 */ - @Excel(name = "批号") - private String lotNo; - - /** 单据ID */ - @Excel(name = "单据ID") - private String inOrOutId; - - /** 子单据ID */ - @Excel(name = "子单据ID") - private String inOrOutDId; - - /** 创建时间 */ - @Excel(name = "创建时间",dateFormat = "yyyy-MM-dd HH:mm:ss") - private Date createTime; - - @Override - public Date getCreateTime() { - return createTime; - } - - public void setCreateTime(Date createTime) { - this.createTime = createTime; - } - - /** 入库数量 */ - @Excel(name = "入库数量") - private String inQuantity; - - /** 托盘号 */ -// @Excel(name = "托盘号") - private String trayCode; - - /** 货位ID */ -// @Excel(name = "货位ID") - private String cargoSpaceId; - - /** 排 */ -// @Excel(name = "排") - private Long thePlatoon; - - /** 列 */ -// @Excel(name = "列") - private Long theColumn; - - /** 层 */ -// @Excel(name = "层") - private Long theFloor; - - /** 优先级 */ -// @Excel(name = "优先级") - private Long priority; - - /** 执行阶段 */ -// @Excel(name = "执行阶段") - private String executionPhase; - - /** 物料ID */ -// @Excel(name = "物料ID") - private String wlbh; - - /** 垛型ID */ -// @Excel(name = "垛型ID") - private String stackingId; - - /** 库存状态 */ -// @Excel(name = "库存状态") - private String stockStatus; - - /** 开始时间 */ -// @Excel(name = "开始时间") - private String startTime; - - /** 结束时间 */ -// @Excel(name = "结束时间") - private String finishTime; - - /** 仓库ID */ -// @Excel(name = "仓库ID") - private String warehouseId; - - /** 物料GUID */ -// @Excel(name = "物料GUID") - private String productGuid; - - - - /** 产品分类 */ -// @Excel(name = "产品分类") + /** 常用码 */ + @Excel(name = "常用码") private String parentId; - /** 品号描述 */ - @Excel(name = "品号描述") + /** 单价 */ + @Excel(name = "单价") private String price; - /** 英文描述 */ - @Excel(name = "英文描述") - private String cargoNo; - /** 图号 */ @Excel(name = "图号") + private String cargoNo; + + /** 单位 */ + @Excel(name = "单位") private String unit; /** 规格 */ @Excel(name = "规格") private String spec; - /** 型号 */ - @Excel(name = "型号") - private String spare1; + /** 物料类型 */ + @Excel(name = "物料类型") + private String productType; - /** 单件净重 */ - @Excel(name = "单件净重") - private String spare2; + /** 是否系统项 */ + @Excel(name = "是否系统项") + private String systemItem; - /** 颜色 */ - @Excel(name = "颜色") - private String spare3; + /** 创建时间 */ + @Excel(name = "创建时间") + private String productCtm; - /** 序列号 */ - @Excel(name = "序列号") - private String spare4; + /** 创建人 */ + @Excel(name = "创建人") + private String productCtu; - /** 电压 */ - @Excel(name = "电压") - private String spare5; + /** 库存上限 */ + @Excel(name = "库存上限") + private String upperNum; - /** 功率 */ - @Excel(name = "功率") - private String spare6; + /** 库存下限 */ + @Excel(name = "库存下限") + private String limitNum; + /** 是否启用 */ + @Excel(name = "是否启用") + private String enableFlag; + /** 入库数量 */ + @Excel(name = "入库数量") + private String inQuantity; - /** 相位 */ - @Excel(name = "相位") - private String spare7; + /** 批次号 */ + @Excel(name = "批次号") + private String lotNo; - /** 毛重 */ - @Excel(name = "毛重") - private String spare8; + /** 入库单 */ + @Excel(name = "入库单") + private String inOrOutId; - /** NC号 */ - @Excel(name = "NC号") - private String spare9; + /** 入库子单 */ + @Excel(name = "入库子单") + private String inOrOutDId; - /** 电源线 */ - @Excel(name = "电源线") - private String spare10; + /** 入库金额 */ + @Excel(name = "入库金额") + private String priceTotal; - /** 插头 */ - @Excel(name = "插头") - private String spare11; + /** 来源 */ + @Excel(name = "来源") + private String origin; - /** 接嘴 */ - @Excel(name = "接嘴") - private String spare12; + /** 周转类型 */ + @Excel(name = "周转类型") + private String turnovertype; - /** 快捷码 */ - @Excel(name = "快捷码") - private String spare13; + /** 套账 */ + @Excel(name = "套账") + private String account; - /** 库存单位编号 */ - @Excel(name = "库存单位编号") - private String spare14; + /** 用途 */ + @Excel(name = "用途") + private String purpose; - /** 库存单位名称 */ - @Excel(name = "库存单位名称") - private String spare15; + /** 台次 */ + @Excel(name = "台次") + private String units; - /** 品号群组 */ - @Excel(name = "品号群组") - private String spare16; + /** 合同号 */ + @Excel(name = "合同号") + private String contract; - /** 归类品 */ - @Excel(name = "归类品") - private String spare17; + /** 件次 */ + @Excel(name = "件次") + private String cases; - /** 计量体系 */ - @Excel(name = "计量体系") - private String spare18; + /** 质量 */ + @Excel(name = "质量") + private String quality; - /** 群组名称 */ - @Excel(name = "群组名称") - private String spare19; + /** 管理号 */ + @Excel(name = "管理号") + private String managementNo; - /** 批号管理 */ - @Excel(name = "批号管理") - private String spare20; - - /** 状态 */ - @Excel(name = "状态") - private String spare21; - - /** 产品大类 */ - @Excel(name = "产品大类") - private String spare22; - - /** 产品二类 */ - @Excel(name = "产品二类") - private String spare23; - - /** 产品线/产品系列（组码） */ - @Excel(name = "产品线/产品系列", readConverterExp = "组=码") - private String spare24; - - /** BOM状态（组码） */ - @Excel(name = "BOM状态", readConverterExp = "组=码") - private String spare25; - - /** 产品定位（组码） */ - @Excel(name = "产品定位", readConverterExp = "组=码") - private String spare26; - - /** 电脑板型号（组码） */ - @Excel(name = "电脑板型号", readConverterExp = "组=码") - private String spare27; - - /** 非标要求 */ - @Excel(name = "非标要求") - private String spare28; - - /** 品牌（组码） */ - @Excel(name = "品牌", readConverterExp = "组=码") - private String spare29; - - /** 非标颜色 */ - @Excel(name = "非标颜色") - private String spare30; - - /** 主颜色 */ - @Excel(name = "主颜色") - private String spare31; - - /** 辅助颜色 */ - @Excel(name = "辅助颜色") - private String spare32; - - /** 是否标准款（组码） */ - @Excel(name = "是否标准款", readConverterExp = "组=码") - private String spare33; - - /** 包装方式 */ - @Excel(name = "包装方式") - private String spare34; - - /** 主要包装方式 */ - @Excel(name = "主要包装方式") - private String spare35; - - /** 长 */ - @Excel(name = "长") - private String spare36; - - /** 宽 */ - @Excel(name = "宽") - private String spare37; - - /** 高 */ - @Excel(name = "高") - private String spare38; - - /** 包装材积 */ - @Excel(name = "包装材积") - private String spare39; - - @Excel(name = "描述") - private String remark; - - - public String getJobId() { - return jobId; - } - - public void setJobId(String jobId) { - this.jobId = jobId; - } - - public String getJobDetailId() { - return jobDetailId; - } - - public void setJobDetailId(String jobDetailId) { + public void setJobDetailId(String jobDetailId) + { this.jobDetailId = jobDetailId; } - public String getInOrOut() { - return inOrOut; + public String getJobDetailId() + { + return jobDetailId; } - public void setInOrOut(String inOrOut) { - this.inOrOut = inOrOut; + public void setJobId(String jobId) + { + this.jobId = jobId; } - public String getTaskNo() { - return taskNo; + public String getJobId() + { + return jobId; } - public void setTaskNo(String taskNo) { + public void setTaskNo(String taskNo) + { this.taskNo = taskNo; } - public String getLineId() { - return lineId; + public String getTaskNo() + { + return taskNo; } - public void setLineId(String lineId) { - this.lineId = lineId; - } - - public String getProductId() { - return productId; - } - - public void setProductId(String productId) { - this.productId = productId; - } - - public String getProductName() { - return productName; - } - - public void setProductName(String productName) { - this.productName = productName; - } - - public String getRoadwayId() { - return roadwayId; - } - - public void setRoadwayId(String roadwayId) { - this.roadwayId = roadwayId; - } - - public String getCargoSpaceName() { - return cargoSpaceName; - } - - public void setCargoSpaceName(String cargoSpaceName) { - this.cargoSpaceName = cargoSpaceName; - } - - public String getStatus() { - return status; - } - - public void setStatus(String status) { + public void setStatus(String status) + { this.status = status; } - public String getEntranceId() { - return entranceId; + public String getStatus() + { + return status; } - public void setEntranceId(String entranceId) { - this.entranceId = entranceId; + public void setInOrOut(Long inOrOut) + { + this.inOrOut = inOrOut; } - public String getLotNo() { - return lotNo; + public Long getInOrOut() + { + return inOrOut; } - public void setLotNo(String lotNo) { - this.lotNo = lotNo; - } - - public String getInOrOutId() { - return inOrOutId; - } - - public void setInOrOutId(String inOrOutId) { - this.inOrOutId = inOrOutId; - } - - public String getInOrOutDId() { - return inOrOutDId; - } - - public void setInOrOutDId(String inOrOutDId) { - this.inOrOutDId = inOrOutDId; - } - - - public String getInQuantity() { - return inQuantity; - } - - public void setInQuantity(String inQuantity) { - this.inQuantity = inQuantity; - } - - public String getTrayCode() { - return trayCode; - } - - public void setTrayCode(String trayCode) { + public void setTrayCode(String trayCode) + { this.trayCode = trayCode; } - public String getCargoSpaceId() { - return cargoSpaceId; + public String getTrayCode() + { + return trayCode; } - public void setCargoSpaceId(String cargoSpaceId) { - this.cargoSpaceId = cargoSpaceId; - } - - public Long getThePlatoon() { - return thePlatoon; - } - - public void setThePlatoon(Long thePlatoon) { - this.thePlatoon = thePlatoon; - } - - public Long getTheColumn() { - return theColumn; - } - - public void setTheColumn(Long theColumn) { - this.theColumn = theColumn; - } - - public Long getTheFloor() { - return theFloor; - } - - public void setTheFloor(Long theFloor) { - this.theFloor = theFloor; - } - - public Long getPriority() { - return priority; - } - - public void setPriority(Long priority) { - this.priority = priority; - } - - public String getExecutionPhase() { - return executionPhase; - } - - public void setExecutionPhase(String executionPhase) { - this.executionPhase = executionPhase; - } - - public String getWlbh() { - return wlbh; - } - - public void setWlbh(String wlbh) { - this.wlbh = wlbh; - } - - public String getStackingId() { - return stackingId; - } - - public void setStackingId(String stackingId) { - this.stackingId = stackingId; - } - - public String getStockStatus() { - return stockStatus; - } - - public void setStockStatus(String stockStatus) { - this.stockStatus = stockStatus; - } - - public String getStartTime() { - return startTime; - } - - public void setStartTime(String startTime) { + public void setStartTime(String startTime) + { this.startTime = startTime; } - public String getFinishTime() { - return finishTime; + public String getStartTime() + { + return startTime; } - public void setFinishTime(String finishTime) { + public void setFinishTime(String finishTime) + { this.finishTime = finishTime; } - public String getWarehouseId() { - return warehouseId; + public String getFinishTime() + { + return finishTime; } - public void setWarehouseId(String warehouseId) { + public void setEntranceId(String entranceId) + { + this.entranceId = entranceId; + } + + public String getEntranceId() + { + return entranceId; + } + + public void setWarehouseId(String warehouseId) + { this.warehouseId = warehouseId; } - public String getProductGuid() { - return productGuid; + public String getWarehouseId() + { + return warehouseId; } - public void setProductGuid(String productGuid) { - this.productGuid = productGuid; + public void setProductId(String productId) + { + this.productId = productId; } - public String getParentId() { - return parentId; + public String getProductId() + { + return productId; } - public void setParentId(String parentId) { + public void setProductName(String productName) + { + this.productName = productName; + } + + public String getProductName() + { + return productName; + } + + public void setParentId(String parentId) + { this.parentId = parentId; } - public String getPrice() { - return price; + public String getParentId() + { + return parentId; } - public void setPrice(String price) { + public void setPrice(String price) + { this.price = price; } - public String getCargoNo() { - return cargoNo; + public String getPrice() + { + return price; } - public void setCargoNo(String cargoNo) { + public void setCargoNo(String cargoNo) + { this.cargoNo = cargoNo; } - public String getUnit() { - return unit; + public String getCargoNo() + { + return cargoNo; } - public void setUnit(String unit) { + public void setUnit(String unit) + { this.unit = unit; } - public String getSpec() { - return spec; + public String getUnit() + { + return unit; } - public void setSpec(String spec) { + public void setSpec(String spec) + { this.spec = spec; } - public String getSpare1() { - return spare1; + public String getSpec() + { + return spec; } - public void setSpare1(String spare1) { - this.spare1 = spare1; + public void setProductType(String productType) + { + this.productType = productType; } - public String getSpare2() { - return spare2; + public String getProductType() + { + return productType; } - public void setSpare2(String spare2) { - this.spare2 = spare2; + public void setSystemItem(String systemItem) + { + this.systemItem = systemItem; } - public String getSpare3() { - return spare3; + public String getSystemItem() + { + return systemItem; } - public void setSpare3(String spare3) { - this.spare3 = spare3; + public void setProductCtm(String productCtm) + { + this.productCtm = productCtm; } - public String getSpare4() { - return spare4; + public String getProductCtm() + { + return productCtm; } - public void setSpare4(String spare4) { - this.spare4 = spare4; + public void setProductCtu(String productCtu) + { + this.productCtu = productCtu; } - public String getSpare5() { - return spare5; + public String getProductCtu() + { + return productCtu; } - public void setSpare5(String spare5) { - this.spare5 = spare5; + public void setUpperNum(String upperNum) + { + this.upperNum = upperNum; } - public String getSpare6() { - return spare6; + public String getUpperNum() + { + return upperNum; } - public void setSpare6(String spare6) { - this.spare6 = spare6; + public void setLimitNum(String limitNum) + { + this.limitNum = limitNum; } - public String getSpare7() { - return spare7; + public String getLimitNum() + { + return limitNum; } - public void setSpare7(String spare7) { - this.spare7 = spare7; + public void setEnableFlag(String enableFlag) + { + this.enableFlag = enableFlag; } - public String getSpare8() { - return spare8; + public String getEnableFlag() + { + return enableFlag; } - public void setSpare8(String spare8) { - this.spare8 = spare8; + public void setInQuantity(String inQuantity) + { + this.inQuantity = inQuantity; } - public String getSpare9() { - return spare9; + public String getInQuantity() + { + return inQuantity; } - public void setSpare9(String spare9) { - this.spare9 = spare9; + public void setLotNo(String lotNo) + { + this.lotNo = lotNo; } - public String getSpare10() { - return spare10; + public String getLotNo() + { + return lotNo; } - public void setSpare10(String spare10) { - this.spare10 = spare10; + public void setInOrOutId(String inOrOutId) + { + this.inOrOutId = inOrOutId; } - public String getSpare11() { - return spare11; + public String getInOrOutId() + { + return inOrOutId; } - public void setSpare11(String spare11) { - this.spare11 = spare11; + public void setInOrOutDId(String inOrOutDId) + { + this.inOrOutDId = inOrOutDId; } - public String getSpare12() { - return spare12; + public String getInOrOutDId() + { + return inOrOutDId; } - public void setSpare12(String spare12) { - this.spare12 = spare12; + public void setPriceTotal(String priceTotal) + { + this.priceTotal = priceTotal; } - public String getSpare13() { - return spare13; + public String getPriceTotal() + { + return priceTotal; } - public void setSpare13(String spare13) { - this.spare13 = spare13; + public void setOrigin(String origin) + { + this.origin = origin; } - public String getSpare14() { - return spare14; + public String getOrigin() + { + return origin; } - public void setSpare14(String spare14) { - this.spare14 = spare14; + public void setTurnovertype(String turnovertype) + { + this.turnovertype = turnovertype; } - public String getSpare15() { - return spare15; + public String getTurnovertype() + { + return turnovertype; } - public void setSpare15(String spare15) { - this.spare15 = spare15; + public void setAccount(String account) + { + this.account = account; } - public String getSpare16() { - return spare16; + public String getAccount() + { + return account; } - public void setSpare16(String spare16) { - this.spare16 = spare16; + public void setPurpose(String purpose) + { + this.purpose = purpose; } - public String getSpare17() { - return spare17; + public String getPurpose() + { + return purpose; } - public void setSpare17(String spare17) { - this.spare17 = spare17; + public void setUnits(String units) + { + this.units = units; } - public String getSpare18() { - return spare18; + public String getUnits() + { + return units; } - public void setSpare18(String spare18) { - this.spare18 = spare18; + public void setContract(String contract) + { + this.contract = contract; } - public String getSpare19() { - return spare19; + public String getContract() + { + return contract; } - public void setSpare19(String spare19) { - this.spare19 = spare19; + public void setCases(String cases) + { + this.cases = cases; } - public String getSpare20() { - return spare20; + public String getCases() + { + return cases; } - public void setSpare20(String spare20) { - this.spare20 = spare20; + public void setQuality(String quality) + { + this.quality = quality; } - public String getSpare21() { - return spare21; + public String getQuality() + { + return quality; } - public void setSpare21(String spare21) { - this.spare21 = spare21; + public void setManagementNo(String managementNo) + { + this.managementNo = managementNo; } - public String getSpare22() { - return spare22; - } - - public void setSpare22(String spare22) { - this.spare22 = spare22; - } - - public String getSpare23() { - return spare23; - } - - public void setSpare23(String spare23) { - this.spare23 = spare23; - } - - public String getSpare24() { - return spare24; - } - - public void setSpare24(String spare24) { - this.spare24 = spare24; - } - - public String getSpare25() { - return spare25; - } - - public void setSpare25(String spare25) { - this.spare25 = spare25; - } - - public String getSpare26() { - return spare26; - } - - public void setSpare26(String spare26) { - this.spare26 = spare26; - } - - public String getSpare27() { - return spare27; - } - - public void setSpare27(String spare27) { - this.spare27 = spare27; - } - - public String getSpare28() { - return spare28; - } - - public void setSpare28(String spare28) { - this.spare28 = spare28; - } - - public String getSpare29() { - return spare29; - } - - public void setSpare29(String spare29) { - this.spare29 = spare29; - } - - public String getSpare30() { - return spare30; - } - - public void setSpare30(String spare30) { - this.spare30 = spare30; - } - - public String getSpare31() { - return spare31; - } - - public void setSpare31(String spare31) { - this.spare31 = spare31; - } - - public String getSpare32() { - return spare32; - } - - public void setSpare32(String spare32) { - this.spare32 = spare32; - } - - public String getSpare33() { - return spare33; - } - - public void setSpare33(String spare33) { - this.spare33 = spare33; - } - - public String getSpare34() { - return spare34; - } - - public void setSpare34(String spare34) { - this.spare34 = spare34; - } - - public String getSpare35() { - return spare35; - } - - public void setSpare35(String spare35) { - this.spare35 = spare35; - } - - public String getSpare36() { - return spare36; - } - - public void setSpare36(String spare36) { - this.spare36 = spare36; - } - - public String getSpare37() { - return spare37; - } - - public void setSpare37(String spare37) { - this.spare37 = spare37; - } - - public String getSpare38() { - return spare38; - } - - public void setSpare38(String spare38) { - this.spare38 = spare38; - } - - public String getSpare39() { - return spare39; - } - - public void setSpare39(String spare39) { - this.spare39 = spare39; - } - - @Override - public String getRemark() { - return remark; - } - - @Override - public void setRemark(String remark) { - this.remark = remark; + public String getManagementNo() + { + return managementNo; } @Override public String toString() { - return "ViewInJobFlow{" + - "jobId='" + jobId + '\'' + - ", jobDetailId='" + jobDetailId + '\'' + - ", inOrOut='" + inOrOut + '\'' + - ", taskNo='" + taskNo + '\'' + - ", lineId='" + lineId + '\'' + - ", productId='" + productId + '\'' + - ", productName='" + productName + '\'' + - ", roadwayId='" + roadwayId + '\'' + - ", cargoSpaceName='" + cargoSpaceName + '\'' + - ", status='" + status + '\'' + - ", entranceId='" + entranceId + '\'' + - ", lotNo='" + lotNo + '\'' + - ", inOrOutId='" + inOrOutId + '\'' + - ", inOrOutDId='" + inOrOutDId + '\'' + - ", inQuantity='" + inQuantity + '\'' + - ", trayCode='" + trayCode + '\'' + - ", cargoSpaceId='" + cargoSpaceId + '\'' + - ", thePlatoon=" + thePlatoon + - ", theColumn=" + theColumn + - ", theFloor=" + theFloor + - ", priority=" + priority + - ", executionPhase='" + executionPhase + '\'' + - ", wlbh='" + wlbh + '\'' + - ", stackingId='" + stackingId + '\'' + - ", stockStatus='" + stockStatus + '\'' + - ", startTime='" + startTime + '\'' + - ", finishTime='" + finishTime + '\'' + - ", warehouseId='" + warehouseId + '\'' + - ", productGuid='" + productGuid + '\'' + - ", parentId='" + parentId + '\'' + - ", price='" + price + '\'' + - ", cargoNo='" + cargoNo + '\'' + - ", unit='" + unit + '\'' + - ", spec='" + spec + '\'' + - ", spare1='" + spare1 + '\'' + - ", spare2='" + spare2 + '\'' + - ", spare3='" + spare3 + '\'' + - ", spare4='" + spare4 + '\'' + - ", spare5='" + spare5 + '\'' + - ", spare6='" + spare6 + '\'' + - ", spare7='" + spare7 + '\'' + - ", spare8='" + spare8 + '\'' + - ", spare9='" + spare9 + '\'' + - ", spare10='" + spare10 + '\'' + - ", spare11='" + spare11 + '\'' + - ", spare12='" + spare12 + '\'' + - ", spare13='" + spare13 + '\'' + - ", spare14='" + spare14 + '\'' + - ", spare15='" + spare15 + '\'' + - ", spare16='" + spare16 + '\'' + - ", spare17='" + spare17 + '\'' + - ", spare18='" + spare18 + '\'' + - ", spare19='" + spare19 + '\'' + - ", spare20='" + spare20 + '\'' + - ", spare21='" + spare21 + '\'' + - ", spare22='" + spare22 + '\'' + - ", spare23='" + spare23 + '\'' + - ", spare24='" + spare24 + '\'' + - ", spare25='" + spare25 + '\'' + - ", spare26='" + spare26 + '\'' + - ", spare27='" + spare27 + '\'' + - ", spare28='" + spare28 + '\'' + - ", spare29='" + spare29 + '\'' + - ", spare30='" + spare30 + '\'' + - ", spare31='" + spare31 + '\'' + - ", spare32='" + spare32 + '\'' + - ", spare33='" + spare33 + '\'' + - ", spare34='" + spare34 + '\'' + - ", spare35='" + spare35 + '\'' + - ", spare36='" + spare36 + '\'' + - ", spare37='" + spare37 + '\'' + - ", spare38='" + spare38 + '\'' + - ", spare39='" + spare39 + '\'' + - ", remark='" + remark + '\'' + - '}'; + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("jobDetailId", getJobDetailId()) + .append("jobId", getJobId()) + .append("taskNo", getTaskNo()) + .append("status", getStatus()) + .append("inOrOut", getInOrOut()) + .append("trayCode", getTrayCode()) + .append("createTime", getCreateTime()) + .append("startTime", getStartTime()) + .append("finishTime", getFinishTime()) + .append("entranceId", getEntranceId()) + .append("warehouseId", getWarehouseId()) + .append("productId", getProductId()) + .append("productName", getProductName()) + .append("parentId", getParentId()) + .append("price", getPrice()) + .append("cargoNo", getCargoNo()) + .append("unit", getUnit()) + .append("spec", getSpec()) + .append("remark", getRemark()) + .append("productType", getProductType()) + .append("systemItem", getSystemItem()) + .append("productCtm", getProductCtm()) + .append("productCtu", getProductCtu()) + .append("upperNum", getUpperNum()) + .append("limitNum", getLimitNum()) + .append("enableFlag", getEnableFlag()) + .append("inQuantity", getInQuantity()) + .append("lotNo", getLotNo()) + .append("inOrOutId", getInOrOutId()) + .append("inOrOutDId", getInOrOutDId()) + .append("priceTotal", getPriceTotal()) + .append("origin", getOrigin()) + .append("turnovertype", getTurnovertype()) + .append("account", getAccount()) + .append("purpose", getPurpose()) + .append("units", getUnits()) + .append("contract", getContract()) + .append("cases", getCases()) + .append("quality", getQuality()) + .append("managementNo", getManagementNo()) + .toString(); } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewInJobFlow/mapper/ViewInJobFlowMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewInJobFlow/mapper/ViewInJobFlowMapper.java index a825e0e..fad0be4 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewInJobFlow/mapper/ViewInJobFlowMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewInJobFlow/mapper/ViewInJobFlowMapper.java @@ -6,18 +6,18 @@ import com.ruoyi.search.ViewInJobFlow.domain.ViewInJobFlow; /** * 入库作业流水Mapper接口 * - * @author gw - * @date 2025-09-22 + * @author ruoyi + * @date 2025-10-28 */ public interface ViewInJobFlowMapper { /** * 查询入库作业流水 * - * @param jobId 入库作业流水主键 + * @param jobDetailId 入库作业流水主键 * @return 入库作业流水 */ - public ViewInJobFlow selectViewInJobFlowByJobId(String jobId); + public ViewInJobFlow selectViewInJobFlowByJobDetailId(String jobDetailId); /** * 查询入库作业流水列表 @@ -46,16 +46,16 @@ public interface ViewInJobFlowMapper /** * 删除入库作业流水 * - * @param jobId 入库作业流水主键 + * @param jobDetailId 入库作业流水主键 * @return 结果 */ - public int deleteViewInJobFlowByJobId(String jobId); + public int deleteViewInJobFlowByJobDetailId(String jobDetailId); /** * 批量删除入库作业流水 * - * @param jobIds 需要删除的数据主键集合 + * @param jobDetailIds 需要删除的数据主键集合 * @return 结果 */ - public int deleteViewInJobFlowByJobIds(String[] jobIds); + public int deleteViewInJobFlowByJobDetailIds(String[] jobDetailIds); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewInJobFlow/service/IViewInJobFlowService.java b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewInJobFlow/service/IViewInJobFlowService.java index 5091f11..7b1d01c 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewInJobFlow/service/IViewInJobFlowService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewInJobFlow/service/IViewInJobFlowService.java @@ -6,18 +6,18 @@ import com.ruoyi.search.ViewInJobFlow.domain.ViewInJobFlow; /** * 入库作业流水Service接口 * - * @author gw - * @date 2025-09-22 + * @author ruoyi + * @date 2025-10-28 */ public interface IViewInJobFlowService { /** * 查询入库作业流水 * - * @param jobId 入库作业流水主键 + * @param jobDetailId 入库作业流水主键 * @return 入库作业流水 */ - public ViewInJobFlow selectViewInJobFlowByJobId(String jobId); + public ViewInJobFlow selectViewInJobFlowByJobDetailId(String jobDetailId); /** * 查询入库作业流水列表 @@ -46,16 +46,16 @@ public interface IViewInJobFlowService /** * 批量删除入库作业流水 * - * @param jobIds 需要删除的入库作业流水主键集合 + * @param jobDetailIds 需要删除的入库作业流水主键集合 * @return 结果 */ - public int deleteViewInJobFlowByJobIds(String[] jobIds); + public int deleteViewInJobFlowByJobDetailIds(String[] jobDetailIds); /** * 删除入库作业流水信息 * - * @param jobId 入库作业流水主键 + * @param jobDetailId 入库作业流水主键 * @return 结果 */ - public int deleteViewInJobFlowByJobId(String jobId); + public int deleteViewInJobFlowByJobDetailId(String jobDetailId); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewInJobFlow/service/impl/ViewInJobFlowServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewInJobFlow/service/impl/ViewInJobFlowServiceImpl.java index c7e48dc..7e9dd46 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewInJobFlow/service/impl/ViewInJobFlowServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewInJobFlow/service/impl/ViewInJobFlowServiceImpl.java @@ -11,8 +11,8 @@ import com.ruoyi.search.ViewInJobFlow.service.IViewInJobFlowService; /** * 入库作业流水Service业务层处理 * - * @author gw - * @date 2025-09-22 + * @author ruoyi + * @date 2025-10-28 */ @Service public class ViewInJobFlowServiceImpl implements IViewInJobFlowService @@ -23,13 +23,13 @@ public class ViewInJobFlowServiceImpl implements IViewInJobFlowService /** * 查询入库作业流水 * - * @param jobId 入库作业流水主键 + * @param jobDetailId 入库作业流水主键 * @return 入库作业流水 */ @Override - public ViewInJobFlow selectViewInJobFlowByJobId(String jobId) + public ViewInJobFlow selectViewInJobFlowByJobDetailId(String jobDetailId) { - return viewInJobFlowMapper.selectViewInJobFlowByJobId(jobId); + return viewInJobFlowMapper.selectViewInJobFlowByJobDetailId(jobDetailId); } /** @@ -72,24 +72,24 @@ public class ViewInJobFlowServiceImpl implements IViewInJobFlowService /** * 批量删除入库作业流水 * - * @param jobIds 需要删除的入库作业流水主键 + * @param jobDetailIds 需要删除的入库作业流水主键 * @return 结果 */ @Override - public int deleteViewInJobFlowByJobIds(String[] jobIds) + public int deleteViewInJobFlowByJobDetailIds(String[] jobDetailIds) { - return viewInJobFlowMapper.deleteViewInJobFlowByJobIds(jobIds); + return viewInJobFlowMapper.deleteViewInJobFlowByJobDetailIds(jobDetailIds); } /** * 删除入库作业流水信息 * - * @param jobId 入库作业流水主键 + * @param jobDetailId 入库作业流水主键 * @return 结果 */ @Override - public int deleteViewInJobFlowByJobId(String jobId) + public int deleteViewInJobFlowByJobDetailId(String jobDetailId) { - return viewInJobFlowMapper.deleteViewInJobFlowByJobId(jobId); + return viewInJobFlowMapper.deleteViewInJobFlowByJobDetailId(jobDetailId); } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewOutJobFlow/controller/ViewOutJobFlowController.java b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewOutJobFlow/controller/ViewOutJobFlowController.java index 3ebb940..fc0e022 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewOutJobFlow/controller/ViewOutJobFlowController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewOutJobFlow/controller/ViewOutJobFlowController.java @@ -22,10 +22,10 @@ import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.common.core.page.TableDataInfo; /** - * 出库作业流水Controller + * 出库作业流水ControllerController * - * @author gw - * @date 2025-09-22 + * @author ruoyi + * @date 2025-10-28 */ @RestController @RequestMapping("/search/ViewOutJobFlow") @@ -35,7 +35,7 @@ public class ViewOutJobFlowController extends BaseController private IViewOutJobFlowService viewOutJobFlowService; /** - * 查询出库作业流水列表 + * 查询出库作业流水Controller列表 */ @PreAuthorize("@ss.hasPermi('search:ViewOutJobFlow:list')") @GetMapping("/list") @@ -47,33 +47,33 @@ public class ViewOutJobFlowController extends BaseController } /** - * 导出出库作业流水列表 + * 导出出库作业流水Controller列表 */ @PreAuthorize("@ss.hasPermi('search:ViewOutJobFlow:export')") - @Log(title = "出库作业流水", businessType = BusinessType.EXPORT) + @Log(title = "出库作业流水Controller", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(HttpServletResponse response, ViewOutJobFlow viewOutJobFlow) { List list = viewOutJobFlowService.selectViewOutJobFlowList(viewOutJobFlow); ExcelUtil util = new ExcelUtil(ViewOutJobFlow.class); - util.exportExcel(response, list, "出库作业流水数据"); + util.exportExcel(response, list, "出库作业流水Controller数据"); } /** - * 获取出库作业流水详细信息 + * 获取出库作业流水Controller详细信息 */ @PreAuthorize("@ss.hasPermi('search:ViewOutJobFlow:query')") - @GetMapping(value = "/{jobId}") - public AjaxResult getInfo(@PathVariable("jobId") String jobId) + @GetMapping(value = "/{jobDetailId}") + public AjaxResult getInfo(@PathVariable("jobDetailId") String jobDetailId) { - return success(viewOutJobFlowService.selectViewOutJobFlowByJobId(jobId)); + return success(viewOutJobFlowService.selectViewOutJobFlowByJobDetailId(jobDetailId)); } /** - * 新增出库作业流水 + * 新增出库作业流水Controller */ @PreAuthorize("@ss.hasPermi('search:ViewOutJobFlow:add')") - @Log(title = "出库作业流水", businessType = BusinessType.INSERT) + @Log(title = "出库作业流水Controller", businessType = BusinessType.INSERT) @PostMapping public AjaxResult add(@RequestBody ViewOutJobFlow viewOutJobFlow) { @@ -81,10 +81,10 @@ public class ViewOutJobFlowController extends BaseController } /** - * 修改出库作业流水 + * 修改出库作业流水Controller */ @PreAuthorize("@ss.hasPermi('search:ViewOutJobFlow:edit')") - @Log(title = "出库作业流水", businessType = BusinessType.UPDATE) + @Log(title = "出库作业流水Controller", businessType = BusinessType.UPDATE) @PutMapping public AjaxResult edit(@RequestBody ViewOutJobFlow viewOutJobFlow) { @@ -92,13 +92,13 @@ public class ViewOutJobFlowController extends BaseController } /** - * 删除出库作业流水 + * 删除出库作业流水Controller */ @PreAuthorize("@ss.hasPermi('search:ViewOutJobFlow:remove')") - @Log(title = "出库作业流水", businessType = BusinessType.DELETE) - @DeleteMapping("/{jobIds}") - public AjaxResult remove(@PathVariable String[] jobIds) + @Log(title = "出库作业流水Controller", businessType = BusinessType.DELETE) + @DeleteMapping("/{jobDetailIds}") + public AjaxResult remove(@PathVariable String[] jobDetailIds) { - return toAjax(viewOutJobFlowService.deleteViewOutJobFlowByJobIds(jobIds)); + return toAjax(viewOutJobFlowService.deleteViewOutJobFlowByJobDetailIds(jobDetailIds)); } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewOutJobFlow/domain/ViewOutJobFlow.java b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewOutJobFlow/domain/ViewOutJobFlow.java index 59a2288..f33feee 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewOutJobFlow/domain/ViewOutJobFlow.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewOutJobFlow/domain/ViewOutJobFlow.java @@ -1,1031 +1,595 @@ package com.ruoyi.search.ViewOutJobFlow.domain; -import lombok.Data; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.core.domain.BaseEntity; -import java.util.Date; - /** - * 出库作业流水对象 view_out_job_flow + * 出库作业流水Controller对象 view_out_job_flow * - * @author gw - * @date 2025-09-22 + * @author ruoyi + * @date 2025-10-28 */ public class ViewOutJobFlow extends BaseEntity { private static final long serialVersionUID = 1L; - /** 作业ID */ - @Excel(name = "作业ID") - private String jobId; - - /** 子作业ID */ - @Excel(name = "子作业ID") + /** 子任务 */ + @Excel(name = "子任务") private String jobDetailId; - /** 作业类型 */ - @Excel(name = "作业类型",dictType = "out_job_type") - private String inOrOut; + /** 任务编码 */ + @Excel(name = "任务编码") + private String jobId; /** 任务号 */ @Excel(name = "任务号") private String taskNo; - /** 订单号 */ - @Excel(name = "订单号") - private String lineId; + /** 状态 */ + @Excel(name = "状态") + private String status; - /** 物料编码 */ - @Excel(name = "物料编码") - private String productId; - - /** 品名 */ - @Excel(name = "物料名称") - private String productName; + /** 任务类型 */ + @Excel(name = "任务类型") + private Long inOrOut; /** 托盘码 */ @Excel(name = "托盘码") private String trayCode; - /** 巷道ID */ - @Excel(name = "巷道ID") - private String roadwayId; - - /** 货位名称 */ - @Excel(name = "货位名称") - private String cargoSpaceName; - - /** 状态 */ - @Excel(name = "状态",dictType = "mydo_job_status") - private String status; - - /** 出口ID */ - @Excel(name = "出口ID") - private String exitId; - - /** 批号 */ - @Excel(name = "批号") - private String lotNo; - - /** 单据ID */ - @Excel(name = "单据ID") - private String inOrOutId; - - /** 子单据ID */ - @Excel(name = "子单据ID") - private String inOrOutDId; - - /** 创建时间 */ - @Excel(name = "创建时间",dateFormat = "yyyy-MM-dd HH:mm:ss") - private Date createTime; - - /** 出库数量 */ - @Excel(name = "出库数量") - private String outQuantity; - - /** 客户名称 */ - @Excel(name = "客户名称") - private String customerName; - - /** 货位ID */ -// @Excel(name = "货位ID") - private String cargoSpaceId; - - /** 排 */ -// @Excel(name = "排") - private Long thePlatoon; - - /** 列 */ -// @Excel(name = "列") - private Long theColumn; - - /** 层 */ -// @Excel(name = "层") - private Long theFloor; - - /** 优先级 */ -// @Excel(name = "优先级") - private Long priority; - - /** 执行阶段 */ -// @Excel(name = "执行阶段") - private String executionPhase; - - /** 物料ID */ -// @Excel(name = "物料ID") - private String wlbh; - - /** 剁型ID */ -// @Excel(name = "剁型ID") - private String stackingId; - - /** 库存状态 */ -// @Excel(name = "库存状态") - private String stockStatus; - - /** 回流数量 */ -// @Excel(name = "回流数量") - private String giveNum; - /** 开始时间 */ -// @Excel(name = "开始时间") + @Excel(name = "开始时间") private String startTime; /** 结束时间 */ -// @Excel(name = "结束时间") + @Excel(name = "结束时间") private String finishTime; - /** 仓库ID */ -// @Excel(name = "仓库ID") + /** 出口 */ + @Excel(name = "出口") + private String exitId; + + /** 仓库编码 */ + @Excel(name = "仓库编码") private String warehouseId; - /** 物料GUID */ -// @Excel(name = "物料GUID") - private String productGuid; + /** 物料编码 */ + @Excel(name = "物料编码") + private String productId; - /** 产品分类 */ -// @Excel(name = "产品分类") + /** 物料名称 */ + @Excel(name = "物料名称") + private String productName; + + /** 常用编码 */ + @Excel(name = "常用编码") private String parentId; - /** 品号描述 */ - @Excel(name = "品号描述") + /** 单价 */ + @Excel(name = "单价") private String price; - /** 英文描述 */ - @Excel(name = "英文描述") - private String cargoNo; - /** 图号 */ @Excel(name = "图号") + private String cargoNo; + + /** 单位 */ + @Excel(name = "单位") private String unit; /** 规格 */ @Excel(name = "规格") private String spec; - /** 型号 */ -// @Excel(name = "型号") - private String spare1; + /** 物料类型 */ + @Excel(name = "物料类型") + private String productType; - /** 单件净重 */ -// @Excel(name = "单件净重") - private String spare2; + /** 是否系统项 */ + @Excel(name = "是否系统项") + private String systemItem; - /** 颜色 */ -// @Excel(name = "颜色") - private String spare3; + /** 物料创建时间 */ + @Excel(name = "物料创建时间") + private String productCtm; - /** 序列号 */ -// @Excel(name = "序列号") - private String spare4; + /** 物料创建人 */ + @Excel(name = "物料创建人") + private String productCtu; - /** 电压 */ -// @Excel(name = "电压") - private String spare5; + /** 库存上限 */ + @Excel(name = "库存上限") + private String upperNum; - /** 功率 */ -// @Excel(name = "功率") - private String spare6; + /** 库存下限 */ + @Excel(name = "库存下限") + private String limitNum; - /** 相位 */ -// @Excel(name = "相位") - private String spare7; + /** 是否可用 */ + @Excel(name = "是否可用") + private String enableFlag; - /** 毛重 */ -// @Excel(name = "毛重") - private String spare8; + /** 出库数量 */ + @Excel(name = "出库数量") + private String outQuantity; - /** NC号 */ - @Excel(name = "NC号") - private String spare9; + /** 批次号 */ + @Excel(name = "批次号") + private String lotNo; - /** 电源线 */ - @Excel(name = "电源线") - private String spare10; + /** 单据编码 */ + @Excel(name = "单据编码") + private String inOrOutId; - /** 插头 */ - @Excel(name = "插头") - private String spare11; + /** 子单据编码 */ + @Excel(name = "子单据编码") + private String inOrOutDId; - /** 接嘴 */ - @Excel(name = "接嘴") - private String spare12; + /** 金额 */ + @Excel(name = "金额") + private String priceTotal; - /** 快捷码 */ - @Excel(name = "快捷码") - private String spare13; + /** 来源 */ + @Excel(name = "来源") + private String origin; - /** 库存单位编号 */ - @Excel(name = "库存单位编号") - private String spare14; + /** 周转类型 */ + @Excel(name = "周转类型") + private String turnovertype; - /** 库存单位名称 */ - @Excel(name = "库存单位名称") - private String spare15; + /** 套账 */ + @Excel(name = "套账") + private String account; - /** 品号群组 */ - @Excel(name = "品号群组") - private String spare16; + /** 用途 */ + @Excel(name = "用途") + private String purpose; - /** 归类品 */ - @Excel(name = "归类品") - private String spare17; + /** 台次 */ + @Excel(name = "台次") + private String units; - /** 计量体系 */ - @Excel(name = "计量体系") - private String spare18; + /** 合同 */ + @Excel(name = "合同") + private String contract; - /** 群组名称 */ - @Excel(name = "群组名称") - private String spare19; + /** 件次 */ + @Excel(name = "件次") + private String cases; - /** 批号管理 */ - @Excel(name = "批号管理") - private String spare20; + /** 质量 */ + @Excel(name = "质量") + private String quality; - /** 状态 */ - @Excel(name = "状态") - private String spare21; + /** 管理号 */ + @Excel(name = "管理号") + private String managementNo; - /** 产品大类 */ - @Excel(name = "产品大类") - private String spare22; - - /** 产品二类 */ - @Excel(name = "产品二类") - private String spare23; - - /** 产品线/产品系列（组码） */ - @Excel(name = "产品线/产品系列", readConverterExp = "组=码") - private String spare24; - - /** BOM状态（组码） */ - @Excel(name = "BOM状态", readConverterExp = "组=码") - private String spare25; - - /** 产品定位（组码） */ - @Excel(name = "产品定位", readConverterExp = "组=码") - private String spare26; - - /** 电脑板型号（组码） */ - @Excel(name = "电脑板型号", readConverterExp = "组=码") - private String spare27; - - /** 非标要求 */ - @Excel(name = "非标要求") - private String spare28; - - /** 品牌（组码） */ - @Excel(name = "品牌", readConverterExp = "组=码") - private String spare29; - - /** 非标颜色 */ - @Excel(name = "非标颜色") - private String spare30; - - /** 主颜色 */ - @Excel(name = "主颜色") - private String spare31; - - /** 辅助颜色 */ - @Excel(name = "辅助颜色") - private String spare32; - - /** 是否标准款（组码） */ - @Excel(name = "是否标准款", readConverterExp = "组=码") - private String spare33; - - /** 包装方式 */ - @Excel(name = "包装方式") - private String spare34; - - /** 主要包装方式 */ - @Excel(name = "主要包装方式") - private String spare35; - - /** 长 */ - @Excel(name = "长") - private String spare36; - - /** 宽 */ - @Excel(name = "宽") - private String spare37; - - /** 高 */ - @Excel(name = "高") - private String spare38; - - /** 包装材积 */ - @Excel(name = "包装材积") - private String spare39; - - /** 描述 */ - @Excel(name = "描述") - private String remark; - - - - public String getJobId() { - return jobId; - } - - public void setJobId(String jobId) { - this.jobId = jobId; - } - - public String getJobDetailId() { - return jobDetailId; - } - - public void setJobDetailId(String jobDetailId) { + public void setJobDetailId(String jobDetailId) + { this.jobDetailId = jobDetailId; } - public String getStatus() { - return status; + public String getJobDetailId() + { + return jobDetailId; } - public void setStatus(String status) { - this.status = status; + public void setJobId(String jobId) + { + this.jobId = jobId; } - public String getTaskNo() { - return taskNo; + public String getJobId() + { + return jobId; } - public void setTaskNo(String taskNo) { + public void setTaskNo(String taskNo) + { this.taskNo = taskNo; } - public String getTrayCode() { - return trayCode; + public String getTaskNo() + { + return taskNo; } - public void setTrayCode(String trayCode) { - this.trayCode = trayCode; + public void setStatus(String status) + { + this.status = status; } - public String getRoadwayId() { - return roadwayId; + public String getStatus() + { + return status; } - public void setRoadwayId(String roadwayId) { - this.roadwayId = roadwayId; - } - - public String getCargoSpaceId() { - return cargoSpaceId; - } - - public void setCargoSpaceId(String cargoSpaceId) { - this.cargoSpaceId = cargoSpaceId; - } - - public String getCargoSpaceName() { - return cargoSpaceName; - } - - public void setCargoSpaceName(String cargoSpaceName) { - this.cargoSpaceName = cargoSpaceName; - } - - public Long getThePlatoon() { - return thePlatoon; - } - - public void setThePlatoon(Long thePlatoon) { - this.thePlatoon = thePlatoon; - } - - public Long getTheColumn() { - return theColumn; - } - - public void setTheColumn(Long theColumn) { - this.theColumn = theColumn; - } - - public Long getTheFloor() { - return theFloor; - } - - public void setTheFloor(Long theFloor) { - this.theFloor = theFloor; - } - - public Long getPriority() { - return priority; - } - - public void setPriority(Long priority) { - this.priority = priority; - } - - public String getExecutionPhase() { - return executionPhase; - } - - public void setExecutionPhase(String executionPhase) { - this.executionPhase = executionPhase; - } - - public String getInOrOut() { - return inOrOut; - } - - public void setInOrOut(String inOrOut) { + public void setInOrOut(Long inOrOut) + { this.inOrOut = inOrOut; } - public String getExitId() { - return exitId; + public Long getInOrOut() + { + return inOrOut; } - public void setExitId(String exitId) { - this.exitId = exitId; + public void setTrayCode(String trayCode) + { + this.trayCode = trayCode; } - public String getWlbh() { - return wlbh; + public String getTrayCode() + { + return trayCode; } - public void setWlbh(String wlbh) { - this.wlbh = wlbh; - } - - public String getLotNo() { - return lotNo; - } - - public void setLotNo(String lotNo) { - this.lotNo = lotNo; - } - - public String getStackingId() { - return stackingId; - } - - public void setStackingId(String stackingId) { - this.stackingId = stackingId; - } - - public String getStockStatus() { - return stockStatus; - } - - public void setStockStatus(String stockStatus) { - this.stockStatus = stockStatus; - } - - public String getOutQuantity() { - return outQuantity; - } - - public void setOutQuantity(String outQuantity) { - this.outQuantity = outQuantity; - } - - public String getGiveNum() { - return giveNum; - } - - public void setGiveNum(String giveNum) { - this.giveNum = giveNum; - } - - public String getInOrOutId() { - return inOrOutId; - } - - public void setInOrOutId(String inOrOutId) { - this.inOrOutId = inOrOutId; - } - - public String getInOrOutDId() { - return inOrOutDId; - } - - public void setInOrOutDId(String inOrOutDId) { - this.inOrOutDId = inOrOutDId; - } - - public String getStartTime() { - return startTime; - } - - public void setStartTime(String startTime) { + public void setStartTime(String startTime) + { this.startTime = startTime; } - public String getFinishTime() { - return finishTime; + public String getStartTime() + { + return startTime; } - public void setFinishTime(String finishTime) { + public void setFinishTime(String finishTime) + { this.finishTime = finishTime; } - public String getWarehouseId() { - return warehouseId; + public String getFinishTime() + { + return finishTime; } - public void setWarehouseId(String warehouseId) { + public void setExitId(String exitId) + { + this.exitId = exitId; + } + + public String getExitId() + { + return exitId; + } + + public void setWarehouseId(String warehouseId) + { this.warehouseId = warehouseId; } - public String getProductGuid() { - return productGuid; + public String getWarehouseId() + { + return warehouseId; } - public void setProductGuid(String productGuid) { - this.productGuid = productGuid; - } - - public String getProductId() { - return productId; - } - - public void setProductId(String productId) { + public void setProductId(String productId) + { this.productId = productId; } - public String getParentId() { - return parentId; + public String getProductId() + { + return productId; } - public void setParentId(String parentId) { - this.parentId = parentId; - } - - public String getPrice() { - return price; - } - - public void setPrice(String price) { - this.price = price; - } - - public String getCargoNo() { - return cargoNo; - } - - public void setCargoNo(String cargoNo) { - this.cargoNo = cargoNo; - } - - public String getUnit() { - return unit; - } - - public void setUnit(String unit) { - this.unit = unit; - } - - public String getSpec() { - return spec; - } - - public void setSpec(String spec) { - this.spec = spec; - } - - public String getSpare1() { - return spare1; - } - - public void setSpare1(String spare1) { - this.spare1 = spare1; - } - - public String getSpare2() { - return spare2; - } - - public void setSpare2(String spare2) { - this.spare2 = spare2; - } - - public String getSpare3() { - return spare3; - } - - public void setSpare3(String spare3) { - this.spare3 = spare3; - } - - public String getSpare4() { - return spare4; - } - - public void setSpare4(String spare4) { - this.spare4 = spare4; - } - - public String getSpare5() { - return spare5; - } - - public void setSpare5(String spare5) { - this.spare5 = spare5; - } - - public String getSpare6() { - return spare6; - } - - public void setSpare6(String spare6) { - this.spare6 = spare6; - } - - public String getProductName() { - return productName; - } - - public void setProductName(String productName) { + public void setProductName(String productName) + { this.productName = productName; } - public String getSpare7() { - return spare7; + public String getProductName() + { + return productName; } - public void setSpare7(String spare7) { - this.spare7 = spare7; + public void setParentId(String parentId) + { + this.parentId = parentId; } - public String getSpare8() { - return spare8; + public String getParentId() + { + return parentId; } - public void setSpare8(String spare8) { - this.spare8 = spare8; + public void setPrice(String price) + { + this.price = price; } - public String getSpare9() { - return spare9; + public String getPrice() + { + return price; } - public void setSpare9(String spare9) { - this.spare9 = spare9; + public void setCargoNo(String cargoNo) + { + this.cargoNo = cargoNo; } - public String getSpare10() { - return spare10; + public String getCargoNo() + { + return cargoNo; } - public void setSpare10(String spare10) { - this.spare10 = spare10; + public void setUnit(String unit) + { + this.unit = unit; } - public String getSpare11() { - return spare11; + public String getUnit() + { + return unit; } - public void setSpare11(String spare11) { - this.spare11 = spare11; + public void setSpec(String spec) + { + this.spec = spec; } - public String getSpare12() { - return spare12; + public String getSpec() + { + return spec; } - public void setSpare12(String spare12) { - this.spare12 = spare12; + public void setProductType(String productType) + { + this.productType = productType; } - public String getSpare13() { - return spare13; + public String getProductType() + { + return productType; } - public void setSpare13(String spare13) { - this.spare13 = spare13; + public void setSystemItem(String systemItem) + { + this.systemItem = systemItem; } - public String getSpare14() { - return spare14; + public String getSystemItem() + { + return systemItem; } - public void setSpare14(String spare14) { - this.spare14 = spare14; + public void setProductCtm(String productCtm) + { + this.productCtm = productCtm; } - public String getSpare15() { - return spare15; + public String getProductCtm() + { + return productCtm; } - public void setSpare15(String spare15) { - this.spare15 = spare15; + public void setProductCtu(String productCtu) + { + this.productCtu = productCtu; } - public String getSpare16() { - return spare16; + public String getProductCtu() + { + return productCtu; } - public void setSpare16(String spare16) { - this.spare16 = spare16; + public void setUpperNum(String upperNum) + { + this.upperNum = upperNum; } - public String getSpare17() { - return spare17; + public String getUpperNum() + { + return upperNum; } - public void setSpare17(String spare17) { - this.spare17 = spare17; + public void setLimitNum(String limitNum) + { + this.limitNum = limitNum; } - public String getSpare18() { - return spare18; + public String getLimitNum() + { + return limitNum; } - public void setSpare18(String spare18) { - this.spare18 = spare18; + public void setEnableFlag(String enableFlag) + { + this.enableFlag = enableFlag; } - public String getSpare19() { - return spare19; + public String getEnableFlag() + { + return enableFlag; } - public void setSpare19(String spare19) { - this.spare19 = spare19; + public void setOutQuantity(String outQuantity) + { + this.outQuantity = outQuantity; } - public String getSpare20() { - return spare20; + public String getOutQuantity() + { + return outQuantity; } - public void setSpare20(String spare20) { - this.spare20 = spare20; + public void setLotNo(String lotNo) + { + this.lotNo = lotNo; } - public String getSpare21() { - return spare21; + public String getLotNo() + { + return lotNo; } - public void setSpare21(String spare21) { - this.spare21 = spare21; + public void setInOrOutId(String inOrOutId) + { + this.inOrOutId = inOrOutId; } - public String getSpare22() { - return spare22; + public String getInOrOutId() + { + return inOrOutId; } - public void setSpare22(String spare22) { - this.spare22 = spare22; + public void setInOrOutDId(String inOrOutDId) + { + this.inOrOutDId = inOrOutDId; } - public String getSpare23() { - return spare23; + public String getInOrOutDId() + { + return inOrOutDId; } - public void setSpare23(String spare23) { - this.spare23 = spare23; + public void setPriceTotal(String priceTotal) + { + this.priceTotal = priceTotal; } - public String getSpare24() { - return spare24; + public String getPriceTotal() + { + return priceTotal; } - public void setSpare24(String spare24) { - this.spare24 = spare24; + public void setOrigin(String origin) + { + this.origin = origin; } - public String getSpare25() { - return spare25; + public String getOrigin() + { + return origin; } - public void setSpare25(String spare25) { - this.spare25 = spare25; + public void setTurnovertype(String turnovertype) + { + this.turnovertype = turnovertype; } - public String getSpare26() { - return spare26; + public String getTurnovertype() + { + return turnovertype; } - public void setSpare26(String spare26) { - this.spare26 = spare26; + public void setAccount(String account) + { + this.account = account; } - public String getSpare27() { - return spare27; + public String getAccount() + { + return account; } - public void setSpare27(String spare27) { - this.spare27 = spare27; + public void setPurpose(String purpose) + { + this.purpose = purpose; } - public String getSpare28() { - return spare28; + public String getPurpose() + { + return purpose; } - public void setSpare28(String spare28) { - this.spare28 = spare28; + public void setUnits(String units) + { + this.units = units; } - public String getSpare29() { - return spare29; + public String getUnits() + { + return units; } - public void setSpare29(String spare29) { - this.spare29 = spare29; + public void setContract(String contract) + { + this.contract = contract; } - public String getSpare30() { - return spare30; + public String getContract() + { + return contract; } - public void setSpare30(String spare30) { - this.spare30 = spare30; + public void setCases(String cases) + { + this.cases = cases; } - public String getSpare31() { - return spare31; + public String getCases() + { + return cases; } - public void setSpare31(String spare31) { - this.spare31 = spare31; + public void setQuality(String quality) + { + this.quality = quality; } - public String getSpare32() { - return spare32; + public String getQuality() + { + return quality; } - public void setSpare32(String spare32) { - this.spare32 = spare32; + public void setManagementNo(String managementNo) + { + this.managementNo = managementNo; } - public String getSpare33() { - return spare33; + public String getManagementNo() + { + return managementNo; } - public void setSpare33(String spare33) { - this.spare33 = spare33; - } - - public String getSpare34() { - return spare34; - } - - public void setSpare34(String spare34) { - this.spare34 = spare34; - } - - public String getSpare35() { - return spare35; - } - - public void setSpare35(String spare35) { - this.spare35 = spare35; - } - - public String getSpare36() { - return spare36; - } - - public void setSpare36(String spare36) { - this.spare36 = spare36; - } - - public String getSpare37() { - return spare37; - } - - public void setSpare37(String spare37) { - this.spare37 = spare37; - } - - public String getSpare38() { - return spare38; - } - - public void setSpare38(String spare38) { - this.spare38 = spare38; - } - - public String getSpare39() { - return spare39; - } - - public void setSpare39(String spare39) { - this.spare39 = spare39; - } - - public String getCustomerName() { - return customerName; - } - - public void setCustomerName(String customerName) { - this.customerName = customerName; - } - - public String getLineId() { - return lineId; - } - - public void setLineId(String lineId) { - this.lineId = lineId; - } - - @Override - public String getRemark() { - return remark; - } - - @Override - public void setRemark(String remark) { - this.remark = remark; - } - - @Override - public Date getCreateTime() { - return createTime; - } - - public void setCreateTime(Date createTime) { - this.createTime = createTime; - } @Override public String toString() { - return "ViewOutJobFlow{" + - "jobId='" + jobId + '\'' + - ", jobDetailId='" + jobDetailId + '\'' + - ", status='" + status + '\'' + - ", taskNo='" + taskNo + '\'' + - ", trayCode='" + trayCode + '\'' + - ", roadwayId='" + roadwayId + '\'' + - ", cargoSpaceId='" + cargoSpaceId + '\'' + - ", cargoSpaceName='" + cargoSpaceName + '\'' + - ", thePlatoon=" + thePlatoon + - ", theColumn=" + theColumn + - ", theFloor=" + theFloor + - ", priority=" + priority + - ", executionPhase='" + executionPhase + '\'' + - ", inOrOut='" + inOrOut + '\'' + - ", exitId='" + exitId + '\'' + - ", wlbh='" + wlbh + '\'' + - ", lotNo='" + lotNo + '\'' + - ", stackingId='" + stackingId + '\'' + - ", stockStatus='" + stockStatus + '\'' + - ", outQuantity='" + outQuantity + '\'' + - ", giveNum='" + giveNum + '\'' + - ", inOrOutId='" + inOrOutId + '\'' + - ", inOrOutDId='" + inOrOutDId + '\'' + - ", startTime='" + startTime + '\'' + - ", finishTime='" + finishTime + '\'' + - ", warehouseId='" + warehouseId + '\'' + - ", productGuid='" + productGuid + '\'' + - ", productId='" + productId + '\'' + - ", parentId='" + parentId + '\'' + - ", price='" + price + '\'' + - ", cargoNo='" + cargoNo + '\'' + - ", unit='" + unit + '\'' + - ", spec='" + spec + '\'' + - ", spare1='" + spare1 + '\'' + - ", spare2='" + spare2 + '\'' + - ", spare3='" + spare3 + '\'' + - ", spare4='" + spare4 + '\'' + - ", spare5='" + spare5 + '\'' + - ", spare6='" + spare6 + '\'' + - ", productName='" + productName + '\'' + - ", spare7='" + spare7 + '\'' + - ", spare8='" + spare8 + '\'' + - ", spare9='" + spare9 + '\'' + - ", spare10='" + spare10 + '\'' + - ", spare11='" + spare11 + '\'' + - ", spare12='" + spare12 + '\'' + - ", spare13='" + spare13 + '\'' + - ", spare14='" + spare14 + '\'' + - ", spare15='" + spare15 + '\'' + - ", spare16='" + spare16 + '\'' + - ", spare17='" + spare17 + '\'' + - ", spare18='" + spare18 + '\'' + - ", spare19='" + spare19 + '\'' + - ", spare20='" + spare20 + '\'' + - ", spare21='" + spare21 + '\'' + - ", spare22='" + spare22 + '\'' + - ", spare23='" + spare23 + '\'' + - ", spare24='" + spare24 + '\'' + - ", spare25='" + spare25 + '\'' + - ", spare26='" + spare26 + '\'' + - ", spare27='" + spare27 + '\'' + - ", spare28='" + spare28 + '\'' + - ", spare29='" + spare29 + '\'' + - ", spare30='" + spare30 + '\'' + - ", spare31='" + spare31 + '\'' + - ", spare32='" + spare32 + '\'' + - ", spare33='" + spare33 + '\'' + - ", spare34='" + spare34 + '\'' + - ", spare35='" + spare35 + '\'' + - ", spare36='" + spare36 + '\'' + - ", spare37='" + spare37 + '\'' + - ", spare38='" + spare38 + '\'' + - ", spare39='" + spare39 + '\'' + - ", customerName='" + customerName + '\'' + - ", lineId='" + lineId + '\'' + - ", remark='" + remark + '\'' + - ", creatTime='" + createTime + '\'' + - '}'; + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("jobDetailId", getJobDetailId()) + .append("jobId", getJobId()) + .append("taskNo", getTaskNo()) + .append("status", getStatus()) + .append("inOrOut", getInOrOut()) + .append("trayCode", getTrayCode()) + .append("createTime", getCreateTime()) + .append("startTime", getStartTime()) + .append("finishTime", getFinishTime()) + .append("exitId", getExitId()) + .append("warehouseId", getWarehouseId()) + .append("productId", getProductId()) + .append("productName", getProductName()) + .append("parentId", getParentId()) + .append("price", getPrice()) + .append("cargoNo", getCargoNo()) + .append("unit", getUnit()) + .append("spec", getSpec()) + .append("remark", getRemark()) + .append("productType", getProductType()) + .append("systemItem", getSystemItem()) + .append("productCtm", getProductCtm()) + .append("productCtu", getProductCtu()) + .append("upperNum", getUpperNum()) + .append("limitNum", getLimitNum()) + .append("enableFlag", getEnableFlag()) + .append("outQuantity", getOutQuantity()) + .append("lotNo", getLotNo()) + .append("inOrOutId", getInOrOutId()) + .append("inOrOutDId", getInOrOutDId()) + .append("priceTotal", getPriceTotal()) + .append("origin", getOrigin()) + .append("turnovertype", getTurnovertype()) + .append("account", getAccount()) + .append("purpose", getPurpose()) + .append("units", getUnits()) + .append("contract", getContract()) + .append("cases", getCases()) + .append("quality", getQuality()) + .append("managementNo", getManagementNo()) + .toString(); } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewOutJobFlow/mapper/ViewOutJobFlowMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewOutJobFlow/mapper/ViewOutJobFlowMapper.java index dd6c4d6..89bbda6 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewOutJobFlow/mapper/ViewOutJobFlowMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewOutJobFlow/mapper/ViewOutJobFlowMapper.java @@ -4,58 +4,58 @@ import java.util.List; import com.ruoyi.search.ViewOutJobFlow.domain.ViewOutJobFlow; /** - * 出库作业流水Mapper接口 + * 出库作业流水ControllerMapper接口 * - * @author gw - * @date 2025-09-22 + * @author ruoyi + * @date 2025-10-28 */ public interface ViewOutJobFlowMapper { /** - * 查询出库作业流水 + * 查询出库作业流水Controller * - * @param jobId 出库作业流水主键 - * @return 出库作业流水 + * @param jobDetailId 出库作业流水Controller主键 + * @return 出库作业流水Controller */ - public ViewOutJobFlow selectViewOutJobFlowByJobId(String jobId); + public ViewOutJobFlow selectViewOutJobFlowByJobDetailId(String jobDetailId); /** - * 查询出库作业流水列表 + * 查询出库作业流水Controller列表 * - * @param viewOutJobFlow 出库作业流水 - * @return 出库作业流水集合 + * @param viewOutJobFlow 出库作业流水Controller + * @return 出库作业流水Controller集合 */ public List selectViewOutJobFlowList(ViewOutJobFlow viewOutJobFlow); /** - * 新增出库作业流水 + * 新增出库作业流水Controller * - * @param viewOutJobFlow 出库作业流水 + * @param viewOutJobFlow 出库作业流水Controller * @return 结果 */ public int insertViewOutJobFlow(ViewOutJobFlow viewOutJobFlow); /** - * 修改出库作业流水 + * 修改出库作业流水Controller * - * @param viewOutJobFlow 出库作业流水 + * @param viewOutJobFlow 出库作业流水Controller * @return 结果 */ public int updateViewOutJobFlow(ViewOutJobFlow viewOutJobFlow); /** - * 删除出库作业流水 + * 删除出库作业流水Controller * - * @param jobId 出库作业流水主键 + * @param jobDetailId 出库作业流水Controller主键 * @return 结果 */ - public int deleteViewOutJobFlowByJobId(String jobId); + public int deleteViewOutJobFlowByJobDetailId(String jobDetailId); /** - * 批量删除出库作业流水 + * 批量删除出库作业流水Controller * - * @param jobIds 需要删除的数据主键集合 + * @param jobDetailIds 需要删除的数据主键集合 * @return 结果 */ - public int deleteViewOutJobFlowByJobIds(String[] jobIds); + public int deleteViewOutJobFlowByJobDetailIds(String[] jobDetailIds); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewOutJobFlow/service/IViewOutJobFlowService.java b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewOutJobFlow/service/IViewOutJobFlowService.java index 97d05da..f135d8f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewOutJobFlow/service/IViewOutJobFlowService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewOutJobFlow/service/IViewOutJobFlowService.java @@ -4,58 +4,58 @@ import java.util.List; import com.ruoyi.search.ViewOutJobFlow.domain.ViewOutJobFlow; /** - * 出库作业流水Service接口 + * 出库作业流水ControllerService接口 * - * @author gw - * @date 2025-09-22 + * @author ruoyi + * @date 2025-10-28 */ public interface IViewOutJobFlowService { /** - * 查询出库作业流水 + * 查询出库作业流水Controller * - * @param jobId 出库作业流水主键 - * @return 出库作业流水 + * @param jobDetailId 出库作业流水Controller主键 + * @return 出库作业流水Controller */ - public ViewOutJobFlow selectViewOutJobFlowByJobId(String jobId); + public ViewOutJobFlow selectViewOutJobFlowByJobDetailId(String jobDetailId); /** - * 查询出库作业流水列表 + * 查询出库作业流水Controller列表 * - * @param viewOutJobFlow 出库作业流水 - * @return 出库作业流水集合 + * @param viewOutJobFlow 出库作业流水Controller + * @return 出库作业流水Controller集合 */ public List selectViewOutJobFlowList(ViewOutJobFlow viewOutJobFlow); /** - * 新增出库作业流水 + * 新增出库作业流水Controller * - * @param viewOutJobFlow 出库作业流水 + * @param viewOutJobFlow 出库作业流水Controller * @return 结果 */ public int insertViewOutJobFlow(ViewOutJobFlow viewOutJobFlow); /** - * 修改出库作业流水 + * 修改出库作业流水Controller * - * @param viewOutJobFlow 出库作业流水 + * @param viewOutJobFlow 出库作业流水Controller * @return 结果 */ public int updateViewOutJobFlow(ViewOutJobFlow viewOutJobFlow); /** - * 批量删除出库作业流水 + * 批量删除出库作业流水Controller * - * @param jobIds 需要删除的出库作业流水主键集合 + * @param jobDetailIds 需要删除的出库作业流水Controller主键集合 * @return 结果 */ - public int deleteViewOutJobFlowByJobIds(String[] jobIds); + public int deleteViewOutJobFlowByJobDetailIds(String[] jobDetailIds); /** - * 删除出库作业流水信息 + * 删除出库作业流水Controller信息 * - * @param jobId 出库作业流水主键 + * @param jobDetailId 出库作业流水Controller主键 * @return 结果 */ - public int deleteViewOutJobFlowByJobId(String jobId); + public int deleteViewOutJobFlowByJobDetailId(String jobDetailId); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewOutJobFlow/service/impl/ViewOutJobFlowServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewOutJobFlow/service/impl/ViewOutJobFlowServiceImpl.java index 2fad341..62302e5 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewOutJobFlow/service/impl/ViewOutJobFlowServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewOutJobFlow/service/impl/ViewOutJobFlowServiceImpl.java @@ -9,10 +9,10 @@ import com.ruoyi.search.ViewOutJobFlow.domain.ViewOutJobFlow; import com.ruoyi.search.ViewOutJobFlow.service.IViewOutJobFlowService; /** - * 出库作业流水Service业务层处理 + * 出库作业流水ControllerService业务层处理 * - * @author gw - * @date 2025-09-22 + * @author ruoyi + * @date 2025-10-28 */ @Service public class ViewOutJobFlowServiceImpl implements IViewOutJobFlowService @@ -21,22 +21,22 @@ public class ViewOutJobFlowServiceImpl implements IViewOutJobFlowService private ViewOutJobFlowMapper viewOutJobFlowMapper; /** - * 查询出库作业流水 + * 查询出库作业流水Controller * - * @param jobId 出库作业流水主键 - * @return 出库作业流水 + * @param jobDetailId 出库作业流水Controller主键 + * @return 出库作业流水Controller */ @Override - public ViewOutJobFlow selectViewOutJobFlowByJobId(String jobId) + public ViewOutJobFlow selectViewOutJobFlowByJobDetailId(String jobDetailId) { - return viewOutJobFlowMapper.selectViewOutJobFlowByJobId(jobId); + return viewOutJobFlowMapper.selectViewOutJobFlowByJobDetailId(jobDetailId); } /** - * 查询出库作业流水列表 + * 查询出库作业流水Controller列表 * - * @param viewOutJobFlow 出库作业流水 - * @return 出库作业流水 + * @param viewOutJobFlow 出库作业流水Controller + * @return 出库作业流水Controller */ @Override public List selectViewOutJobFlowList(ViewOutJobFlow viewOutJobFlow) @@ -45,9 +45,9 @@ public class ViewOutJobFlowServiceImpl implements IViewOutJobFlowService } /** - * 新增出库作业流水 + * 新增出库作业流水Controller * - * @param viewOutJobFlow 出库作业流水 + * @param viewOutJobFlow 出库作业流水Controller * @return 结果 */ @Override @@ -58,9 +58,9 @@ public class ViewOutJobFlowServiceImpl implements IViewOutJobFlowService } /** - * 修改出库作业流水 + * 修改出库作业流水Controller * - * @param viewOutJobFlow 出库作业流水 + * @param viewOutJobFlow 出库作业流水Controller * @return 结果 */ @Override @@ -70,26 +70,26 @@ public class ViewOutJobFlowServiceImpl implements IViewOutJobFlowService } /** - * 批量删除出库作业流水 + * 批量删除出库作业流水Controller * - * @param jobIds 需要删除的出库作业流水主键 + * @param jobDetailIds 需要删除的出库作业流水Controller主键 * @return 结果 */ @Override - public int deleteViewOutJobFlowByJobIds(String[] jobIds) + public int deleteViewOutJobFlowByJobDetailIds(String[] jobDetailIds) { - return viewOutJobFlowMapper.deleteViewOutJobFlowByJobIds(jobIds); + return viewOutJobFlowMapper.deleteViewOutJobFlowByJobDetailIds(jobDetailIds); } /** - * 删除出库作业流水信息 + * 删除出库作业流水Controller信息 * - * @param jobId 出库作业流水主键 + * @param jobDetailId 出库作业流水Controller主键 * @return 结果 */ @Override - public int deleteViewOutJobFlowByJobId(String jobId) + public int deleteViewOutJobFlowByJobDetailId(String jobDetailId) { - return viewOutJobFlowMapper.deleteViewOutJobFlowByJobId(jobId); + return viewOutJobFlowMapper.deleteViewOutJobFlowByJobDetailId(jobDetailId); } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockWarning/controller/ViewStockWarningController.java b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockWarning/controller/ViewStockWarningController.java index 0153f61..3340917 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockWarning/controller/ViewStockWarningController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockWarning/controller/ViewStockWarningController.java @@ -22,10 +22,10 @@ import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.common.core.page.TableDataInfo; /** - * 库存预警查询Controller + * 库存预警查询ControllerController * - * @author gw - * @date 2025-09-22 + * @author ruoyi + * @date 2025-10-28 */ @RestController @RequestMapping("/search/ViewStockWarning") @@ -35,7 +35,7 @@ public class ViewStockWarningController extends BaseController private IViewStockWarningService viewStockWarningService; /** - * 查询库存预警查询列表 + * 查询库存预警查询Controller列表 */ @PreAuthorize("@ss.hasPermi('search:ViewStockWarning:list')") @GetMapping("/list") @@ -47,33 +47,33 @@ public class ViewStockWarningController extends BaseController } /** - * 导出库存预警查询列表 + * 导出库存预警查询Controller列表 */ @PreAuthorize("@ss.hasPermi('search:ViewStockWarning:export')") - @Log(title = "库存预警查询", businessType = BusinessType.EXPORT) + @Log(title = "库存预警查询Controller", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(HttpServletResponse response, ViewStockWarning viewStockWarning) { List list = viewStockWarningService.selectViewStockWarningList(viewStockWarning); ExcelUtil util = new ExcelUtil(ViewStockWarning.class); - util.exportExcel(response, list, "库存预警查询数据"); + util.exportExcel(response, list, "库存预警查询Controller数据"); } /** - * 获取库存预警查询详细信息 + * 获取库存预警查询Controller详细信息 */ @PreAuthorize("@ss.hasPermi('search:ViewStockWarning:query')") - @GetMapping(value = "/{stockId}") - public AjaxResult getInfo(@PathVariable("stockId") String stockId) + @GetMapping(value = "/{warehouseId}") + public AjaxResult getInfo(@PathVariable("warehouseId") String warehouseId) { - return success(viewStockWarningService.selectViewStockWarningByStockId(stockId)); + return success(viewStockWarningService.selectViewStockWarningByWarehouseId(warehouseId)); } /** - * 新增库存预警查询 + * 新增库存预警查询Controller */ @PreAuthorize("@ss.hasPermi('search:ViewStockWarning:add')") - @Log(title = "库存预警查询", businessType = BusinessType.INSERT) + @Log(title = "库存预警查询Controller", businessType = BusinessType.INSERT) @PostMapping public AjaxResult add(@RequestBody ViewStockWarning viewStockWarning) { @@ -81,10 +81,10 @@ public class ViewStockWarningController extends BaseController } /** - * 修改库存预警查询 + * 修改库存预警查询Controller */ @PreAuthorize("@ss.hasPermi('search:ViewStockWarning:edit')") - @Log(title = "库存预警查询", businessType = BusinessType.UPDATE) + @Log(title = "库存预警查询Controller", businessType = BusinessType.UPDATE) @PutMapping public AjaxResult edit(@RequestBody ViewStockWarning viewStockWarning) { @@ -92,13 +92,13 @@ public class ViewStockWarningController extends BaseController } /** - * 删除库存预警查询 + * 删除库存预警查询Controller */ @PreAuthorize("@ss.hasPermi('search:ViewStockWarning:remove')") - @Log(title = "库存预警查询", businessType = BusinessType.DELETE) - @DeleteMapping("/{stockIds}") - public AjaxResult remove(@PathVariable String[] stockIds) + @Log(title = "库存预警查询Controller", businessType = BusinessType.DELETE) + @DeleteMapping("/{warehouseIds}") + public AjaxResult remove(@PathVariable String[] warehouseIds) { - return toAjax(viewStockWarningService.deleteViewStockWarningByStockIds(stockIds)); + return toAjax(viewStockWarningService.deleteViewStockWarningByWarehouseIds(warehouseIds)); } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockWarning/domain/ViewStockWarning.java b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockWarning/domain/ViewStockWarning.java index 573aaf1..bb31f8b 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockWarning/domain/ViewStockWarning.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockWarning/domain/ViewStockWarning.java @@ -6,508 +6,46 @@ import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.core.domain.BaseEntity; /** - * 库存预警查询对象 view_stock_warning + * 库存预警查询Controller对象 view_stock_warning * - * @author gw - * @date 2025-09-22 + * @author ruoyi + * @date 2025-10-28 */ public class ViewStockWarning extends BaseEntity { private static final long serialVersionUID = 1L; - /** 库存ID */ - @Excel(name = "库存ID") - private String stockId; - - /** 货位ID */ - @Excel(name = "货位ID") - private String cargoSpaceId; - - /** 库存状态 */ - @Excel(name = "库存状态") - private String stockStatus; - - /** 物料状态 */ - @Excel(name = "物料状态") - private String productStatus; - - /** 批次号 */ - @Excel(name = "批次号") - private String lotNo; - - /** 入库时间 */ - @Excel(name = "入库时间") - private String inDate; - - /** 回流时间 */ - @Excel(name = "回流时间") - private String backDate; - - /** 库存数量 */ - @Excel(name = "库存数量") - private String quantity; - - /** 作业ID */ - @Excel(name = "作业ID") - private String jobId; - - /** 托盘条码 */ - @Excel(name = "托盘条码") - private String trayCode; - - /** 出库数量 */ - @Excel(name = "出库数量") - private String outQuantity; - - /** 入库子单ID */ - @Excel(name = "入库子单ID") - private String stockinDetailId; - - /** 入库主单 */ - @Excel(name = "入库主单") - private String stockinId; - - /** 入库类型 */ - @Excel(name = "入库类型") - private String inType; - - /** 入库班组ID */ - @Excel(name = "入库班组ID") - private String inClassId; - - /** 仓库ID */ - @Excel(name = "仓库ID") + /** 仓库编码 */ + @Excel(name = "仓库编码") private String warehouseId; - /** 垛型ID */ - @Excel(name = "垛型ID") - private String stackingId; - /** 仓库名称 */ @Excel(name = "仓库名称") private String warehouseName; - /** 仓库地址 */ - @Excel(name = "仓库地址") - private String address; - - /** 仓库描述 */ - @Excel(name = "仓库描述") - private String cDesc; - - /** 仓库级别 */ - @Excel(name = "仓库级别") - private String warehouseKind; - - /** 仓库类型 */ - @Excel(name = "仓库类型") - private String warehouseType; - - /** 是否可用 */ - @Excel(name = "是否可用") - private String isCurrent; - - /** 物料GUID */ - @Excel(name = "物料GUID") - private String productGuid; - - /** 品号 */ - @Excel(name = "品号") + /** 物料编码 */ + @Excel(name = "物料编码") private String productId; - /** 产品分类 */ - @Excel(name = "产品分类") - private String parentId; - - /** 品号描述 */ - @Excel(name = "品号描述") - private String price; - - /** 英文描述 */ - @Excel(name = "英文描述") - private String cargoNo; - - /** 图号 */ - @Excel(name = "图号") - private String unit; - - /** 规格 */ - @Excel(name = "规格") - private String spec; - - /** 型号 */ - @Excel(name = "型号") - private String spare1; - - /** 单件净重 */ - @Excel(name = "单件净重") - private String spare2; - - /** 颜色 */ - @Excel(name = "颜色") - private String spare3; - - /** 序列号 */ - @Excel(name = "序列号") - private String spare4; - - /** 电压 */ - @Excel(name = "电压") - private String spare5; - - /** 功率 */ - @Excel(name = "功率") - private String spare6; - - /** 品名 */ - @Excel(name = "品名") + /** 物料名称 */ + @Excel(name = "物料名称") private String productName; - /** 相位 */ - @Excel(name = "相位") - private String spare7; + /** 库存数量 */ + @Excel(name = "库存数量") + private String quantity; - /** 毛重 */ - @Excel(name = "毛重") - private String spare8; + /** 库存下限 */ + @Excel(name = "库存下限") + private String spare5; - /** NC号 */ - @Excel(name = "NC号") - private String spare9; + /** 库存上限 */ + @Excel(name = "库存上限") + private String spare6; - /** 电源线 */ - @Excel(name = "电源线") - private String spare10; - - /** 插头 */ - @Excel(name = "插头") - private String spare11; - - /** 接嘴 */ - @Excel(name = "接嘴") - private String spare12; - - /** 快捷码 */ - @Excel(name = "快捷码") - private String spare13; - - /** 库存单位编号 */ - @Excel(name = "库存单位编号") - private String spare14; - - /** 库存单位名称 */ - @Excel(name = "库存单位名称") - private String spare15; - - /** 品号群组 */ - @Excel(name = "品号群组") - private String spare16; - - /** 归类品 */ - @Excel(name = "归类品") - private String spare17; - - /** 计量体系 */ - @Excel(name = "计量体系") - private String spare18; - - /** 群组名称 */ - @Excel(name = "群组名称") - private String spare19; - - /** 批号管理 */ - @Excel(name = "批号管理") - private String spare20; - - /** 状态 */ - @Excel(name = "状态") - private String spare21; - - /** 产品大类 */ - @Excel(name = "产品大类") - private String spare22; - - /** 产品二类 */ - @Excel(name = "产品二类") - private String spare23; - - /** 产品线/产品系列（组码） */ - @Excel(name = "产品线/产品系列", readConverterExp = "组=码") - private String spare24; - - /** BOM状态（组码） */ - @Excel(name = "BOM状态", readConverterExp = "组=码") - private String spare25; - - /** 产品定位（组码） */ - @Excel(name = "产品定位", readConverterExp = "组=码") - private String spare26; - - /** 电脑板型号（组码） */ - @Excel(name = "电脑板型号", readConverterExp = "组=码") - private String spare27; - - /** 非标要求 */ - @Excel(name = "非标要求") - private String spare28; - - /** 品牌（组码） */ - @Excel(name = "品牌", readConverterExp = "组=码") - private String spare29; - - /** 非标颜色 */ - @Excel(name = "非标颜色") - private String spare30; - - /** 主颜色 */ - @Excel(name = "主颜色") - private String spare31; - - /** 辅助颜色 */ - @Excel(name = "辅助颜色") - private String spare32; - - /** 是否标准款（组码） */ - @Excel(name = "是否标准款", readConverterExp = "组=码") - private String spare33; - - /** 包装方式 */ - @Excel(name = "包装方式") - private String spare34; - - /** 主要包装方式 */ - @Excel(name = "主要包装方式") - private String spare35; - - /** 长 */ - @Excel(name = "长") - private String spare36; - - /** 宽 */ - @Excel(name = "宽") - private String spare37; - - /** 高 */ - @Excel(name = "高") - private String spare38; - - /** 包装材积 */ - @Excel(name = "包装材积") - private String spare39; - - /** 货位名称 */ - @Excel(name = "货位名称") - private String cargoSpaceName; - - /** 巷道id */ - @Excel(name = "巷道id") - private String roadwayId; - - /** 货区id */ - @Excel(name = "货区id") - private String cargoAreaId; - - /** 货位类型 */ - @Excel(name = "货位类型") - private String theType; - - /** 货位类型名称 */ - @Excel(name = "货位类型名称") - private String theTypeName; - - /** 排 */ - @Excel(name = "排") - private Long thePlatoon; - - /** 列 */ - @Excel(name = "列") - private Long theColumn; - - /** 层 */ - @Excel(name = "层") - private Long theFloor; - - /** 货位状态 */ - @Excel(name = "货位状态") - private String cargoStatus; - - /** 是否锁定 */ - @Excel(name = "是否锁定") - private String locked; - - /** 货位高度 */ - @Excel(name = "货位高度") - private String cargoHight; - - /** 是否双伸 */ - @Excel(name = "是否双伸") - private String issDouble; - - /** 双货位分组编码 */ - @Excel(name = "双货位分组编码") - private String groupCodingNo; - - /** 双货位分组编码1 */ - @Excel(name = "双货位分组编码1") - private String groupCoding; - - /** 双货位标识 */ - @Excel(name = "双货位标识") - private String cargoSpaceLogo; - - /** 本仓库区域 */ - @Excel(name = "本仓库区域") - private String thisCargoArea; - - public void setStockId(String stockId) - { - this.stockId = stockId; - } - - public String getStockId() - { - return stockId; - } - - public void setCargoSpaceId(String cargoSpaceId) - { - this.cargoSpaceId = cargoSpaceId; - } - - public String getCargoSpaceId() - { - return cargoSpaceId; - } - - public void setStockStatus(String stockStatus) - { - this.stockStatus = stockStatus; - } - - public String getStockStatus() - { - return stockStatus; - } - - public void setProductStatus(String productStatus) - { - this.productStatus = productStatus; - } - - public String getProductStatus() - { - return productStatus; - } - - public void setLotNo(String lotNo) - { - this.lotNo = lotNo; - } - - public String getLotNo() - { - return lotNo; - } - - public void setInDate(String inDate) - { - this.inDate = inDate; - } - - public String getInDate() - { - return inDate; - } - - public void setBackDate(String backDate) - { - this.backDate = backDate; - } - - public String getBackDate() - { - return backDate; - } - - public void setQuantity(String quantity) - { - this.quantity = quantity; - } - - public String getQuantity() - { - return quantity; - } - - public void setJobId(String jobId) - { - this.jobId = jobId; - } - - public String getJobId() - { - return jobId; - } - - public void setTrayCode(String trayCode) - { - this.trayCode = trayCode; - } - - public String getTrayCode() - { - return trayCode; - } - - public void setOutQuantity(String outQuantity) - { - this.outQuantity = outQuantity; - } - - public String getOutQuantity() - { - return outQuantity; - } - - public void setStockinDetailId(String stockinDetailId) - { - this.stockinDetailId = stockinDetailId; - } - - public String getStockinDetailId() - { - return stockinDetailId; - } - - public void setStockinId(String stockinId) - { - this.stockinId = stockinId; - } - - public String getStockinId() - { - return stockinId; - } - - public void setInType(String inType) - { - this.inType = inType; - } - - public String getInType() - { - return inType; - } - - public void setInClassId(String inClassId) - { - this.inClassId = inClassId; - } - - public String getInClassId() - { - return inClassId; - } + /** 预警标志 */ + @Excel(name = "预警标志") + private Long flag; public void setWarehouseId(String warehouseId) { @@ -519,16 +57,6 @@ public class ViewStockWarning extends BaseEntity return warehouseId; } - public void setStackingId(String stackingId) - { - this.stackingId = stackingId; - } - - public String getStackingId() - { - return stackingId; - } - public void setWarehouseName(String warehouseName) { this.warehouseName = warehouseName; @@ -539,66 +67,6 @@ public class ViewStockWarning extends BaseEntity return warehouseName; } - public void setAddress(String address) - { - this.address = address; - } - - public String getAddress() - { - return address; - } - - public void setcDesc(String cDesc) - { - this.cDesc = cDesc; - } - - public String getcDesc() - { - return cDesc; - } - - public void setWarehouseKind(String warehouseKind) - { - this.warehouseKind = warehouseKind; - } - - public String getWarehouseKind() - { - return warehouseKind; - } - - public void setWarehouseType(String warehouseType) - { - this.warehouseType = warehouseType; - } - - public String getWarehouseType() - { - return warehouseType; - } - - public void setIsCurrent(String isCurrent) - { - this.isCurrent = isCurrent; - } - - public String getIsCurrent() - { - return isCurrent; - } - - public void setProductGuid(String productGuid) - { - this.productGuid = productGuid; - } - - public String getProductGuid() - { - return productGuid; - } - public void setProductId(String productId) { this.productId = productId; @@ -609,94 +77,24 @@ public class ViewStockWarning extends BaseEntity return productId; } - public void setParentId(String parentId) + public void setProductName(String productName) { - this.parentId = parentId; + this.productName = productName; } - public String getParentId() + public String getProductName() { - return parentId; + return productName; } - public void setPrice(String price) + public void setQuantity(String quantity) { - this.price = price; + this.quantity = quantity; } - public String getPrice() + public String getQuantity() { - return price; - } - - public void setCargoNo(String cargoNo) - { - this.cargoNo = cargoNo; - } - - public String getCargoNo() - { - return cargoNo; - } - - public void setUnit(String unit) - { - this.unit = unit; - } - - public String getUnit() - { - return unit; - } - - public void setSpec(String spec) - { - this.spec = spec; - } - - public String getSpec() - { - return spec; - } - - public void setSpare1(String spare1) - { - this.spare1 = spare1; - } - - public String getSpare1() - { - return spare1; - } - - public void setSpare2(String spare2) - { - this.spare2 = spare2; - } - - public String getSpare2() - { - return spare2; - } - - public void setSpare3(String spare3) - { - this.spare3 = spare3; - } - - public String getSpare3() - { - return spare3; - } - - public void setSpare4(String spare4) - { - this.spare4 = spare4; - } - - public String getSpare4() - { - return spare4; + return quantity; } public void setSpare5(String spare5) @@ -719,596 +117,27 @@ public class ViewStockWarning extends BaseEntity return spare6; } - public void setProductName(String productName) + public void setFlag(Long flag) { - this.productName = productName; + this.flag = flag; } - public String getProductName() + public Long getFlag() { - return productName; - } - - public void setSpare7(String spare7) - { - this.spare7 = spare7; - } - - public String getSpare7() - { - return spare7; - } - - public void setSpare8(String spare8) - { - this.spare8 = spare8; - } - - public String getSpare8() - { - return spare8; - } - - public void setSpare9(String spare9) - { - this.spare9 = spare9; - } - - public String getSpare9() - { - return spare9; - } - - public void setSpare10(String spare10) - { - this.spare10 = spare10; - } - - public String getSpare10() - { - return spare10; - } - - public void setSpare11(String spare11) - { - this.spare11 = spare11; - } - - public String getSpare11() - { - return spare11; - } - - public void setSpare12(String spare12) - { - this.spare12 = spare12; - } - - public String getSpare12() - { - return spare12; - } - - public void setSpare13(String spare13) - { - this.spare13 = spare13; - } - - public String getSpare13() - { - return spare13; - } - - public void setSpare14(String spare14) - { - this.spare14 = spare14; - } - - public String getSpare14() - { - return spare14; - } - - public void setSpare15(String spare15) - { - this.spare15 = spare15; - } - - public String getSpare15() - { - return spare15; - } - - public void setSpare16(String spare16) - { - this.spare16 = spare16; - } - - public String getSpare16() - { - return spare16; - } - - public void setSpare17(String spare17) - { - this.spare17 = spare17; - } - - public String getSpare17() - { - return spare17; - } - - public void setSpare18(String spare18) - { - this.spare18 = spare18; - } - - public String getSpare18() - { - return spare18; - } - - public void setSpare19(String spare19) - { - this.spare19 = spare19; - } - - public String getSpare19() - { - return spare19; - } - - public void setSpare20(String spare20) - { - this.spare20 = spare20; - } - - public String getSpare20() - { - return spare20; - } - - public void setSpare21(String spare21) - { - this.spare21 = spare21; - } - - public String getSpare21() - { - return spare21; - } - - public void setSpare22(String spare22) - { - this.spare22 = spare22; - } - - public String getSpare22() - { - return spare22; - } - - public void setSpare23(String spare23) - { - this.spare23 = spare23; - } - - public String getSpare23() - { - return spare23; - } - - public void setSpare24(String spare24) - { - this.spare24 = spare24; - } - - public String getSpare24() - { - return spare24; - } - - public void setSpare25(String spare25) - { - this.spare25 = spare25; - } - - public String getSpare25() - { - return spare25; - } - - public void setSpare26(String spare26) - { - this.spare26 = spare26; - } - - public String getSpare26() - { - return spare26; - } - - public void setSpare27(String spare27) - { - this.spare27 = spare27; - } - - public String getSpare27() - { - return spare27; - } - - public void setSpare28(String spare28) - { - this.spare28 = spare28; - } - - public String getSpare28() - { - return spare28; - } - - public void setSpare29(String spare29) - { - this.spare29 = spare29; - } - - public String getSpare29() - { - return spare29; - } - - public void setSpare30(String spare30) - { - this.spare30 = spare30; - } - - public String getSpare30() - { - return spare30; - } - - public void setSpare31(String spare31) - { - this.spare31 = spare31; - } - - public String getSpare31() - { - return spare31; - } - - public void setSpare32(String spare32) - { - this.spare32 = spare32; - } - - public String getSpare32() - { - return spare32; - } - - public void setSpare33(String spare33) - { - this.spare33 = spare33; - } - - public String getSpare33() - { - return spare33; - } - - public void setSpare34(String spare34) - { - this.spare34 = spare34; - } - - public String getSpare34() - { - return spare34; - } - - public void setSpare35(String spare35) - { - this.spare35 = spare35; - } - - public String getSpare35() - { - return spare35; - } - - public void setSpare36(String spare36) - { - this.spare36 = spare36; - } - - public String getSpare36() - { - return spare36; - } - - public void setSpare37(String spare37) - { - this.spare37 = spare37; - } - - public String getSpare37() - { - return spare37; - } - - public void setSpare38(String spare38) - { - this.spare38 = spare38; - } - - public String getSpare38() - { - return spare38; - } - - public void setSpare39(String spare39) - { - this.spare39 = spare39; - } - - public String getSpare39() - { - return spare39; - } - - public void setCargoSpaceName(String cargoSpaceName) - { - this.cargoSpaceName = cargoSpaceName; - } - - public String getCargoSpaceName() - { - return cargoSpaceName; - } - - public void setRoadwayId(String roadwayId) - { - this.roadwayId = roadwayId; - } - - public String getRoadwayId() - { - return roadwayId; - } - - public void setCargoAreaId(String cargoAreaId) - { - this.cargoAreaId = cargoAreaId; - } - - public String getCargoAreaId() - { - return cargoAreaId; - } - - public void setTheType(String theType) - { - this.theType = theType; - } - - public String getTheType() - { - return theType; - } - - public void setTheTypeName(String theTypeName) - { - this.theTypeName = theTypeName; - } - - public String getTheTypeName() - { - return theTypeName; - } - - public void setThePlatoon(Long thePlatoon) - { - this.thePlatoon = thePlatoon; - } - - public Long getThePlatoon() - { - return thePlatoon; - } - - public void setTheColumn(Long theColumn) - { - this.theColumn = theColumn; - } - - public Long getTheColumn() - { - return theColumn; - } - - public void setTheFloor(Long theFloor) - { - this.theFloor = theFloor; - } - - public Long getTheFloor() - { - return theFloor; - } - - public void setCargoStatus(String cargoStatus) - { - this.cargoStatus = cargoStatus; - } - - public String getCargoStatus() - { - return cargoStatus; - } - - public void setLocked(String locked) - { - this.locked = locked; - } - - public String getLocked() - { - return locked; - } - - public void setCargoHight(String cargoHight) - { - this.cargoHight = cargoHight; - } - - public String getCargoHight() - { - return cargoHight; - } - - public void setIssDouble(String issDouble) - { - this.issDouble = issDouble; - } - - public String getIssDouble() - { - return issDouble; - } - - public void setGroupCodingNo(String groupCodingNo) - { - this.groupCodingNo = groupCodingNo; - } - - public String getGroupCodingNo() - { - return groupCodingNo; - } - - public void setGroupCoding(String groupCoding) - { - this.groupCoding = groupCoding; - } - - public String getGroupCoding() - { - return groupCoding; - } - - public void setCargoSpaceLogo(String cargoSpaceLogo) - { - this.cargoSpaceLogo = cargoSpaceLogo; - } - - public String getCargoSpaceLogo() - { - return cargoSpaceLogo; - } - - public void setThisCargoArea(String thisCargoArea) - { - this.thisCargoArea = thisCargoArea; - } - - public String getThisCargoArea() - { - return thisCargoArea; + return flag; } @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("stockId", getStockId()) - .append("cargoSpaceId", getCargoSpaceId()) - .append("stockStatus", getStockStatus()) - .append("productStatus", getProductStatus()) - .append("lotNo", getLotNo()) - .append("inDate", getInDate()) - .append("backDate", getBackDate()) - .append("quantity", getQuantity()) - .append("jobId", getJobId()) - .append("trayCode", getTrayCode()) - .append("outQuantity", getOutQuantity()) - .append("stockinDetailId", getStockinDetailId()) - .append("stockinId", getStockinId()) - .append("inType", getInType()) - .append("inClassId", getInClassId()) .append("warehouseId", getWarehouseId()) - .append("stackingId", getStackingId()) .append("warehouseName", getWarehouseName()) - .append("address", getAddress()) - .append("cDesc", getcDesc()) - .append("warehouseKind", getWarehouseKind()) - .append("warehouseType", getWarehouseType()) - .append("isCurrent", getIsCurrent()) - .append("productGuid", getProductGuid()) .append("productId", getProductId()) - .append("parentId", getParentId()) - .append("price", getPrice()) - .append("cargoNo", getCargoNo()) - .append("unit", getUnit()) - .append("spec", getSpec()) - .append("remark", getRemark()) - .append("spare1", getSpare1()) - .append("spare2", getSpare2()) - .append("spare3", getSpare3()) - .append("spare4", getSpare4()) + .append("productName", getProductName()) + .append("quantity", getQuantity()) .append("spare5", getSpare5()) .append("spare6", getSpare6()) - .append("productName", getProductName()) - .append("spare7", getSpare7()) - .append("spare8", getSpare8()) - .append("spare9", getSpare9()) - .append("spare10", getSpare10()) - .append("spare11", getSpare11()) - .append("spare12", getSpare12()) - .append("spare13", getSpare13()) - .append("spare14", getSpare14()) - .append("spare15", getSpare15()) - .append("spare16", getSpare16()) - .append("spare17", getSpare17()) - .append("spare18", getSpare18()) - .append("spare19", getSpare19()) - .append("spare20", getSpare20()) - .append("spare21", getSpare21()) - .append("spare22", getSpare22()) - .append("spare23", getSpare23()) - .append("spare24", getSpare24()) - .append("spare25", getSpare25()) - .append("spare26", getSpare26()) - .append("spare27", getSpare27()) - .append("spare28", getSpare28()) - .append("spare29", getSpare29()) - .append("spare30", getSpare30()) - .append("spare31", getSpare31()) - .append("spare32", getSpare32()) - .append("spare33", getSpare33()) - .append("spare34", getSpare34()) - .append("spare35", getSpare35()) - .append("spare36", getSpare36()) - .append("spare37", getSpare37()) - .append("spare38", getSpare38()) - .append("spare39", getSpare39()) - .append("cargoSpaceName", getCargoSpaceName()) - .append("roadwayId", getRoadwayId()) - .append("cargoAreaId", getCargoAreaId()) - .append("theType", getTheType()) - .append("theTypeName", getTheTypeName()) - .append("thePlatoon", getThePlatoon()) - .append("theColumn", getTheColumn()) - .append("theFloor", getTheFloor()) - .append("cargoStatus", getCargoStatus()) - .append("locked", getLocked()) - .append("cargoHight", getCargoHight()) - .append("issDouble", getIssDouble()) - .append("groupCodingNo", getGroupCodingNo()) - .append("groupCoding", getGroupCoding()) - .append("cargoSpaceLogo", getCargoSpaceLogo()) - .append("thisCargoArea", getThisCargoArea()) + .append("flag", getFlag()) .toString(); } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockWarning/mapper/ViewStockWarningMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockWarning/mapper/ViewStockWarningMapper.java index 1af4cbe..551bd14 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockWarning/mapper/ViewStockWarningMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockWarning/mapper/ViewStockWarningMapper.java @@ -4,58 +4,58 @@ import java.util.List; import com.ruoyi.search.ViewStockWarning.domain.ViewStockWarning; /** - * 库存预警查询Mapper接口 + * 库存预警查询ControllerMapper接口 * - * @author gw - * @date 2025-09-22 + * @author ruoyi + * @date 2025-10-28 */ public interface ViewStockWarningMapper { /** - * 查询库存预警查询 + * 查询库存预警查询Controller * - * @param stockId 库存预警查询主键 - * @return 库存预警查询 + * @param warehouseId 库存预警查询Controller主键 + * @return 库存预警查询Controller */ - public ViewStockWarning selectViewStockWarningByStockId(String stockId); + public ViewStockWarning selectViewStockWarningByWarehouseId(String warehouseId); /** - * 查询库存预警查询列表 + * 查询库存预警查询Controller列表 * - * @param viewStockWarning 库存预警查询 - * @return 库存预警查询集合 + * @param viewStockWarning 库存预警查询Controller + * @return 库存预警查询Controller集合 */ public List selectViewStockWarningList(ViewStockWarning viewStockWarning); /** - * 新增库存预警查询 + * 新增库存预警查询Controller * - * @param viewStockWarning 库存预警查询 + * @param viewStockWarning 库存预警查询Controller * @return 结果 */ public int insertViewStockWarning(ViewStockWarning viewStockWarning); /** - * 修改库存预警查询 + * 修改库存预警查询Controller * - * @param viewStockWarning 库存预警查询 + * @param viewStockWarning 库存预警查询Controller * @return 结果 */ public int updateViewStockWarning(ViewStockWarning viewStockWarning); /** - * 删除库存预警查询 + * 删除库存预警查询Controller * - * @param stockId 库存预警查询主键 + * @param warehouseId 库存预警查询Controller主键 * @return 结果 */ - public int deleteViewStockWarningByStockId(String stockId); + public int deleteViewStockWarningByWarehouseId(String warehouseId); /** - * 批量删除库存预警查询 + * 批量删除库存预警查询Controller * - * @param stockIds 需要删除的数据主键集合 + * @param warehouseIds 需要删除的数据主键集合 * @return 结果 */ - public int deleteViewStockWarningByStockIds(String[] stockIds); + public int deleteViewStockWarningByWarehouseIds(String[] warehouseIds); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockWarning/service/IViewStockWarningService.java b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockWarning/service/IViewStockWarningService.java index 246872c..c798858 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockWarning/service/IViewStockWarningService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockWarning/service/IViewStockWarningService.java @@ -4,58 +4,58 @@ import java.util.List; import com.ruoyi.search.ViewStockWarning.domain.ViewStockWarning; /** - * 库存预警查询Service接口 + * 库存预警查询ControllerService接口 * - * @author gw - * @date 2025-09-22 + * @author ruoyi + * @date 2025-10-28 */ public interface IViewStockWarningService { /** - * 查询库存预警查询 + * 查询库存预警查询Controller * - * @param stockId 库存预警查询主键 - * @return 库存预警查询 + * @param warehouseId 库存预警查询Controller主键 + * @return 库存预警查询Controller */ - public ViewStockWarning selectViewStockWarningByStockId(String stockId); + public ViewStockWarning selectViewStockWarningByWarehouseId(String warehouseId); /** - * 查询库存预警查询列表 + * 查询库存预警查询Controller列表 * - * @param viewStockWarning 库存预警查询 - * @return 库存预警查询集合 + * @param viewStockWarning 库存预警查询Controller + * @return 库存预警查询Controller集合 */ public List selectViewStockWarningList(ViewStockWarning viewStockWarning); /** - * 新增库存预警查询 + * 新增库存预警查询Controller * - * @param viewStockWarning 库存预警查询 + * @param viewStockWarning 库存预警查询Controller * @return 结果 */ public int insertViewStockWarning(ViewStockWarning viewStockWarning); /** - * 修改库存预警查询 + * 修改库存预警查询Controller * - * @param viewStockWarning 库存预警查询 + * @param viewStockWarning 库存预警查询Controller * @return 结果 */ public int updateViewStockWarning(ViewStockWarning viewStockWarning); /** - * 批量删除库存预警查询 + * 批量删除库存预警查询Controller * - * @param stockIds 需要删除的库存预警查询主键集合 + * @param warehouseIds 需要删除的库存预警查询Controller主键集合 * @return 结果 */ - public int deleteViewStockWarningByStockIds(String[] stockIds); + public int deleteViewStockWarningByWarehouseIds(String[] warehouseIds); /** - * 删除库存预警查询信息 + * 删除库存预警查询Controller信息 * - * @param stockId 库存预警查询主键 + * @param warehouseId 库存预警查询Controller主键 * @return 结果 */ - public int deleteViewStockWarningByStockId(String stockId); + public int deleteViewStockWarningByWarehouseId(String warehouseId); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockWarning/service/impl/ViewStockWarningServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockWarning/service/impl/ViewStockWarningServiceImpl.java index 09a806c..d6b0fc3 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockWarning/service/impl/ViewStockWarningServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockWarning/service/impl/ViewStockWarningServiceImpl.java @@ -8,10 +8,10 @@ import com.ruoyi.search.ViewStockWarning.domain.ViewStockWarning; import com.ruoyi.search.ViewStockWarning.service.IViewStockWarningService; /** - * 库存预警查询Service业务层处理 + * 库存预警查询ControllerService业务层处理 * - * @author gw - * @date 2025-09-22 + * @author ruoyi + * @date 2025-10-28 */ @Service public class ViewStockWarningServiceImpl implements IViewStockWarningService @@ -20,22 +20,22 @@ public class ViewStockWarningServiceImpl implements IViewStockWarningService private ViewStockWarningMapper viewStockWarningMapper; /** - * 查询库存预警查询 + * 查询库存预警查询Controller * - * @param stockId 库存预警查询主键 - * @return 库存预警查询 + * @param warehouseId 库存预警查询Controller主键 + * @return 库存预警查询Controller */ @Override - public ViewStockWarning selectViewStockWarningByStockId(String stockId) + public ViewStockWarning selectViewStockWarningByWarehouseId(String warehouseId) { - return viewStockWarningMapper.selectViewStockWarningByStockId(stockId); + return viewStockWarningMapper.selectViewStockWarningByWarehouseId(warehouseId); } /** - * 查询库存预警查询列表 + * 查询库存预警查询Controller列表 * - * @param viewStockWarning 库存预警查询 - * @return 库存预警查询 + * @param viewStockWarning 库存预警查询Controller + * @return 库存预警查询Controller */ @Override public List selectViewStockWarningList(ViewStockWarning viewStockWarning) @@ -44,9 +44,9 @@ public class ViewStockWarningServiceImpl implements IViewStockWarningService } /** - * 新增库存预警查询 + * 新增库存预警查询Controller * - * @param viewStockWarning 库存预警查询 + * @param viewStockWarning 库存预警查询Controller * @return 结果 */ @Override @@ -56,9 +56,9 @@ public class ViewStockWarningServiceImpl implements IViewStockWarningService } /** - * 修改库存预警查询 + * 修改库存预警查询Controller * - * @param viewStockWarning 库存预警查询 + * @param viewStockWarning 库存预警查询Controller * @return 结果 */ @Override @@ -68,26 +68,26 @@ public class ViewStockWarningServiceImpl implements IViewStockWarningService } /** - * 批量删除库存预警查询 + * 批量删除库存预警查询Controller * - * @param stockIds 需要删除的库存预警查询主键 + * @param warehouseIds 需要删除的库存预警查询Controller主键 * @return 结果 */ @Override - public int deleteViewStockWarningByStockIds(String[] stockIds) + public int deleteViewStockWarningByWarehouseIds(String[] warehouseIds) { - return viewStockWarningMapper.deleteViewStockWarningByStockIds(stockIds); + return viewStockWarningMapper.deleteViewStockWarningByWarehouseIds(warehouseIds); } /** - * 删除库存预警查询信息 + * 删除库存预警查询Controller信息 * - * @param stockId 库存预警查询主键 + * @param warehouseId 库存预警查询Controller主键 * @return 结果 */ @Override - public int deleteViewStockWarningByStockId(String stockId) + public int deleteViewStockWarningByWarehouseId(String warehouseId) { - return viewStockWarningMapper.deleteViewStockWarningByStockId(stockId); + return viewStockWarningMapper.deleteViewStockWarningByWarehouseId(warehouseId); } } diff --git a/ruoyi-admin/src/main/resources/mapper/search/ViewInJobFlowMapper.xml b/ruoyi-admin/src/main/resources/mapper/search/ViewInJobFlowMapper.xml index bca46cc..ce8f54d 100644 --- a/ruoyi-admin/src/main/resources/mapper/search/ViewInJobFlowMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/search/ViewInJobFlowMapper.xml @@ -5,417 +5,243 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - - + - - - - - - - - - + - - - - - - - - + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - select job_id, job_detail_id,line_id, status, task_no, tray_code, roadway_id, cargo_space_id, cargo_space_name, the_platoon, the_column, the_floor, priority, execution_phase, in_or_out, entrance_id, wlbh, lot_no, stacking_id, stock_status, in_quantity, in_or_out_id, in_or_out_d_id, create_time, start_time, finish_time, warehouse_id, product_guid, product_id, parent_id, price, cargo_no, unit, spec, remark, spare1, spare2, spare3, spare4, spare5, spare6, product_name, spare7, spare8, spare9, spare10, spare11, spare12, spare13, spare14, spare15, spare16, spare17, spare18, spare19, spare20, spare21, spare22, spare23, spare24, spare25, spare26, spare27, spare28, spare29, spare30, spare31, spare32, spare33, spare34, spare35, spare36, spare37, spare38, spare39 from view_in_job_flow + select job_detail_id, job_id, task_no, status, in_or_out, tray_code, create_time, start_time, finish_time, entrance_id, warehouse_id, product_id, product_name, parent_id, price, cargo_no, unit, spec, remark, productType, systemItem, productCtm, productCtu, upperNum, limitNum, enableFlag, in_quantity, lot_no, in_or_out_id, in_or_out_d_id, priceTotal, origin, turnovertype, account, purpose, units, contract, cases, quality, managementNo from view_in_job_flow - - where job_id = #{jobId} + where job_detail_id = #{jobDetailId} insert into view_in_job_flow - job_id, job_detail_id, - status, - task_no, - tray_code, - roadway_id, - cargo_space_id, - cargo_space_name, - the_platoon, - the_column, - the_floor, - priority, - execution_phase, + job_id, + task_no, + status, in_or_out, - entrance_id, - wlbh, - lot_no, - stacking_id, - stock_status, - in_quantity, - in_or_out_id, - in_or_out_d_id, + tray_code, create_time, start_time, finish_time, + entrance_id, warehouse_id, - product_guid, product_id, + product_name, parent_id, price, cargo_no, unit, spec, remark, - spare1, - spare2, - spare3, - spare4, - spare5, - spare6, - product_name, - spare7, - spare8, - spare9, - spare10, - spare11, - spare12, - spare13, - spare14, - spare15, - spare16, - spare17, - spare18, - spare19, - spare20, - spare21, - spare22, - spare23, - spare24, - spare25, - spare26, - spare27, - spare28, - spare29, - spare30, - spare31, - spare32, - spare33, - spare34, - spare35, - spare36, - spare37, - spare38, - spare39, + productType, + systemItem, + productCtm, + productCtu, + upperNum, + limitNum, + enableFlag, + in_quantity, + lot_no, + in_or_out_id, + in_or_out_d_id, + priceTotal, + origin, + turnovertype, + account, + purpose, + units, + contract, + cases, + quality, + managementNo, - #{jobId}, #{jobDetailId}, - #{status}, - #{taskNo}, - #{trayCode}, - #{roadwayId}, - #{cargoSpaceId}, - #{cargoSpaceName}, - #{thePlatoon}, - #{theColumn}, - #{theFloor}, - #{priority}, - #{executionPhase}, + #{jobId}, + #{taskNo}, + #{status}, #{inOrOut}, - #{entranceId}, - #{wlbh}, - #{lotNo}, - #{stackingId}, - #{stockStatus}, - #{inQuantity}, - #{inOrOutId}, - #{inOrOutDId}, + #{trayCode}, #{createTime}, #{startTime}, #{finishTime}, + #{entranceId}, #{warehouseId}, - #{productGuid}, #{productId}, + #{productName}, #{parentId}, #{price}, #{cargoNo}, #{unit}, #{spec}, #{remark}, - #{spare1}, - #{spare2}, - #{spare3}, - #{spare4}, - #{spare5}, - #{spare6}, - #{productName}, - #{spare7}, - #{spare8}, - #{spare9}, - #{spare10}, - #{spare11}, - #{spare12}, - #{spare13}, - #{spare14}, - #{spare15}, - #{spare16}, - #{spare17}, - #{spare18}, - #{spare19}, - #{spare20}, - #{spare21}, - #{spare22}, - #{spare23}, - #{spare24}, - #{spare25}, - #{spare26}, - #{spare27}, - #{spare28}, - #{spare29}, - #{spare30}, - #{spare31}, - #{spare32}, - #{spare33}, - #{spare34}, - #{spare35}, - #{spare36}, - #{spare37}, - #{spare38}, - #{spare39}, + #{productType}, + #{systemItem}, + #{productCtm}, + #{productCtu}, + #{upperNum}, + #{limitNum}, + #{enableFlag}, + #{inQuantity}, + #{lotNo}, + #{inOrOutId}, + #{inOrOutDId}, + #{priceTotal}, + #{origin}, + #{turnovertype}, + #{account}, + #{purpose}, + #{units}, + #{contract}, + #{cases}, + #{quality}, + #{managementNo}, update view_in_job_flow - job_detail_id = #{jobDetailId}, - status = #{status}, - task_no = #{taskNo}, - tray_code = #{trayCode}, - roadway_id = #{roadwayId}, - cargo_space_id = #{cargoSpaceId}, - cargo_space_name = #{cargoSpaceName}, - the_platoon = #{thePlatoon}, - the_column = #{theColumn}, - the_floor = #{theFloor}, - priority = #{priority}, - execution_phase = #{executionPhase}, + job_id = #{jobId}, + task_no = #{taskNo}, + status = #{status}, in_or_out = #{inOrOut}, - entrance_id = #{entranceId}, - wlbh = #{wlbh}, - lot_no = #{lotNo}, - stacking_id = #{stackingId}, - stock_status = #{stockStatus}, - in_quantity = #{inQuantity}, - in_or_out_id = #{inOrOutId}, - in_or_out_d_id = #{inOrOutDId}, + tray_code = #{trayCode}, create_time = #{createTime}, start_time = #{startTime}, finish_time = #{finishTime}, + entrance_id = #{entranceId}, warehouse_id = #{warehouseId}, - product_guid = #{productGuid}, product_id = #{productId}, + product_name = #{productName}, parent_id = #{parentId}, price = #{price}, cargo_no = #{cargoNo}, unit = #{unit}, spec = #{spec}, remark = #{remark}, - spare1 = #{spare1}, - spare2 = #{spare2}, - spare3 = #{spare3}, - spare4 = #{spare4}, - spare5 = #{spare5}, - spare6 = #{spare6}, - product_name = #{productName}, - spare7 = #{spare7}, - spare8 = #{spare8}, - spare9 = #{spare9}, - spare10 = #{spare10}, - spare11 = #{spare11}, - spare12 = #{spare12}, - spare13 = #{spare13}, - spare14 = #{spare14}, - spare15 = #{spare15}, - spare16 = #{spare16}, - spare17 = #{spare17}, - spare18 = #{spare18}, - spare19 = #{spare19}, - spare20 = #{spare20}, - spare21 = #{spare21}, - spare22 = #{spare22}, - spare23 = #{spare23}, - spare24 = #{spare24}, - spare25 = #{spare25}, - spare26 = #{spare26}, - spare27 = #{spare27}, - spare28 = #{spare28}, - spare29 = #{spare29}, - spare30 = #{spare30}, - spare31 = #{spare31}, - spare32 = #{spare32}, - spare33 = #{spare33}, - spare34 = #{spare34}, - spare35 = #{spare35}, - spare36 = #{spare36}, - spare37 = #{spare37}, - spare38 = #{spare38}, - spare39 = #{spare39}, + productType = #{productType}, + systemItem = #{systemItem}, + productCtm = #{productCtm}, + productCtu = #{productCtu}, + upperNum = #{upperNum}, + limitNum = #{limitNum}, + enableFlag = #{enableFlag}, + in_quantity = #{inQuantity}, + lot_no = #{lotNo}, + in_or_out_id = #{inOrOutId}, + in_or_out_d_id = #{inOrOutDId}, + priceTotal = #{priceTotal}, + origin = #{origin}, + turnovertype = #{turnovertype}, + account = #{account}, + purpose = #{purpose}, + units = #{units}, + contract = #{contract}, + cases = #{cases}, + quality = #{quality}, + managementNo = #{managementNo}, - where job_id = #{jobId} + where job_detail_id = #{jobDetailId} - - delete from view_in_job_flow where job_id = #{jobId} + + delete from view_in_job_flow where job_detail_id = #{jobDetailId} - - delete from view_in_job_flow where job_id in - - #{jobId} + + delete from view_in_job_flow where job_detail_id in + + #{jobDetailId} \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/mapper/search/ViewOutJobFlowMapper.xml b/ruoyi-admin/src/main/resources/mapper/search/ViewOutJobFlowMapper.xml index 9c94e5f..711ba77 100644 --- a/ruoyi-admin/src/main/resources/mapper/search/ViewOutJobFlowMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/search/ViewOutJobFlowMapper.xml @@ -5,427 +5,243 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - - + - - - - - - - - - + - - - - - - - - - + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - select job_id, job_detail_id,line_id, status, task_no, tray_code, roadway_id, cargo_space_id, cargo_space_name, the_platoon, the_column, the_floor, priority, execution_phase, in_or_out, exit_id, wlbh, lot_no, stacking_id, stock_status, out_quantity, give_num, in_or_out_id, in_or_out_d_id, create_time, start_time, finish_time, warehouse_id, product_guid, product_id, parent_id, price, cargo_no, unit, spec, remark, spare1, spare2, spare3, spare4, spare5, spare6, product_name, spare7, spare8, spare9, spare10, spare11, spare12, spare13, spare14, spare15, spare16, spare17, spare18, spare19, spare20, spare21, spare22, spare23, spare24, spare25, spare26, spare27, spare28, spare29, spare30, spare31, spare32, spare33, spare34, spare35, spare36, spare37, spare38, spare39, customer_name from view_out_job_flow + select job_detail_id, job_id, task_no, status, in_or_out, tray_code, create_time, start_time, finish_time, exit_id, warehouse_id, product_id, product_name, parent_id, price, cargo_no, unit, spec, remark, productType, systemItem, productCtm, productCtu, upperNum, limitNum, enableFlag, out_quantity, lot_no, in_or_out_id, in_or_out_d_id, priceTotal, origin, turnovertype, account, purpose, units, contract, cases, quality, managementNo from view_out_job_flow - - where job_id = #{jobId} + where job_detail_id = #{jobDetailId} insert into view_out_job_flow - job_id, job_detail_id, - status, - task_no, - tray_code, - roadway_id, - cargo_space_id, - cargo_space_name, - the_platoon, - the_column, - the_floor, - priority, - execution_phase, + job_id, + task_no, + status, in_or_out, - exit_id, - wlbh, - lot_no, - stacking_id, - stock_status, - out_quantity, - give_num, - in_or_out_id, - in_or_out_d_id, + tray_code, create_time, start_time, finish_time, + exit_id, warehouse_id, - product_guid, product_id, + product_name, parent_id, price, cargo_no, unit, spec, remark, - spare1, - spare2, - spare3, - spare4, - spare5, - spare6, - product_name, - spare7, - spare8, - spare9, - spare10, - spare11, - spare12, - spare13, - spare14, - spare15, - spare16, - spare17, - spare18, - spare19, - spare20, - spare21, - spare22, - spare23, - spare24, - spare25, - spare26, - spare27, - spare28, - spare29, - spare30, - spare31, - spare32, - spare33, - spare34, - spare35, - spare36, - spare37, - spare38, - spare39, - customer_name, + productType, + systemItem, + productCtm, + productCtu, + upperNum, + limitNum, + enableFlag, + out_quantity, + lot_no, + in_or_out_id, + in_or_out_d_id, + priceTotal, + origin, + turnovertype, + account, + purpose, + units, + contract, + cases, + quality, + managementNo, - #{jobId}, #{jobDetailId}, - #{status}, - #{taskNo}, - #{trayCode}, - #{roadwayId}, - #{cargoSpaceId}, - #{cargoSpaceName}, - #{thePlatoon}, - #{theColumn}, - #{theFloor}, - #{priority}, - #{executionPhase}, + #{jobId}, + #{taskNo}, + #{status}, #{inOrOut}, - #{exitId}, - #{wlbh}, - #{lotNo}, - #{stackingId}, - #{stockStatus}, - #{outQuantity}, - #{giveNum}, - #{inOrOutId}, - #{inOrOutDId}, + #{trayCode}, #{createTime}, #{startTime}, #{finishTime}, + #{exitId}, #{warehouseId}, - #{productGuid}, #{productId}, + #{productName}, #{parentId}, #{price}, #{cargoNo}, #{unit}, #{spec}, #{remark}, - #{spare1}, - #{spare2}, - #{spare3}, - #{spare4}, - #{spare5}, - #{spare6}, - #{productName}, - #{spare7}, - #{spare8}, - #{spare9}, - #{spare10}, - #{spare11}, - #{spare12}, - #{spare13}, - #{spare14}, - #{spare15}, - #{spare16}, - #{spare17}, - #{spare18}, - #{spare19}, - #{spare20}, - #{spare21}, - #{spare22}, - #{spare23}, - #{spare24}, - #{spare25}, - #{spare26}, - #{spare27}, - #{spare28}, - #{spare29}, - #{spare30}, - #{spare31}, - #{spare32}, - #{spare33}, - #{spare34}, - #{spare35}, - #{spare36}, - #{spare37}, - #{spare38}, - #{spare39}, - #{customerName}, + #{productType}, + #{systemItem}, + #{productCtm}, + #{productCtu}, + #{upperNum}, + #{limitNum}, + #{enableFlag}, + #{outQuantity}, + #{lotNo}, + #{inOrOutId}, + #{inOrOutDId}, + #{priceTotal}, + #{origin}, + #{turnovertype}, + #{account}, + #{purpose}, + #{units}, + #{contract}, + #{cases}, + #{quality}, + #{managementNo}, update view_out_job_flow - job_detail_id = #{jobDetailId}, - status = #{status}, - task_no = #{taskNo}, - tray_code = #{trayCode}, - roadway_id = #{roadwayId}, - cargo_space_id = #{cargoSpaceId}, - cargo_space_name = #{cargoSpaceName}, - the_platoon = #{thePlatoon}, - the_column = #{theColumn}, - the_floor = #{theFloor}, - priority = #{priority}, - execution_phase = #{executionPhase}, + job_id = #{jobId}, + task_no = #{taskNo}, + status = #{status}, in_or_out = #{inOrOut}, - exit_id = #{exitId}, - wlbh = #{wlbh}, - lot_no = #{lotNo}, - stacking_id = #{stackingId}, - stock_status = #{stockStatus}, - out_quantity = #{outQuantity}, - give_num = #{giveNum}, - in_or_out_id = #{inOrOutId}, - in_or_out_d_id = #{inOrOutDId}, + tray_code = #{trayCode}, create_time = #{createTime}, start_time = #{startTime}, finish_time = #{finishTime}, + exit_id = #{exitId}, warehouse_id = #{warehouseId}, - product_guid = #{productGuid}, product_id = #{productId}, + product_name = #{productName}, parent_id = #{parentId}, price = #{price}, cargo_no = #{cargoNo}, unit = #{unit}, spec = #{spec}, remark = #{remark}, - spare1 = #{spare1}, - spare2 = #{spare2}, - spare3 = #{spare3}, - spare4 = #{spare4}, - spare5 = #{spare5}, - spare6 = #{spare6}, - product_name = #{productName}, - spare7 = #{spare7}, - spare8 = #{spare8}, - spare9 = #{spare9}, - spare10 = #{spare10}, - spare11 = #{spare11}, - spare12 = #{spare12}, - spare13 = #{spare13}, - spare14 = #{spare14}, - spare15 = #{spare15}, - spare16 = #{spare16}, - spare17 = #{spare17}, - spare18 = #{spare18}, - spare19 = #{spare19}, - spare20 = #{spare20}, - spare21 = #{spare21}, - spare22 = #{spare22}, - spare23 = #{spare23}, - spare24 = #{spare24}, - spare25 = #{spare25}, - spare26 = #{spare26}, - spare27 = #{spare27}, - spare28 = #{spare28}, - spare29 = #{spare29}, - spare30 = #{spare30}, - spare31 = #{spare31}, - spare32 = #{spare32}, - spare33 = #{spare33}, - spare34 = #{spare34}, - spare35 = #{spare35}, - spare36 = #{spare36}, - spare37 = #{spare37}, - spare38 = #{spare38}, - spare39 = #{spare39}, - customer_name = #{customerName}, + productType = #{productType}, + systemItem = #{systemItem}, + productCtm = #{productCtm}, + productCtu = #{productCtu}, + upperNum = #{upperNum}, + limitNum = #{limitNum}, + enableFlag = #{enableFlag}, + out_quantity = #{outQuantity}, + lot_no = #{lotNo}, + in_or_out_id = #{inOrOutId}, + in_or_out_d_id = #{inOrOutDId}, + priceTotal = #{priceTotal}, + origin = #{origin}, + turnovertype = #{turnovertype}, + account = #{account}, + purpose = #{purpose}, + units = #{units}, + contract = #{contract}, + cases = #{cases}, + quality = #{quality}, + managementNo = #{managementNo}, - where job_id = #{jobId} + where job_detail_id = #{jobDetailId} - - delete from view_out_job_flow where job_id = #{jobId} + + delete from view_out_job_flow where job_detail_id = #{jobDetailId} - - delete from view_out_job_flow where job_id in - - #{jobId} + + delete from view_out_job_flow where job_detail_id in + + #{jobDetailId} \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/mapper/search/ViewStockWarningMapper.xml b/ruoyi-admin/src/main/resources/mapper/search/ViewStockWarningMapper.xml index abea5e6..6d25072 100644 --- a/ruoyi-admin/src/main/resources/mapper/search/ViewStockWarningMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/search/ViewStockWarningMapper.xml @@ -5,480 +5,85 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - select stock_id, cargo_space_id, stock_status, product_status, lot_no, in_date, back_date, quantity, job_id, tray_code, out_quantity, stockin_detail_id, stockin_id, in_type, in_class_id, warehouse_id, stacking_id, warehouse_name, address, c_desc, warehouse_kind, warehouse_type, is_current, product_guid, product_id, parent_id, price, cargo_no, unit, spec, remark, spare1, spare2, spare3, spare4, spare5, spare6, product_name, spare7, spare8, spare9, spare10, spare11, spare12, spare13, spare14, spare15, spare16, spare17, spare18, spare19, spare20, spare21, spare22, spare23, spare24, spare25, spare26, spare27, spare28, spare29, spare30, spare31, spare32, spare33, spare34, spare35, spare36, spare37, spare38, spare39, cargo_space_name, roadway_id, cargo_area_id, the_type, the_type_name, the_platoon, the_column, the_floor, cargo_status, locked, cargo_hight, iss_double, group_coding_no, group_coding, cargo_space_logo, this_cargo_area from view_stock_warning + select warehouse_id, warehouse_name, product_id, product_name, quantity, spare5, spare6, flag from view_stock_warning - - where stock_id = #{stockId} + where warehouse_id = #{warehouseId} insert into view_stock_warning - stock_id, - cargo_space_id, - stock_status, - product_status, - lot_no, - in_date, - back_date, - quantity, - job_id, - tray_code, - out_quantity, - stockin_detail_id, - stockin_id, - in_type, - in_class_id, warehouse_id, - stacking_id, warehouse_name, - address, - c_desc, - warehouse_kind, - warehouse_type, - is_current, - product_guid, product_id, - parent_id, - price, - cargo_no, - unit, - spec, - remark, - spare1, - spare2, - spare3, - spare4, + product_name, + quantity, spare5, spare6, - product_name, - spare7, - spare8, - spare9, - spare10, - spare11, - spare12, - spare13, - spare14, - spare15, - spare16, - spare17, - spare18, - spare19, - spare20, - spare21, - spare22, - spare23, - spare24, - spare25, - spare26, - spare27, - spare28, - spare29, - spare30, - spare31, - spare32, - spare33, - spare34, - spare35, - spare36, - spare37, - spare38, - spare39, - cargo_space_name, - roadway_id, - cargo_area_id, - the_type, - the_type_name, - the_platoon, - the_column, - the_floor, - cargo_status, - locked, - cargo_hight, - iss_double, - group_coding_no, - group_coding, - cargo_space_logo, - this_cargo_area, + flag, - #{stockId}, - #{cargoSpaceId}, - #{stockStatus}, - #{productStatus}, - #{lotNo}, - #{inDate}, - #{backDate}, - #{quantity}, - #{jobId}, - #{trayCode}, - #{outQuantity}, - #{stockinDetailId}, - #{stockinId}, - #{inType}, - #{inClassId}, #{warehouseId}, - #{stackingId}, #{warehouseName}, - #{address}, - #{cDesc}, - #{warehouseKind}, - #{warehouseType}, - #{isCurrent}, - #{productGuid}, #{productId}, - #{parentId}, - #{price}, - #{cargoNo}, - #{unit}, - #{spec}, - #{remark}, - #{spare1}, - #{spare2}, - #{spare3}, - #{spare4}, + #{productName}, + #{quantity}, #{spare5}, #{spare6}, - #{productName}, - #{spare7}, - #{spare8}, - #{spare9}, - #{spare10}, - #{spare11}, - #{spare12}, - #{spare13}, - #{spare14}, - #{spare15}, - #{spare16}, - #{spare17}, - #{spare18}, - #{spare19}, - #{spare20}, - #{spare21}, - #{spare22}, - #{spare23}, - #{spare24}, - #{spare25}, - #{spare26}, - #{spare27}, - #{spare28}, - #{spare29}, - #{spare30}, - #{spare31}, - #{spare32}, - #{spare33}, - #{spare34}, - #{spare35}, - #{spare36}, - #{spare37}, - #{spare38}, - #{spare39}, - #{cargoSpaceName}, - #{roadwayId}, - #{cargoAreaId}, - #{theType}, - #{theTypeName}, - #{thePlatoon}, - #{theColumn}, - #{theFloor}, - #{cargoStatus}, - #{locked}, - #{cargoHight}, - #{issDouble}, - #{groupCodingNo}, - #{groupCoding}, - #{cargoSpaceLogo}, - #{thisCargoArea}, + #{flag}, update view_stock_warning - cargo_space_id = #{cargoSpaceId}, - stock_status = #{stockStatus}, - product_status = #{productStatus}, - lot_no = #{lotNo}, - in_date = #{inDate}, - back_date = #{backDate}, - quantity = #{quantity}, - job_id = #{jobId}, - tray_code = #{trayCode}, - out_quantity = #{outQuantity}, - stockin_detail_id = #{stockinDetailId}, - stockin_id = #{stockinId}, - in_type = #{inType}, - in_class_id = #{inClassId}, - warehouse_id = #{warehouseId}, - stacking_id = #{stackingId}, warehouse_name = #{warehouseName}, - address = #{address}, - c_desc = #{cDesc}, - warehouse_kind = #{warehouseKind}, - warehouse_type = #{warehouseType}, - is_current = #{isCurrent}, - product_guid = #{productGuid}, product_id = #{productId}, - parent_id = #{parentId}, - price = #{price}, - cargo_no = #{cargoNo}, - unit = #{unit}, - spec = #{spec}, - remark = #{remark}, - spare1 = #{spare1}, - spare2 = #{spare2}, - spare3 = #{spare3}, - spare4 = #{spare4}, + product_name = #{productName}, + quantity = #{quantity}, spare5 = #{spare5}, spare6 = #{spare6}, - product_name = #{productName}, - spare7 = #{spare7}, - spare8 = #{spare8}, - spare9 = #{spare9}, - spare10 = #{spare10}, - spare11 = #{spare11}, - spare12 = #{spare12}, - spare13 = #{spare13}, - spare14 = #{spare14}, - spare15 = #{spare15}, - spare16 = #{spare16}, - spare17 = #{spare17}, - spare18 = #{spare18}, - spare19 = #{spare19}, - spare20 = #{spare20}, - spare21 = #{spare21}, - spare22 = #{spare22}, - spare23 = #{spare23}, - spare24 = #{spare24}, - spare25 = #{spare25}, - spare26 = #{spare26}, - spare27 = #{spare27}, - spare28 = #{spare28}, - spare29 = #{spare29}, - spare30 = #{spare30}, - spare31 = #{spare31}, - spare32 = #{spare32}, - spare33 = #{spare33}, - spare34 = #{spare34}, - spare35 = #{spare35}, - spare36 = #{spare36}, - spare37 = #{spare37}, - spare38 = #{spare38}, - spare39 = #{spare39}, - cargo_space_name = #{cargoSpaceName}, - roadway_id = #{roadwayId}, - cargo_area_id = #{cargoAreaId}, - the_type = #{theType}, - the_type_name = #{theTypeName}, - the_platoon = #{thePlatoon}, - the_column = #{theColumn}, - the_floor = #{theFloor}, - cargo_status = #{cargoStatus}, - locked = #{locked}, - cargo_hight = #{cargoHight}, - iss_double = #{issDouble}, - group_coding_no = #{groupCodingNo}, - group_coding = #{groupCoding}, - cargo_space_logo = #{cargoSpaceLogo}, - this_cargo_area = #{thisCargoArea}, + flag = #{flag}, - where stock_id = #{stockId} + where warehouse_id = #{warehouseId} - - delete from view_stock_warning where stock_id = #{stockId} + + delete from view_stock_warning where warehouse_id = #{warehouseId} - - delete from view_stock_warning where stock_id in - - #{stockId} + + delete from view_stock_warning where warehouse_id in + + #{warehouseId} \ No newline at end of file diff --git a/ruoyi-ui/src/api/search/ViewInJobFlow.js b/ruoyi-ui/src/api/search/ViewInJobFlow.js index ace8294..436ac90 100644 --- a/ruoyi-ui/src/api/search/ViewInJobFlow.js +++ b/ruoyi-ui/src/api/search/ViewInJobFlow.js @@ -10,9 +10,9 @@ export function listViewInJobFlow(query) { } // 查询入库作业流水详细 -export function getViewInJobFlow(jobId) { +export function getViewInJobFlow(jobDetailId) { return request({ - url: '/search/ViewInJobFlow/' + jobId, + url: '/search/ViewInJobFlow/' + jobDetailId, method: 'get' }) } @@ -36,9 +36,9 @@ export function updateViewInJobFlow(data) { } // 删除入库作业流水 -export function delViewInJobFlow(jobId) { +export function delViewInJobFlow(jobDetailId) { return request({ - url: '/search/ViewInJobFlow/' + jobId, + url: '/search/ViewInJobFlow/' + jobDetailId, method: 'delete' }) } diff --git a/ruoyi-ui/src/api/search/ViewOutJobFlow.js b/ruoyi-ui/src/api/search/ViewOutJobFlow.js index 3e72164..60ed5fb 100644 --- a/ruoyi-ui/src/api/search/ViewOutJobFlow.js +++ b/ruoyi-ui/src/api/search/ViewOutJobFlow.js @@ -1,6 +1,6 @@ import request from '@/utils/request' -// 查询出库作业流水列表 +// 查询出库作业流水Controller列表 export function listViewOutJobFlow(query) { return request({ url: '/search/ViewOutJobFlow/list', @@ -9,15 +9,15 @@ export function listViewOutJobFlow(query) { }) } -// 查询出库作业流水详细 -export function getViewOutJobFlow(jobId) { +// 查询出库作业流水Controller详细 +export function getViewOutJobFlow(jobDetailId) { return request({ - url: '/search/ViewOutJobFlow/' + jobId, + url: '/search/ViewOutJobFlow/' + jobDetailId, method: 'get' }) } -// 新增出库作业流水 +// 新增出库作业流水Controller export function addViewOutJobFlow(data) { return request({ url: '/search/ViewOutJobFlow', @@ -26,7 +26,7 @@ export function addViewOutJobFlow(data) { }) } -// 修改出库作业流水 +// 修改出库作业流水Controller export function updateViewOutJobFlow(data) { return request({ url: '/search/ViewOutJobFlow', @@ -35,10 +35,10 @@ export function updateViewOutJobFlow(data) { }) } -// 删除出库作业流水 -export function delViewOutJobFlow(jobId) { +// 删除出库作业流水Controller +export function delViewOutJobFlow(jobDetailId) { return request({ - url: '/search/ViewOutJobFlow/' + jobId, + url: '/search/ViewOutJobFlow/' + jobDetailId, method: 'delete' }) } diff --git a/ruoyi-ui/src/api/search/ViewStockWarning.js b/ruoyi-ui/src/api/search/ViewStockWarning.js index 025d4e4..d844b92 100644 --- a/ruoyi-ui/src/api/search/ViewStockWarning.js +++ b/ruoyi-ui/src/api/search/ViewStockWarning.js @@ -1,6 +1,6 @@ import request from '@/utils/request' -// 查询库存预警查询列表 +// 查询库存预警查询Controller列表 export function listViewStockWarning(query) { return request({ url: '/search/ViewStockWarning/list', @@ -9,15 +9,15 @@ export function listViewStockWarning(query) { }) } -// 查询库存预警查询详细 -export function getViewStockWarning(stockId) { +// 查询库存预警查询Controller详细 +export function getViewStockWarning(warehouseId) { return request({ - url: '/search/ViewStockWarning/' + stockId, + url: '/search/ViewStockWarning/' + warehouseId, method: 'get' }) } -// 新增库存预警查询 +// 新增库存预警查询Controller export function addViewStockWarning(data) { return request({ url: '/search/ViewStockWarning', @@ -26,7 +26,7 @@ export function addViewStockWarning(data) { }) } -// 修改库存预警查询 +// 修改库存预警查询Controller export function updateViewStockWarning(data) { return request({ url: '/search/ViewStockWarning', @@ -35,10 +35,10 @@ export function updateViewStockWarning(data) { }) } -// 删除库存预警查询 -export function delViewStockWarning(stockId) { +// 删除库存预警查询Controller +export function delViewStockWarning(warehouseId) { return request({ - url: '/search/ViewStockWarning/' + stockId, + url: '/search/ViewStockWarning/' + warehouseId, method: 'delete' }) } diff --git a/ruoyi-ui/src/views/search/StockSummary/index.vue b/ruoyi-ui/src/views/search/StockSummary/index.vue index 8417993..b102a69 100644 --- a/ruoyi-ui/src/views/search/StockSummary/index.vue +++ b/ruoyi-ui/src/views/search/StockSummary/index.vue @@ -3,82 +3,55 @@ - 订单号 - 物料编号 - 物料名称 - 批号 - - - 巷道 - 货位 - 品号描述 - 规格 - - 英文描述 - - 单件净重 - - - - - - - NC号 - 电源线 - 插头 - 接嘴 - 快捷码 - 库存单位编号 - 库存单位名称 - 品号群组 - 归类品 - 计量体系 - 群组名称 - 批号管理 - 状态 - 产品大类 - 产品二类 - 产品线/产品系列 - BOM状态 - 产品定位 - 电脑板型号 - 非标要求 - 品牌 - 非标颜色 - 主颜色 - 辅助颜色 - 是否标准款 - 包装方式 - 主要包装方式 - 长 - 宽 - 高 - 包装材积 + 库存状态 + 套账 + 托盘 + 物料编码 + 规格 + 单价 + 物料状态 + 图号 + 合同号 + 台次 + 件次 + 质量 + 常用编码 + 入库单号 + 供应商编码 + 来源 + 用途 +
- - + - + + + + + + + @@ -91,30 +64,169 @@ @keyup.enter.native="handleQuery" /> + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - 搜索 重置 @@ -211,6 +323,7 @@ import { listWarehouse } from "@/api/bas/warehouse" export default { name: "StockSummary", + dicts:['product_status', 'stock_status','cargo_space_status','cargo_space_lock_status','product_type','origin_type','account_type','turnover_type','purpose_type','quality_type','check_flag'], data() { return { // 遮罩层 diff --git a/ruoyi-ui/src/views/search/ViewInJobFlow/index.vue b/ruoyi-ui/src/views/search/ViewInJobFlow/index.vue index 99ff118..bb319a8 100644 --- a/ruoyi-ui/src/views/search/ViewInJobFlow/index.vue +++ b/ruoyi-ui/src/views/search/ViewInJobFlow/index.vue @@ -1,32 +1,22 @@