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

chenlu

2025-08-18 7722f8adb4b3340c48fec029892fbed946869898

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

 north-glass-erp/northglass-erp/src/views/mm/productStock/CreateProductStock.vue

@@ -326,7 +326,7 @@
const validRules = ref({
  "inventoryQuantity": [{
    validator (e) {
      if ((parseInt(e.row.inventoryQuantity) + e.row.receivedQuantity) > e.row.orderDetail.quantity) {
      if ((parseInt(e.row.inventoryQuantity) + e.row.receivedQuantity) > e.row.quantity) {
        return new Error(t('productStock.msg3'))
      }
      const regex = /^[1-9]\d*$/g

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

@@ -118,6 +118,9 @@
                    Integer calculateType=flowCard.getOrder().getCalculateType();
                    double deliveryDetailMoney = 0.0;
                    double deliveryDetailArea = 0.0;
                    if(flowCards.getInventoryQuantity()<=flowCard.getInventoryQuantity()){
                        flowCard.setInventoryQuantity(flowCards.getInventoryQuantity());
                    }
                    BigDecimal getComputeArea= BigDecimal.valueOf(flowCard.getOrderDetail().getComputeArea());
                    BigDecimal getQuantity= BigDecimal.valueOf(flowCard.getInventoryQuantity());
                    BigDecimal getPrice= BigDecimal.valueOf(flowCard.getOrderDetail().getPrice());

 north-glass-erp/src/main/resources/mapper/mm/FinishedGoodsInventory.xml

@@ -45,6 +45,7 @@
        <result column="inventory_quantity" property="inventoryQuantity"/>
        <result column="process_id" property="processId"/>
        <result column="received_quantity" property="receivedQuantity"/>
        <result column="fc_quantity" property="quantity"/>


        <result column="order_id" property="order.orderId"/>
@@ -636,6 +637,7 @@
        o.project,
        fc.order_number,
        od.quantity,
        fc.quantity as fc_quantity,
        fc.inventory_quantity-fc.received_quantity as inventory_quantity,
        o.area,
        fc.process_id,

 north-glass-erp/src/main/resources/mapper/mm/FinishedOperateLog.xml

@@ -950,7 +950,7 @@
            o.order_id=#{orderId} and fol.remarks=#{remarks} and od.product_id=#{productId}
        group by od.order_id,od.order_number
        ORDER BY
            fol.operate_time DESC
            od.order_number

    </select>