廖井涛
2024-08-02 109e6d0e1f954b7c06d39c285b87cb9fbebc493c
修改金额重置
5个文件已修改
27 ■■■■ 已修改文件
north-glass-erp/northglass-erp/src/views/sd/customer/SelectCustomer.vue 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/views/sd/customer/SelectCustomerOrder.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/src/main/java/com/example/erp/service/sd/CustomerService.java 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/src/main/resources/mapper/sd/OrderMapper.xml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/views/sd/customer/SelectCustomer.vue
@@ -163,6 +163,15 @@
  selectOrderList()
}
const handleSortChange=({ sortList, sortOrder })=> {
  // 根据排序参数构建请求数据
  filterData.value.sortList=sortList.map(item => item.property)
  filterData.value.sortOrder=sortList.map(item => item.order)
  console.log(filterData.value)
}
//子组件接收参数
@@ -287,6 +296,7 @@
        ref="xGrid"
        v-bind="gridOptions"
        v-on="gridEvents"
        @sort-change="handleSortChange"
    >
      <!--      下拉显示所有信息插槽-->
north-glass-erp/northglass-erp/src/views/sd/customer/SelectCustomerOrder.vue
@@ -220,7 +220,7 @@
    custom: true
  },
  footerMethod ({ columns, data }) {//页脚函数
    let footList = ['quantity','area','order.money']
    let footList = ['quantity','area','money']
    return[
      columns.map((column, columnIndex) => {
        if (columnIndex === 0) {
north-glass-erp/src/main/java/com/example/erp/service/sd/CustomerService.java
@@ -46,21 +46,21 @@
        Object savePoint = TransactionAspectSupport.currentTransactionStatus().createSavepoint();
        try {
            Customer customer = JSONObject.parseObject(JSONObject.toJSONString(object.get("customer")), Customer.class);
            customer=null;
           if(customer!=null){
               if (customer.getId()!=null && customer.getId()!=0){
                   customerMapper.updateCustomer(customer);
               }else{
                   customerMapper.insertCustomer(customer);
               }
           }
        } catch (Exception e) {
            TransactionAspectSupport.currentTransactionStatus().rollbackToSavepoint(savePoint);
            //将异常传入数据库
            SysError sysError = new SysError();
            sysError.setError(e+Arrays.toString(e.getStackTrace()));
            sysError.setFunc("insertCustomer");
            sysError.setError(Arrays.toString(e.getStackTrace()));
            sysError.setFunc("saveOrder");
            sysErrorService.insert(sysError);
            saveState = false;
@@ -88,8 +88,8 @@
            TransactionAspectSupport.currentTransactionStatus().rollbackToSavepoint(savePoint);
            //将异常传入数据库
            SysError sysError = new SysError();
            sysError.setError(e+Arrays.toString(e.getStackTrace()));
            sysError.setFunc("deleteCustomer");
            sysError.setError(e.toString());
            sysError.setFunc("saveOrder");
            sysErrorService.insert(sysError);
            saveState = false;
north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java
@@ -381,6 +381,7 @@
                    .eq("`column`",orderOtherMoney.getColumn()));
        });
        order.setMoney(money+orderOtherMoneyMapper.selectGrossAmount(order.getOrderId()));
        order.setOtherMoney(orderOtherMoneyMapper.selectGrossAmount(order.getOrderId()));
        orderMapper.updateMoney(order);
        orderDetailMapper.updateOrderMoney(OrderDetails);
        return false;
north-glass-erp/src/main/resources/mapper/sd/OrderMapper.xml
@@ -276,7 +276,7 @@
    </update>
    <update id="updateMoney">
        update `order` set money = #{order.money},calculate_type = #{order.calculateType} where order_id = #{order.orderId}
        update `order` set money = #{order.money},calculate_type = #{order.calculateType},other_money=#{order.otherMoney} where order_id = #{order.orderId}
    </update>
    <update id="cancelOrder">