From 32d8fc76414b23fd538af7ae92a5ce0a213b1c3d Mon Sep 17 00:00:00 2001 From: liuhanqing Date: Mon, 26 May 2025 17:48:41 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BA=93=E5=AD=98=E7=BB=B4=E6=8A=A4=E8=AE=B0?= =?UTF-8?q?=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/InMydoJobController.java | 14 +++- .../com/ruoyi/job/mydojob/domain/MydoJob.java | 44 +++++++++++ .../service/impl/BasStockServiceImpl.java | 37 ++++++++++ .../resources/mapper/job/MydoJobMapper.xml | 73 ++++++++++++------- .../src/api/job/{mydoJob.js => inmydoJob.js} | 10 +-- ruoyi-ui/src/views/in/job/index.vue | 15 ++-- 6 files changed, 153 insertions(+), 40 deletions(-) rename ruoyi-ui/src/api/job/{mydoJob.js => inmydoJob.js} (79%) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/controller/InMydoJobController.java b/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/controller/InMydoJobController.java index f82ce92..e1042c6 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/controller/InMydoJobController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/controller/InMydoJobController.java @@ -1,7 +1,10 @@ package com.ruoyi.job.mydojob.controller; +import java.util.ArrayList; import java.util.List; import javax.servlet.http.HttpServletResponse; + +import com.ruoyi.job.mydojobfinish.service.IMydoJobFinishService; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -28,11 +31,13 @@ import com.ruoyi.common.core.page.TableDataInfo; * @date 2025-05-23 */ @RestController -@RequestMapping("/job/mydoJob") +@RequestMapping("/job/inmydoJob") public class InMydoJobController extends BaseController { @Autowired private IMydoJobService mydoJobService; + @Autowired + private IMydoJobFinishService mydoJobFinishService; /** * 查询任务表列表 @@ -42,7 +47,12 @@ public class InMydoJobController extends BaseController public TableDataInfo list(MydoJob mydoJob) { startPage(); - List list = mydoJobService.selectMydoJobList(mydoJob); + List list = null; + if(Integer.parseInt(mydoJob.getStatus())<4) { + list = mydoJobService.selectMydoJobList(mydoJob); + }else{ + list= mydoJobFinishService.selectMydoJobFinishListByMydoJob(mydoJob); + } return getDataTable(list); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/domain/MydoJob.java b/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/domain/MydoJob.java index 06e4e2f..6490afb 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/domain/MydoJob.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/domain/MydoJob.java @@ -34,10 +34,14 @@ public class MydoJob /** 供应商ID */ @Excel(name = "供应商ID") private String supplierId; + @Excel(name = "供应商名称") + private String supplierName; /** 客户ID */ @Excel(name = "客户ID") private String customerId; + @Excel(name = "客户名称") + private String customerName; /** 部门ID */ @Excel(name = "部门ID") @@ -54,6 +58,8 @@ public class MydoJob /** 货位ID */ @Excel(name = "货位ID") private String cargoSpaceId; + @Excel(name = "货位名称") + private String cargoSpaceName; /** 目标巷道ID */ @Excel(name = "目标巷道ID") @@ -62,6 +68,8 @@ public class MydoJob /** 目标货位ID */ @Excel(name = "目标货位ID") private String targetCargoSpaceId; + @Excel(name = "目标货位名称") + private String targetCargoSpaceName; /** 产线ID */ @Excel(name = "产线ID") @@ -110,6 +118,8 @@ public class MydoJob /** 仓库ID */ @Excel(name = "仓库ID") private String warehouseId; + @Excel(name = "仓库名称") + private String warehouseName; /** 重分标记 */ @Excel(name = "重分标记") @@ -373,6 +383,40 @@ public class MydoJob return faultFlag; } + public String getSupplierName() { + return supplierName; + } + + public void setSupplierName(String supplierName) { + this.supplierName = supplierName; + } + + public String getCustomerName() { + return customerName; + } + + public void setCustomerName(String customerName) { + this.customerName = customerName; + } + + public String getCargoSpaceName() { + return cargoSpaceName; + } + + public void setCargoSpaceName(String cargoSpaceName) { + this.cargoSpaceName = cargoSpaceName; + } + + public String getTargetCargoSpaceName() { + return targetCargoSpaceName; + } + + public void setTargetCargoSpaceName(String targetCargoSpaceName) { + this.targetCargoSpaceName = targetCargoSpaceName; + } + + + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/stock/stock/service/impl/BasStockServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/stock/stock/service/impl/BasStockServiceImpl.java index 417f7fb..a533da8 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/stock/stock/service/impl/BasStockServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/stock/stock/service/impl/BasStockServiceImpl.java @@ -1,11 +1,19 @@ package com.ruoyi.stock.stock.service.impl; +import java.util.Date; import java.util.List; + +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.util.IdUtil; +import com.ruoyi.common.utils.SecurityUtils; +import com.ruoyi.stock.maintain.domain.BasStockMaintainRecord; +import com.ruoyi.stock.maintain.service.IBasStockMaintainRecordService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.ruoyi.stock.stock.mapper.BasStockMapper; import com.ruoyi.stock.stock.domain.BasStock; import com.ruoyi.stock.stock.service.IBasStockService; +import org.springframework.transaction.annotation.Transactional; /** * 库存信息Service业务层处理 @@ -18,6 +26,8 @@ public class BasStockServiceImpl implements IBasStockService { @Autowired private BasStockMapper basStockMapper; + @Autowired + private IBasStockMaintainRecordService basStockMaintainRecordService; /** * 查询库存信息 @@ -52,9 +62,27 @@ public class BasStockServiceImpl implements IBasStockService @Override public int insertBasStock(BasStock basStock) { + insertMaintainRecord(null,basStock,"1"); return basStockMapper.insertBasStock(basStock); } + private void insertMaintainRecord(BasStock oldStock,BasStock basStock, String operate) { + BasStockMaintainRecord basStockMaintainRecord = new BasStockMaintainRecord(); + basStockMaintainRecord.setWhGuid(IdUtil.fastSimpleUUID()); + basStockMaintainRecord.setStockId(basStock.getStockId()); + basStockMaintainRecord.setCargoSpaceId(basStock.getCargoSpaceId()); + basStockMaintainRecord.setLotNo(basStock.getLotNo()); + basStockMaintainRecord.setTrayCode(basStock.getTrayCode()); + basStockMaintainRecord.setProductGuid(basStock.getProductGuid()); + basStockMaintainRecord.setCreateBy(SecurityUtils.getLoginUser().getUsername()); + basStockMaintainRecord.setCreateTime(new Date()); + basStockMaintainRecord.setOldQuantity(oldStock!=null?oldStock.getQuantity():"0"); + basStockMaintainRecord.setQuantity(basStock.getQuantity()); + basStockMaintainRecord.setWarehouseId(basStock.getWarehouseId()); + basStockMaintainRecord.setMethod(operate); + basStockMaintainRecordService.insertBasStockMaintainRecord(basStockMaintainRecord); + } + /** * 修改库存信息 * @@ -64,6 +92,8 @@ public class BasStockServiceImpl implements IBasStockService @Override public int updateBasStock(BasStock basStock) { + BasStock oldBasStock = basStockMapper.selectBasStockByStockId(basStock.getStockId()); + insertMaintainRecord(oldBasStock,basStock,"2"); return basStockMapper.updateBasStock(basStock); } @@ -74,8 +104,13 @@ public class BasStockServiceImpl implements IBasStockService * @return 结果 */ @Override + @Transactional(rollbackFor = Exception.class) public int deleteBasStockByStockIds(String[] stockIds) { + for (String stockId : stockIds) { + BasStock oldBasStock = basStockMapper.selectBasStockByStockId(stockId); + insertMaintainRecord(oldBasStock,oldBasStock,"3"); + } return basStockMapper.deleteBasStockByStockIds(stockIds); } @@ -88,6 +123,8 @@ public class BasStockServiceImpl implements IBasStockService @Override public int deleteBasStockByStockId(String stockId) { + BasStock oldBasStock = basStockMapper.selectBasStockByStockId(stockId); + insertMaintainRecord(oldBasStock,oldBasStock,"3"); return basStockMapper.deleteBasStockByStockId(stockId); } diff --git a/ruoyi-admin/src/main/resources/mapper/job/MydoJobMapper.xml b/ruoyi-admin/src/main/resources/mapper/job/MydoJobMapper.xml index 5cc6fb7..b7f50b7 100644 --- a/ruoyi-admin/src/main/resources/mapper/job/MydoJobMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/job/MydoJobMapper.xml @@ -30,46 +30,65 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + + - select job_id, status, on_line_type, task_no, supplier_id, customer_id, department_id, tray_code, roadway_id, cargo_space_id, target_roadway_id, target_cargo_space_id, line_id, workshop_id, priority, execution_phase, in_or_out, create_time, start_time, finish_time, entrance_id, exit_id, class_id, warehouse_id, fault_flag from mydo_job + select mj.job_id, mj.status, mj.on_line_type, mj.task_no, mj.supplier_id, + mj.customer_id, mj.department_id, mj.tray_code, mj.roadway_id, mj.cargo_space_id, + mj.target_roadway_id, mj.target_cargo_space_id, mj.line_id, mj.workshop_id, mj.priority, + mj.execution_phase, mj.in_or_out, mj.create_time, mj.start_time, mj.finish_time, mj.entrance_id, + mj.exit_id, mj.class_id, mj.warehouse_id, mj.fault_flag, + bs.supplier_name as supplier_name, bc.customer_name as customer_name, + bcs.cargo_space_name as cargo_space_name, bcst.cargo_space_name as target_cargo_space_name, + bw.warehouse_name as warehouse_name + from mydo_job mj + left join bas_supplier bs on mj.supplier_id = bs.id + left join bas_customer bc on mj.customer_id = bc.id + left join bas_cargo_space bcs on mj.cargo_space_id = bcs.cargo_space_id + left join bas_cargo_space bcst on mj.target_cargo_space_id = bcst.cargo_space_id + left join bas_warehouse bw on mj.warehouse_id = bw.warehouse_id + diff --git a/ruoyi-ui/src/api/job/mydoJob.js b/ruoyi-ui/src/api/job/inmydoJob.js similarity index 79% rename from ruoyi-ui/src/api/job/mydoJob.js rename to ruoyi-ui/src/api/job/inmydoJob.js index 962a6e0..d33c2ab 100644 --- a/ruoyi-ui/src/api/job/mydoJob.js +++ b/ruoyi-ui/src/api/job/inmydoJob.js @@ -3,7 +3,7 @@ import request from '@/utils/request' // 查询任务表列表 export function listMydoJob(query) { return request({ - url: '/job/mydoJob/list', + url: '/job/inmydoJob/list', method: 'get', params: query }) @@ -12,7 +12,7 @@ export function listMydoJob(query) { // 查询任务表详细 export function getMydoJob(jobId) { return request({ - url: '/job/mydoJob/' + jobId, + url: '/job/inmydoJob/' + jobId, method: 'get' }) } @@ -20,7 +20,7 @@ export function getMydoJob(jobId) { // 新增任务表 export function addMydoJob(data) { return request({ - url: '/job/mydoJob', + url: '/job/inmydoJob', method: 'post', data: data }) @@ -29,7 +29,7 @@ export function addMydoJob(data) { // 修改任务表 export function updateMydoJob(data) { return request({ - url: '/job/mydoJob', + url: '/job/inmydoJob', method: 'put', data: data }) @@ -38,7 +38,7 @@ export function updateMydoJob(data) { // 删除任务表 export function delMydoJob(jobId) { return request({ - url: '/job/mydoJob/' + jobId, + url: '/job/inmydoJob/' + jobId, method: 'delete' }) } diff --git a/ruoyi-ui/src/views/in/job/index.vue b/ruoyi-ui/src/views/in/job/index.vue index 0669100..2e66db3 100644 --- a/ruoyi-ui/src/views/in/job/index.vue +++ b/ruoyi-ui/src/views/in/job/index.vue @@ -261,14 +261,14 @@ - + - - - + + + @@ -352,7 +352,7 @@