zyr/FT546MWS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

现场修改

Browse Source
This commit is contained in:
liuhanqing
2026-03-11 09:01:51 +08:00
parent 4384eb5b7a
commit 969949adf4
9 changed files with 74 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ruoyi-admin/src/main/java/com/ruoyi/api/controller/ToErpApiController.java
View File

@@ -41,7 +41,7 @@ public class ToErpApiController {
/**
* 回传其他入库单
*/
@Scheduled(fixedDelay = 1500)
//@Scheduled(fixedDelay = 1500)
@RequestMapping("/callbackInDeliveryNotice")
@ResponseBody
public void callbackInDeliveryNotice() {
@@ -51,7 +51,7 @@ public class ToErpApiController {
/**
* 回传其他出库单
*/
@Scheduled(fixedDelay = 1500)
// @Scheduled(fixedDelay = 1500)
@RequestMapping("/callbackOutDeliveryNotice")
@ResponseBody
public void callbackDeliveryOutNotice() {
@@ -60,7 +60,7 @@ public class ToErpApiController {
/**
* 移库回调接口
*/
@Scheduled(fixedDelay = 1500)
// @Scheduled(fixedDelay = 1500)
@RequestMapping("/moveCargoSpace")
@ResponseBody
public void moveCargoSpace(){

1
ruoyi-admin/src/main/java/com/ruoyi/api/domain/RequestEnter.java
View File

@@ -20,4 +20,5 @@ public class RequestEnter {
private String type;
private String flag;
private String taskNo;
}

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

@@ -59,4 +59,6 @@ public interface IToWmsService {
* 作废物料
*/
AjaxResult InvalidProduct(ErpProduct erpProduct);
AjaxResult requestEnterByTaskNo(RequestEnter requestEnter);
}

3
ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToErpServiceImpl.java
View File

@@ -279,6 +279,7 @@ public class ToErpServiceImpl implements IToErpService {
out.setSpare3(deliveryNoticeVo.getApproveDate());//审核时间
out.setSpare4(deliveryNoticeVo.getApproveMan());//审核人
out.setSpare5(deliveryNoticeVo.getRemark());
out.setSpare7(deliveryNoticeVo.getDestination());
if (exist == null) {
outStockoutService.insertOutStockout(out);
@@ -309,8 +310,8 @@ public class ToErpServiceImpl implements IToErpService {
d.setSpare3(item.getTopMaterial());
d.setSpare4(deliveryNoticeVo.getProjectNo());
// d.setSpare6(item.getLineNo());
d.setSpare8(deliveryNoticeVo.getOutType());
d.setRemark(item.getRemark());
//d.setSpare8(deliveryNoticeVo.getDestination());
try {

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

@@ -98,21 +98,24 @@ public class ToWmsServiceImpl implements IToWmsService {
String trayCode = requestEnter.getTrayCode();
MydoJob inJob = mydoJobMapper.selectInJobByTrayCode(trayCode);
if(inJob != null && Integer.parseInt(inJob.getInOrOut()) < 20){
if(inJob.getCargoSpaceId() != null && !"".equals(inJob.getCargoSpaceId())){
return AjaxResult.success(inJob);
}else{
//分配货位
HashMap<String, Object> map = new HashMap<>();
// if(inJob.getCargoSpaceId() != null && !"".equals(inJob.getCargoSpaceId())){
// return AjaxResult.success(inJob);
// }else{
// //分配货位
// HashMap<String, Object> map = new HashMap<>();
//
// map.put("v_tray_code", trayCode);
// mydoJobMapper.allotInJobSpace(map);
// if (!"10".equals(map.get("v_result").toString())) {
// return AjaxResult.error(map.get("v_resultmsg").toString());
// }else{
//
// }
// }
// MydoJob inJob2 = mydoJobMapper.selectInJobByTrayCode(trayCode);
return AjaxResult.success(inJob);
map.put("v_tray_code", trayCode);
mydoJobMapper.allotInJobSpace(map);
if (!"10".equals(map.get("v_result").toString())) {
return AjaxResult.error(map.get("v_resultmsg").toString());
}else{
MydoJob inJob2 = mydoJobMapper.selectInJobByTrayCode(trayCode);
return AjaxResult.success(inJob2);
}
}
}else{
return AjaxResult.error("该条码无入库任务，请扫码绑定！");
}
@@ -196,14 +199,19 @@ public class ToWmsServiceImpl implements IToWmsService {
return AjaxResult.error("任务不存在");
}
MydoJob outJob = outMydoJobs.get(0);
if ("30".equals(outJob.getInOrOut())){
//移库作业
mydoJobService.ykCompleted(outJob);
}else {
//出库作业
outJob.setExecutionPhase("2");
mydoJobService.updateMydoJob(outJob);
//出库作业
outJob.setExecutionPhase("2");
mydoJobService.updateMydoJob(outJob);
break;
case "7":
//移库作业
mydoJobParam.setTaskNo(wmsJobRequest.getTaskNo());
List<MydoJob> ykMydoJobs = mydoJobService.selectMydoJobListApi(mydoJobParam);
if (ykMydoJobs.isEmpty()) {
return AjaxResult.error("任务不存在");
}
MydoJob ykJob = ykMydoJobs.get(0);
mydoJobService.ykCompleted(ykJob);
break;
default:
@@ -390,5 +398,30 @@ public class ToWmsServiceImpl implements IToWmsService {
return AjaxResult.error(erpProduct.getSys_MainId()+"物料不存在");
}
@Override
public AjaxResult requestEnterByTaskNo(RequestEnter requestEnter) {
String taskNo = requestEnter.getTaskNo();
MydoJob inJob = mydoJobMapper.selectInJobByTaskNo(taskNo);
if(inJob != null && Integer.parseInt(inJob.getInOrOut()) < 20){
if(inJob.getCargoSpaceId() != null && !"".equals(inJob.getCargoSpaceId())){
return AjaxResult.success(inJob);
}else{
//分配货位
HashMap<String, Object> map = new HashMap<>();
map.put("v_tray_code", inJob.getTrayCode());
mydoJobMapper.allotInJobSpace(map);
if (!"10".equals(map.get("v_result").toString())) {
return AjaxResult.error(map.get("v_resultmsg").toString());
}else{
MydoJob inJob2 = mydoJobMapper.selectInJobByTaskNo(taskNo);
return AjaxResult.success(inJob2);
}
}
}else{
return AjaxResult.error("该条码无入库任务，请扫码绑定！");
}
}
}

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

@@ -82,6 +82,9 @@ public interface MydoJobMapper
MydoJob selectInJobByTrayCode(@Param("trayCode") String trayCode);
MydoJob selectInJobByTaskNo(@Param("taskNo") String taskNo);
void allotInJobSpace(HashMap<String, Object> map);
void ykCompleted(HashMap<String, Object> map);

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

@@ -532,6 +532,7 @@ public class MydoJobServiceImpl implements IMydoJobService {
public void ykCompleted(MydoJob outJob) {
HashMap<String, Object> map = new HashMap<>();
map.put("v_job_id", outJob.getJobId());
map.put("v_result", null);
mydoJobMapper.ykCompleted(map);
if (!"10".equals(map.get("v_result").toString())) {
log.error("移库任务处理异常 异常代码{}", map.get("v_result"));

2
ruoyi-admin/src/main/resources/mapper/bas/cargoSpace/BasCargoSpaceMapper.xml
View File

@@ -208,7 +208,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
bs.product_name
from bas_cargo_space bcs
left join bas_stock bs on bcs.cargo_space_id = bs.cargo_space_id
where bcs.status in ('1', '2','4')
where bcs.status in ( '2')
</select>
<select id="selectBasCargoSpaceListByRoadway" parameterType="BasCargoSpace" resultMap="BasCargoSpaceResult">
select bcs.cargo_space_id, bcs.warehouse_id, bcs.roadway_id, bcs.cargo_space_name,

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

@@ -205,12 +205,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</trim>
where job_id = #{jobId}
</update>
<update id="ykCompleted">
<select id="ykCompleted" parameterType="java.util.Map" statementType="CALLABLE">
{call proc_yk_complete(
#{v_job_id,jdbcType=VARCHAR,mode=IN},
#{v_result,mode=OUT,jdbcType=INTEGER}
)}
</update>
</select>
<delete id="deleteMydoJobByJobId" parameterType="String">
delete from mydo_job where job_id = #{jobId}
@@ -266,6 +266,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
select * from mydo_job where tray_code = #{trayCode}
</select>
<select id="selectInJobByTaskNo" parameterType="String" resultMap="MydoJobResult">
select * from mydo_job where task_no = #{taskNo}
</select>
<select id="allotInJobSpace" parameterType="java.util.Map" statementType="CALLABLE">
{call proc_allot_space(
#{v_tray_code,jdbcType=VARCHAR,mode=IN},