root/lanzhouhailiang_one
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix:木箱入库返回值改成return

Browse Source
This commit is contained in:
zhangzq
2024-12-29 14:59:01 +08:00
parent d4b72797ce
commit 710134a860
3 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InBoxManageServiceImpl.java
View File

@@ -32,6 +32,7 @@ import org.nl.wms.ext.acs.service.WmsToAcsService;
import org.nl.wms.ext.mes.service.LmsToMesService; import org.nl.wms.ext.mes.service.LmsToMesService;
import org.nl.wms.pda.mps.eum.RegionTypeEnum; import org.nl.wms.pda.mps.eum.RegionTypeEnum;
import org.nl.wms.pdm.bi.service.SubpackagerelationService; import org.nl.wms.pdm.bi.service.SubpackagerelationService;
import org.nl.wms.sch.manage.TaskStatusEnum;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
@@ -100,17 +101,19 @@ public class InBoxManageServiceImpl implements InBoxManageService {
// 仓位表 // 仓位表
WQLObject attrTab = WQLObject.getWQLObject("st_ivt_structattr"); WQLObject attrTab = WQLObject.getWQLObject("st_ivt_structattr");
String box_arr = whereJson.getString("box_no"); String box_arr = whereJson.getString("box_no");
int count = ischBaseTaskService.count(new QueryWrapper<SchBaseTask>()
.eq("start_device_code", whereJson.getString("device_code"))
.eq("vehicle_code", whereJson.getString("box_no"))
.eq("task_type", "010702")
.lt("task_status", TaskStatusEnum.FINISHED.getCode()));
if (count>0){
return;
}
// 查询木箱信息 // 查询木箱信息
BstIvtBoxinfo boxDao = iBstIvtBoxinfoService.getOne( BstIvtBoxinfo boxDao = iBstIvtBoxinfoService.getOne(
new QueryWrapper<BstIvtBoxinfo>().lambda() new QueryWrapper<BstIvtBoxinfo>().lambda()
.eq(BstIvtBoxinfo::getBox_no, whereJson.getString("box_no")) .eq(BstIvtBoxinfo::getBox_no, whereJson.getString("box_no"))
); );
/* /*
* 找一个木箱区的一个仓位,生成任务并下发 * 找一个木箱区的一个仓位,生成任务并下发
*/ */

4
lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InVehicleManageServiceImpl.java
View File

@@ -74,9 +74,9 @@ public class InVehicleManageServiceImpl implements InVehicleManageService {
.eq("start_device_code", whereJson.getString("device_code")) .eq("start_device_code", whereJson.getString("device_code"))
.eq("vehicle_code", whereJson.getString("vehicle_code")) .eq("vehicle_code", whereJson.getString("vehicle_code"))
.eq("task_type", "010705") .eq("task_type", "010705")
.lt("", TaskStatusEnum.FINISHED.getCode())); .lt("task_status", TaskStatusEnum.EXECUTING.getCode()));
if (count>0){ if (count>0){
throw new BadRequestException(whereJson.getString("vehicle_code")+"当前任务正在执行中"); return;
} }
// 找一个托盘区的空仓位 // 找一个托盘区的空仓位
JSONObject jsonParam = new JSONObject(); JSONObject jsonParam = new JSONObject();

6
lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AbstractAcsTask.java
View File

@@ -114,7 +114,11 @@ public abstract class AbstractAcsTask {
List<AcsTaskDto> taskList = this.schedule(); List<AcsTaskDto> taskList = this.schedule();
if (ObjectUtil.isNotEmpty(taskList)) { if (ObjectUtil.isNotEmpty(taskList)) {
JSONArray arr = JSONArray.parseArray(JSON.toJSONString(taskList)); JSONArray arr = JSONArray.parseArray(JSON.toJSONString(taskList));
return acsUtil.notifyAcs3("api/wms/task", arr); if (acsUtil == null){
return AcsUtil.notifyAcs("api/wms/task", arr);
}else {
return acsUtil.notifyAcs3("api/wms/task", arr);
}
} }
return null; return null;