出库明细动态字段不显示问题修复

skyouc

22 小时以前 ae3bf92a8f0a7b80ae6d6ca73382ee372ea7b2d7

 rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/AsnOrderLogSchedule.java

@@ -9,15 +9,11 @@
import com.vincent.rsf.server.api.service.ReportMsgService;
import com.vincent.rsf.server.common.utils.FieldsUtils;
import com.vincent.rsf.server.manager.entity.*;
import com.vincent.rsf.server.manager.enums.AsnExceStatus;
import com.vincent.rsf.server.manager.enums.OrderType;
import com.vincent.rsf.server.manager.enums.OrderWorkType;
import com.vincent.rsf.server.manager.enums.POExceStatus;
import com.vincent.rsf.server.manager.enums.*;
import com.vincent.rsf.server.manager.service.*;
import com.vincent.rsf.server.manager.service.impl.TransferOrderServiceImpl;
import com.vincent.rsf.server.system.entity.User;
import com.vincent.rsf.server.system.service.UserService;
import com.vincent.rsf.server.system.service.impl.UserServiceImpl;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Scheduled;
@@ -34,6 +30,7 @@
 * @description
 * @create 2025/3/19 19:07
 */
@Slf4j
@Component
public class AsnOrderLogSchedule {

@@ -70,8 +67,9 @@
    public void InStockToLog() {
        List<WkOrder> wkOrders = asnOrderService.list(new LambdaQueryWrapper<WkOrder>()
                .eq(WkOrder::getType, OrderType.ORDER_IN.type)
                .eq(WkOrder::getExceStatus, AsnExceStatus.ASN_EXCE_STATUS_TASK_EXCE.val)
                .apply("anfme = qty"));
                .isNotNull(WkOrder::getPoCode)
                .ne(WkOrder::getPoCode, "")
                .eq(WkOrder::getExceStatus, AsnExceStatus.ASN_EXCE_STATUS_TASK_DONE.val));
        if (wkOrders.isEmpty()) {
            return;
        }
@@ -95,9 +93,9 @@
    public void outStockComplete() {
        List<WkOrder> wkOrders = asnOrderService.list(new LambdaQueryWrapper<WkOrder>()
                .eq(WkOrder::getType, OrderType.ORDER_OUT.type)
                .eq(WkOrder::getExceStatus, AsnExceStatus.OUT_STOCK_STATUS_TASK_DONE.val)

        );
                .isNotNull(WkOrder::getPoCode)
                .ne(WkOrder::getPoCode, "")
                .eq(WkOrder::getExceStatus, AsnExceStatus.OUT_STOCK_STATUS_TASK_DONE.val));
        if (wkOrders.isEmpty()) {
            return;
        }
@@ -114,9 +112,7 @@
     * @description: 上传已完成订单至ERP平台
     * @version 1.0
     */
    @Transactional(rollbackFor = Exception.class)
    public void reportOrders(List<WkOrder> orders) {
        orders.forEach(order -> {
    public void reportOrders(WkOrder order) {
            ReportParams params = new ReportParams();
            List<WkOrderItem> orderItems = asnOrderItemService.list(new LambdaQueryWrapper<WkOrderItem>().eq(WkOrderItem::getOrderId, order.getId()));
            if (orderItems.isEmpty()) {
@@ -136,6 +132,7 @@
                //设置通用参数
                param.setWMSNO(order.getCode())
                        .setPONO(order.getPoCode())
                        .setOrderNO(order.getPoCode())
                        .setOrderDate(order.getCreateTime())
                        .setItemCode(orderItem.getMatnrCode())
                        .setEditUser(nickName)
@@ -168,7 +165,9 @@
                    //生产补料
                    params.setOrderType("WR_Instock_BL").setAction("Update");
                    param.setOutQty(orderItem.getQty());

                } else if (order.getWkType().equals(OrderWorkType.ORDER_WORK_TYPE_FIX_OUT.type)) {
                    params.setOrderType("WO_Outstock_WR").setAction("Update");
                    param.setOutQty(orderItem.getQty());
                } else if (order.getWkType().equals(OrderWorkType.ORDER_WORK_TYPE_OTHER_IN.type)) {
                    //其它入库单/手动入库单
                    params.setOrderType("In_Instock").setAction("Update");
@@ -182,15 +181,15 @@
                reportData.add(param);
            });
            params.setData(reportData);

            R reported = reportMsgService.reportOrders(params);
            if (reported.get("code").equals(200)) {
               order.setNtyStatus(1);
               if (!asnOrderService.updateById(order)) {
                   throw new CoolException("上报状态修改失败！！");
               }
            try {
                R reported = reportMsgService.uploadReportOrders(params);
                if (reported.get("code").equals("200")) {
                    order.setNtyStatus(OrderReportStatus.ORDER_REPORT_STATUS_ALL.val);
                    asnOrderService.updateById(order);
                }
            } catch (Exception e) {
                log.error("<UNK>", e);
            }
        });
    }


@@ -199,14 +198,11 @@
     * @param type
     * @return
     * @author Ryan
     * @description 添加历史单据
     * @description 添加历史单据,产上报ERP
     * @time 2025/6/16 08:56
     */
    @Transactional(rollbackFor = Exception.class)
    public void moveOrderToLog(List<WkOrder> wkOrders, String type) {
        //上报已完成订单至ERP、MES等三方系统
//        reportOrders(wkOrders);
        //
        Set<Long> longSet = wkOrders.stream().map(WkOrder::getId).collect(Collectors.toSet());
        List<WkOrderItem> orderItems = asnOrderItemService.list(new LambdaQueryWrapper<WkOrderItem>()
                .in(WkOrderItem::getOrderId, longSet));
@@ -215,46 +211,60 @@
        }

        for (WkOrder order : wkOrders) {
            AsnOrderLog one = asnOrderLogService.getOne(new LambdaQueryWrapper<AsnOrderLog>().eq(AsnOrderLog::getCode, order.getCode()), false);
            if (Objects.isNull(one)) {
                AsnOrderLog orderLog = new AsnOrderLog();
                if (type.equals(OrderType.ORDER_OUT.type)) {
                    order.setExceStatus(AsnExceStatus.ASN_EXCE_STATUS_TASK_DONE.val);
                    order.setQty(order.getWorkQty());
            try {
                //上报次数限定
                if (order.getReportOnce() < 4 ) {
                    //上报已完成订单至ERP、MES等三方系统
                    reportOrders(order);
                    order.setReportOnce(order.getReportOnce() + 1);
                    if (!asnOrderService.updateById(order)) {
                        log.error(order.getCode() +  "，单据上传次数修改失败！！");
                    }
                }
                BeanUtils.copyProperties(order, orderLog);
                orderLog.setId(null);
                orderLog.setAsnId(order.getId());

                if (!asnOrderLogService.save(orderLog)) {
                    throw new CoolException("主单历史档添加失败！！");
                }

                List<AsnOrderItemLog> logs = new ArrayList<>();
                List<WkOrderItem> items = asnOrderItemService.list(new LambdaQueryWrapper<WkOrderItem>()
                        .eq(WkOrderItem::getOrderId, order.getId()));
                items.forEach(item -> {
                    AsnOrderItemLog itemLog = new AsnOrderItemLog();
                    BeanUtils.copyProperties(item, itemLog);
                    itemLog.setAsnItemId(itemLog.getId())
                            .setId(null)
                            .setMatnrId(item.getMatnrId())
                            .setLogId(orderLog.getId())
                            .setAsnId(item.getOrderId());
                    logs.add(itemLog);
                });

                if (!asnOrderItemLogService.saveBatch(logs)) {
                    throw new CoolException("单据明细历史档保存失败！！");
                }

                //更新PO/DO单执行状态
                if (type.equals(OrderType.ORDER_IN.type)) {
                    if (order.getWkType().equals(OrderWorkType.ORDER_WORK_TYPE_OTHER_TERANSFER.type)) {
            } catch (Exception e) {
                log.error(e.getMessage());
            }
            if (order.getNtyStatus().equals(OrderReportStatus.ORDER_REPORT_STATUS_ALL.val)) {
                AsnOrderLog one = asnOrderLogService.getOne(new LambdaQueryWrapper<AsnOrderLog>().eq(AsnOrderLog::getCode, order.getCode()), false);
                if (Objects.isNull(one)) {
                    AsnOrderLog orderLog = new AsnOrderLog();
                    if (type.equals(OrderType.ORDER_OUT.type)) {
                        order.setExceStatus(AsnExceStatus.ASN_EXCE_STATUS_TASK_DONE.val);
                        if (!asnOrderService.updateById(order)) {
                            throw new CoolException("单据状态更新失败！！");
                        }
                        order.setQty(order.getWorkQty());
                    }
                    BeanUtils.copyProperties(order, orderLog);
                    orderLog.setId(null);
                    orderLog.setAsnId(order.getId());

                    if (!asnOrderLogService.save(orderLog)) {
                        throw new CoolException("主单历史档添加失败！！");
                    }

                    List<AsnOrderItemLog> logs = new ArrayList<>();
                    List<WkOrderItem> items = asnOrderItemService.list(new LambdaQueryWrapper<WkOrderItem>()
                            .eq(WkOrderItem::getOrderId, order.getId()));
                    items.forEach(item -> {
                        AsnOrderItemLog itemLog = new AsnOrderItemLog();
                        BeanUtils.copyProperties(item, itemLog);
                        itemLog.setAsnItemId(itemLog.getId())
                                .setId(null)
                                .setMatnrId(item.getMatnrId())
                                .setLogId(orderLog.getId())
                                .setAsnId(item.getOrderId());
                        logs.add(itemLog);
                    });

                    if (!asnOrderItemLogService.saveBatch(logs)) {
                        throw new CoolException("单据明细历史档保存失败！！");
                    }

                    //更新PO/DO单执行状态
                    if (type.equals(OrderType.ORDER_IN.type)) {
                        if (order.getWkType().equals(OrderWorkType.ORDER_WORK_TYPE_OTHER_TERANSFER.type)) {
                            order.setExceStatus(AsnExceStatus.ASN_EXCE_STATUS_TASK_DONE.val);
                            if (!asnOrderService.updateById(order)) {
                                throw new CoolException("单据状态更新失败！！");
                            }
//                        List<TransferOrder> orders = transferOrderService.list(new LambdaQueryWrapper<TransferOrder>().eq(TransferOrder::getTransferId, order.getPoId()));
//                        if (orders.isEmpty()) {
//                            throw new CoolException("数据错误：关联表信息不存在！！");
@@ -267,46 +277,51 @@
//                        if (!this.asnOrderService.removeByIds(orderIds)) {
//                            throw new CoolException("原单据删除失败！！");
//                        }
                        if (!transferService.update(new LambdaUpdateWrapper<Transfer>()
                                .eq(Transfer::getId, order.getPoId())
                                .set(Transfer::getExceStatus, AsnExceStatus.ASN_EXCE_STATUS_TASK_DONE.val))) {
                            throw new CoolException("调拔单状态修改失败！！");
                            if (!transferService.update(new LambdaUpdateWrapper<Transfer>()
                                    .eq(Transfer::getId, order.getPoId())
                                    .set(Transfer::getExceStatus, AsnExceStatus.ASN_EXCE_STATUS_TASK_DONE.val))) {
                                throw new CoolException("调拔单状态修改失败！！");
                            }
                            return;
                        } else {
                            if (!Objects.isNull(order.getPoId())) {
                                purchaseService.update(new LambdaUpdateWrapper<Purchase>()
                                        .set(Purchase::getExceStatus, POExceStatus.PO_EXCE_STATUS_ALL_DONE.val)
                                        .eq(Purchase::getId, order.getPoId()));
                            }
                        }
                        return;
                    } else {
                        if (!Objects.isNull(order.getPoId())) {
                            purchaseService.update(new LambdaUpdateWrapper<Purchase>()
                                    .set(Purchase::getExceStatus, POExceStatus.PO_EXCE_STATUS_ALL_DONE.val)
                                    .eq(Purchase::getId, order.getPoId()));
                        }
                    }
                } else {
                    if (order.getWkType().equals(OrderWorkType.ORDER_WORK_TYPE_STOCK_TERANSFER.type)) {
                        order.setExceStatus(AsnExceStatus.OUT_STOCK_STATUS_TASK_DONE.val);
                        if (!asnOrderService.updateById(order)) {
                            throw new CoolException("单据状态更新失败！！");
                        }
                        //如果为调拔单据保留
                        return;
                    } else {
                        if (!Objects.isNull(order.getPoId())) {
                            deliveryService.update(new LambdaUpdateWrapper<Delivery>()
                                    .eq(Delivery::getId, order.getPoId())
                                    .set(Delivery::getExceStatus, POExceStatus.PO_EXCE_STATUS_ALL_DONE.val));
                        if (order.getWkType().equals(OrderWorkType.ORDER_WORK_TYPE_STOCK_TERANSFER.type)) {
                            order.setExceStatus(AsnExceStatus.OUT_STOCK_STATUS_TASK_DONE.val);
                            if (!asnOrderService.updateById(order)) {
                                throw new CoolException("单据状态更新失败！！");
                            }
                            //如果为调拔单据保留
                            return;
                        } else {
                            if (!Objects.isNull(order.getPoId())) {
                                deliveryService.update(new LambdaUpdateWrapper<Delivery>()
                                        .eq(Delivery::getId, order.getPoId())
                                        .set(Delivery::getExceStatus, POExceStatus.PO_EXCE_STATUS_ALL_DONE.val));
                            }
                        }
                    }
                }
            }

            if (!asnOrderItemService.remove(new LambdaQueryWrapper<WkOrderItem>()
                    .eq(WkOrderItem::getOrderId, order.getId()))) {
                throw new CoolException("原单据明细删除失败！！");
            }
            if (!this.asnOrderService.removeById(order.getId())) {
                throw new CoolException("原单据删除失败！！");
                if (!asnOrderItemService.remove(new LambdaQueryWrapper<WkOrderItem>()
                        .eq(WkOrderItem::getOrderId, order.getId()))) {
                    throw new CoolException("原单据明细删除失败！！");
                }
                if (!this.asnOrderService.removeById(order.getId())) {
                    throw new CoolException("原单据删除失败！！");
                }
                try {
                    //休眠3秒
                    Thread.sleep(3000);
                } catch (InterruptedException e) {
                    throw new RuntimeException(e);
                }
            }
        }
    }


}