修改语言以及发货报表跟发货打印

廖井涛

2024-07-30 8b8e560ee567d97364e51d3194bf5bffe154d652

修改语言以及发货报表跟发货打印

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

@@ -12,6 +12,7 @@
let delivery = ref([])
let money = ref("")
let otherMoneys = 0
let sumMoney = 0
let takeCare = "注意:请妥善保管好我司的玻璃架，如有丢失或损坏，按1500元只赔偿。谢谢配合!"
let remark = "备注:本批玻璃为优等合格品，请在卸货时,当面消点验收、如有质量问题在一周内与本公司联系,否则概不负责！"

@@ -35,6 +36,10 @@
      delivery.value=deepClone(res.data.delivery)
      money.value=deepClone(res.data.money)
      otherMoney.value=deepClone(res.data.otherMoney)
      produceList.value.forEach(item => {
        sumMoney+=item.DeliveryDetail.money
      })

      otherMoney1=[]
      otherMoney=deepClone(res.data.otherMoney)
      for(let i=0;i<otherMoney.length;i++){
@@ -185,7 +190,7 @@
                <td>{{item.DeliveryDetail.quantity}}</td>
                <td>{{item.DeliveryDetail.area}}</td>
                <td></td>
                <td>{{item.DeliveryDetail.grossAmount}}</td>
                <td>{{item.DeliveryDetail.money}}</td>
                <td colspan="2"></td>
              </tr>

@@ -195,7 +200,7 @@
              <td>{{delivery.quantity}}</td>
              <td>{{delivery.area}}</td>
              <td></td>
              <td>{{parseFloat((delivery.money-otherMoneys-delivery.freight).toFixed(2))}}</td>
              <td>{{sumMoney}}</td>
              <td colspan="2"></td>
            </tr>
            <tr class="day-in">

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

@@ -12,6 +12,7 @@
let otherMoney1 = []
let money = ref("")
let otherMoneys = 0
let sumMoney = 0
let takeCare = "注意:请妥善保管好我司的玻璃架，如有丢失或损坏，按1500元只赔偿。谢谢配合!"
let remark = "备注:本批玻璃为优等合格品，请在卸货时,当面消点验收、如有质量问题在一周内与本公司联系,否则概不负责！"

@@ -34,6 +35,9 @@
      produceList.value = deepClone(res.data.data)
      delivery.value=deepClone(res.data.delivery)
      money.value=deepClone(res.data.money)
      produceList.value.forEach(item => {
        sumMoney+=item.DeliveryDetail.grossAmount
      })
      otherMoney1=[]
      otherMoney=deepClone(res.data.otherMoney)
      for(let i=0;i<otherMoney.length;i++){
@@ -184,7 +188,7 @@
        <td>{{delivery.quantity}}</td>
        <td>{{delivery.area}}</td>
        <td></td>
        <td>{{delivery.money-otherMoneys}}</td>
        <td>{{sumMoney}}</td>
        <td></td>
      </tr>
      <tr class="day-in">

 north-glass-erp/northglass-erp/src/lang/en.js

@@ -256,6 +256,7 @@
            calculationAreaPrompt5:'Do you want to continue creating duplicate orders',

            pleaseCancelTheFilteringFirst:'Please cancel the selection first.',
            grossAreaIsNot0:'存在实际总面积等于0',
        }

    },
@@ -416,7 +417,8 @@
        printStatus:'Print times',
        labelPrinting2:'Label printing 2',
        addAutomatically:'Auto fill',
        selectFill:'Selected fill'
        selectFill:'Selected fill',
        engineeringPrinting:'工程打印'
    },
    reportingWorks:{
        glassNumber:'Code',
@@ -612,6 +614,8 @@
        endOperationOrderNumber:'Transfer sequence number',
        typeClaim:'Take out type',

        pleaseEnterTheBoxNumber:'请输入箱号',


    },
    customer:{
@@ -675,6 +679,10 @@
        money:'Amount',

        pleaseSelectTheSameCustomerProject:'Please select the project for the same customer',
        noMoney:'无金额',
        freightPrice:'运费单价',
        freightQuantity:'运费数量',
        freight:'运费金额',

    },
    replenish:{

 north-glass-erp/northglass-erp/src/lang/ru.js

@@ -230,6 +230,8 @@
        sheet3:'浏览发货信息',
        sheet5:'生产加工单弯钢(单片)',
        oneClickStorage:'一键完工',

        quantityMount:'数量金额',
        msg:{
            productCheck:'Пожалуйста, выберите продукт',
            tableLengthNot:'Нет данных таблицы',
@@ -254,6 +256,7 @@
            calculationAreaPrompt5:'Повторить заказ Создать',

            pleaseCancelTheFilteringFirst:'请先取消筛选',
            grossAreaIsNot0:'存在实际总面积等于0',
        }

    },
@@ -414,7 +417,8 @@
        printStatus:'打印次数',
        labelPrinting2:'标签打印2',
        addAutomatically:'自动填充',
        selectFill:'自动填充'
        selectFill:'自动填充',
        engineeringPrinting:'工程打印'
    },
    reportingWorks:{
        glassNumber:'number',
@@ -610,6 +614,8 @@
        endOperationOrderNumber:'Номер заказа на завершение операции',
        typeClaim:'Тип получения',

        pleaseEnterTheBoxNumber:'请输入箱号',


    },
    customer:{
@@ -673,6 +679,10 @@
        money:'Сумма',

        pleaseSelectTheSameCustomerProject:'请选择相同客户的项目',
        noMoney:'无金额',
        freightPrice:'运费单价',
        freightQuantity:'运费数量',
        freight:'运费金额',

    },
    replenish:{

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

@@ -41,7 +41,7 @@


    <select id="getSelectCustomerDeliveryDate" >
        select d.delivery_id,d.order_id,d.customer_id,d.customer_name,
        select d.delivery_id,dd.order_id,d.customer_id,d.customer_name,
               d.project,od.product_name,sum(dd.quantity) as quantity,sum(dd.area) as area,dd.price,sum(dd.money) as money,
                date(d.create_time) as create_time

@@ -51,7 +51,7 @@

                where date(d.create_time)>=#{startDate} and date(d.create_time) &lt;= #{endDate}
                and d.customer_id = #{orderDetail.order.customerId}
        group by od.product_id
        group by od.order_id,od.product_id
        limit #{offset},#{pageSize};
    </select>

@@ -65,7 +65,7 @@
        where
             date(d.create_time)>=#{startDate} and date(d.create_time) &lt;= #{endDate}
            and d.customer_id = #{orderDetail.order.customerId}
        group by od.product_id, od.width, od.height) as zu
        group by od.order_id,od.product_id) as zu
    </select>

    <select id="getSelectCustomerOderDate" >
@@ -93,7 +93,7 @@
            and date(o.create_time)>=#{startDate} and date(o.create_time) &lt;= #{endDate}
                                   and o.customer_id = #{orderDetail.order.customerId}
        </where>
        group by od.product_id
        group by od.order_id,od.product_id
        limit #{offset},#{pageSize};
    </select>

@@ -107,7 +107,7 @@
            and date(o.create_time)>=#{startDate} and date(o.create_time) &lt;= #{endDate}
                and o.customer_id = #{orderDetail.order.customerId}
        </where>
        group by od.product_id, od.width, od.height) as zu
        group by od.order_id,od.product_id) as zu
    </select>

    <select id="getCustomerList">
@@ -225,7 +225,7 @@

    <select id="exportSelectCustomerDeliveryDate" >
        select d.delivery_id,
               d.order_id,
               dd.order_id,
               d.customer_name,
               d.project,
               od.product_name,
@@ -242,7 +242,7 @@
        where date(d.create_time) >= #{startDate}
          and date(d.create_time) &lt;= #{endDate}
          and d.customer_id = #{orderDetail.order.customerId}
        group by od.product_id
        group by od.order_id,od.product_id

        UNION ALL

@@ -285,7 +285,7 @@
        where date(o.create_time) >= #{startDate}
          and date(o.create_time) &lt;= #{endDate}
          and o.customer_id = #{orderDetail.order.customerId}
        group by od.product_id
        group by od.order_id,od.product_id

        UNION ALL


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

@@ -828,7 +828,7 @@
            </if>

        </where>
        group by dd.delivery_id,od.product_id
        group by dd.delivery_id,dd.order_id,od.product_id
        order by dd.delivery_id,dd.delivery_number
        limit #{offset},#{pageSize};
    </select>
@@ -924,7 +924,7 @@
            </if>

        </where>
        group by dd.delivery_id,od.product_id) as zu
        group by dd.delivery_id,dd.order_id,od.product_id) as zu
    </select>

    <select id="getSelectDeliveryPrinting" resultMap="selectDeliveryDetailOrderDetail" >
@@ -1080,7 +1080,7 @@
                                   left join sd.`order` o on dd.order_id=o.order_id
                                   left join sd.customer c on d.customer_id=c.id
        where  date(d.create_time)>=#{dates[0]} and date(d.create_time) &lt;= #{dates[1]}
        group by dd.delivery_id,od.product_id
        group by dd.delivery_id,dd.order_id,od.product_id
        order by dd.delivery_id,dd.delivery_number
    </select>
</mapper>