Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override

廖井涛

2025-10-23 df143921e8ec85b43420b71961d73825521911d1

Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override

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

@@ -34,7 +34,6 @@
        //创建List对象
        orderBasicDataMap = getBasicDataByType("order");


        //获取客户列表
        List<Object> orderBasicDataList = new ArrayList<>();
        orderBasicDataMap.put("customer",orderBasicDataList);
@@ -150,7 +149,6 @@
    }

    public int deleteBasicData(BasicData basicData) {

        return  basicDataMapper.deleteById(basicData.getId());
    }


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

@@ -63,9 +63,7 @@
                   log.setFunction("insertCustomer新增");
               }
               logService.saveLog(log);

           }

        } catch (Exception e) {
            TransactionAspectSupport.currentTransactionStatus().rollbackToSavepoint(savePoint);
            //将异常传入数据库
@@ -96,11 +94,7 @@
                log.setContent(object.toString());
                log.setFunction("deleteCustomer删除");
                logService.saveLog(log);

            }



        } catch (Exception e) {
            TransactionAspectSupport.currentTransactionStatus().rollbackToSavepoint(savePoint);
            //将异常传入数据库
@@ -109,7 +103,6 @@
            sysError.setFunc("saveOrder");
            sysErrorService.insert(sysError);
            saveState = false;

        }
        return saveState;

@@ -135,7 +128,6 @@
            map.put("data", customerMapper.getSelectCustomerDeliveryDate(offset, pageSize,startDate,endDate, orderDetail));
            map.put("total", customerMapper.getSelectCustomerDeliveryDatePageTotal(offset, pageSize,startDate,endDate, orderDetail));
        }

        List<String> list = new ArrayList<>();
        list.add(startDate);
        list.add(endDate);

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

@@ -407,9 +407,7 @@
            sysError.setFunc("insertDelivery");
            sysErrorService.insert(sysError);
            saveState = "false4";

        }

        return saveState;
    }

@@ -462,7 +460,6 @@
            sysError.setFunc("addDeliveryDetail");
            sysErrorService.insert(sysError);
            saveState = "false";

        }
        return saveState;

@@ -508,7 +505,6 @@
            sysError.setFunc("deleteDelivery");
            sysErrorService.insert(sysError);
            saveState = false;

        }
        return saveState;

@@ -576,7 +572,6 @@
                itemmap.put("DeliveryDetail", detail);
                itemmap.put("DeliveryDetailList", deliveryDetailList2);
                list.add(itemmap);

            }
            /*Delivery delivery=deliveryMapper.getSelectShippingOrderDetailDeliveryPrinting(deliveryDetail);
            delivery.setMoney(delivery.getMoney()+otherMoney);

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

@@ -89,7 +89,6 @@
                updateOrder(order,OrderDetails,orderOtherMoneyList,(Map<String, String>) orderMap.get("position"));
                log.setFunction("saveOrder修改:"+order.getOrderId());
            }

            logService.saveLog(log);
        }catch (Exception e){
            TransactionAspectSupport.currentTransactionStatus().rollbackToSavepoint(savePoint);
@@ -99,7 +98,6 @@
            sysError.setFunc("saveOrder");
            sysErrorService.insert(sysError);
            saveState = false;

            //throw new Exception();
        }
        return saveState;
@@ -108,7 +106,6 @@
    public boolean saveOrderTitle(Map<String,Object> orderMap) throws Exception {
        JSONObject orderJson = new JSONObject(orderMap);
        Order order = JSONObject.parseObject(JSONObject.toJSONString(orderJson.get("title")), Order.class);

        boolean saveState = true;
        //设置回滚点
        Object savePoint = TransactionAspectSupport.currentTransactionStatus().createSavepoint();
@@ -147,7 +144,6 @@
            sysError.setFunc("saveOrder");
            sysErrorService.insert(sysError);
            saveState = false;

            //throw new Exception();
        }
        return saveState;
@@ -174,7 +170,6 @@
        order.setOrderId(orderId);
        order.setCreateOrder(2);
        orderMapper.insert(order);

        insertOtherDetail(orderId,OrderDetails,orderOtherMoneyList,position);
    }

@@ -205,7 +200,6 @@
            String formattedDate = dateFormat.format(currentDate);
            orderId =  "NG"+formattedDate+formattedNumber;
        }

        return orderId;
    }

@@ -276,7 +270,6 @@
            if(otherColumns!=null){
                otherColumns.values().removeIf(value -> value == null || value.equals(""));
                OrderDetails.get(i).setOtherColumns(JSON.toJSONString(otherColumns));

                otherColumns.forEach((key, value) ->{

                    if(value!=null && !value.equals("") && key.contains("M")) {
@@ -292,25 +285,19 @@
            }else{
                OrderDetails.get(i).setOtherColumns("{}");
            }

            if(OrderDetails.get(i).getFileName()!=null&&!OrderDetails.get(i).getFileName().trim().isEmpty()){
                orderMapper.saveOrderFile(OrderDetails.get(i).getFileName(), OrderDetails.get(i).getFileData(),orderId,OrderDetails.get(i).getOrderNumber(),OrderDetails.get(i).getFileJson());
            }

            if(OrderDetails.get(i).getShape()==null){
                OrderDetails.get(i).setShape("1");
            }

        }




        //往明细表插数据
        orderDetailMapper.insertBatch(OrderDetails);
        //往小片表传入产品数据
        orderGlassDetailMapper.insertOrderGlassDetail(orderId,position.get("outside"),position.get("inside"));

        //修改成品拱高
        List<OrderDetail> orderDetails = orderDetailMapper
                .selectList(new LambdaQueryWrapper<OrderDetail>()
@@ -371,8 +358,6 @@

        //修改订单主表面积与周长以及重量
        orderMapper.updateOrderParameter(orderId);

        
    }

    public static List<OrderProcessDetail> getOrderProcessDetails(List<OrderGlassDetail> orderGlassDetails) {
@@ -434,8 +419,6 @@
        List<OrderDetail> orderDetails = orderDetailMapper.selectList(new QueryWrapper<OrderDetail>().eq("order_id",id));
        List<OrderOtherMoney> orderOtherMoneyList = orderOtherMoneyMapper.findById(id);
        List<Map<String,String>> orderFileList = orderMapper.selectOrderFileList(id);


        Map<String,Object> map = new HashMap<>();
        map.put("order",order);
        map.put("orderDetails",orderDetails);
@@ -852,16 +835,7 @@
        });
        returns.put("orderDetail",orderProductDetail);







        return returns;



    }

    public boolean updateOrderPrintNumber(String orderId) {