入庫功能優化

zc

23 小时以前 fe0c2392123c13a50a773e503cfce6528374271d

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

@@ -317,6 +317,7 @@
                        .setItemCode(orderItem.getMatnrCode())
                        .setEditUser(nickName)
                        .setEditDate(order.getUpdateTime())
                        .setZone(stocks.getLocCode())
                        .setGoodsNO(fields.get("crushNo"))
                        .setMemoDtl(order.getMemo());

@@ -363,7 +364,6 @@
                    param.setOutQty(orderItem.getQty());
                }
                reportData.add(param);


                params.setData(reportData);
                try {
@@ -415,11 +415,11 @@
                            //采购入库单
                            params.setOrderType("PO_Instock").setAction("Update");
                            //获取指定查询字段CrushNo 票号
                            param.setInQty(orderItem.getQty());
                            param.setInQty(items.getQty());
                        } else if (order.getWkType().equals(OrderWorkType.ORDER_WORK_TYPE_PURCHASE_RETURN.type)) {
                            //采购退货
                            params.setOrderType("PR_Outstock").setAction("Update");
                            param.setOutQty(orderItem.getQty());
                            param.setOutQty(items.getQty());
                        } else if (order.getWkType().equals(OrderWorkType.ORDER_WORK_TYPE_OTHER_TERANSFER_IN.type)) {
                            //调拔入库单
                            params.setOrderType("Mv_Instock").setAction("Update");
@@ -429,27 +429,27 @@
                        } else if (order.getWkType().equals(OrderWorkType.ORDER_WORK_TYPE_PURCHASE.type)) {
                            //生产退料
                            params.setOrderType("WR_Instock").setAction("Update");
                            param.setInQty(orderItem.getQty());
                            param.setInQty(items.getQty());
                        } else if (order.getWkType().equals(OrderWorkType.ORDER_WORK_TYPE_RETURN_ORDER.type)) {
                            //生产领料
                            params.setOrderType("WO_Outstock").setAction("Update");
                            param.setOutQty(orderItem.getQty());
                            param.setOutQty(items.getQty());
                        } else if (order.getWkType().equals(OrderWorkType.ORDER_WORK_TYPE_PROD_ADDITION.type)) {
                            //生产补料
                            params.setOrderType("WR_Instock_BL").setAction("Update");
                            param.setOutQty(orderItem.getQty());
                            param.setOutQty(items.getQty());
                        } else if (order.getWkType().equals(OrderWorkType.ORDER_WORK_TYPE_FIX_OUT.type)) {
                            params.setOrderType("WO_Outstock_WR").setAction("Update");
                            param.setOutQty(orderItem.getQty());
                            param.setOutQty(items.getQty());
                        } else if (order.getWkType().equals(OrderWorkType.ORDER_WORK_TYPE_OTHER_IN.type)) {
                            //其它入库单/手动入库单
                            params.setOrderType("In_Instock").setAction("Update");
                            param.setInQty(orderItem.getQty());
                            param.setInQty(items.getQty());

                        } else if (order.getWkType().equals(OrderWorkType.ORDER_WORK_TYPE_OTHER.type)) {
                            //其它出库单/手动出库单
                            params.setOrderType("Io_Outstock").setAction("Update");
                            param.setOutQty(orderItem.getQty());
                            param.setOutQty(items.getQty());
                        }
                        dataParams.add(param);

@@ -485,14 +485,11 @@
    @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;
@@ -541,7 +538,7 @@
        } else if (order.getWkType().equals(OrderWorkType.ORDER_WORK_TYPE_OTHER_TERANSFER_IN.type)) {
            //调拔入库单
            params.setOrderType("Mv_Instock").setAction("Update");

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