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

临时处理接驳线报工单据

Browse Source
This commit is contained in:
zj
2026-01-27 09:49:00 +08:00
parent 57f155566f
commit 55fd40718f
8 changed files with 50 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-admin/src/main/java/com/ruoyi/api/controller/ToWmsApiController.java
View File

@@ -114,6 +114,8 @@ public class ToWmsApiController {
return ajaxResult;
}
/**
* 取货无货，重新分配物料
*/

2
ruoyi-admin/src/main/java/com/ruoyi/api/domain/WmsJobRequest.java
View File

@@ -24,4 +24,6 @@ public class WmsJobRequest {
private String positionCode2;
//任务id
private String jobId;
private String exitId;
}

2
ruoyi-admin/src/main/java/com/ruoyi/api/service/IToWmsService.java
View File

@@ -41,6 +41,8 @@ public interface IToWmsService {
*/
AjaxResult reMaterial(ReMaterialParam reMaterialParam);
/**
* 获取入库作业
*/

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

@@ -142,14 +142,6 @@ public class ToWmsServiceImpl implements IToWmsService {
return new AjaxResult(3, "物料不存在！");
}
//todo 创建工艺入库单
if ("2".equals(requestEnter.getFloor())){
AjaxResult workshopInboundOrder = toErpService.createWorkshopInboundOrder(basProduct,erpBill);
if (!workshopInboundOrder.isSuccess()){
throw new RuntimeException("创建工单失败,人工处理");
}
}
List<MydoJob> inList = mydoJobService.getInJobBySerial(serial);
List<BasStock> stockList = stockService.getStockBySerial(serial);
if(!CollUtil.isEmpty(inList) || !CollUtil.isEmpty(stockList)) {
@@ -172,32 +164,11 @@ public class ToWmsServiceImpl implements IToWmsService {
return new AjaxResult(6, "托盘大小不匹配！");
}
String inOrOutType = null;
String inStockId = null;
String inStockDetailId = null;
//创建作业标准
if ("1".equals(requestEnter.getFloor())) {
//一楼入库 其它入库 和 退料入库 存在单据，需要修改单据数量
inOrOutType = "2";
}else if ("2".equals(requestEnter.getFloor())) {
inOrOutType = "1";
}
//生成作业
MydoJob mydoJob = new MydoJob();
//type=1是手持机调用
if (!"1".equals(requestEnter.getType())) {
mydoJob.setStatus("3");
}else{
mydoJob.setStatus("1");
}
mydoJob.setInOrOut(inOrOutType);
mydoJob.setExecutionPhase("1");
mydoJob.setWorkshopId(requestEnter.getFlag());
mydoJob.setTrayCode(serial);
mydoJob.setWarehouseId("01");
mydoJob.setRoadwayId(getRoadway(size));
mydoJob.setLineId(erpBill);
mydoJob.setDepartmentId(String.valueOf(size));
BasRoadway basRoadway = basRoadwayService.selectBasRoadwayById(mydoJob.getRoadwayId());
if ("1".equals(requestEnter.getFloor())) {
if ("Y".equals(basRoadway.getInLocked())) {
@@ -217,6 +188,39 @@ public class ToWmsServiceImpl implements IToWmsService {
if (ObjUtil.isNull(basCargoSpace)) {
return new AjaxResult(8, "没有可用货位！");
}
//todo 创建工艺入库单
//注释该部分用于处理异常报工无法正常入库的工单任务
// if ("2".equals(requestEnter.getFloor())){
// AjaxResult workshopInboundOrder = toErpService.createWorkshopInboundOrder(basProduct,erpBill);
// if (!workshopInboundOrder.isSuccess()){
// throw new RuntimeException("创建工单失败,人工处理");
// }
// }
String inOrOutType = null;
String inStockId = null;
String inStockDetailId = null;
//创建作业标准
if ("1".equals(requestEnter.getFloor())) {
//一楼入库 其它入库 和 退料入库 存在单据，需要修改单据数量
inOrOutType = "2";
}else if ("2".equals(requestEnter.getFloor())) {
inOrOutType = "1";
}
//type=1是手持机调用
if (!"1".equals(requestEnter.getType())) {
mydoJob.setStatus("3");
}else{
mydoJob.setStatus("1");
}
mydoJob.setInOrOut(inOrOutType);
mydoJob.setExecutionPhase("1");
mydoJob.setWorkshopId(requestEnter.getFlag());
mydoJob.setTrayCode(serial);
mydoJob.setLineId(erpBill);
mydoJob.setDepartmentId(String.valueOf(size));
mydoJob.setCargoSpaceId(basCargoSpace.getCargoSpaceId());
mydoJob.setEntranceId(requestEnter.getEntranceId());
mydoJob.setClassId(requestEnter.getFloor());
@@ -563,6 +567,8 @@ public class ToWmsServiceImpl implements IToWmsService {
return AjaxResult.error(basProduct.getProductGuid()+"物料不存在");
}
@Override
public AjaxResult InvalidProduct(BasProduct basProduct) {
BasProduct oldProduct = basProductService.selectBasProductByProductGuid(basProduct.getProductGuid());

2
ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/mapper/MydoJobMapper.java
View File

@@ -51,6 +51,8 @@ public interface MydoJobMapper
*/
public int updateMydoJob(MydoJob mydoJob);
/**
* 删除任务表
*

2
ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/service/IMydoJobService.java
View File

@@ -44,6 +44,8 @@ public interface IMydoJobService
*/
public int insertMydoJob(MydoJob mydoJob);
/**
* 修改任务表
*

2
ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/service/impl/MydoJobServiceImpl.java
View File

@@ -157,6 +157,8 @@ public class MydoJobServiceImpl implements IMydoJobService {
return mydoJobMapper.updateMydoJob(mydoJob);
}
/**
* 批量删除任务表
*

2
ruoyi-admin/src/main/resources/mapper/job/MydoJobMapper.xml
View File

@@ -200,6 +200,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
where job_id = #{jobId}
</update>
<delete id="deleteMydoJobByJobId" parameterType="String">
delete from mydo_job where job_id = #{jobId}
</delete>