入库上报明细库位不完全修改

skyouc

1 天以前 3e9d3cf02c66e26587e5d5e16a1a2905e565af98

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

@@ -12,6 +12,7 @@
import com.vincent.rsf.framework.common.R;
import com.vincent.rsf.framework.exception.CoolException;
import com.vincent.rsf.server.api.config.RemotesInfoProperties;
import com.vincent.rsf.server.api.controller.erp.params.ReportDataParam;
import com.vincent.rsf.server.api.controller.erp.params.ReportParams;
import com.vincent.rsf.server.api.entity.CommonResponse;
import com.vincent.rsf.server.api.entity.constant.RcsConstant;
@@ -19,13 +20,16 @@
import com.vincent.rsf.server.api.entity.params.ErpInspectItem;
import com.vincent.rsf.server.api.entity.params.ErpInspectParams;
import com.vincent.rsf.server.api.service.ReportMsgService;
import com.vincent.rsf.server.manager.entity.WkOrder;
import com.vincent.rsf.server.manager.entity.WkOrderItem;
import com.vincent.rsf.server.manager.entity.Purchase;
import com.vincent.rsf.server.manager.service.AsnOrderItemService;
import com.vincent.rsf.server.manager.service.AsnOrderService;
import com.vincent.rsf.server.manager.service.PurchaseService;
import com.vincent.rsf.server.common.utils.FieldsUtils;
import com.vincent.rsf.server.manager.entity.*;
import com.vincent.rsf.server.manager.enums.OrderReportStatus;
import com.vincent.rsf.server.manager.enums.OrderType;
import com.vincent.rsf.server.manager.enums.OrderWorkType;
import com.vincent.rsf.server.manager.service.*;
import com.vincent.rsf.server.system.entity.User;
import com.vincent.rsf.server.system.service.UserService;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpEntity;
@@ -66,6 +70,12 @@
    private AsnOrderItemService asnOrderItemService;
    @Autowired
    private RemotesInfoProperties.RcsApi rcsApi;
    @Autowired
    private UserService userService;
    @Autowired
    private StockItemService stockItemService;
    @Autowired
    private StockService stockService;

    /**
     * @author Ryan
@@ -209,7 +219,8 @@
                if (result.getCode() == 200) {
                    return R.ok().add(result.getData());
                } else {
                    throw new CoolException("修改失败！！");
                    return R.ok(result.getMsg()).add(result.getData());
//                    throw new CoolException("修改失败！！");
                }
            } catch (JsonProcessingException e) {
                throw new CoolException(e.getMessage());
@@ -257,4 +268,236 @@
            }
        }
    }


    /**
     * @author Ryan
     * @date 2025/10/28
     * @description: 上传已完成订单至ERP平台
     * @version 1.0
     */
    @Override
    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()) {
            throw new CoolException("订据明细不存在！！");
        }
        List<ReportDataParam> reportData = new ArrayList<>();
        orderItems.forEach(orderItem -> {
            ReportDataParam param = new ReportDataParam();
            User user = userService.getById(order.getUpdateBy());
            String nickName = null;
            if (!Objects.isNull(user)) {
                nickName = user.getNickname();
            }
            //获取入库库位信息
            if (order.getType().equals(OrderType.ORDER_IN.type)) {
                //筛选当前唯一字段所有出入库信息
                List<StockItem> stockItems = stockItemService.list(new LambdaQueryWrapper<StockItem>()
                        .eq(StockItem::getFieldsIndex, orderItem.getFieldsIndex()));
                //获取库存中订单库位
                Set<Long> longSet = stockItems.stream().map(StockItem::getStockId).collect(Collectors.toSet());
                //获取库存库位信息
                Stock stocks = stockService.getOne(new LambdaQueryWrapper<Stock>()
                        .in(Stock::getId, longSet)
                        .eq(Stock::getType, OrderType.ORDER_IN.type)
                        .eq(Stock::getSourceCode, order.getCode()));
                if (!Objects.isNull(stocks)) {
                    param.setZone(stocks.getLocCode());
                }
            }
            //获取索引内容
            Map<String, String> fields = FieldsUtils.getFields(orderItem.getFieldsIndex());

            //设置通用参数
            param.setWMSNO(order.getCode())
                    .setPONO(order.getPoCode())
                    .setOrderNO(order.getPoCode())
                    .setOrderDate(order.getCreateTime())
                    .setItemCode(orderItem.getMatnrCode())
                    .setEditUser(nickName)
                    .setEditDate(order.getUpdateTime())
                    .setGoodsNO(fields.get("crushNo"))
                    .setMemoDtl(order.getMemo());

            if (order.getWkType().equals(OrderWorkType.ORDER_WORK_TYPE_DONE_IN.type)) {
                //采购入库单
                params.setOrderType("PO_Instock").setAction("Update");
                //获取指定查询字段CrushNo 票号
                param.setInQty(orderItem.getQty());
            } else if (order.getWkType().equals(OrderWorkType.ORDER_WORK_TYPE_PURCHASE_RETURN.type)) {
                //采购退货
                params.setOrderType("PR_Outstock").setAction("Update");
                param.setOutQty(orderItem.getQty());
            } else if (order.getWkType().equals(OrderWorkType.ORDER_WORK_TYPE_OTHER_TERANSFER_IN.type)) {
                //调拔入库单
                params.setOrderType("Mv_Instock").setAction("Update");

            } else if (order.getWkType().equals(OrderWorkType.ORDER_WORK_TYPE_PROD.type)) {
                //生产入库单
//                params.setOrderType("WO_Outstock").setAction("Update");
            } else if (order.getWkType().equals(OrderWorkType.ORDER_WORK_TYPE_PURCHASE.type)) {
                //生产退料
                params.setOrderType("WR_Instock").setAction("Update");
                param.setInQty(orderItem.getQty());
            } else if (order.getWkType().equals(OrderWorkType.ORDER_WORK_TYPE_RETURN_ORDER.type)) {
                //生产领料
                params.setOrderType("WO_Outstock").setAction("Update");
                param.setOutQty(orderItem.getQty());

            } else if (order.getWkType().equals(OrderWorkType.ORDER_WORK_TYPE_PROD_ADDITION.type)) {
                //生产补料
                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");
                param.setInQty(orderItem.getQty());

            } else if (order.getWkType().equals(OrderWorkType.ORDER_WORK_TYPE_OTHER.type)) {
                //其它出库单/手动出库单
                params.setOrderType("Io_Outstock").setAction("Update");
                param.setOutQty(orderItem.getQty());
            }
            reportData.add(param);
        });
        params.setData(reportData);
        try {
            R reported = uploadReportOrders(params);
            if (Integer.valueOf(reported.get("code").toString()) == 200) {
                order.setNtyStatus(OrderReportStatus.ORDER_REPORT_STATUS_ALL.val);
                asnOrderService.updateById(order);
            }
        } catch (Exception e) {
            log.error("<UNK>", e);
        }

        try {
            //休眠3秒
            Thread.sleep(3000);
        } catch (InterruptedException e) {
            throw new RuntimeException(e);
        }
    }

    /**
     * @author Ryan
     * @date 2025/11/10
     * @description: 入库任务明细上报
     * @version 1.0
     */
    @Override
    public void reportOrderItem(WkOrderItem orderItem) {
        ReportParams params = new ReportParams();

        WkOrder order = asnOrderService.getById(orderItem.getOrderId());
        if (Objects.isNull(order)) {
            throw new RuntimeException("单据不存在或已完成！！");
        }

        List<ReportDataParam> reportData = new ArrayList<>();

        ReportDataParam param = new ReportDataParam();
        User user = userService.getById(orderItem.getUpdateBy());
        String nickName = null;
        if (!Objects.isNull(user)) {
            nickName = user.getNickname();
        }
        //获取入库库位信息
        if (order.getType().equals(OrderType.ORDER_IN.type)) {
            //筛选当前唯一字段所有出入库信息
            List<StockItem> stockItems = stockItemService.list(new LambdaQueryWrapper<StockItem>()
                    .eq(StockItem::getFieldsIndex, orderItem.getFieldsIndex()));
            //获取库存中订单库位
            Set<Long> longSet = stockItems.stream().map(StockItem::getStockId).collect(Collectors.toSet());
            //获取库存库位信息
            Stock stocks = stockService.getOne(new LambdaQueryWrapper<Stock>()
                    .in(Stock::getId, longSet)
                    .eq(Stock::getType, OrderType.ORDER_IN.type)
                    .eq(Stock::getSourceCode, order.getCode()));
            if (!Objects.isNull(stocks)) {
                param.setZone(stocks.getLocCode());
            }
        }
        //获取索引内容
        Map<String, String> fields = FieldsUtils.getFields(orderItem.getFieldsIndex());

        //设置通用参数
        param.setWMSNO(order.getCode())
                .setPONO(order.getPoCode())
                .setOrderNO(order.getPoCode())
                .setOrderDate(order.getCreateTime())
                .setItemCode(orderItem.getMatnrCode())
                .setEditUser(nickName)
                .setEditDate(order.getUpdateTime())
                .setGoodsNO(fields.get("crushNo"))
                .setMemoDtl(order.getMemo());

        if (order.getWkType().equals(OrderWorkType.ORDER_WORK_TYPE_DONE_IN.type)) {
            //采购入库单
            params.setOrderType("PO_Instock").setAction("Update");
            //获取指定查询字段CrushNo 票号
            param.setInQty(orderItem.getQty());
        } else if (order.getWkType().equals(OrderWorkType.ORDER_WORK_TYPE_PURCHASE_RETURN.type)) {
            //采购退货
            params.setOrderType("PR_Outstock").setAction("Update");
            param.setOutQty(orderItem.getQty());
        } else if (order.getWkType().equals(OrderWorkType.ORDER_WORK_TYPE_OTHER_TERANSFER_IN.type)) {
            //调拔入库单
            params.setOrderType("Mv_Instock").setAction("Update");

        } else if (order.getWkType().equals(OrderWorkType.ORDER_WORK_TYPE_PROD.type)) {
            //生产入库单
//                params.setOrderType("WO_Outstock").setAction("Update");
        } else if (order.getWkType().equals(OrderWorkType.ORDER_WORK_TYPE_PURCHASE.type)) {
            //生产退料
            params.setOrderType("WR_Instock").setAction("Update");
            param.setInQty(orderItem.getQty());
        } else if (order.getWkType().equals(OrderWorkType.ORDER_WORK_TYPE_RETURN_ORDER.type)) {
            //生产领料
            params.setOrderType("WO_Outstock").setAction("Update");
            param.setOutQty(orderItem.getQty());

        } else if (order.getWkType().equals(OrderWorkType.ORDER_WORK_TYPE_PROD_ADDITION.type)) {
            //生产补料
            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");
            param.setInQty(orderItem.getQty());

        } else if (order.getWkType().equals(OrderWorkType.ORDER_WORK_TYPE_OTHER.type)) {
            //其它出库单/手动出库单
            params.setOrderType("Io_Outstock").setAction("Update");
            param.setOutQty(orderItem.getQty());
        }
        reportData.add(param);
        params.setData(reportData);
        try {
            R reported = uploadReportOrders(params);
            if (Integer.valueOf(reported.get("code").toString()) == 200) {
                order.setNtyStatus(OrderReportStatus.ORDER_REPORT_STATUS_ALL.val);
                asnOrderService.updateById(order);
            }
        } catch (Exception e) {
            log.error("<UNK>", e);
        }

        try {
            //休眠3秒
            Thread.sleep(3000);
        } catch (InterruptedException e) {
            throw new RuntimeException(e);
        }
    }


}