自动化立体仓库 - WMS系统
zhangc
2024-12-25 27c4f7966ead8a8410570e91ff2d9b2c9761f005
优化订单同步逻辑及库位查找
2个文件已修改
43 ■■■■ 已修改文件
src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java 33 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java
@@ -145,13 +145,15 @@
                    }
                }
                if (!Cools.isEmpty(agvWrkMast.getSourceLocNo())) {
                    agvLocMast = agvLocMastService.selectById(agvWrkMast.getLocNo());
                    agvLocMast = agvLocMastService.selectById(agvWrkMast.getSourceLocNo());
                    if (agvLocMast != null) {
                        pltType = agvLocMast.getPltType();
                    }
                }
                agvWrkMast.setPltType(pltType);
                log.info("仓库编码:{}",agvWrkMast.getPltType());
                if (pltType != null) {
                    agvWrkMast.setPltType(pltType);
                }
                log.info("工作号--{},仓库编码:{}", agvWrkMast.getWrkNo(), agvWrkMast.getPltType());
            }
            agvWrkMast.setModiTime(new Date());
            //修改工作档状态为207.库存更新完成
@@ -771,7 +773,7 @@
                iteam.setLineNo(orderDetl.getItemNum());
                iteam.setSupplierCode(order.getSalesman());
                iteam.setUnit(agvWrkDetl.getUnit());
                iteam.setRemark(agvWrkDetl.getThreeCode());
                iteams.add(iteam);
                mesBuyPakinReportParam.setCode(orderNo);
src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
@@ -3,17 +3,13 @@
import cn.hutool.core.util.NumberUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.exception.CoolException;
import com.zy.asrs.entity.DocType;
import com.zy.asrs.entity.Order;
import com.zy.asrs.entity.OrderDetl;
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.ReportErpParam;
import com.zy.asrs.service.ApiLogService;
import com.zy.asrs.service.DocTypeService;
import com.zy.asrs.service.OrderDetlService;
import com.zy.asrs.service.OrderService;
import com.zy.asrs.service.*;
import com.zy.asrs.task.AbstractHandler;
import com.zy.asrs.task.core.ReturnT;
import com.zy.common.utils.HttpHandler;
@@ -45,6 +41,15 @@
    private ApiLogService apiLogService;
    @Autowired
    private DocTypeService docTypeService;
    @Autowired
    private AgvWrkDetlLogService agvWrkDetlLogService;
    @Autowired
    private AgvWrkMastService agvWrkMastService;
    @Autowired
    private AgvLocMastService agvLocMastService;
    @Value("${spring.profiles.active}")
    private String active;
@@ -104,7 +109,19 @@
                }
            }
            if (Cools.isEmpty(order.getPltType())) {
                return;
                List<AgvWrkDetlLog> agvWrkDetlLogs = agvWrkDetlLogService.selectList(new EntityWrapper<AgvWrkDetlLog>().eq("order_no", order.getOrderNo()).eq("io_type", 1));
                if (!Cools.isEmpty(agvWrkDetlLogs)) {
                    AgvWrkMast agvWrkMast = agvWrkMastService.selectById(agvWrkDetlLogs.get(0).getWrkNo());
                    if (agvWrkMast != null) {
                        AgvLocMast agvLocMast = agvLocMastService.selectById(agvWrkMast.getLocNo());
                        if (agvLocMast != null) {
                            order.setPltType(agvLocMast.getPltType());
                        }
                    }
                }
                if (Cools.isEmpty(order.getPltType())) {
                    return;
                }
            }
            if (Cools.isEmpty(order.getInTime())) {
                order.setInTime(DateUtils.convert(new Date(), DateUtils.yyyyMMddHHmmsssss_F));