Merge branch 'master' of http://bore.pub:10439/r/ERP_override

chenlu

2024-07-01 39b565ab0ea5e98a2bb0eb5c78b3c23247dbc2fe

Merge branch 'master' of http://bore.pub:10439/r/ERP_override

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

@@ -175,7 +175,7 @@
          <td>{{item1.orderNumber}}</td>
          <td>{{  item1.otherColumns?.S02}}</td>
          <td>{{  item1.otherColumns?.S03}}</td>
          <td>{{  item1.otherColumns?.S01}}</td>
          <td class="notChangeRow">{{  item1.otherColumns?.S01}}</td>
          <td>{{item1.width +'*'+item1.height}}</td>
          <td>{{item1.quantity}}</td>
          <td>{{item1.grossArea}}</td>
@@ -278,6 +278,9 @@
  background-color: black;
  color: black;
}
.notChangeRow{
  white-space: nowrap;
}


</style>

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

@@ -160,7 +160,7 @@
          <td>{{item1.orderNumber}}</td>
          <td>{{  item1.otherColumns?.S02}}</td>
          <td>{{  item1.otherColumns?.S03}}</td>
          <td>{{  item1.otherColumns?.S01}}</td>
          <td class="notChangeRow">{{  item1.otherColumns?.S01}}</td>
          <td>{{item1.width}}*{{item1.height}}</td>
          <td>{{item1.quantity}}</td>
          <td>{{item1.grossArea}}</td>
@@ -288,5 +288,7 @@
  border:0
}


.notChangeRow{
  white-space: nowrap;
}
</style>

 north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue

@@ -852,7 +852,7 @@
  })
}

//更新金额
//更新金额重置
const updateMoney = () => {
  const updateData = {
    order: titleUploadData.value,

 north-glass-erp/src/main/java/com/example/erp/mapper/sd/OrderOtherMoneyMapper.java

@@ -10,4 +10,6 @@
public interface OrderOtherMoneyMapper extends BaseMapper<OrderOtherMoney> {

    List<OrderOtherMoney> findById(String orderId);

    Double selectGrossAmount(String orderId);
}

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

@@ -329,7 +329,8 @@
            orderDetail =  updateOrderMoneyComputed(orderDetail,order.getCalculateType());
            money+= orderDetail.getGrossAmount();
        }
        order.setMoney(money);

        order.setMoney(money+orderOtherMoneyMapper.selectGrossAmount(order.getOrderId()));
        orderMapper.updateMoney(order);
        orderDetailMapper.updateOrderMoney(OrderDetails);
        return false;

 north-glass-erp/src/main/resources/mapper/sd/OrderOtherMoneyMapper.xml

@@ -19,5 +19,10 @@
        where a.order_id = #{orderId}
    </select>

    <select id="selectGrossAmount">
        select sum(money) from order_other_money where order_id = #{orderId}

    </select>


</mapper>