lhq/FT542-WMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of http://106.13.86.63:10082/lhq/FT542-WMS

Browse Source
This commit is contained in:
escapemoon
2025-12-16 08:47:15 +08:00
parent 0a1fdc1fe7 3db0d40355
commit e11dd7ceeb
3 changed files with 47 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToWmsServiceImpl.java
View File

@@ -104,51 +104,64 @@ public class ToWmsServiceImpl implements IToWmsService {
return AjaxResult.error("托盘条码不能为空");
}
MydoJob mydoJob1 = mydoJobService.selectMydoJobByTrayCode(requestEnter.getTrayCode());
String productId="";
//校验 - 条码已经有作业
if (ObjUtil.isNotNull(mydoJobService.selectMydoJobByTrayCode(requestEnter.getTrayCode()))) {
if (ObjUtil.isNotNull(mydoJob1) && "1".equals(mydoJob1.getInOrOut())) {
return AjaxResult.error("已存在该条码的入库作业：" + requestEnter.getTrayCode());
}
MydoJob mydoJob = new MydoJob();
if (ObjUtil.isNull(mydoJob1)) {
//入库分配 20251210
//根据已绑定条码获取子单物料号
TrayMsg msg = new TrayMsg();
msg.setTrayCode(requestEnter.getTrayCode());
List<TrayMsg> list = trayMsgService.selectTrayMsgList(msg);
//入库分配 20251210
//根据已绑定条码获取子单物料号
TrayMsg msg = new TrayMsg();
msg.setTrayCode(requestEnter.getTrayCode());
List<TrayMsg> list = trayMsgService.selectTrayMsgList(msg);
//校验 - 条码未绑定子单
if (!CollUtil.isNotEmpty(list)) {
log.info("未找到该托盘【" + requestEnter.getTrayCode() + "】绑定的子单据，请检查绑定列表");
return AjaxResult.error("该托盘未绑定子单据：" + requestEnter.getTrayCode());
}
//校验 - 条码未绑定子单
if (!CollUtil.isNotEmpty(list)) {
log.info("未找到该托盘【" + requestEnter.getTrayCode() + "】绑定的子单据，请检查绑定列表");
return AjaxResult.error("该托盘未绑定子单据：" + requestEnter.getTrayCode());
//获取绑定的子单信息
InStockinDetail inStockinDetail = inStockinDetailService.selectInStockinDetailByStockinDetailId(list.get(0).getStockinDetailId());
productId=inStockinDetail.getProductId();
//返回入库作业参数
HashMap<String, String> map = new HashMap<>();
map.put("v_param", "RK");
mydoJobService.getInJobId(map);//存储过程【util_serial_job】生成作业号
mydoJob.setJobId(map.get("v_serial"));
mydoJob.setStatus("1");
mydoJob.setInOrOut("1");
mydoJob.setTrayCode(requestEnter.getTrayCode());
map.put("v_param", "1");
mydoJobService.getInTask(map);
mydoJob.setTaskNo(map.get("v_serial"));
mydoJob.setCreateTime(new Date());
mydoJobService.insertMydoJob(mydoJob);
}else if(ObjUtil.isNotNull(mydoJob1) && !"1".equals(mydoJob1.getInOrOut())){
productId="KTP0001";
mydoJob=mydoJob1;
}
//获取绑定的子单信息
InStockinDetail inStockinDetail = inStockinDetailService.selectInStockinDetailByStockinDetailId(list.get(0).getStockinDetailId());
//获取货位
String cargoSpaceId = getCargoSpaceByProductInfo(inStockinDetail.getProductId());
String cargoSpaceId = getCargoSpaceByProductInfo(productId);
//是否有符合条件的货位
if (!StringUtils.isNotBlank(cargoSpaceId)) {
return AjaxResult.error("无符合条件的货位用于分配，请检查库存区占用情况，物料号：" + inStockinDetail.getProductId());
return AjaxResult.error("无符合条件的货位用于分配，请检查库存区占用情况，物料号：" + productId);
}
//返回入库作业参数
MydoJob mydoJob = new MydoJob();
HashMap<String, String> map = new HashMap<>();
map.put("v_param", "RK");
mydoJobService.getInJobId(map);//存储过程【util_serial_job】生成作业号
mydoJob.setJobId(map.get("v_serial"));
mydoJob.setCargoSpaceId(cargoSpaceId);
mydoJob.setStatus("3");
mydoJob.setInOrOut("1");
mydoJob.setTrayCode(requestEnter.getTrayCode());
map.put("v_param", "1");
mydoJobService.getInTask(map);
mydoJob.setTaskNo(map.get("v_serial"));
BasCargoSpace basCargoSpace = basCargoSpaceService.selectBasCargoSpaceByCargoSpaceId(cargoSpaceId);
mydoJob.setRoadwayId(basCargoSpace.getTheFloor().toString());
mydoJob.setCreateTime(new Date());
mydoJobService.insertMydoJob(mydoJob);
mydoJob.setStatus("3");
mydoJobService.updateMydoJob(mydoJob);
return AjaxResult.success(mydoJob);
}

3
ruoyi-admin/src/main/java/com/ruoyi/in/stockindetail/domain/InStockinDetail.java
View File

@@ -161,4 +161,7 @@ public class InStockinDetail extends BaseEntity
@Excel(name = "供应商名称")
private String supplierName;
}

2
ruoyi-ui/src/permission.js
View File

@@ -3,7 +3,7 @@ import store from './store'
import { Message } from 'element-ui'
import NProgress from 'nprogress'
import 'nprogress/nprogress.css'
import { getToken } from '@//auth'
import { getToken } from '@/utils/auth'
import { isPathMatch } from '@/utils/validate'
import { isRelogin } from '@/utils/request'