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

chenlu

3 天以前 7281bfd73d6233edc7b71ab9f79ad8afcb613387

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

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

@@ -14,6 +14,7 @@
                v-model="dataList[itme.process_type][itme1.process_type]"
                placeholder=""
                clearable
                filterable
                style="width: 120px"
            >
              <el-option

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

@@ -348,7 +348,7 @@
const validRules = ref({
  "cancelAvailable": [{
    validator (e) {
      if (parseInt(e.row.cancelAvailable)  > e.row.quantity) {
      if (parseInt(e.row.cancelAvailable)  > e.row.quantityAvailable) {
        return new Error(t('ingredientsStock.msg2'))
      }
      const regex = /^[1-9]\d*$/g

 north-glass-erp/northglass-erp/src/views/sd/delivery/CreateDelivery.vue

@@ -468,7 +468,7 @@
            otherMoney:otherMoney.value,
            deliveryIdType:company.deliveryIdType,
            deliveryOutbound:company.deliveryOutbound,
            type:2
            type:1

          })
          gridOptions.toolbarConfig.buttons[0].disabled = true

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

@@ -37,7 +37,7 @@

    <select id="getSelectFinishedGlassShelfInformationInventoryArea">
        SELECT
            MAX(CAST(REGEXP_REPLACE(glass_shelf_number, '[^0-9]', '')AS UNSIGNED)) AS maxDindex
            ifnull(MAX(CAST(REGEXP_REPLACE(glass_shelf_number, '[^0-9]', '')AS UNSIGNED)),0) AS maxDindex
        FROM
            finished_glass_shelf_information
        WHERE

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

@@ -80,7 +80,7 @@
        from (select *
        from mm.finished_operate_log aa where aa.operate_type = #{type}  and aa.status!='已作废') fol
        left join sd.order_detail od on fol.order_id = od.order_id and fol.operation_number = od.order_number
        left join mm.finished_goods_inventory fgi on fgi.order_id = fol.order_id and fol.operation_number = fgi.order_number
        left join mm.finished_goods_inventory fgi on fgi.order_id = fol.order_id and fol.operation_number = fgi.order_number and fgi.box_no=fol.remarks
        left join sd.`order` o on o.order_id=fol.order_id
        <where>
            date(fol.operate_time)>=#{startDate} and date(fol.operate_time) &lt;= #{endDate}
@@ -148,17 +148,20 @@
                and o.project regexp #{finishedOperateLog.order.project}
            </if>
        </where>
        group by fol.order_id,fol.operation_number,fol.remarks
        order by fol.operate_time desc
        limit #{offset},#{pageSize};
    </select>

    <select id="getSelectStorageRecordLogPageTotal">
        select CEILING(count(fol.id)/#{pageSize}) as 'pageTotal',
        count(fol.id) as 'total'
        select
        CEILING(count(zu.id)/#{pageSize}) as 'pageTotal',
        count(zu.id) as 'total' from (
        select fol.id
        from (select *
        from mm.finished_operate_log aa where aa.operate_type = #{type}  and aa.status!='已作废') fol
        left join sd.order_detail od on fol.order_id = od.order_id and fol.operation_number = od.order_number
        left join mm.finished_goods_inventory fgi on fgi.order_id = fol.order_id and fol.operation_number = fgi.order_number
        left join mm.finished_goods_inventory fgi on fgi.order_id = fol.order_id and fol.operation_number = fgi.order_number and fgi.box_no=fol.remarks
        left join sd.`order` o on o.order_id=fol.order_id
        <where>
            date(fol.operate_time)>=#{startDate} and date(fol.operate_time) &lt;= #{endDate}
@@ -226,7 +229,9 @@
                and o.project regexp #{finishedOperateLog.order.project}
            </if>
        </where>
        group by fol.order_id,fol.operation_number,fol.remarks
        order by fol.`status` desc
        ) as zu
    </select>

    <update id="updateToExamine">