现场调试更改
This commit is contained in:
lsymicc
@@ -0,0 +1,306 @@
|
||||
package com.ruoyi.scheduleTask;
|
||||
|
||||
import cn.hutool.core.date.DateUtil;
|
||||
import cn.hutool.core.util.ObjUtil;
|
||||
import com.ruoyi.api.service.IApiWcsService;
|
||||
import com.ruoyi.bas.cargospace.service.IBasCargoSpaceService;
|
||||
import com.ruoyi.bas.id.job.service.IBasJobIdService;
|
||||
import com.ruoyi.bas.stock.domain.BasStock;
|
||||
import com.ruoyi.bas.stock.domain.BasStockInfo;
|
||||
import com.ruoyi.bas.stock.service.IBasStockInfoService;
|
||||
import com.ruoyi.bas.stock.service.IBasStockService;
|
||||
import com.ruoyi.common.*;
|
||||
import com.ruoyi.common.core.domain.AjaxResult;
|
||||
import com.ruoyi.in.bind.service.IInTrayMsgService;
|
||||
import com.ruoyi.in.job.domain.MydoJob;
|
||||
import com.ruoyi.in.job.service.IMydoJobService;
|
||||
import com.ruoyi.in.jobdetail.domain.MydoJobDetail;
|
||||
import com.ruoyi.in.jobdetail.service.IMydoJobDetailService;
|
||||
import com.ruoyi.in.stockindetail.domain.InStockinDetail;
|
||||
import com.ruoyi.in.stockindetail.service.IInStockinDetailService;
|
||||
import com.ruoyi.out.stockoutdetail.domain.OutStockoutDetail;
|
||||
import com.ruoyi.out.stockoutdetail.service.IOutStockoutDetailService;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.scheduling.annotation.Scheduled;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.UUID;
|
||||
|
||||
@Slf4j
|
||||
@Component
|
||||
public class MydoJobHandler {
|
||||
|
||||
@Autowired
|
||||
IMydoJobService mydoJobService;
|
||||
@Autowired
|
||||
IMydoJobDetailService mydoJobDetailService;
|
||||
@Autowired
|
||||
IApiWcsService apiWcsService;
|
||||
@Autowired
|
||||
IBasStockService basStockService;
|
||||
@Autowired
|
||||
IBasStockInfoService basStockInfoService;
|
||||
@Autowired
|
||||
IBasCargoSpaceService basCargoSpaceService;
|
||||
@Autowired
|
||||
IOutStockoutDetailService outStockoutDetailService;
|
||||
@Autowired
|
||||
IInStockinDetailService inStockinDetailService;
|
||||
@Autowired
|
||||
IBasJobIdService basJobIdService;
|
||||
@Autowired
|
||||
IInTrayMsgService intrayMsgService;
|
||||
|
||||
private static final int TIMEINTERVAL_DEFAULT = 1000;
|
||||
private static final int TIMEINTERVAL_2000 = 2000;
|
||||
private static final int TIMEINTERVAL_5000 = 5000;
|
||||
|
||||
|
||||
/**
|
||||
* 手动作废作业账务处理
|
||||
*/
|
||||
@Scheduled(fixedRate = TIMEINTERVAL_2000)
|
||||
public void cancelMydoJobHandler(){
|
||||
List<MydoJob> mydoJobs = mydoJobService.selectOutMydoJobList(
|
||||
new MydoJob().builder()
|
||||
.status(TaskStatusEnum.CANCEL.getCode())
|
||||
.build()
|
||||
);
|
||||
|
||||
if (mydoJobs.isEmpty()) return;
|
||||
|
||||
for (MydoJob mydoJob : mydoJobs) {
|
||||
//任务子表
|
||||
List<MydoJobDetail> details = mydoJobDetailService.selectMydoJobDetailByJobId(mydoJob.getJobId());
|
||||
if (!details.isEmpty()){
|
||||
//移除任务子表
|
||||
mydoJobDetailService.insertMydoJobDetailsForJobFinish(mydoJob.getJobId());
|
||||
mydoJobDetailService.deleteMydoJobDetailsByJobId(mydoJob.getJobId());
|
||||
log.info("【手动作废任务】移除任务明细，作业号:{}", mydoJob.getJobId());
|
||||
}
|
||||
//库存子表
|
||||
List<BasStock> stocks = basStockService.selectBasStockListByTrayCode(mydoJob.getTrayCode());
|
||||
if (!stocks.isEmpty()){
|
||||
for (BasStock stock : stocks){
|
||||
stock.setCargoSpaceId(mydoJob.getTargetCargoSpaceId());
|
||||
stock.setStockStatus(BasStockCode.STOCK_STATUS_AVAILABLE);
|
||||
basStockService.updateBasStock(stock);
|
||||
}
|
||||
}
|
||||
|
||||
//恢复货位状态
|
||||
//移库
|
||||
if (mydoJob.getInOrOut() == TaskType.TASKTYPE_PICK_STOCK_MOVE){
|
||||
basCargoSpaceService.updateBasCargoSpaceStatus(mydoJob.getCargoSpaceId(), mydoJob.getTrayCode(), CargoSpaceCode.CARGOSPACE_STATUS_OCCUPIED);
|
||||
basCargoSpaceService.updateBasCargoSpaceStatus(mydoJob.getTargetCargoSpaceId(), "", CargoSpaceCode.CARGOSPACE_STATUS_AVAILABLE);
|
||||
|
||||
BasStockInfo stockInfo = basStockInfoService.selectBasStockInfoByTrayCode(mydoJob.getTrayCode());
|
||||
if (ObjUtil.isNotNull(stockInfo)){
|
||||
stockInfo.setCargoSpaceId(mydoJob.getCargoSpaceId());
|
||||
basStockInfoService.updateBasStockInfo(stockInfo);
|
||||
}
|
||||
|
||||
log.info(
|
||||
"【账务处理-移库】任务作废，更新库存和货位信息，作业号:{}，托盘号:{}，源位置:{}，目标位置:{}", mydoJob.getJobId(), mydoJob.getTrayCode(), mydoJob.getCargoSpaceId(), mydoJob.getTargetCargoSpaceId()
|
||||
);
|
||||
return;
|
||||
}
|
||||
|
||||
//入库
|
||||
if (mydoJob.getInOrOut() < 20){
|
||||
basCargoSpaceService.updateBasCargoSpaceStatus(mydoJob.getCargoSpaceId(), "", CargoSpaceCode.CARGOSPACE_STATUS_AVAILABLE);
|
||||
BasStockInfo stockInfo = basStockInfoService.selectBasStockInfoByTrayCode(mydoJob.getTrayCode());
|
||||
if (ObjUtil.isNotNull(stockInfo)){
|
||||
basStockInfoService.deleteBasStockInfoByTrayCode(mydoJob.getTrayCode());
|
||||
}
|
||||
for (MydoJobDetail mydoJobDetail : details){
|
||||
//还原子单数量
|
||||
InStockinDetail inStockinDetail = inStockinDetailService.selectInStockinDetailByRollerNumber(mydoJobDetail.getRollerNumber());
|
||||
inStockinDetail.setScanNum(BigDecimal.ZERO);
|
||||
inStockinDetail.setAssignNum(BigDecimal.ZERO);
|
||||
inStockinDetail.setStatus(0);
|
||||
inStockinDetailService.updateInStockinDetail(inStockinDetail);
|
||||
}
|
||||
|
||||
log.info("【账务处理-入库】任务作废，更新货位信息，作业号:{}", mydoJob.getJobId());
|
||||
return;
|
||||
}
|
||||
|
||||
//出库
|
||||
if (mydoJob.getInOrOut() >= 20){
|
||||
basCargoSpaceService.updateBasCargoSpaceStatus(mydoJob.getCargoSpaceId(), mydoJob.getTrayCode(), CargoSpaceCode.CARGOSPACE_STATUS_OCCUPIED);
|
||||
|
||||
BasStockInfo stockInfo = basStockInfoService.selectBasStockInfoByTrayCode(mydoJob.getTrayCode());
|
||||
if (ObjUtil.isNotNull(stockInfo)){
|
||||
stockInfo.setCargoSpaceId(mydoJob.getCargoSpaceId());
|
||||
basStockInfoService.updateBasStockInfo(stockInfo);
|
||||
}
|
||||
|
||||
for (MydoJobDetail mydoJobDetail : details){
|
||||
//还原子单数量
|
||||
OutStockoutDetail outStockoutDetail = outStockoutDetailService.selectOutStockoutDetailByRollerNumber(mydoJobDetail.getRollerNumber());
|
||||
outStockoutDetail.setAllotNum(BigDecimal.ZERO);
|
||||
outStockoutDetail.setAssignNum(BigDecimal.ZERO);
|
||||
outStockoutDetail.setStatus(0);
|
||||
outStockoutDetailService.updateOutStockoutDetail(outStockoutDetail);
|
||||
}
|
||||
|
||||
log.info("【账务处理-出库】任务作废，更新货位和库存信息，作业号:{}", mydoJob.getJobId());
|
||||
}
|
||||
|
||||
//todo 作废后可以向堆垛机下发出库放货指令？
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 手动完成作业账务处理
|
||||
*/
|
||||
@Scheduled(fixedRate = TIMEINTERVAL_2000)
|
||||
public void manualCompleteMydoJobHandler(){
|
||||
List<MydoJob> mydoJobs = mydoJobService.selectOutMydoJobList(
|
||||
new MydoJob().builder()
|
||||
.status(TaskStatusEnum.MANUAL_FINISHED.getCode())
|
||||
.build()
|
||||
);
|
||||
|
||||
if (mydoJobs.isEmpty()) return;
|
||||
|
||||
for (MydoJob mydoJob : mydoJobs) {
|
||||
//任务子表
|
||||
List<MydoJobDetail> details = mydoJobDetailService.selectMydoJobDetailByJobId(mydoJob.getJobId());
|
||||
if (!details.isEmpty()){
|
||||
//移除任务子表
|
||||
mydoJobDetailService.insertMydoJobDetailsForJobFinish(mydoJob.getJobId());
|
||||
mydoJobDetailService.deleteMydoJobDetailsByJobId(mydoJob.getJobId());
|
||||
log.info("【手动完成任务】移除任务明细，作业号:{}", mydoJob.getJobId());
|
||||
}
|
||||
//库存子表
|
||||
List<BasStock> stocks = basStockService.selectBasStockListByTrayCode(mydoJob.getTrayCode());
|
||||
if (!stocks.isEmpty()){
|
||||
for (BasStock stock : stocks){
|
||||
stock.setCargoSpaceId(mydoJob.getTargetCargoSpaceId());
|
||||
stock.setStockStatus(BasStockCode.STOCK_STATUS_AVAILABLE);
|
||||
basStockService.updateBasStock(stock);
|
||||
}
|
||||
}
|
||||
|
||||
//恢复货位状态
|
||||
//移库
|
||||
if (mydoJob.getInOrOut() == TaskType.TASKTYPE_PICK_STOCK_MOVE){
|
||||
basCargoSpaceService.updateBasCargoSpaceStatus(mydoJob.getCargoSpaceId(), "", CargoSpaceCode.CARGOSPACE_STATUS_AVAILABLE);
|
||||
basCargoSpaceService.updateBasCargoSpaceStatus(mydoJob.getTargetCargoSpaceId(), mydoJob.getTrayCode(), CargoSpaceCode.CARGOSPACE_STATUS_OCCUPIED);
|
||||
|
||||
BasStockInfo stockInfo = basStockInfoService.selectBasStockInfoByTrayCode(mydoJob.getTrayCode());
|
||||
if (ObjUtil.isNotNull(stockInfo)){
|
||||
stockInfo.setCargoSpaceId(mydoJob.getTargetCargoSpaceId());
|
||||
basStockInfoService.updateBasStockInfo(stockInfo);
|
||||
}
|
||||
|
||||
log.info(
|
||||
"【账务处理-移库】任务作废，更新库存和货位信息，作业号:{}，托盘号:{}，源位置:{}，目标位置:{}", mydoJob.getJobId(), mydoJob.getTrayCode(), mydoJob.getCargoSpaceId(), mydoJob.getTargetCargoSpaceId()
|
||||
);
|
||||
return;
|
||||
}
|
||||
|
||||
//入库
|
||||
if (mydoJob.getInOrOut() < 20){
|
||||
basCargoSpaceService.updateBasCargoSpaceStatus(mydoJob.getCargoSpaceId(), mydoJob.getTrayCode(), CargoSpaceCode.CARGOSPACE_STATUS_OCCUPIED);
|
||||
|
||||
//生成库存编号
|
||||
String stockId = basJobIdService.getId(JobIdType.STOCK);
|
||||
|
||||
//插入库存主表
|
||||
BasStockInfo info = basStockInfoService.selectBasStockInfoByTrayCode(mydoJob.getTrayCode());
|
||||
if (ObjUtil.isNull(info)){
|
||||
basStockInfoService.insertBasStockInfo(
|
||||
new BasStockInfo().builder()
|
||||
.stockId(stockId)
|
||||
.cargoSpaceId(mydoJob.getCargoSpaceId())
|
||||
.trayCode(mydoJob.getTrayCode())
|
||||
.warehouseId(mydoJob.getWarehouseId())
|
||||
.trayType(mydoJob.getTrayType())
|
||||
.emptyStatus(details.size())//版辊数量
|
||||
.build()
|
||||
);
|
||||
|
||||
log.info("【账务处理-入库】新增库存主表信息，库存编号:{}，货位:{}，托盘号:{}，入库数量:{}", stockId, mydoJob.getCargoSpaceId(), mydoJob.getTrayCode(), details.size());
|
||||
}else{
|
||||
info.setStockId(stockId);
|
||||
info.setCargoSpaceId(mydoJob.getCargoSpaceId());
|
||||
info.setEmptyStatus(details.size());
|
||||
basStockInfoService.updateBasStockInfo(info);
|
||||
log.info("【账务处理-入库】更新库存主表信息，库存编号:{}，货位:{}，托盘号:{}，入库数量:{}", stockId, mydoJob.getCargoSpaceId(), mydoJob.getTrayCode(), details.size());
|
||||
}
|
||||
|
||||
int num = 1;
|
||||
|
||||
//每条子任务生成一条库存信息
|
||||
for (MydoJobDetail detail : details){
|
||||
|
||||
//更新子单数量
|
||||
InStockinDetail inStockinDetail = inStockinDetailService.selectInStockinDetailByRollerNumber(detail.getRollerNumber());
|
||||
inStockinDetail.setScanNum(BigDecimal.ONE);
|
||||
inStockinDetail.setAssignNum(BigDecimal.ONE);
|
||||
inStockinDetail.setStatus(1);
|
||||
inStockinDetailService.updateInStockinDetail(inStockinDetail);
|
||||
|
||||
//物料数量固定为1，辊号唯一
|
||||
//插入库存明细信息
|
||||
basStockService.insertBasStock(
|
||||
new BasStock().builder()
|
||||
.stockId(stockId)
|
||||
.stockDetailId(stockId + "-" + num)
|
||||
.stockStatus(BasStockCode.STOCK_STATUS_AVAILABLE)
|
||||
.jobId(mydoJob.getJobId())
|
||||
.jobDetailId(mydoJob.getJobId() + "-" + num++)
|
||||
.stockinId(inStockinDetail.getStockinId())//获取单据号需要从托盘绑定信息表获取
|
||||
.stockinDetailId(inStockinDetail.getStockinDetailId())
|
||||
.rollerNumber(detail.getRollerNumber())
|
||||
.quantity(detail.getInQuantity())
|
||||
.cargoSpaceId(mydoJob.getCargoSpaceId())
|
||||
.productId(detail.getProductId())
|
||||
.productName(detail.getProductName())
|
||||
.inDate(DateUtil.date().now())
|
||||
.build()
|
||||
);
|
||||
|
||||
intrayMsgService.deleteInTrayMsgByRollerNumber(detail.getRollerNumber());
|
||||
}
|
||||
|
||||
log.info("【账务处理-入库】任务完成，移除绑定信息，更新货位信息，作业号:{}", mydoJob.getJobId());
|
||||
return;
|
||||
}
|
||||
|
||||
//出库
|
||||
if (mydoJob.getInOrOut() >= 20){
|
||||
for (MydoJobDetail mydoJobDetail : details){
|
||||
//还原子单数量
|
||||
OutStockoutDetail outStockoutDetail = outStockoutDetailService.selectOutStockoutDetailByRollerNumber(mydoJobDetail.getRollerNumber());
|
||||
outStockoutDetail.setAllotNum(BigDecimal.ONE);
|
||||
outStockoutDetail.setAssignNum(BigDecimal.ONE);
|
||||
outStockoutDetail.setStatus(1);
|
||||
outStockoutDetailService.updateOutStockoutDetail(outStockoutDetail);
|
||||
}
|
||||
|
||||
basStockService.deleteBasStockByTrayCode(mydoJob.getTrayCode());
|
||||
basStockInfoService.deleteBasStockInfoByTrayCode(mydoJob.getTrayCode());
|
||||
|
||||
basCargoSpaceService.updateBasCargoSpaceStatus(mydoJob.getCargoSpaceId(), "", CargoSpaceCode.CARGOSPACE_STATUS_AVAILABLE);
|
||||
log.info("【账务处理-出库】任务完成，移除托盘库存，更新货位和库存信息，作业号:{}，托盘号:{}", mydoJob.getJobId(), mydoJob.getTrayCode());
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
||||
Reference in New Issue
Block a user