修改成品出库

廖井涛

2024-07-23 642dc3c771c909ec8edb287e68a1ca12de4e4c27

修改成品出库

 north-glass-erp/northglass-erp/src/components/sd/order/PrintSheet4.vue

@@ -39,7 +39,6 @@
    data.value= res.data
    productIdData.value=data.value.orderProductDetail
    data.value.orderProductDetail.forEach(item => {

      grossNum.value.quantity += getQuantity(item.productDetail)
      grossNum.value.grossArea += getArea(item.productDetail)
      grossNum.value.perimeter += getPerimeter(item.productDetail)

 north-glass-erp/northglass-erp/src/lang/zh.js

@@ -674,6 +674,7 @@
        money:'金额',

        pleaseSelectTheSameCustomerProject:'请选择相同客户的项目',
        noMoney:'无金额',

    },
    replenish:{

 north-glass-erp/northglass-erp/src/views/mm/mainProductStock/FinishedProductOut.vue

@@ -215,7 +215,7 @@
    {field: 'productId', width: '100',title: t('order.productId'), filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: 'productName',width: '200', title: t('order.product'), filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: 'deliveryDetail.quantity',width: '100', title: t('delivery.deliveryQuantity'), filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: 'warehouseNum',width: '140', title: t('productStock.inventoryQuantity'), filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: 'finishedGoodsInventory.quantityAvailable',width: '140', title: t('productStock.inventoryQuantity'), filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: 'delivery.customerName',width: '200', title: t('customer.customerName'), filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: 'width', width: '100',title: t('order.width'), filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: 'height',width: '100', title: t('order.height'), filters:[{ data: '' }],slots: { filter: 'num1_filter' }},

 north-glass-erp/northglass-erp/src/views/sd/delivery/SelectDelivery.vue

@@ -261,7 +261,7 @@
      options: [
        [
          { code: 'sheet1', name: t('basicData.print'), prefixIcon: 'vxe-icon-file-txt', visible: true},
          { code: 'sheet2', name: t('basicData.print')+'无金额', prefixIcon: 'vxe-icon-file-txt', visible: true},
          { code: 'sheet2', name: t('basicData.print')+ t('delivery.noMoney'), prefixIcon: 'vxe-icon-file-txt', visible: true},
        ]
      ]
    }

 north-glass-erp/src/main/java/com/example/erp/service/mm/FinishedGoodsInventoryService.java

@@ -139,7 +139,7 @@
            //将异常传入数据库
            SysError sysError = new SysError();
            sysError.setError(e.toString());
            sysError.setFunc("saveOrder");
            sysError.setFunc("addSelectWarehousing");
            sysErrorService.insert(sysError);
            saveState = false;

@@ -219,6 +219,9 @@
                            }
                        }

                    }else{
                        TransactionAspectSupport.currentTransactionStatus().rollbackToSavepoint(savePoint);
                        saveState = false;
                    }
                }
            }
@@ -228,7 +231,7 @@
            //将异常传入数据库
            SysError sysError = new SysError();
            sysError.setError(e.toString());
            sysError.setFunc("saveOrder");
            sysError.setFunc("addDeliveryDetail");
            sysErrorService.insert(sysError);
            saveState = false;

@@ -298,7 +301,7 @@
            //将异常传入数据库
            SysError sysError = new SysError();
            sysError.setError(e.toString());
            sysError.setFunc("saveOrder");
            sysError.setFunc("updateFinishedGoodsInventoryAllocate");
            sysErrorService.insert(sysError);
            saveState = false;

@@ -381,7 +384,7 @@
            //将异常传入数据库
            SysError sysError = new SysError();
            sysError.setError(e.toString());
            sysError.setFunc("saveOrder");
            sysError.setFunc("updateFinishedGoodsInventoryTakeOut");
            sysErrorService.insert(sysError);
            saveState = false;

@@ -464,7 +467,7 @@
            //将异常传入数据库
            SysError sysError = new SysError();
            sysError.setError(e.toString());
            sysError.setFunc("saveOrder");
            sysError.setFunc("updateFinishedGoodsInventoryRework");
            sysErrorService.insert(sysError);
            saveState = false;

@@ -511,7 +514,7 @@
            //将异常传入数据库
            SysError sysError = new SysError();
            sysError.setError(e.toString());
            sysError.setFunc("saveOrder");
            sysError.setFunc("updateFinishedGoodsInventoryToExamine");
            sysErrorService.insert(sysError);
            saveState = false;

@@ -548,7 +551,7 @@
            //将异常传入数据库
            SysError sysError = new SysError();
            sysError.setError(e.toString());
            sysError.setFunc("saveOrder");
            sysError.setFunc("cancelFinishedGoodsInventoryToExamine");
            sysErrorService.insert(sysError);
            saveState = false;

@@ -674,7 +677,7 @@
            //将异常传入数据库
            SysError sysError = new SysError();
            sysError.setError(e.toString());
            sysError.setFunc("saveOrder");
            sysError.setFunc("cancelFinishedGoodsInventoryStorage");
            sysErrorService.insert(sysError);
            saveState = false;

@@ -716,7 +719,7 @@
            //将异常传入数据库
            SysError sysError = new SysError();
            sysError.setError(e.toString());
            sysError.setFunc("saveOrder");
            sysError.setFunc("oneClickStorage");
            sysErrorService.insert(sysError);
            saveState = false;


 north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java

@@ -479,16 +479,6 @@
            orderProductDetailMap.put("productId",map.get("productId"));
            orderProductDetailMap.put("productName",map.get("productName"));
            List<OrderDetail> orderDetails = orderDetailMapper.getOrderProductByProductId(map.get("productId"),orderId);
            orderDetails.forEach(orderDetail->{

                orderDetail.setGrossArea(
                        Double.parseDouble(String.format("%.3f",Double.parseDouble(
                                String.format("%.3f",
                                orderDetail.getWidth()*orderDetail.getHeight()/1000000)
                                ) * orderDetail.getQuantity()))
                );
            });

            orderProductDetailMap.put("productDetail",orderDetails);
            orderProductDetail.add(orderProductDetailMap);
        });