Merge remote-tracking branch 'origin/xgmFlasrs2' into xgmFlasrs2

zhang

9 天以前 60af4db0b445edbb2856f9bc7199a3e627d32db2

Merge remote-tracking branch 'origin/xgmFlasrs2' into xgmFlasrs2

 src/main/java/com/zy/asrs/controller/OpenController.java

@@ -277,6 +277,9 @@
    public R list(@RequestHeader(required = false) String appkey, @RequestBody(required = false) LocMast param) {
        auth(appkey, param, request);
        LocMast locMast = locMastService.selectById(param.getLocNo());
        if (locMast == null) {
            return R.error("库位不存在");
        }
        List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("loc_no", locMast.getLocNo()));
        HashMap<String, Object> map = new HashMap<>();
        map.put("status", locMast.getLocSts());

 src/main/java/com/zy/asrs/controller/OutController.java

@@ -10,6 +10,7 @@
import com.zy.asrs.entity.Order;
import com.zy.asrs.entity.OrderDetl;
import com.zy.asrs.service.*;
import com.zy.asrs.utils.MatCompareUtils;
import com.zy.common.model.LocDto;
import com.zy.common.model.TaskDto;
import com.zy.common.web.BaseController;
@@ -79,7 +80,9 @@
            }

            for (LocDetl locDetl : locDetls) {
                if (locDetl.getMatnr().equals(orderDetl.getMatnr())) {
                if (MatCompareUtils.compare(locDetl,orderDetl)) {

                   // if (locDetl.getMatnr().equals(orderDetl.getMatnr())) {
                    if (issued > 0) {
                        LocDto locDto = new LocDto(locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getMaktx(), locDetl.getBatch(), orderDetl.getOrderNo(),
                                issued >= locDetl.getAnfme() ? locDetl.getAnfme() : issued);

 src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java

@@ -1,5 +1,6 @@
package com.zy.asrs.task.handler;

import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
import com.zy.asrs.entity.*;
@@ -357,6 +358,8 @@
                                    TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                                    return FAIL.setMsg("全板出库 ===>> 更新订单完成数量失败; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getSourceLocNo() + "]");
                                }
                            }else {
                                log.info("单据找不到，{}，{}",wrkDetl.getOrderNo(), JSON.toJSON(wrkDetl));
                            }
                        } catch (Exception ignore) {
                            log.error("fail", ignore);

 src/main/java/com/zy/asrs/task/kingdee/handler/InboundOrderHandler.java

@@ -196,7 +196,7 @@
                                    null,    // 实付金额
                                    null,    // 付款类型
                                    null,    // 业务员
                                    null,    // 结算天数
                                    1,    // 结算天数
                                    null,    // 邮费支付类型
                                    null,    // 邮费
                                    null,    // 付款时间

 src/main/java/com/zy/third/erp/task/ERPInOrOutService.java

@@ -85,7 +85,7 @@
                null,    // 实付金额
                null,    // 付款类型
                null,    // 业务员
                null,    // 结算天数
                1,    // 结算天数
                null,    // 邮费支付类型
                null,    // 邮费
                null,    // 付款时间
@@ -186,7 +186,7 @@
                null,    // 实付金额
                null,    // 付款类型
                null,    // 业务员
                null,    // 结算天数
                1,    // 结算天数
                null,    // 邮费支付类型
                null,    // 邮费
                null,    // 付款时间

 src/main/java/com/zy/third/lk/task/LKInTBScheduler.java

@@ -242,6 +242,8 @@
            if (orderDetl.getQty() > orderDetl.getAnfme() && orderDetl.getQty() > orderDetl.getWorkQty()) {
                log.info("修正错误数量：{}", JSON.toJSON(orderDetl));
                content.put("MainNum", orderDetl.getWorkQty());
            } else if (orderDetl.getAnfme() == orderDetl.getWorkQty() && orderDetl.getQty() <= 0) {
                content.put("MainNum", orderDetl.getWorkQty());
            } else {
                content.put("MainNum", orderDetl.getQty());
            }