多加入参数和修改规则

cl

6 天以前 cb2f02d60aac235f2f9e5ef777e0141fb697c264

 rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReceiveMsgServiceImpl.java

@@ -607,6 +607,19 @@
                .setUpdateTime(new Date())
                .setCreateBy(loginUserId)
                .setUpdateBy(loginUserId);
        if (StringUtils.isNotBlank(syncOrder.getDocTaskWarehouseNo())) {
            wkOrder.setDocTaskWarehouseNo(syncOrder.getDocTaskWarehouseNo().trim());
        }
        if (StringUtils.isNotBlank(syncOrder.getOrgNo())) {
            wkOrder.setDocOrgNo(syncOrder.getOrgNo().trim());
        }
        String effTypeForDoc = resolvedOrderType != null ? resolvedOrderType : StringUtils.trimToNull(syncOrder.getType());
        if (OrderType.ORDER_IN.type.equals(effTypeForDoc) && StringUtils.isNotBlank(syncOrder.getInWarehouseNo())) {
            wkOrder.setDocInWarehouseNo(syncOrder.getInWarehouseNo().trim());
        }
        if (OrderType.ORDER_OUT.type.equals(effTypeForDoc) && StringUtils.isNotBlank(syncOrder.getOutWarehouseNo())) {
            wkOrder.setDocOutWarehouseNo(syncOrder.getOutWarehouseNo().trim());
        }

        if (resolvedOrderType != null && resolvedOrderType.equals(OrderType.ORDER_OUT.type)) {
            wkOrder.setExceStatus(AsnExceStatus.OUT_STOCK_STATUS_TASK_INIT.val);
@@ -781,6 +794,26 @@
                return true;
            }
        }
        if (StringUtils.isNotBlank(syncOrder.getOrgNo())) {
            if (!StringUtils.equals(syncOrder.getOrgNo().trim(), StringUtils.trimToNull(order.getDocOrgNo()))) {
                return true;
            }
        }
        if (StringUtils.isNotBlank(syncOrder.getDocTaskWarehouseNo())) {
            if (!StringUtils.equals(syncOrder.getDocTaskWarehouseNo().trim(), StringUtils.trimToNull(order.getDocTaskWarehouseNo()))) {
                return true;
            }
        }
        if (OrderType.ORDER_IN.type.equals(order.getType()) && StringUtils.isNotBlank(syncOrder.getInWarehouseNo())) {
            if (!StringUtils.equals(syncOrder.getInWarehouseNo().trim(), StringUtils.trimToNull(order.getDocInWarehouseNo()))) {
                return true;
            }
        }
        if (OrderType.ORDER_OUT.type.equals(order.getType()) && StringUtils.isNotBlank(syncOrder.getOutWarehouseNo())) {
            if (!StringUtils.equals(syncOrder.getOutWarehouseNo().trim(), StringUtils.trimToNull(order.getDocOutWarehouseNo()))) {
                return true;
            }
        }
        return false;
    }

@@ -887,6 +920,18 @@
        if (StringUtils.isNotBlank(syncOrder.getStationId())) {
            order.setStationId(syncOrder.getStationId());
        }
        if (StringUtils.isNotBlank(syncOrder.getDocTaskWarehouseNo())) {
            order.setDocTaskWarehouseNo(syncOrder.getDocTaskWarehouseNo().trim());
        }
        if (StringUtils.isNotBlank(syncOrder.getOrgNo())) {
            order.setDocOrgNo(syncOrder.getOrgNo().trim());
        }
        if (OrderType.ORDER_IN.type.equals(order.getType()) && StringUtils.isNotBlank(syncOrder.getInWarehouseNo())) {
            order.setDocInWarehouseNo(syncOrder.getInWarehouseNo().trim());
        }
        if (OrderType.ORDER_OUT.type.equals(order.getType()) && StringUtils.isNotBlank(syncOrder.getOutWarehouseNo())) {
            order.setDocOutWarehouseNo(syncOrder.getOutWarehouseNo().trim());
        }
        order.setUpdateBy(loginUserId);
        order.setUpdateTime(new Date());
        asnOrderService.updateById(order);
@@ -972,6 +1017,18 @@
        if (StringUtils.isNotBlank(syncOrder.getStationId())) {
            order.setStationId(syncOrder.getStationId());
        }
        if (StringUtils.isNotBlank(syncOrder.getDocTaskWarehouseNo())) {
            order.setDocTaskWarehouseNo(syncOrder.getDocTaskWarehouseNo().trim());
        }
        if (StringUtils.isNotBlank(syncOrder.getOrgNo())) {
            order.setDocOrgNo(syncOrder.getOrgNo().trim());
        }
        if (OrderType.ORDER_IN.type.equals(order.getType()) && StringUtils.isNotBlank(syncOrder.getInWarehouseNo())) {
            order.setDocInWarehouseNo(syncOrder.getInWarehouseNo().trim());
        }
        if (OrderType.ORDER_OUT.type.equals(order.getType()) && StringUtils.isNotBlank(syncOrder.getOutWarehouseNo())) {
            order.setDocOutWarehouseNo(syncOrder.getOutWarehouseNo().trim());
        }
        order.setUpdateBy(loginUserId);
        order.setUpdateTime(new Date());
        asnOrderService.updateById(order);