guoyuji
2024-03-19 8f4f9527b7227954adeedcd8508c7e9c53aa49d9
显示订单当前库存
6个文件已修改
28 ■■■■ 已修改文件
north-glass-erp/northglass-erp/src/lang/zh.js 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/views/sd/order/SelectOrder.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/src/main/java/com/example/erp/entity/sd/Order.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/src/main/resources/mapper/sd/OrderMapper.xml 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/target/classes/mapper/mm/FinishedGoodsInventory.xml 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/target/classes/mapper/sd/OrderMapper.xml 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/lang/zh.js
@@ -2,12 +2,12 @@
    login:{
        userErr:'请输入你的账号',
        pwErr:'请输入你的密码',
        loginSuccessful:'登陆成功',
        loginSuccessful:'登录成功',
        connectErr:'服务器连接失败',
        user:'用户',
        password:'密码',
        SysName:'北玻自动化ERP管理系统',
        login:'登陆',
        login:'登录',
        register:'注册',
    },
    main:{
north-glass-erp/northglass-erp/src/views/sd/order/SelectOrder.vue
@@ -60,7 +60,7 @@
      {field: 'project',width:120,  title: t('order.project'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
      {field: 'batch',width:120,  title: t('order.batch'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
      {field: 'quantity',width:120,  title: t('order.quantity'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
      {field: '14',width:120,  title: t('searchOrder.inventoryNum'), sortable: true},
      {field: 'goodsQuantity',width:120,  title: t('searchOrder.inventoryNum'), sortable: true},
      {field: 'area',width:120,  title: t('order.computeGrossArea'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
      {field: 'createTime',width:120,   title: t('basicData.reportData'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
      {field: 'packType',width:120,  title: t('order.packType'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
north-glass-erp/src/main/java/com/example/erp/entity/sd/Order.java
@@ -55,6 +55,8 @@
    private Integer delivery;
    private LocalDate createTime;
    private LocalDate updateTime;
    @TableField(select = false,exist = false)
    private Integer goodsQuantity;
    @TableField(value = "customer_id")
    private Customer  customer;
north-glass-erp/src/main/resources/mapper/sd/OrderMapper.xml
@@ -17,7 +17,7 @@
    <update id="updateOrderParameter">
        update `order` o
        left join
            (select a.order_id,sum(a.perimeter) as aa,sum(a.quantity) as b,sum(a.compute_gross_area)  as c
            (select a.order_id,round(sum(a.perimeter),2) as aa,sum(a.quantity) as b,sum(a.compute_gross_area)  as c
             from sd.order_detail as a group by a.order_id)  od
            on o.order_id = od.order_id
        set
@@ -31,9 +31,12 @@
    
    <select id="getOrderList">
        select
            *
            *,
        sum(fgi.quantity_available) as goodsQuantity
        from
            `order` as o
        left join mm.finished_goods_inventory as  fgi
        on o.order_id = fgi.order_id
        where  date(o.create_time)>=#{startDate} and date(o.create_time) &lt;= #{endDate}
          <if test="orderType!= null and orderType != ''">
@@ -91,7 +94,7 @@
           <if test="order.deliveryAddress != null and order.deliveryAddress != ''">
               and o.delivery_address REGEXP #{order.deliveryAddress}
           </if>
        group by o.id
        order by o.id desc
        limit #{offset},#{pageSize}
    </select>
north-glass-erp/target/classes/mapper/mm/FinishedGoodsInventory.xml
@@ -428,6 +428,10 @@
        select sum(warehouse_num) from sd.order_detail where order_id=#{orderId}
    </select>
    <select id="findOrderDeliveryQuantitySum"  >
        select sum(delivery_num) from sd.order_detail where order_id=#{orderId}
    </select>
    <select id="findDeliveryQuantity" >
        select quantity from sd.`delivery`  where delivery_id=#{deliveryId}
    </select>
north-glass-erp/target/classes/mapper/sd/OrderMapper.xml
@@ -31,9 +31,12 @@
    
    <select id="getOrderList">
        select
            *
            *,
        sum(fgi.quantity_available) as goodsQuantity
        from
            `order` as o
        left join mm.finished_goods_inventory as  fgi
        on o.order_id = fgi.order_id
        where  date(o.create_time)>=#{startDate} and date(o.create_time) &lt;= #{endDate}
          <if test="orderType!= null and orderType != ''">
@@ -91,7 +94,7 @@
           <if test="order.deliveryAddress != null and order.deliveryAddress != ''">
               and o.delivery_address REGEXP #{order.deliveryAddress}
           </if>
        group by o.id
        order by o.id desc
        limit #{offset},#{pageSize}
    </select>