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

fix:出空木箱修改

Browse Source
This commit is contained in:
zhouz
2025-11-05 11:03:46 +08:00
parent 37b87529a7
commit d8af9d1b65
3 changed files with 5 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoIssueOutEmptyTask.java
View File

@@ -4,13 +4,9 @@ import cn.hutool.core.util.ObjectUtil;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.SneakyThrows; import lombok.SneakyThrows;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
import org.nl.b_lms.sch.task.dao.SchBaseTask;
import org.nl.b_lms.sch.task.service.IschBaseTaskService;
import org.nl.b_lms.sch.tasks.TwoOutBoxTask; import org.nl.b_lms.sch.tasks.TwoOutBoxTask;
import org.nl.b_lms.storage_manage.ios.enums.IOSEnum; import org.nl.b_lms.storage_manage.ios.enums.IOSEnum;
import org.nl.b_lms.storage_manage.ios.service.iostorInv.util.service.OutBoxManageService; import org.nl.b_lms.storage_manage.ios.service.iostorInv.util.service.OutBoxManageService;
@@ -22,7 +18,6 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List;
import static org.nl.wms.util.TaskUtil.getRoutePlanCode; import static org.nl.wms.util.TaskUtil.getRoutePlanCode;
@@ -37,9 +32,6 @@ public class AutoIssueOutEmptyTask {
@Autowired @Autowired
private OutBoxManageService outBoxManageService; private OutBoxManageService outBoxManageService;
@Autowired
private IschBaseTaskService ischBaseTaskService;
//自动执行等待的桁架任务 //自动执行等待的桁架任务
public void run() { public void run() {
try { try {

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

@@ -128,7 +128,6 @@ public class OutBoxManageServiceImpl implements OutBoxManageService {
request_param.put("containerType", jsonAttr.getString("storagevehicle_type")); request_param.put("containerType", jsonAttr.getString("storagevehicle_type"));
jsonTaskParam.put("request_param", request_param.toString()); jsonTaskParam.put("request_param", request_param.toString());
twoOutBoxTask.createTask(jsonTaskParam); twoOutBoxTask.createTask(jsonTaskParam);
twoOutBoxTask.immediateNotifyAcs(null);
// 锁定起点 // 锁定起点
jsonAttr.put("lock_type", IOSEnum.LOCK_TYPE.code("验箱出库锁")); jsonAttr.put("lock_type", IOSEnum.LOCK_TYPE.code("验箱出库锁"));
attrTab.update(jsonAttr); attrTab.update(jsonAttr);

9
lms/nladmin-system/src/main/java/org/nl/wms/sch/ComPareUtil.java
View File

@@ -61,15 +61,16 @@ public class ComPareUtil {
} }
//查询子卷入库配置 //查询子卷入库配置
IPdmBiContainerinboundService iPdmBiContainerinboundService = SpringContextHolder.getBean(IPdmBiContainerinboundService.class); IPdmBiContainerinboundService iPdmBiContainerinboundService = SpringContextHolder.getBean(IPdmBiContainerinboundService.class);
PdmBiContainerinbound pdmBiContainerinbound = iPdmBiContainerinboundService.getOne(new QueryWrapper<PdmBiContainerinbound>() PdmBiContainerinbound pdmBiContainerinbound = iPdmBiContainerinboundService.list(new QueryWrapper<PdmBiContainerinbound>()
.eq("box", sub.getPackage_box_sn())); .eq("box", sub.getPackage_box_sn())
.orderByDesc("id")).get(0);
JSONObject json = new JSONObject(); JSONObject json = new JSONObject();
json.put("compaer_result", compaer_result); json.put("compaer_result", compaer_result);
json.put("box_no", sub.getPackage_box_sn()); json.put("box_no", sub.getPackage_box_sn());
json.put("box_weight", sub.getBox_weight().intValue()); json.put("box_weight", sub.getBox_weight().intValue());
json.put("current_weight", new BigDecimal(current_weight).intValue()); json.put("current_weight", new BigDecimal(current_weight).intValue());
json.put("containers", list.stream().map(a->a.getContainer_name()).collect(Collectors.toList())); json.put("containers", list.stream().map(a -> a.getContainer_name()).collect(Collectors.toList()));
json.put("inbound", (pdmBiContainerinbound != null ? pdmBiContainerinbound.getInbound():false)); json.put("inbound", (pdmBiContainerinbound != null ? pdmBiContainerinbound.getInbound() : false));
return json; return json;
} }
} }