diff --git a/ruoyi-admin/src/main/java/com/ruoyi/api/controller/ToWmsApiController.java b/ruoyi-admin/src/main/java/com/ruoyi/api/controller/ToWmsApiController.java index ee08b8d..c8ca280 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/api/controller/ToWmsApiController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/api/controller/ToWmsApiController.java @@ -1,20 +1,28 @@ package com.ruoyi.api.controller; +import cn.hutool.core.convert.Convert; import cn.hutool.json.JSONUtil; import com.ruoyi.api.domain.ReMaterialParam; import com.ruoyi.api.domain.RequestEnter; import com.ruoyi.api.domain.WmsJobRequest; import com.ruoyi.api.service.IToWmsService; +import com.ruoyi.bas.basJobId.service.IBasJobIdService; +import com.ruoyi.bas.tag.mapper.BasTagMapper; +import com.ruoyi.bas.taskNo.service.IBasTaskNoService; import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.job.mydojob.domain.MydoJob; +import com.ruoyi.job.mydojob.mapper.MydoJobMapper; +import com.ruoyi.job.mydojobdetail.domain.MydoJobDetail; +import com.ruoyi.job.mydojobdetail.mapper.MydoJobDetailMapper; import com.ruoyi.log.domain.RequestLog; import com.ruoyi.log.service.IRequestLogService; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; +import java.util.Date; +import java.util.List; import java.util.Map; +import java.util.stream.Collectors; /** * 作业统计 Controller @@ -23,9 +31,51 @@ import java.util.Map; @RequestMapping("/api2wms") public class ToWmsApiController { + @Autowired + private BasTagMapper basTagMapper; + @Autowired + private MydoJobMapper mydoJobMapper; + @Autowired + private MydoJobDetailMapper mydoJobDetailMapper; + @Autowired + private IBasJobIdService basJobIdService; + @Autowired + private IBasTaskNoService basTaskNoService; + @GetMapping("/genMoniData") + public void genMoniData(){ + List> list = basTagMapper.selectTestData("110"); + Map>> deptIdList = list.stream().collect(Collectors.groupingBy(x -> x.get("deptId"))); + String rkPri = "RK20260117"; + int i = 85000; + for (String deptId : deptIdList.keySet()) { + List> deptMydoJobList = deptIdList.get(deptId); + for (Map stringStringMap : deptMydoJobList) { + MydoJob mydoJob = new MydoJob(); + mydoJob.setJobId(rkPri+String.format("%05d",i)); + mydoJob.setStatus("1"); + mydoJob.setOnLineType("1"); + mydoJob.setTaskNo(i+""); + mydoJob.setDepartmentId(deptId); + mydoJob.setTrayCode(stringStringMap.get("trayCode")); + mydoJob.setPriority(10L); + mydoJob.setExecutionPhase("1"); + mydoJob.setInOrOut("3"); + mydoJob.setCreateTime(new Date()); + mydoJob.setWarehouseId("01"); + mydoJobMapper.insertMydoJob(mydoJob); + MydoJobDetail mydoJobDetail = new MydoJobDetail(); + mydoJobDetail.setJobDetailId(mydoJob.getJobId()+"-1"); + mydoJobDetail.setJobId(mydoJob.getJobId()); + mydoJobDetail.setProductGuid("KTP0001"); + mydoJobDetail.setProductId("KTP0001"); + mydoJobDetail.setInQuantity("1"); + mydoJobDetailMapper.insertMydoJobDetail(mydoJobDetail); + ++i; + } + } - + } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToWcsServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToWcsServiceImpl.java index 22da080..a5e2032 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToWcsServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToWcsServiceImpl.java @@ -12,12 +12,12 @@ import com.ruoyi.api.domain.RequestEnterResponse; import com.ruoyi.api.domain.WmsJobRequest; import com.ruoyi.api.service.IToWcsService; import com.ruoyi.bas.cargoSpace.domain.BasCargoSpace; -import com.ruoyi.bas.cargoSpace.domain.BasCargoSpaceWeight; import com.ruoyi.bas.cargoSpace.service.IBasCargoSpaceService; import com.ruoyi.bas.weightRule.domain.BasCargoSpaceWeightRule; import com.ruoyi.bas.weightRule.service.IBasCargoSpaceWeightRuleService; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.utils.MessageUtils; +import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.job.mydojob.domain.MydoJob; import com.ruoyi.job.mydojob.service.IMydoJobService; import com.ruoyi.job.mydojobdetail.domain.MydoJobDetail; @@ -26,6 +26,7 @@ import com.ruoyi.log.domain.RequestLog; import com.ruoyi.log.service.IRequestLogService; import com.ruoyi.out.outStockout.service.IOutStockoutService; import com.ruoyi.pda.domain.TrayCodeMsg; +import com.ruoyi.pda.mapper.PdaMapper; import com.ruoyi.pda.service.PdaService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; @@ -52,6 +53,8 @@ public class ToWcsServiceImpl implements IToWcsService { private IOutStockoutService outStockoutService; @Autowired private PdaService pdaService; + @Autowired + private PdaMapper pdaMapper; @Autowired private IBasCargoSpaceWeightRuleService basCargoSpaceWeightRuleService; @@ -67,32 +70,44 @@ public class ToWcsServiceImpl implements IToWcsService { public void pushOutMydoJob() { //查询所有未推送的料箱出库作业 MydoJob mydoJobParam = new MydoJob(); - mydoJobParam.setStatus("1"); List list = new ArrayList<>(); list.add("21"); list.add("23"); list.add("26"); mydoJobParam.setInOutIds(list); - List outMydoJobs = mydoJobService.selectMydoJobListApi(mydoJobParam); - for (MydoJob outMydoJob : outMydoJobs) { - if ("01".equals(outMydoJob.getWarehouseId())){ - RequestLog requestLog = requestLogService.getRequestLog(PUSH_OUT_MYDO_JOB_1, JSONUtil.toJsonStr(outMydoJob), "推送出库任务"); - if ("1".equals(requestLog.getIsSuccessful())){ - outMydoJob.setStatus("3"); - outMydoJob.setExecutionPhase("1"); - outMydoJob.setStartTime(DateUtil.formatDateTime(new Date())); - mydoJobService.updateMydoJob(outMydoJob); - } - }else if ("02".equals(outMydoJob.getWarehouseId())){ - RequestLog requestLog = requestLogService.getRequestLog(PUSH_OUT_MYDO_JOB_2, JSONUtil.toJsonStr(outMydoJob), "推送出库任务"); - if ("1".equals(requestLog.getIsSuccessful())){ - outMydoJob.setStatus("3"); - outMydoJob.setExecutionPhase("1"); - outMydoJob.setStartTime(DateUtil.formatDateTime(new Date())); - mydoJobService.updateMydoJob(outMydoJob); + MydoJob mydoJobParam1 = new MydoJob(); + mydoJobParam1.setInOutIds(list); + for (int i = 1; i <= 6; i++) { + mydoJobParam.setRoadwayId(String.valueOf(i)); + mydoJobParam.setStatus("3"); + List roadwayRunningMydoJobs = mydoJobService.selectMydoJobListApi(mydoJobParam); + if (CollUtil.isEmpty(roadwayRunningMydoJobs)){ + mydoJobParam1.setStatus("1"); + List roadwayWaitingMydoJobs = mydoJobService.selectMydoJobListApi(mydoJobParam1); + if (CollUtil.isNotEmpty(roadwayWaitingMydoJobs)){ + MydoJob outMydoJob = roadwayWaitingMydoJobs.get(0); + if ("01".equals(outMydoJob.getWarehouseId())){ + RequestLog requestLog = requestLogService.getRequestLog(PUSH_OUT_MYDO_JOB_1, JSONUtil.toJsonStr(outMydoJob), "推送出库任务"); + if ("1".equals(requestLog.getIsSuccessful())){ + outMydoJob.setStatus("3"); + outMydoJob.setExecutionPhase("1"); + outMydoJob.setStartTime(DateUtil.formatDateTime(new Date())); + mydoJobService.updateMydoJob(outMydoJob); + } + }else if ("02".equals(outMydoJob.getWarehouseId())){ + RequestLog requestLog = requestLogService.getRequestLog(PUSH_OUT_MYDO_JOB_2, JSONUtil.toJsonStr(outMydoJob), "推送出库任务"); + if ("1".equals(requestLog.getIsSuccessful())){ + outMydoJob.setStatus("3"); + outMydoJob.setExecutionPhase("1"); + outMydoJob.setStartTime(DateUtil.formatDateTime(new Date())); + mydoJobService.updateMydoJob(outMydoJob); + } + } } + } } + } @@ -137,7 +152,7 @@ public class ToWcsServiceImpl implements IToWcsService { param.setWarehouseId(requestEnter.getWarehouseId()); List mydoJobs = mydoJobService.selectMydoJobListApi(param); if (CollUtil.isEmpty(mydoJobs)){ - //生成杂料入库任务 + /*//生成杂料入库任务 TrayCodeMsg trayCodeMsg = new TrayCodeMsg(); trayCodeMsg.setTrayCode(requestEnter.getTrayCode()); trayCodeMsg.setWarehouseId(requestEnter.getWarehouseId()); @@ -145,7 +160,22 @@ public class ToWcsServiceImpl implements IToWcsService { mydoJobs = mydoJobService.selectMydoJobListApi(param); if (CollUtil.isEmpty(mydoJobs)){ return AjaxResult.error("杂料入库任务生成失败", requestEnter.getTrayCode()); + }*/ + if ("02".equals(requestEnter.getWarehouseId())){ + HashMap map = new HashMap<>(); + map.put("v_tray_code", requestEnter.getTrayCode()); + map.put("v_warehouse_id", requestEnter.getWarehouseId()); + map.put("v_dept_id", ""); + pdaMapper.ktpin(map); + String result1 = map.get("v_result").toString(); + if ("10".equals(result1)){ + return AjaxResult.success(map.get("v_resultmsg").toString()); + }else{ + return AjaxResult.error(map.get("v_resultmsg").toString()); + } } + + return AjaxResult.error("无入库任务", requestEnter.getTrayCode()); } MydoJob mydoJob = mydoJobs.get(0); if(StrUtil.isEmpty(mydoJob.getCargoSpaceId())){ diff --git a/ruoyi-admin/src/main/java/com/ruoyi/bas/tag/mapper/BasTagMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/bas/tag/mapper/BasTagMapper.java index de5d0f7..292c6a7 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/bas/tag/mapper/BasTagMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/bas/tag/mapper/BasTagMapper.java @@ -3,6 +3,7 @@ package com.ruoyi.bas.tag.mapper; import com.ruoyi.bas.tag.domain.BasTag; import java.util.List; +import java.util.Map; /** * 电子标签Mapper接口 @@ -61,4 +62,8 @@ public interface BasTagMapper public int deleteBasTagByIds(Long[] ids); BasTag selectBasTagByTrayCode(String trayCode); + + void insertData(); + + List> selectTestData(String deptId); } 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 f6ea2d4..90ed7a4 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 @@ -41,7 +41,6 @@ public class InMydoJobController extends BaseController { startPage(); List list = null; - //mydoJob.setInOut("1"); if( StrUtil.isEmpty(mydoJob.getStatus()) ||Integer.parseInt(mydoJob.getStatus())<4) { list = mydoJobService.selectMydoJobList(mydoJob); }else{ diff --git a/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/controller/OutMydoJobController.java b/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/controller/OutMydoJobController.java index 7a5e39b..21e8db6 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/controller/OutMydoJobController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/controller/OutMydoJobController.java @@ -12,10 +12,7 @@ import com.ruoyi.job.mydojob.service.IMydoJobService; import com.ruoyi.job.mydojobfinish.service.IMydoJobFinishService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import java.util.List; @@ -76,4 +73,11 @@ public class OutMydoJobController extends BaseController { } + @Log(title = "修改优先级",businessType = BusinessType.UPDATE) + @PostMapping("/updatePriority") + public AjaxResult updatePriority(@RequestBody MydoJob mydoJob){ + return mydoJobService.updatePriority(mydoJob); + } + + } 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 d91aa46..941896d 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 @@ -131,8 +131,8 @@ public class MydoJob extends BaseEntity private List inOutIds; - private String createLeftTime; - private String createRightTime; + private String dateStart; + private String dateEnd; private String productId; @@ -144,20 +144,20 @@ public class MydoJob extends BaseEntity this.productId = productId; } - public String getCreateLeftTime() { - return createLeftTime; + public String getDateEnd() { + return dateEnd; } - public void setCreateLeftTime(String createLeftTime) { - this.createLeftTime = createLeftTime; + public void setDateEnd(String dateEnd) { + this.dateEnd = dateEnd; } - public String getCreateRightTime() { - return createRightTime; + public String getDateStart() { + return dateStart; } - public void setCreateRightTime(String createRightTime) { - this.createRightTime = createRightTime; + public void setDateStart(String dateStart) { + this.dateStart = dateStart; } public List getInOutIds() { diff --git a/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/service/IMydoJobService.java b/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/service/IMydoJobService.java index e61b6f7..1ca173c 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/service/IMydoJobService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/service/IMydoJobService.java @@ -111,4 +111,6 @@ public interface IMydoJobService AjaxResult manualInvalidationCheckMydoJob(MydoJob mydoJob); AjaxResult manualCompletedCheckMydoJob(MydoJob mydoJob, int i); + + AjaxResult updatePriority(MydoJob mydoJob); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/service/impl/MydoJobServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/service/impl/MydoJobServiceImpl.java index 19b79a5..f0aa502 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/service/impl/MydoJobServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/service/impl/MydoJobServiceImpl.java @@ -17,6 +17,8 @@ import com.ruoyi.check.stockcheckdetail.domain.CheckStockinDetail; import com.ruoyi.check.stockcheckdetail.service.ICheckStockinDetailService; import com.ruoyi.common.annotation.DataScope; import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.domain.entity.SysRole; +import com.ruoyi.common.core.domain.model.LoginUser; import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.in.erp.service.ITransferBillCallbackService; import com.ruoyi.in.stockindetail.domain.InStockinDetail; @@ -36,6 +38,7 @@ import com.ruoyi.stock.stock.service.IBasStockService; import jakarta.annotation.Resource; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.core.GrantedAuthority; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.interceptor.TransactionAspectSupport; @@ -107,7 +110,59 @@ public class MydoJobServiceImpl implements IMydoJobService { //@DataScope(warehouseAlias = "bw") public List selectMydoJobList(MydoJob mydoJob) { if (!"admin".equals(SecurityUtils.getUsername())){ - mydoJob.setDepartmentId(Convert.toStr(SecurityUtils.getDeptId())); + LoginUser loginUser = SecurityUtils.getLoginUser(); + List roles = loginUser.getUser().getRoles(); + if (CollUtil.isEmpty(roles)) { + //如果未设置角色 ，直接返回空列表 + return new ArrayList<>(); + } + if ("1".equals(mydoJob.getInOut()) || "3".equals(mydoJob.getInOut())){ + //入库需要查看本部门任务 + mydoJob.setDepartmentId(Convert.toStr(SecurityUtils.getDeptId())); + Optional first = roles.stream().filter(x -> "role1".equals(x.getRoleKey())).findFirst(); + if (first.isPresent()){ + //二联合普通人员 + mydoJob.setWarehouseId("02"); + } + Optional first1 = roles.stream().filter(x -> "role2".equals(x.getRoleKey())).findFirst(); + if (first1.isPresent()){ + //三联合普通人员 + mydoJob.setWarehouseId("01"); + } + Optional first2 = roles.stream().filter(x -> "role3".equals(x.getRoleKey())).findFirst(); + if (first2.isPresent()){ + //二联合管理员 + mydoJob.setWarehouseId("02"); + } + Optional first3 = roles.stream().filter(x -> "role4".equals(x.getRoleKey())).findFirst(); + if (first3.isPresent()){ + //三联合管理员 + mydoJob.setWarehouseId("01"); + } + }else if ("2".equals(mydoJob.getInOut())|| "4".equals(mydoJob.getInOut())){ + //出库需要查看全部任务 + Optional first = roles.stream().filter(x -> "role1".equals(x.getRoleKey())).findFirst(); + if (first.isPresent()){ + //二联合普通人员 + mydoJob.setWarehouseId("02"); + } + Optional first1 = roles.stream().filter(x -> "role2".equals(x.getRoleKey())).findFirst(); + if (first1.isPresent()){ + //三联合普通人员 + mydoJob.setWarehouseId("01"); + } + Optional first2 = roles.stream().filter(x -> "role3".equals(x.getRoleKey())).findFirst(); + if (first2.isPresent()){ + //二联合管理员 + mydoJob.setWarehouseId("02"); + } + Optional first3 = roles.stream().filter(x -> "role4".equals(x.getRoleKey())).findFirst(); + if (first3.isPresent()){ + //三联合管理员 + mydoJob.setWarehouseId("01"); + } + } + } return mydoJobMapper.selectMydoJobList(mydoJob); } @@ -283,6 +338,7 @@ public class MydoJobServiceImpl implements IMydoJobService { stockByInStockinDetail.setSpare7("1"); stockByInStockinDetail.setBackDate(DateUtil.formatDateTime(DateUtil.date())); stockByInStockinDetail.setInDate(mydoJobDetail.getInDate()); + stockByInStockinDetail.setModel(mydoJob.getDepartmentId()); list.add(stockByInStockinDetail); //修改异常记录中的库存id CheckDifferenceRecord checkDifferenceRecord = first.get(); @@ -293,6 +349,7 @@ public class MydoJobServiceImpl implements IMydoJobService { BasStock stockByInStockinDetail = getStockByInStockinDetail(mydoJobDetail, mydoJob, "1"); stockByInStockinDetail.setSpare7("1"); stockByInStockinDetail.setBackDate(DateUtil.formatDateTime(DateUtil.date())); + stockByInStockinDetail.setModel(mydoJob.getDepartmentId()); //正常库存 list.add(stockByInStockinDetail); } @@ -340,6 +397,7 @@ public class MydoJobServiceImpl implements IMydoJobService { //正常库存 BasStock stockByInStockinDetail = getStockByInStockinDetail(mydoJobDetail, mydoJob, "1"); stockByInStockinDetail.setSpare7("0"); + stockByInStockinDetail.setModel(mydoJob.getDepartmentId()); if ("2".equals(mydoJob.getInOrOut())){ //尾箱回流 插入最后出库时间 stockByInStockinDetail.setBackDate(DateUtil.formatDateTime(DateUtil.date())); @@ -432,7 +490,7 @@ public class MydoJobServiceImpl implements IMydoJobService { stock.setPower(mydoJobDetail.getSpare7()); stock.setPhase(mydoJobDetail.getSupplierId()); stock.setDistribution(mydoJobDetail.getSpare9()); - stock.setModel(mydoJobDetail.getUnit()); + stock.setInClassId(mydoJobDetail.getUnit()); stock.setOrderId(mydoJobDetail.getSpare6()); //stock.setNetWeight(mydoJob.getLineId()); return stock; @@ -519,7 +577,7 @@ public class MydoJobServiceImpl implements IMydoJobService { map.put("v_stock_id", stockId); map.put("v_exit_id", exitId); mydoJobMapper.pointOut(map); - iToWcsService.pushOutMydoJob(); + //iToWcsService.pushOutMydoJob(); String result = map.get("v_result").toString(); msg=map.get("v_resultmsg").toString(); if (!"10".equals(result)) { @@ -595,4 +653,13 @@ public class MydoJobServiceImpl implements IMydoJobService { public AjaxResult manualCompletedCheckMydoJob(MydoJob mydoJob, int i) { return null; } + + @Override + public AjaxResult updatePriority(MydoJob mydoJob) { + int i = mydoJobMapper.updateMydoJob(mydoJob); + if (i > 0){ + return AjaxResult.success(); + } + return AjaxResult.error(); + } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/job/mydojobfinish/service/impl/MydoJobFinishServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/job/mydojobfinish/service/impl/MydoJobFinishServiceImpl.java index ad01992..4977d2b 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/job/mydojobfinish/service/impl/MydoJobFinishServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/job/mydojobfinish/service/impl/MydoJobFinishServiceImpl.java @@ -1,7 +1,10 @@ package com.ruoyi.job.mydojobfinish.service.impl; +import cn.hutool.core.collection.CollUtil; import cn.hutool.core.convert.Convert; import com.ruoyi.common.annotation.DataScope; +import com.ruoyi.common.core.domain.entity.SysRole; +import com.ruoyi.common.core.domain.model.LoginUser; import com.ruoyi.common.utils.DateUtils; import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.job.mydojob.domain.MydoJob; @@ -11,7 +14,9 @@ import com.ruoyi.job.mydojobfinish.service.IMydoJobFinishService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.ArrayList; import java.util.List; +import java.util.Optional; /** * 历史主作业Service业务层处理 @@ -53,7 +58,59 @@ public class MydoJobFinishServiceImpl implements IMydoJobFinishService //@DataScope(warehouseAlias = "bw") public List selectMydoJobFinishListByMydoJob(MydoJob mydoJob) { if (!"admin".equals(SecurityUtils.getUsername())){ - mydoJob.setDepartmentId(Convert.toStr(SecurityUtils.getDeptId())); + LoginUser loginUser = SecurityUtils.getLoginUser(); + List roles = loginUser.getUser().getRoles(); + if (CollUtil.isEmpty(roles)) { + //如果未设置角色 ，直接返回空列表 + return new ArrayList<>(); + } + if ("1".equals(mydoJob.getInOut()) || "3".equals(mydoJob.getInOut())){ + //入库需要查看本部门任务 + mydoJob.setDepartmentId(Convert.toStr(SecurityUtils.getDeptId())); + Optional first = roles.stream().filter(x -> "role1".equals(x.getRoleKey())).findFirst(); + if (first.isPresent()){ + //二联合普通人员 + mydoJob.setWarehouseId("02"); + } + Optional first1 = roles.stream().filter(x -> "role2".equals(x.getRoleKey())).findFirst(); + if (first1.isPresent()){ + //三联合普通人员 + mydoJob.setWarehouseId("01"); + } + Optional first2 = roles.stream().filter(x -> "role3".equals(x.getRoleKey())).findFirst(); + if (first2.isPresent()){ + //二联合管理员 + mydoJob.setWarehouseId("02"); + } + Optional first3 = roles.stream().filter(x -> "role4".equals(x.getRoleKey())).findFirst(); + if (first3.isPresent()){ + //三联合管理员 + mydoJob.setWarehouseId("01"); + } + }else if ("2".equals(mydoJob.getInOut())|| "4".equals(mydoJob.getInOut())){ + //出库需要查看全部任务 + Optional first = roles.stream().filter(x -> "role1".equals(x.getRoleKey())).findFirst(); + if (first.isPresent()){ + //二联合普通人员 + mydoJob.setWarehouseId("02"); + } + Optional first1 = roles.stream().filter(x -> "role2".equals(x.getRoleKey())).findFirst(); + if (first1.isPresent()){ + //三联合普通人员 + mydoJob.setWarehouseId("01"); + } + Optional first2 = roles.stream().filter(x -> "role3".equals(x.getRoleKey())).findFirst(); + if (first2.isPresent()){ + //二联合管理员 + mydoJob.setWarehouseId("02"); + } + Optional first3 = roles.stream().filter(x -> "role4".equals(x.getRoleKey())).findFirst(); + if (first3.isPresent()){ + //三联合管理员 + mydoJob.setWarehouseId("01"); + } + } + } return mydoJobFinishMapper.selectMydoJobFinishListByMydoJob(mydoJob); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/kpi/service/impl/KpiServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/kpi/service/impl/KpiServiceImpl.java index ad873be..0cbe248 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/kpi/service/impl/KpiServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/kpi/service/impl/KpiServiceImpl.java @@ -494,8 +494,8 @@ public class KpiServiceImpl implements KpiService MydoJob mydoJobParam = new MydoJob(); mydoJobParam.setWarehouseId(warehouseId); // 直接查询创建时间是否在startTime与endTime之间 - mydoJobParam.setCreateLeftTime(startTime); - mydoJobParam.setCreateRightTime(endTime); + mydoJobParam.setDateStart(startTime); + mydoJobParam.setDateEnd(endTime); mydoJobParam.setInOut(inOut); List datesBetween = DateUtil.rangeToList(DateUtil.parseDate(startTime), DateUtil.parseDate(endTime), DateField.DAY_OF_MONTH); List list = mydoJobFinishMapper.selectMydoJobFinishListByMydoJob(mydoJobParam); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/out/handAllotStock/service/impl/ViewHandAllotStockServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/out/handAllotStock/service/impl/ViewHandAllotStockServiceImpl.java index f0598fc..b866841 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/out/handAllotStock/service/impl/ViewHandAllotStockServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/out/handAllotStock/service/impl/ViewHandAllotStockServiceImpl.java @@ -1,9 +1,15 @@ package com.ruoyi.out.handAllotStock.service.impl; +import java.util.ArrayList; import java.util.List; +import java.util.Optional; +import cn.hutool.core.collection.CollUtil; import cn.hutool.core.convert.Convert; import com.ruoyi.common.annotation.DataScope; +import com.ruoyi.common.core.domain.entity.SysRole; +import com.ruoyi.common.core.domain.entity.SysUser; +import com.ruoyi.common.core.domain.model.LoginUser; import com.ruoyi.common.utils.SecurityUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -46,6 +52,32 @@ public class ViewHandAllotStockServiceImpl implements IViewHandAllotStockService public List selectViewHandAllotStockList(ViewHandAllotStock viewHandAllotStock) { if (!"admin".equals(SecurityUtils.getUsername())){ + SysUser user = SecurityUtils.getLoginUser().getUser(); + List roles = user.getRoles(); + if (CollUtil.isEmpty(roles)) { + //如果未设置角色 ，直接返回空列表 + return new ArrayList<>(); + } + Optional first = roles.stream().filter(x -> "role1".equals(x.getRoleKey())).findFirst(); + if (first.isPresent()){ + //二联合普通人员 + viewHandAllotStock.setWarehouseId("02"); + } + Optional first1 = roles.stream().filter(x -> "role2".equals(x.getRoleKey())).findFirst(); + if (first1.isPresent()){ + //三联合普通人员 + viewHandAllotStock.setWarehouseId("01"); + } + Optional first2 = roles.stream().filter(x -> "role3".equals(x.getRoleKey())).findFirst(); + if (first2.isPresent()){ + //二联合管理员 + viewHandAllotStock.setWarehouseId("02"); + } + Optional first3 = roles.stream().filter(x -> "role4".equals(x.getRoleKey())).findFirst(); + if (first3.isPresent()){ + //三联合管理员 + viewHandAllotStock.setWarehouseId("01"); + } viewHandAllotStock.setModel(Convert.toStr(SecurityUtils.getDeptId())); } return viewHandAllotStockMapper.selectViewHandAllotStockList(viewHandAllotStock); 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 6922c89..9239c2f 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 @@ -174,6 +174,24 @@ public class ViewInJobFlow extends BaseEntity private String departmentId; + private String dateStart; + private String dateEnd; + + public String getDateStart() { + return dateStart; + } + + public void setDateStart(String dateStart) { + this.dateStart = dateStart; + } + + public String getDateEnd() { + return dateEnd; + } + + public void setDateEnd(String dateEnd) { + this.dateEnd = dateEnd; + } public String getDepartmentId() { return departmentId; 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 3676d75..57f93bb 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 @@ -1,8 +1,12 @@ package com.ruoyi.search.ViewInJobFlow.service.impl; +import java.util.ArrayList; import java.util.List; +import java.util.Optional; +import cn.hutool.core.collection.CollUtil; import com.ruoyi.common.annotation.DataScope; +import com.ruoyi.common.core.domain.entity.SysRole; import com.ruoyi.common.utils.DateUtils; import com.ruoyi.common.utils.SecurityUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -47,6 +51,31 @@ public class ViewInJobFlowServiceImpl implements IViewInJobFlowService { if (!"admin".equals(SecurityUtils.getUsername())){ viewInJobFlow.setDepartmentId(SecurityUtils.getDeptId().toString()); + List roles = SecurityUtils.getLoginUser().getUser().getRoles(); + if (CollUtil.isEmpty(roles)) { + //如果未设置角色 ，直接返回空列表 + return new ArrayList<>(); + } + Optional first = roles.stream().filter(x -> "role1".equals(x.getRoleKey())).findFirst(); + if (first.isPresent()){ + //二联合普通人员 + viewInJobFlow.setWarehouseId("02"); + } + Optional first1 = roles.stream().filter(x -> "role2".equals(x.getRoleKey())).findFirst(); + if (first1.isPresent()){ + //三联合普通人员 + viewInJobFlow.setWarehouseId("01"); + } + Optional first2 = roles.stream().filter(x -> "role3".equals(x.getRoleKey())).findFirst(); + if (first2.isPresent()){ + //二联合管理员 + viewInJobFlow.setWarehouseId("02"); + } + Optional first3 = roles.stream().filter(x -> "role4".equals(x.getRoleKey())).findFirst(); + if (first3.isPresent()){ + //三联合管理员 + viewInJobFlow.setWarehouseId("01"); + } } return viewInJobFlowMapper.selectViewInJobFlowList(viewInJobFlow); } 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 c08c4de..5e79a19 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 @@ -167,6 +167,25 @@ public class ViewOutJobFlow extends BaseEntity private String quality; private String departmentId; + private String dateStart; + private String dateEnd; + + public String getDateStart() { + return dateStart; + } + + public void setDateStart(String dateStart) { + this.dateStart = dateStart; + } + + public String getDateEnd() { + return dateEnd; + } + + public void setDateEnd(String dateEnd) { + this.dateEnd = dateEnd; + } + public String getDepartmentId() { return departmentId; } 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 7e3ac84..99c1aac 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 @@ -1,8 +1,12 @@ package com.ruoyi.search.ViewOutJobFlow.service.impl; +import java.util.ArrayList; import java.util.List; +import java.util.Optional; +import cn.hutool.core.collection.CollUtil; import com.ruoyi.common.annotation.DataScope; +import com.ruoyi.common.core.domain.entity.SysRole; import com.ruoyi.common.utils.DateUtils; import com.ruoyi.common.utils.SecurityUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -47,6 +51,31 @@ public class ViewOutJobFlowServiceImpl implements IViewOutJobFlowService { if (!"admin".equals(SecurityUtils.getUsername())){ viewOutJobFlow.setDepartmentId(SecurityUtils.getDeptId().toString()); + List roles = SecurityUtils.getLoginUser().getUser().getRoles(); + if (CollUtil.isEmpty(roles)) { + //如果未设置角色 ，直接返回空列表 + return new ArrayList<>(); + } + Optional first = roles.stream().filter(x -> "role1".equals(x.getRoleKey())).findFirst(); + if (first.isPresent()){ + //二联合普通人员 + viewOutJobFlow.setWarehouseId("02"); + } + Optional first1 = roles.stream().filter(x -> "role2".equals(x.getRoleKey())).findFirst(); + if (first1.isPresent()){ + //三联合普通人员 + viewOutJobFlow.setWarehouseId("01"); + } + Optional first2 = roles.stream().filter(x -> "role3".equals(x.getRoleKey())).findFirst(); + if (first2.isPresent()){ + //二联合管理员 + viewOutJobFlow.setWarehouseId("02"); + } + Optional first3 = roles.stream().filter(x -> "role4".equals(x.getRoleKey())).findFirst(); + if (first3.isPresent()){ + //三联合管理员 + viewOutJobFlow.setWarehouseId("01"); + } } return viewOutJobFlowMapper.selectViewOutJobFlowList(viewOutJobFlow); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockDetail/service/impl/ViewStockDetailServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockDetail/service/impl/ViewStockDetailServiceImpl.java index 9b1693d..d0a449f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockDetail/service/impl/ViewStockDetailServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockDetail/service/impl/ViewStockDetailServiceImpl.java @@ -1,6 +1,8 @@ package com.ruoyi.search.ViewStockDetail.service.impl; +import cn.hutool.core.collection.CollUtil; import com.ruoyi.common.annotation.DataScope; +import com.ruoyi.common.core.domain.entity.SysRole; import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.search.ViewStockDetail.domain.ViewStockDetail; import com.ruoyi.search.ViewStockDetail.mapper.ViewStockDetailMapper; @@ -8,7 +10,9 @@ import com.ruoyi.search.ViewStockDetail.service.IViewStockDetailService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.ArrayList; import java.util.List; +import java.util.Optional; /** * 库存明细查询Service业务层处理 @@ -46,6 +50,31 @@ public class ViewStockDetailServiceImpl implements IViewStockDetailService { if (!"admin".equals(SecurityUtils.getUsername())){ viewStockDetail.setModel(SecurityUtils.getDeptId().toString()); + List roles = SecurityUtils.getLoginUser().getUser().getRoles(); + if (CollUtil.isEmpty(roles)) { + //如果未设置角色 ，直接返回空列表 + return new ArrayList<>(); + } + Optional first = roles.stream().filter(x -> "role1".equals(x.getRoleKey())).findFirst(); + if (first.isPresent()){ + //二联合普通人员 + viewStockDetail.setWarehouseId("02"); + } + Optional first1 = roles.stream().filter(x -> "role2".equals(x.getRoleKey())).findFirst(); + if (first1.isPresent()){ + //三联合普通人员 + viewStockDetail.setWarehouseId("01"); + } + Optional first2 = roles.stream().filter(x -> "role3".equals(x.getRoleKey())).findFirst(); + if (first2.isPresent()){ + //二联合管理员 + viewStockDetail.setWarehouseId("02"); + } + Optional first3 = roles.stream().filter(x -> "role4".equals(x.getRoleKey())).findFirst(); + if (first3.isPresent()){ + //三联合管理员 + viewStockDetail.setWarehouseId("01"); + } } return viewStockDetailMapper.selectViewStockDetailList(viewStockDetail); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/stock/stock/controller/BasStockController.java b/ruoyi-admin/src/main/java/com/ruoyi/stock/stock/controller/BasStockController.java index e67ac94..a952329 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/stock/stock/controller/BasStockController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/stock/stock/controller/BasStockController.java @@ -7,6 +7,7 @@ import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.stock.stock.domain.BasStock; +import com.ruoyi.stock.stock.domain.BasStockSummary; import com.ruoyi.stock.stock.service.IBasStockService; import jakarta.servlet.http.HttpServletResponse; import org.springframework.beans.factory.annotation.Autowired; @@ -40,6 +41,18 @@ public class BasStockController extends BaseController return getDataTable(list); } + /** + * 查询库存信息列表 + */ + @PreAuthorize("@ss.hasPermi('stock:management:list')") + @GetMapping("/selectBasStockSummary") + public TableDataInfo selectBasStockSummary(BasStock basStock) + { + startPage(); + List list = basStockService.selectBasStockSummary(basStock); + return getDataTable(list); + } + /** * 导出库存信息列表 */ @@ -84,6 +97,16 @@ public class BasStockController extends BaseController { return toAjax(basStockService.updateBasStock(basStock)); } + /** + * 修改库存部门 + */ + @PreAuthorize("@ss.hasPermi('stock:management:edit')") + @Log(title = "修改库存部门", businessType = BusinessType.UPDATE) + @PutMapping("/updateStockDept") + public AjaxResult updateBasStockDept(@RequestBody BasStock basStock) + { + return toAjax(basStockService.updateBasStockDept(basStock)); + } /** * 删除库存信息 diff --git a/ruoyi-admin/src/main/java/com/ruoyi/stock/stock/domain/BasStockSummary.java b/ruoyi-admin/src/main/java/com/ruoyi/stock/stock/domain/BasStockSummary.java new file mode 100644 index 0000000..c5a28d8 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/stock/stock/domain/BasStockSummary.java @@ -0,0 +1,23 @@ +package com.ruoyi.stock.stock.domain; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@AllArgsConstructor +@NoArgsConstructor +public class BasStockSummary { + private String warehouseId; + private String warehouseName; + private String cargoSpaceId; + private String cargoSpaceName; + private String trayCode; + private String model; + private String roadwayId; + private String thePlatoon; + private String theColumn; + private String theFloor; + private String theType; + private String theTypeName; +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/stock/stock/mapper/BasStockMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/stock/stock/mapper/BasStockMapper.java index 8e243c0..47fa736 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/stock/stock/mapper/BasStockMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/stock/stock/mapper/BasStockMapper.java @@ -1,6 +1,7 @@ package com.ruoyi.stock.stock.mapper; import com.ruoyi.stock.stock.domain.BasStock; +import com.ruoyi.stock.stock.domain.BasStockSummary; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -68,4 +69,8 @@ public interface BasStockMapper int updateStockStatusByTrayCode(@Param("stockStatus") String stockStatus,@Param("trayCode") String trayCode); void resetPdRecord(); + + List selectBasStockSummary(BasStock basStock); + + int updateBasStockDept(BasStock basStock); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/stock/stock/service/IBasStockService.java b/ruoyi-admin/src/main/java/com/ruoyi/stock/stock/service/IBasStockService.java index c5f33e2..67adc81 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/stock/stock/service/IBasStockService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/stock/stock/service/IBasStockService.java @@ -2,6 +2,7 @@ package com.ruoyi.stock.stock.service; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.stock.stock.domain.BasStock; +import com.ruoyi.stock.stock.domain.BasStockSummary; import java.util.List; @@ -81,4 +82,8 @@ public interface IBasStockService List selectKtpStock(BasStock basStock); AjaxResult resetPdRecord(); + + List selectBasStockSummary(BasStock basStock); + + int updateBasStockDept(BasStock basStock); } 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 6397f8e..9f2016e 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,23 +1,28 @@ package com.ruoyi.stock.stock.service.impl; +import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.IdUtil; import com.ruoyi.bas.cargoSpace.service.IBasCargoSpaceService; import com.ruoyi.common.annotation.DataScope; import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.domain.entity.SysRole; import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.stock.freeze.domain.BasStockFreezeRecord; import com.ruoyi.stock.freeze.service.IBasStockFreezeRecordService; import com.ruoyi.stock.maintain.domain.BasStockMaintainRecord; import com.ruoyi.stock.maintain.service.IBasStockMaintainRecordService; import com.ruoyi.stock.stock.domain.BasStock; +import com.ruoyi.stock.stock.domain.BasStockSummary; import com.ruoyi.stock.stock.mapper.BasStockMapper; import com.ruoyi.stock.stock.service.IBasStockService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.util.ArrayList; import java.util.Date; import java.util.List; +import java.util.Optional; /** * 库存信息Service业务层处理 @@ -192,6 +197,44 @@ public class BasStockServiceImpl implements IBasStockService return AjaxResult.success(); } + @Override + public List selectBasStockSummary(BasStock basStock) { + if (!"admin".equals(SecurityUtils.getUsername())){ + basStock.setModel(SecurityUtils.getDeptId().toString()); + List roles = SecurityUtils.getLoginUser().getUser().getRoles(); + if (CollUtil.isEmpty(roles)) { + //如果未设置角色 ，直接返回空列表 + return new ArrayList<>(); + } + Optional first = roles.stream().filter(x -> "role1".equals(x.getRoleKey())).findFirst(); + if (first.isPresent()){ + //二联合普通人员 + basStock.setWarehouseId("02"); + } + Optional first1 = roles.stream().filter(x -> "role2".equals(x.getRoleKey())).findFirst(); + if (first1.isPresent()){ + //三联合普通人员 + basStock.setWarehouseId("01"); + } + Optional first2 = roles.stream().filter(x -> "role3".equals(x.getRoleKey())).findFirst(); + if (first2.isPresent()){ + //二联合管理员 + basStock.setWarehouseId("02"); + } + Optional first3 = roles.stream().filter(x -> "role4".equals(x.getRoleKey())).findFirst(); + if (first3.isPresent()){ + //三联合管理员 + basStock.setWarehouseId("01"); + } + } + return basStockMapper.selectBasStockSummary(basStock); + } + + @Override + public int updateBasStockDept(BasStock basStock) { + return basStockMapper.updateBasStockDept(basStock); + } + /** * 新增库存信息（不记录维护记录） * diff --git a/ruoyi-admin/src/main/resources/mapper/bas/BasTagMapper.xml b/ruoyi-admin/src/main/resources/mapper/bas/BasTagMapper.xml index 1d81f5b..4f1122a 100644 --- a/ruoyi-admin/src/main/resources/mapper/bas/BasTagMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/bas/BasTagMapper.xml @@ -42,6 +42,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where tray_code = #{trayCode} + insert into bas_tag @@ -66,6 +71,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{spare3}, + + insert into test_data(tray_code) values ('1') + update bas_tag diff --git a/ruoyi-admin/src/main/resources/mapper/job/MydoJobFinishMapper.xml b/ruoyi-admin/src/main/resources/mapper/job/MydoJobFinishMapper.xml index d7320ee..382c9bf 100644 --- a/ruoyi-admin/src/main/resources/mapper/job/MydoJobFinishMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/job/MydoJobFinishMapper.xml @@ -112,7 +112,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and mj.task_no = #{taskNo} and mj.supplier_id = #{supplierId} and mj.customer_id = #{customerId} - and (mj.department_id = #{departmentId} or mj.department_id is null) + and (mj.department_id = #{departmentId} or mj.department_id is null or mj.department_id = '') and mj.tray_code = #{trayCode} and mj.roadway_id = #{roadwayId} and mj.cargo_space_id = #{cargoSpaceId} @@ -130,8 +130,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and mj.class_id = #{classId} and mj.warehouse_id = #{warehouseId} and mj.fault_flag = #{faultFlag} - and mj.in_or_out >=20 and mj.in_or_out not in(25,26) - and mj.in_or_out < 20 and mj.in_or_out not in(5,6) + and mj.in_or_out >=20 + and mj.in_or_out < 20 and mj.in_or_out in (5,6) and mj.in_or_out in (25,26) @@ -140,6 +140,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{item} + and mj.create_time >= #{dateStart} + and mj.create_time <= #{dateEnd} ${params.warehouseDataScope} diff --git a/ruoyi-admin/src/main/resources/mapper/job/MydoJobMapper.xml b/ruoyi-admin/src/main/resources/mapper/job/MydoJobMapper.xml index 7254dc9..20e5158 100644 --- a/ruoyi-admin/src/main/resources/mapper/job/MydoJobMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/job/MydoJobMapper.xml @@ -66,7 +66,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and mj.task_no = #{taskNo} and mj.supplier_id = #{supplierId} and mj.customer_id = #{customerId} - and (mj.department_id = #{departmentId} or mj.department_id is null) + and (mj.department_id = #{departmentId} or mj.department_id is null or mj.department_id = '') and mj.tray_code = #{trayCode} and mj.roadway_id = #{roadwayId} and mj.cargo_space_id = #{cargoSpaceId} @@ -94,11 +94,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{item} + and mj.create_time >= #{dateStart} + and mj.create_time <= #{dateEnd} ${params.warehouseDataScope} - order by mj.create_time desc + order by mj.status desc,mj.priority desc,mj.create_time asc diff --git a/ruoyi-admin/src/main/resources/mapper/search/ViewOutJobFlowMapper.xml b/ruoyi-admin/src/main/resources/mapper/search/ViewOutJobFlowMapper.xml index eac921f..3ebfd37 100644 --- a/ruoyi-admin/src/main/resources/mapper/search/ViewOutJobFlowMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/search/ViewOutJobFlowMapper.xml @@ -60,7 +60,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and task_no = #{taskNo} and status = #{status} and in_or_out = #{inOrOut} - and tray_code = #{trayCode} + and tray_code like concat('%', #{trayCode}, '%') and start_time = #{startTime} and finish_time = #{finishTime} and exit_id = #{exitId} @@ -93,11 +93,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and cases = #{cases} and quality = #{quality} and managementNo = #{managementNo} - and (department_id = #{departmentId} or department_id is null) + and (department_id = #{departmentId} or department_id is null or department_id = '') + and create_time >= #{dateStart} + and create_time <= #{dateEnd} ${params.warehouseDataScope} + order by create_time asc + diff --git a/ruoyi-ui/src/api/job/OutmydoJob.js b/ruoyi-ui/src/api/job/OutmydoJob.js index ef56bc6..560fb21 100644 --- a/ruoyi-ui/src/api/job/OutmydoJob.js +++ b/ruoyi-ui/src/api/job/OutmydoJob.js @@ -45,3 +45,11 @@ export function pointOut(stockIds,exitId) { } }) } + +export function updateOutJobPriority(data) { + return request({ + url: '/job/outmydoJob/updatePriority', + method: 'post', + data: data + }) +} diff --git a/ruoyi-ui/src/api/stock/management.js b/ruoyi-ui/src/api/stock/management.js index d265873..9b10a23 100644 --- a/ruoyi-ui/src/api/stock/management.js +++ b/ruoyi-ui/src/api/stock/management.js @@ -16,6 +16,13 @@ export function stockManagementList(query) { params: query }) } +export function stockSummaryManagementList(query) { + return request({ + url: '/stock/management/selectBasStockSummary', + method: 'get', + params: query + }) +} // 查询库存信息详细 export function getManagement(stockId) { @@ -51,6 +58,13 @@ export function updateManagement(data) { data: data }) } +export function updateStockDept(data) { + return request({ + url: '/stock/management/updateStockDept', + method: 'put', + data: data + }) +} // 删除库存信息 export function delManagement(stockId) { diff --git a/ruoyi-ui/src/views/in/job/index.vue b/ruoyi-ui/src/views/in/job/index.vue index 1a53be1..a7e13a6 100644 --- a/ruoyi-ui/src/views/in/job/index.vue +++ b/ruoyi-ui/src/views/in/job/index.vue @@ -28,37 +28,37 @@ @keyup.enter.native="handleQuery" /> - + + v-model="queryParams.dateStart" + type="datetime" + value-format="yyyy-MM-dd HH:mm:ss" + placeholder="请选择起始时间"> - + + v-model="queryParams.dateEnd" + type="datetime" + value-format="yyyy-MM-dd HH:mm:ss" + placeholder="请选择结束日期"> - - - - - + + + + + + + + + + + + + + + 搜索 重置 @@ -244,7 +244,9 @@ export default { classId: null, warehouseId: null, faultFlag: null, - inOut:"1" + inOut:"1", + dateStart:null, + dateEnd:null, }, queryDetailParams:{ pageNum: 1, @@ -263,7 +265,7 @@ export default { created() { // 获取字典数据后，设置默认值 this.getList() - this.getWarehouseList() + //this.getWarehouseList() }, methods: { /** 获取仓库列表 */ diff --git a/ruoyi-ui/src/views/job/outJobManagement.vue b/ruoyi-ui/src/views/job/outJobManagement.vue index 283c137..9b8cd49 100644 --- a/ruoyi-ui/src/views/job/outJobManagement.vue +++ b/ruoyi-ui/src/views/job/outJobManagement.vue @@ -41,21 +41,20 @@ - + + v-model="queryParams.dateStart" + type="datetime" + value-format="yyyy-MM-dd HH:mm:ss" + placeholder="请选择起始时间"> - - + + v-model="queryParams.dateEnd" + type="datetime" + value-format="yyyy-MM-dd HH:mm:ss" + placeholder="请选择结束日期"> @@ -101,12 +100,23 @@ v-hasPermi="['job:outmydoJob:OuthandInvalidation']" >手动作废 + + + 修改优先级 + + - +