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

guoyuji

2024-07-07 950d6c246b3fa1ed93ef783bf0c5035369984f6c

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

 north-glass-erp/northglass-erp/src/components/pp/SelectSortDetailProcessCard.vue

New file
@@ -0,0 +1,471 @@
<script setup>

import request from "@/utils/request"
import deepClone from "@/utils/deepClone"
import {ElDatePicker, ElMessage} from "element-plus"
import useProductGlassTypeStore from "@/stores/sd/product/productGlassType"
import footSum from "@/hook/footSum"
import {nextTick, onMounted, onUnmounted, reactive, ref, watch} from "vue"
import {Search} from "@element-plus/icons-vue"
import GlassType from "@/components/sd/product/GlassType.vue"
import {useRouter} from 'vue-router'
import Sortable from 'sortablejs'
import BasicTable from '@/components/sd/product/BasicTable.vue'
import {VXETable} from "vxe-table";
import  useUserInfoStore from '@/stores/userInfo'
import {useI18n} from "vue-i18n";
import {filterChanged} from "@/hook";
import {addListener, toolbarButtonClickEvent} from "@/hook/mouseMove";
const { t } = useI18n()
const userStore = useUserInfoStore()
let selectRecords = ref(null)
let router = useRouter()
let props = defineProps({
  processId:null,
  technologyNumber:null
})

//定义数据返回结果
let produceDetailList = ref([])

//表尾求和
const sumNum = (list, field) => {
  let count = 0
  list.forEach(item => {
    count += Number(item[field])
  })
  return count.toFixed(2)
}

//筛选条件，有外键需要先定义明细里面的数据
let filterData = ref({
  order: {
    project: ''
  },
  orderDetail: {
    productId: '',
    productName: '',
    computeGrossArea: '',
    processingNote: '',
  }

})


const {currentRoute} = useRouter()
const route = currentRoute.value

onMounted(() => {
  //启用表格拖动选中
  addListener(xGridDetail.value, detailGridOptions)

})

//第一次加载数据
request.post(`/processCard/printFlowCardDetails/${props.processId}/${props.technologyNumber}`,filterData.value).then((res) => {
  if (res.code == 200) {
    produceDetailList.value = (res.data.data)
    xGridDetail.value.reloadData(produceDetailList.value)
  } else {
    ElMessage.warning(res.msg)
  }
})



/*使用筛选，后端获取数据*/
const changeFilterEvent = (event, option, $panel,) => {
  // 手动触发筛选
  $panel.changeOption(event, !!option.data, option)
}


/*后端返回结果多层嵌套展示*/
const hasDecimal = (value) => {
  const regex = /\./; // 定义正则表达式，查找小数点
  return regex.test(value); // 返回true/false
}

//子组件接收参数
const xGridDetail = ref()
const detailGridOptions = reactive({
  border: "full",//表格加边框
  keepSource: true,//保持源数据
  align: 'center',//文字居中
  stripe: true,//斑马纹
  rowConfig: {isCurrent: true, isHover: true, height: 30},//鼠标移动或选择高亮
  id: 'printFlowCard_2',
  showFooter: true,//显示脚
  printConfig: {},
  importConfig: {},
  exportConfig: {},
  scrollX: {enabled: true},
  scrollY: {enabled: true, gt: 0},//开启虚拟滚动
  showOverflow: true,
  columnConfig: {
    resizable: true,
    useKey: true
  },
  filterConfig: {   //筛选配置项
    // remote: true
  },
  customConfig: {
    storage: true
  },
  mouseConfig:{selected: true},//鼠标选中
  keyboardConfig:{
    isArrow: true,
    isDel: true,
    isEnter: true,
    isTab: true,
    isEdit: true,
    isChecked: true
  },
  editConfig: {
    trigger: 'click',
    mode: 'row',
    showStatus: true
  },//表头参数
  //右键菜单
  menuConfig: {
    className: 'my-menus',
    body: {
      options: [
        [
          {
            code: 'copyChecked',
            name: t('basicData.selectSame'),
            prefixIcon: 'vxe-icon-copy',
            visible: true,
            disabled: false
          },
          {
            code: 'copyAll',
            name: t('basicData.sameAfterwards'),
            prefixIcon: 'vxe-icon-feedback',
            visible: true,
            disabled: false
          },
          {
            code: 'clearChecked',
            name: t('basicData.clearSelection'),
            prefixIcon: 'vxe-icon-indicator',
            visible: true,
            disabled: false
          },
          {
            code: 'addAutomatically',
            name: t('processCard.addAutomatically'),
            prefixIcon: 'vxe-icon-indicator',
            visible: true,
            disabled: false
          },
          {
            code: 'selectFill',
            name: t('processCard.selectFill'),
            prefixIcon: 'vxe-icon-indicator',
            visible: true,
            disabled: false
          },
        ]
      ]
    }
  },
  columns: [
    {type: 'expand', fixed: "left", slots: {content: 'content'}, width: 50},
    {type: 'seq', fixed: "left", title: t('basicData.Number'), width: 50},
    {
      field: 'sort',
      width: 80,
      editRender: {name: 'input', attrs: {placeholder: ''}},
      title: t('processCard.sorting'),
    },
    {
      field: 'process_id',
      title: t('processCard.processId'),
      filters: [{data: ''}],
      slots: {filter: 'num1_filter'},
      filterMethod: filterChanged
    },
    {
      field: 'order_number',
      title: t('order.OrderNum'),
      filters: [{data: ''}],
      slots: {filter: 'num1_filter'},
      filterMethod: filterChanged
    },
    {
      field: 'technology_number',
      title: t('processCard.technologyNumber'),
      filters: [{data: ''}],
      slots: {filter: 'num1_filter'},
      filterMethod: filterChanged
    },
    {
      field: 'glass_address',
      title: t('processCard.glassAddress'),
      filters: [{data: ''}],
      slots: {filter: 'num1_filter'},
      filterMethod: filterChanged
    },
    {
      field: 'quantity',
      title: t('order.quantity'),
      filters: [{data: ''}],
      slots: {filter: 'num1_filter'},
      filterMethod: filterChanged
    },
    {
      field: 'child_width',
      title: t('order.width'),
      filters: [{data: ''}],
      slots: {filter: 'num1_filter'},
      filterMethod: filterChanged,
      sortable: true,
    },
    {
      field: 'child_height',
      title: t('order.height'),
      filters: [{data: ''}],
      slots: {filter: 'num1_filter'},
      filterMethod: filterChanged,
      sortable: true,
    },
    {
      field: 'area',
      title: t('order.area'),
      filters: [{data: ''}],
      slots: {filter: 'num1_filter'},
      filterMethod: filterChanged
    },

  ],
  //表单验证
  editRules: {
    sort: [
      //type: 'number', min: 0, message: '请输入大于等于0的数值' ,
      {
        validator ({ cellValue }) {
          const regex = /^[1-9]\d*$/
          if (!regex.test(cellValue)) {
            return new Error(t('basicData.msg.greater0'))

          }
        }}
    ],
  },

  //表头按钮
  toolbarConfig: {
    buttons: [
      {code: 'sort', name: t('basicData.save'), status: 'primary'},
    ],
    // import: false,
    // export: true,
    //print: true,
    zoom: true,
    custom: true
  },
  data: null,//表格数据
  //脚部求和
  footerMethod ({ columns, data }) {//页脚函数
    return[
      columns.map((column, columnIndex) => {
        if (columnIndex === 0) {
          return t('basicData.total')
        }
        const List = ["quantity",'area',]
        if (List.includes(column.field)) {
          return footSum(data, column.field)
        }
        return ''
      })
    ]
  }
})
const gridEventsDetail = {
  toolbarButtonClick ({ code}) {
    const $grid = xGridDetail.value
    selectRecords = $grid.getCheckboxRecords()
    selectRecords.forEach(obj => {
      delete obj.print_status;
    });
    if ($grid) {
      switch (code) {
        case 'sort': {
          const $table = xGridDetail.value
          let data = $table.getTableData().fullData
          let flowCardData = ref({
            flowCard: data,
          })
          for (let i = 0; i < flowCardData.value.flowCard.length; i++) {
            const regex = /^[1-9]\d*$/
            if (!regex.test(flowCardData.value.flowCard[i].sort)) {
              ElMessage.warning(t('basicData.msg.greater0'))
              return; // 如果有一个不是整数
            }
          }
          request.post("/processCard/printSort", flowCardData.value).then((res) => {
            if (res.code == 200) {
              ElMessage.success(t('processCard.sortingSuccessful'))
              router.push({
                path: '/main/processCard/PrintFlowCard',
                query: {orderId: orderId,random: Math.random()}
              })

              //location.reload();
            } else {
              ElMessage.warning(res.msg)
            }
          })
          break
        }

      }
    }
  },
  menuClick({menu, row, column}) {
    const $grids = xGridDetail.value
    if ($grids) {
      switch (menu.code) {
        case 'copyChecked' : {
          let result = toolbarButtonClickEvent()
          if (result.cell === "sort"){
            if (result) {
              const dataList = xGridDetail.value.getTableData().visibleData
              const val = dataList[result.start][result.cell]
              dataList.forEach((item, index) => {
                if (index >= result.start && index <= result.end) {
                  item[result.cell] = val
                }
              })
            }
          }

          break
        }
        case 'copyAll' : {
          let result = toolbarButtonClickEvent()
          if (result.cell === "sort" ) {
            if (result) {
              const dataList = xGridDetail.value.getTableData().visibleData
              const val = dataList[result.start][result.cell]
              dataList.forEach((item, index) => {
                if (index >= result.start) {
                  item[result.cell] = val
                }
              })
            }
          }
          break
        }
        case 'clearChecked' : {
          let result = toolbarButtonClickEvent()
          if (result.cell === "sort" ) {
            if (result) {
              const dataList = xGridDetail.value.getTableData().visibleData
              dataList.forEach((item, index) => {
                if (index >= result.start && index <= result.end) {
                  item[result.cell] = ''
                }
              })
            }
          }
          break
        }
        case 'addAutomatically' : {
          let result = toolbarButtonClickEvent()
          if (result.cell === "sort" ) {
            if (result) {
              const dataList = xGrid.value.getTableData().visibleData
              let val = 1
              dataList.forEach((item, index) => {
                if (index >= result.start && index <= result.end) {
                  item[result.cell] = val
                  val=val*1+1
                }
              })
            }
          }
          break
        }
        case 'selectFill' : {
          let result = toolbarButtonClickEvent()
          if (result.cell === "sort" ) {
            if (result) {
              const dataList = xGrid.value.getTableData().visibleData
              let val = dataList[result.start][result.cell]
              dataList.forEach((item, index) => {
                if (index >= result.start && index <= result.end) {
                  item[result.cell] = val
                  val=val*1+1
                }
              })
            }
          }
          break
        }
      }
    }
  }

}



</script>

<template>
  <div class="main-div-customer" style="width: 100%;height: 100%">

    <vxe-grid
        ref="xGridDetail"
        class="mytable-scrollbar"
        height="100%"
        size="small"
        v-bind="detailGridOptions"
        v-on="gridEventsDetail">

      <template #content="{ row }">
        <ul class="expand-wrapper">
          <li v-for="(item,index) in detailGridOptions.columns" v-show="item.field!=undefined ">
            <span style="font-weight: bold">{{ item.title + ':  ' }}</span>
            <span v-if="hasDecimal(item.field)">{{ row[item.field.split('.')[0]][item.field.split('.')[1]] }}</span>
            <span v-else>{{ row[item.field] }}</span>

          </li>
        </ul>
      </template>

      <template #num1_filter="{ column, $panel }">
        <div>
          <div v-for="(option, index) in column.filters" :key="index">
            <input type="text"
                   v-model="option.data"
                   @input="changeFilterEvent($event, option, $panel)"/>
          </div>
        </div>
      </template>

    </vxe-grid>
  </div>
</template>

<style scoped>
.main-div-customer{
  width: 99%;
  height: 100%;
}
#selectForm {
  width: 40%;
  text-align: center;
}

.vxe-grid {
  /* 禁用浏览器默认选中 */
  -webkit-user-select: none;
  -moz-user-select: none;
  -ms-user-select: none;
  user-select: none;
}
</style>

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

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

@@ -33,7 +34,9 @@
      delivery.value=deepClone(res.data.delivery)
      money.value=deepClone(res.data.money)
      otherMoney.value=deepClone(res.data.otherMoney)

      otherMoney.value.forEach(item => {
        otherMoneys+=item.DeliveryDetailOtherMoney.monery
      })
    }else{
      ElMessage.warning(res.msg)
      router.push("/login")
@@ -157,7 +160,7 @@
        <td>{{delivery.quantity}}</td>
        <td>{{delivery.area}}</td>
        <td></td>
        <td>{{delivery.money}}</td>
        <td>{{delivery.money-otherMoneys}}</td>
        <td></td>
      </tr>
      <tr class="day-in">
@@ -174,10 +177,10 @@
      <tr class="day-in">
        <td style="text-align: left;border-width: 0 1px 0 0; border-style: solid; border-color: #d3dce6;" colspan="4" >
          <div style="display: flex;font-size: 10px;text-align: center" v-for="(item, index2) in otherMoney" :key="index2">
            <div style="width: 25%">{{item.DeliveryDetailOtherMoney[0].alias}}</div>
            <div  style="width: 25%">{{item.DeliveryDetailOtherMoney[0].price}}</div>
            <div  style="width: 25%">{{item.DeliveryDetailOtherMoney[0].count}}</div>
            <div  style="width: 25%">{{item.DeliveryDetailOtherMoney[0].monery}}</div>
            <div style="width: 25%">{{item.DeliveryDetailOtherMoney.alias}}</div>
            <div  style="width: 25%">{{item.DeliveryDetailOtherMoney.price}}</div>
            <div  style="width: 25%">{{item.DeliveryDetailOtherMoney.count}}</div>
            <div  style="width: 25%">{{item.DeliveryDetailOtherMoney.monery}}</div>
          </div>
        </td>
        <td style="text-align: left;border:none;font-size: 15px;" colspan="5">大写金额:&nbsp;&nbsp;&nbsp;&nbsp;{{money}}</td>

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

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

@@ -33,7 +34,9 @@
      delivery.value=deepClone(res.data.delivery)
      money.value=deepClone(res.data.money)
      otherMoney.value=deepClone(res.data.otherMoney)

      otherMoney.value.forEach(item => {
        otherMoneys+=item.DeliveryDetailOtherMoney.monery
      })
    }else{
      ElMessage.warning(res.msg)
      router.push("/login")
@@ -114,7 +117,7 @@
          <td>{{item.DeliveryDetail.quantity}}</td>
          <td>{{item.DeliveryDetail.area}}</td>
          <td></td>
          <td>{{item.DeliveryDetail.money}}</td>
          <td>{{item.DeliveryDetail.grossAmount}}</td>
          <td></td>
        </tr>

@@ -124,7 +127,7 @@
        <td>{{delivery.quantity}}</td>
        <td>{{delivery.area}}</td>
        <td></td>
        <td>{{delivery.money}}</td>
        <td>{{delivery.money-otherMoneys}}</td>
        <td></td>
      </tr>
      <tr class="day-in">
@@ -141,10 +144,10 @@
      <tr class="day-in">
        <td style="text-align: left;border-width: 0 1px 0 0; border-style: solid; border-color: #d3dce6;" colspan="4" >
          <div style="display: flex;font-size: 10px;text-align: center" v-for="(item, index2) in otherMoney" :key="index2">
            <div style="width: 25%">{{item.DeliveryDetailOtherMoney[0].alias}}</div>
            <div  style="width: 25%">{{item.DeliveryDetailOtherMoney[0].price}}</div>
            <div  style="width: 25%">{{item.DeliveryDetailOtherMoney[0].count}}</div>
            <div  style="width: 25%">{{item.DeliveryDetailOtherMoney[0].monery}}</div>
            <div style="width: 25%">{{item.DeliveryDetailOtherMoney.alias}}</div>
            <div  style="width: 25%">{{item.DeliveryDetailOtherMoney.price}}</div>
            <div  style="width: 25%">{{item.DeliveryDetailOtherMoney.count}}</div>
            <div  style="width: 25%">{{item.DeliveryDetailOtherMoney.monery}}</div>
          </div>
        </td>
        <td style="text-align: left;border:none;font-size: 15px;font-weight: bold;" colspan="5">大写金额:&nbsp;&nbsp;&nbsp;&nbsp;{{money}}</td>

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

@@ -208,6 +208,10 @@
        orderDetailsSummaryReport:'订单明细汇总报表',
        buildingNumber:'楼层编号',
        saveHeader:'保存表头',

        orderNotApproved:'订单未审核',
        orderHasBeenReceived:'订单已入库',
        printingNumber:'打印次数',
        msg:{
            productCheck:'请选择产品',
            tableLengthNot:'没有表格数据',
@@ -230,6 +234,8 @@
            calculationAreaPrompt4:'计算',
            warning:'提示',
            calculationAreaPrompt5:'订单重复是否继续创建',

            pleaseCancelTheFilteringFirst:'请先取消筛选',
        }

    },

 north-glass-erp/northglass-erp/src/router/index.js

@@ -403,6 +403,11 @@
              component: () => import('../views/pp/processCard/SelectPrintProject.vue'),
            },
            {
              path: 'selectSortDetailProcessCard',
              name: 'selectSortDetailProcessCard',
              component: () => import('../components/pp/SelectSortDetailProcessCard.vue'),
            },
            {
              path: '',
              redirect:'/main/processCard/SelectProcessCard'
            }

 north-glass-erp/northglass-erp/src/views/pp/Replenish/PrintRepairProcess.vue

@@ -43,32 +43,24 @@
          let technologyNumberMerge = printMerge.split('').join(',');
          console.log(technologyNumberMerge)
          produceList.value[0].detail[0].technologyNumberMerge = technologyNumberMerge
          console.log(produceList.value[0].detail[0])
          const s01Values = [];
          // 遍历 res.data.numberList 数组，获取每个元素的 S01 值并存储到 s01Values 数组中
          produceList.value[0].detailList.forEach(element => {
            try {
              const otherColumnsObject = JSON.parse(element.other_columns);
              const s01Value = otherColumnsObject.S01;
              if (s01Value) {
                s01Values.push(s01Value);
              } else {
                // 如果 S01 值为空，可以选择添加默认值或者忽略这个元素
                s01Values.push(''); // 例如添加空字符串
              }
            } catch (error) {
              // console.error('Error parsing JSON or accessing S01 value:', error);
              // 处理 JSON 解析错误或其他异常情况
          for (let i = 0; i < produceList.value.length; i++) {
            const s01Values = [];

            if (produceList.value[i].detailList[0].other_columns!=null
                || produceList.value[i].detailList[0].other_columns!=undefined){
              produceList.value[i].detailList.forEach(element => {
                const otherColumnsObject = JSON.parse(element.other_columns);
                const s01Value = otherColumnsObject.S01;
                s01Values.push(s01Value || ''); // 如果 S01 值为空，添加空字符串或者其他默认值
              });

              // 将 s01Values 中的值赋给每个订单详情对象的 s01Value 属性
              produceList.value[i].detailList.forEach((detail, index) => {
                detail.s01Value = index < s01Values.length ? s01Values[index] : ''; // 赋值给 s01Value 属性
              });
            }
          });
          // 遍历 res.data.Detail 数组，将 s01Values 中的值赋给每个订单详情对象的 s01Value 属性
          produceList.value[0].detailList.forEach((detail, index) => {
            if (index < s01Values.length) {
              detail.s01Value = s01Values[index]; // 添加一个名为 s01Value 的新属性，存储对应的 S01 值
            } else {
              detail.s01Value = ''; // 如果 s01Values 中的值不足，可以添加默认值或者不进行赋值处理
            }
          });
          }




 north-glass-erp/northglass-erp/src/views/pp/processCard/PrintCustomLabelSemi2.vue

@@ -103,21 +103,19 @@
    <div id="entirety" v-for="(item,id) in labelList" >
      <div class="row1">
        <span>{{ item.customer_name }}</span>&nbsp;
        <span>{{ item.order_id }}</span>&nbsp;
        <span v-if="item.type_name.includes('中空')">中空</span>
        <span v-else-if="item.type_name.includes('夹层')">夹层</span>
        <span v-else-if="item.type_name.includes('夹胶')">夹胶</span>
        <span v-else></span>
      </div>
      <div  class="row2">
        <span>{{ item.order_id }}</span>&nbsp;
      <div class="row2">
        <span>{{item.project}}</span>&nbsp;
        <span>{{ item.building_number }}</span>
      </div>
      <div class="row3" v-if="JSON.parse(item.other_columns).S02==null">{{item.width}}*{{item.height}}={{item.quantity}}</div>
      <div class="row3" v-else>{{JSON.parse(item.other_columns).S02}}={{item.quantity}}</div>
      <div class="row5">
        <span>{{item.project}}</span>&nbsp;
        <span>{{ item.building_number }}</span>
      </div>
      <div class="row6">
        <span>{{item.glass_child}}</span>&nbsp;
        <span>{{item.processing_note}}</span>
      </div>
@@ -151,32 +149,32 @@
}

.row1 {
  font-size: 10pt;
  font-size: 12pt;
  font-weight: bold;
  height: 20px;
  height: 25px;
}

.row2 {
  font-size: 10pt;
  font-size: 12pt;
  font-weight: bold;
  height: 20px;
  height: 25px;
}
span {
  font-size: 10pt;
  font-size: 12pt;
  font-weight: bold;
}

.row3 {
  margin-top: -5px;
  height: 25px;
  font-size: 15pt;
  height: 30px;
  font-size: 20pt;
  font-weight: bolder;
}

.row5 {
  height: 20px;
  height: 25px;
  font-weight: bold;
  font-size: 10pt;
  font-size: 12pt;
}
.row5 span {
  font-size: 10pt;

 north-glass-erp/northglass-erp/src/views/pp/processCard/PrintFlowCard.vue

@@ -12,6 +12,7 @@
import PrintProcess from '@/views/pp/processCard/PrintProcess.vue'
import PrintLabel from '@/views/pp/processCard/PrintLabel.vue'
import PrintCustomLabel from '@/views/pp/processCard/PrintCustomLabel.vue'
import SortDetail from '@/components/pp/SelectSortDetailProcessCard.vue'
import footSum from "@/hook/footSum"
import companyInfo from "@/stores/sd/companyInfo"

@@ -30,28 +31,23 @@
const xGrid = ref(null)
const xGridDetail =ref(null)

let editRow = ref({
  processId:null,
  technologyNumber:null
})

const getTableRow = (row,type) =>{
const getTableRow = (row,type) => {
  switch (type) {
    case 'edit' :{
      request.post(`/processCard/printFlowCardDetails/${row.process_id}/${row.technology_number}`,filterData.value).then((res) => {
        if (res.code == 200) {
    case 'edit' : {
      editRow.value.processId = row.process_id
      editRow.value.technologyNumber = row.technology_number
      printVisible.value = true

          produceDetailList.value = (res.data.data)
          printVisible.value=true

        } else {

          ElMessage.warning(res.msg)

        }
      })
      // router.push({path: '/sort-detail', query: {processId: row.process_id,technologyNumber:row.technology_number}})
      break
    }

  }
}

//筛选条件，有外键需要先定义明细里面的数据
let filterData = ref({

@@ -304,7 +300,6 @@
    if ($grid) {
      switch (code) {
        case 'print': {
          console.log(selectRecords)
          if(selectRecords===null ||selectRecords===''||selectRecords.length===0){
            ElMessage.warning(t('searchOrder.msgList.checkOrder'))
            return
@@ -429,290 +424,6 @@
}



const detailGridOptions = reactive({
  border: "full",//表格加边框
  keepSource: true,//保持源数据
  align: 'center',//文字居中
  stripe: true,//斑马纹
  rowConfig: {isCurrent: true, isHover: true, height: 30},//鼠标移动或选择高亮
  id: 'printFlowCard_2',
  showFooter: true,//显示脚
  printConfig: {},
  importConfig: {},
  exportConfig: {},
  scrollX: {enabled: true},
  scrollY: {enabled: true, gt: 0},//开启虚拟滚动
  showOverflow: true,
  columnConfig: {
    resizable: true,
    useKey: true
  },
  filterConfig: {   //筛选配置项
                    // remote: true
  },
  customConfig: {
    storage: true
  },
  mouseConfig:{selected: true},//鼠标选中
  keyboardConfig:{
    isArrow: true,
    isDel: true,
    isEnter: true,
    isTab: true,
    isEdit: true,
    isChecked: true
  },
  editConfig: {
    trigger: 'click',
    mode: 'row',
    showStatus: true
  },//表头参数
  columns: [
    {type: 'expand', fixed: "left", slots: {content: 'content'}, width: 50},
    {type: 'seq', fixed: "left", title: t('basicData.Number'), width: 50},
    {
      field: 'sort',
      width: 80,
      editRender: {name: 'input', attrs: {placeholder: ''}},
      title: t('processCard.sorting'),
    },
    {
      field: 'process_id',
      title: t('processCard.processId'),
      filters: [{data: ''}],
      slots: {filter: 'num1_filter'},
      filterMethod: filterChanged
    },
    {
      field: 'order_number',
      title: t('order.OrderNum'),
      filters: [{data: ''}],
      slots: {filter: 'num1_filter'},
      filterMethod: filterChanged
    },
    {
      field: 'technology_number',
      title: t('processCard.technologyNumber'),
      filters: [{data: ''}],
      slots: {filter: 'num1_filter'},
      filterMethod: filterChanged
    },
    {
      field: 'glass_address',
      title: t('processCard.glassAddress'),
      filters: [{data: ''}],
      slots: {filter: 'num1_filter'},
      filterMethod: filterChanged
    },
    {
      field: 'quantity',
      title: t('order.quantity'),
      filters: [{data: ''}],
      slots: {filter: 'num1_filter'},
      filterMethod: filterChanged
    },
    {
      field: 'child_width',
      title: t('order.width'),
      filters: [{data: ''}],
      slots: {filter: 'num1_filter'},
      filterMethod: filterChanged,
      sortable: true,
    },
    {
      field: 'child_height',
      title: t('order.height'),
      filters: [{data: ''}],
      slots: {filter: 'num1_filter'},
      filterMethod: filterChanged,
      sortable: true,
    },
    {
      field: 'area',
      title: t('order.area'),
      filters: [{data: ''}],
      slots: {filter: 'num1_filter'},
      filterMethod: filterChanged
    },

  ],
  //表单验证
  editRules: {
    sort: [
      //type: 'number', min: 0, message: '请输入大于等于0的数值' ,
      {
        validator ({ cellValue }) {
          const regex = /^[1-9]\d*$/
          if (!regex.test(cellValue)) {
            return new Error(t('basicData.msg.greater0'))

          }
        }}
    ],
  },
  menuConfig: {
    body: {
    //右键菜单
      options: [
        [
          {
            code: 'copyChecked',
            name: t('basicData.selectSame'),
            prefixIcon: 'vxe-icon-copy',
            visible: true,
            disabled: false
          },
          {
            code: 'copyAll',
            name: t('basicData.sameAfterwards'),
            prefixIcon: 'vxe-icon-feedback',
            visible: true,
            disabled: false
          },
          {
            code: 'clearChecked',
            name: t('basicData.clearSelection'),
            prefixIcon: 'vxe-icon-indicator',
            visible: true,
            disabled: false
          },
          {
            code: 'addAutomatically',
            name: t('processCard.addAutomatically'),
            prefixIcon: 'vxe-icon-indicator',
            visible: true,
            disabled: false
          },
          {
            code: 'selectFill',
            name: t('processCard.selectFill'),
            prefixIcon: 'vxe-icon-indicator',
            visible: true,
            disabled: false
          },
        ]
      ]
    }
  },
  //表头按钮
  toolbarConfig: {
    buttons: [
      {code: 'sort', name: t('processCard.sorting'), status: 'primary'},
    ],
    // import: false,
    // export: true,
    //print: true,
    zoom: true,
    custom: true
  },
  data: null,//表格数据
  //脚部求和
  footerMethod ({ columns, data }) {//页脚函数
    return[
      columns.map((column, columnIndex) => {
        if (columnIndex === 0) {
          return t('basicData.total')
        }
        const List = ["quantity",'area',]
        if (List.includes(column.field)) {
          return footSum(data, column.field)
        }
        return ''
      })
    ]
  }
})


const gridEventsDetail = {
  menuClick({menu, row, column}) {
    const $grid = xGridDetail.value
    if ($grid) {
      switch (menu.code) {
        case 'copyChecked' : {
          let result = toolbarButtonClickEvent()
          if (result.cell === "sort"){
            if (result) {
              const dataList = xGridDetail.value.getTableData().visibleData
              const val = dataList[result.start][result.cell]
              dataList.forEach((item, index) => {
                if (index >= result.start && index <= result.end) {
                  item[result.cell] = val
                }
              })
            }
          }

          break
        }
        case 'copyAll' : {
          let result = toolbarButtonClickEvent()
          if (result.cell === "sort" ) {
            if (result) {
              const dataList = xGridDetail.value.getTableData().visibleData
              const val = dataList[result.start][result.cell]
              dataList.forEach((item, index) => {
                if (index >= result.start) {
                  item[result.cell] = val
                }
              })
            }
          }
          break
        }
        case 'clearChecked' : {
          let result = toolbarButtonClickEvent()
          if (result.cell === "sort" ) {
            if (result) {
              const dataList = xGridDetail.value.getTableData().visibleData
              dataList.forEach((item, index) => {
                if (index >= result.start && index <= result.end) {
                  item[result.cell] = ''
                }
              })
            }
          }
          break
        }
        case 'addAutomatically' : {
          let result = toolbarButtonClickEvent()
          if (result.cell === "sort" ) {
            if (result) {
              const dataList = xGrid.value.getTableData().visibleData
              let val = 1
              dataList.forEach((item, index) => {
                if (index >= result.start && index <= result.end) {
                  item[result.cell] = val
                  val=val*1+1
                }
              })
            }
          }
          break
        }
        case 'selectFill' : {
          let result = toolbarButtonClickEvent()
          if (result.cell === "sort" ) {
            if (result) {
              const dataList = xGrid.value.getTableData().visibleData
              let val = dataList[result.start][result.cell]
              dataList.forEach((item, index) => {
                if (index >= result.start && index <= result.end) {
                  console.log(item)
                  item[result.cell] = val
                  val=val*1+1
                }
              })
            }
          }
          break
        }
      }
    }
  },

}
const openedTable = () => {
  let detail =ref(produceDetailList.value)
  xGridDetail.value.reloadData(detail.value)
@@ -839,43 +550,12 @@
    </el-dialog>

    <el-dialog
        @opened="openedTable"
        id="sizeCheck"
        v-model="printVisible"
        :title="$t('processCard.processCardDetails')"
        :close-on-click-modal="false"
        :close-on-press-escape="false"
        destroy-on-close
        style="width: 80%;height:75% ">
      <vxe-grid
          ref="xGridDetail"
          class="mytable-scrollbar"
          max-height="100%"
          height="550px"
          size="small"
          v-bind="detailGridOptions"
          v-on="gridEventsDetail">

        <template #content="{ row }">
          <ul class="expand-wrapper">
            <li v-for="(item,index) in detailGridOptions.columns" v-show="item.field!=undefined ">
              <span style="font-weight: bold">{{ item.title + ':  ' }}</span>
              <span v-if="hasDecimal(item.field)">{{ row[item.field.split('.')[0]][item.field.split('.')[1]] }}</span>
              <span v-else>{{ row[item.field] }}</span>

            </li>
          </ul>
        </template>

        <template #num1_filter="{ column, $panel }">
          <div>
            <div v-for="(option, index) in column.filters" :key="index">
              <input type="text"
                     v-model="option.data"
                     @input="changeFilterEvent($event, option, $panel)"/>
            </div>
          </div>
        </template>

      </vxe-grid>
      <sort-detail id="child"  :processId="editRow.processId" :technologyNumber="editRow.technologyNumber" />
    </el-dialog>


@@ -896,4 +576,12 @@
  user-select: none;
}

:deep(#sizeCheck .el-dialog__body){
  height: 90%;
  width: 100%;
}
/deep/ .vxe-menu {
  position: absolute;
  z-index: 9999 !important;
}
</style>

 north-glass-erp/northglass-erp/src/views/pp/processCard/PrintLabel.vue

@@ -128,14 +128,13 @@
    <div id="entirety" v-for="(item,id) in labelList" >
        <div class="row1">
          <span>{{ item.customer_name }}</span>&nbsp;
          <span>{{ item.order_id }}</span>&nbsp;
          <span v-if="item.type_name.includes('中空')">中空</span>
          <span v-else-if="item.type_name.includes('夹层')">夹层</span>
          <span v-else-if="item.type_name.includes('夹胶')">夹胶</span>
          <span v-else></span>
        </div>
        <div  class="row2">
          <span>{{ item.order_id }}</span>&nbsp;
        </div>

        <div class="row3" v-if="JSON.parse(item.other_columns).S02==null">{{item.width}}*{{item.height}}={{item.quantity}}</div>
        <div class="row3" v-else>{{JSON.parse(item.other_columns).S02}}={{item.quantity}}</div>
        <div class="row5">
@@ -180,34 +179,39 @@
.row1 {
  font-size: 8pt;
  font-weight: bold;
  height: 16px;
  height: 20px;
}

.row2 {
  font-size: 8pt;
  font-weight: bold;
  height: 16px;
  height: 20px;
}
span {
  font-size: 10pt;
  font-weight: bold;
}

.row1 span {
  font-size: 8pt;
  font-weight: bold;
}

.row3 {
  margin-top: -5px;
  height: 19px;
  height: 25px;
  font-size: 12pt;
  font-weight: bolder;
}

.row5 {
  height: 15px;
  height: 20px;
  font-weight: bold;
  font-size: 8pt;
}

.row6 {
  height: 15px;
  height: 20px;
  font-weight: bold;
  font-size: 8pt;
}

 north-glass-erp/northglass-erp/src/views/pp/processCard/PrintProcess.vue

@@ -34,46 +34,60 @@

      request.post(`/processCard/getSelectPrinting`, data.value).then((res) => {
        if (res.code == 200) {

          produceList.value = deepClone(res.data.data)
          //处理合并打印
          if (printMerge !== null && printMerge !== undefined && printMerge !== "") {

            produceList.value.forEach(item => {
              item.detail[0].technologyNumber = printMerge;
            });

            produceList.value.forEach(item =>{
              let technologyNumberMerge = printMerge.split('').join(',');
              item.detail[0].technologyNumberMerge = technologyNumberMerge
            })

            //合并打印工艺流程处理
            let process = produceList.value[0].detail[0].process
            let indexOfJiaJiao = process.indexOf('夹胶');
            if (indexOfJiaJiao !== -1) {
              // 使用 substring 截取 "夹胶" 后面的部分，包括 "夹胶" 本身
              let afterJiaJiao = process.substring(indexOfJiaJiao).trim();
              produceList.value.forEach(item =>{
                item.detail[0].process = afterJiaJiao
              })
            }

            let indexOfProceList=produceList.value[0].processList
            let getProceList = indexOfProceList.findIndex(item => item.process === '夹胶');

            if (getProceList !== -1) {
              // 使用 filter 方法过滤出 "夹胶" 及其之后的对象
              produceList.value[0].processList = indexOfProceList.filter((item, index) => index >= getProceList);
            }
          }
          produceList.value.forEach(item =>{
            let technologyNumberMerge = printMerge.split('').join(',');
            item.detail[0].technologyNumberMerge = technologyNumberMerge
          })

          //处理编号列
          //定义存放编号数组
          const s01Values = [];
          // 遍历 res.data.numberList 数组，获取每个元素的 S01 值并存储到 s01Values 数组中
          produceList.value[0].detailList.forEach(element => {
            try {
              const otherColumnsObject = JSON.parse(element.other_columns);
              const s01Value = otherColumnsObject.S01;
              if (s01Value) {
                s01Values.push(s01Value);
              } else {
                // 如果 S01 值为空，可以选择添加默认值或者忽略这个元素
                s01Values.push(''); // 例如添加空字符串
              }
            } catch (error) {
              // console.error('Error parsing JSON or accessing S01 value:', error);
              // 处理 JSON 解析错误或其他异常情况
            }
          });
          // 遍历 res.data.Detail 数组，将 s01Values 中的值赋给每个订单详情对象的 s01Value 属性
          produceList.value[0].detailList.forEach((detail, index) => {
            if (index < s01Values.length) {
              detail.s01Value = s01Values[index]; // 添加一个名为 s01Value 的新属性，存储对应的 S01 值
            } else {
              detail.s01Value = ''; // 如果 s01Values 中的值不足，可以添加默认值或者不进行赋值处理
            }
          });
          for (let i = 0; i < produceList.value.length; i++) {
            const s01Values = [];
            // 遍历 detailList 数组，提取 S01 值到 s01Values 数组
            if (produceList.value[i].detailList[0].other_columns!=null
                || produceList.value[i].detailList[0].other_columns!=undefined){
              produceList.value[i].detailList.forEach(element => {
                const otherColumnsObject = JSON.parse(element.other_columns);
                const s01Value = otherColumnsObject.S01;
                s01Values.push(s01Value || ''); // 如果 S01 值为空，添加空字符串或者其他默认值
              });

              // 将 s01Values 中的值赋给每个订单详情对象的 s01Value 属性
              produceList.value[i].detailList.forEach((detail, index) => {
                detail.s01Value = index < s01Values.length ? s01Values[index] : ''; // 赋值给 s01Value 属性
              });
            }

          }


          handleGetQRCode()
@@ -207,14 +221,6 @@
        <td rowspan='2'>半径</td>
        <td rowspan='2'>备注</td>
        <td v-for="(itemPr,index) in item.processList" :key="index" colspan="2">{{ itemPr.process }}</td>
        <!--        <td colspan='2'>切割</td>-->
        <!--        <td colspan='2'>磨边</td>-->
        <!--        <td colspan='2'>钢化</td>-->
        <!--        <td colspan='2'>中空</td>-->
        <!--        <td colspan='2'>包装</td>-->
        <!--        <td colspan='2'></td>-->
        <!--        <td colspan='2'></td>-->
        <!--        <td colspan='2'></td>-->
      </tr>
      <tr>
        

 north-glass-erp/northglass-erp/src/views/pp/reportingWorks/AddReportingWork.vue

@@ -1229,10 +1229,11 @@
          <el-text class="customClass"></el-text>
        </el-col>
        <el-col :span="2">
          <el-text>{{$t('order.project')}}：</el-text>
          <el-text >{{$t('order.project')}}：</el-text>
        </el-col>
        <el-col :span="3">
          <el-text wrap-text="false">{{ titleUploadData.order.project }}</el-text>
          <el-input :readonly="true" v-model="titleUploadData.order.project"/>
<!--          <el-text style="white-space: nowrap; overflow: hidden; text-overflow: ellipsis;">{{ titleUploadData.order.project }}</el-text>-->
        </el-col>

      </el-row>

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

@@ -455,7 +455,7 @@
            return
          }
          if ($grid.getTableData().tableData.length != $grid.getTableData().fullData.length){
            ElMessage.error("请先取消筛选")
            ElMessage.error(t('order.msg.pleaseCancelTheFilteringFirst'))
            return
          }
          let result = toolbarButtonClickEvent()

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

@@ -86,7 +86,8 @@
                { code: 'sheet3', name: '浏览发货信息' }

              ]
            }
            },
            { code: 'oneClickStorage', name: "一键完工", prefixIcon: 'vxe-icon-copy', visible: true},
           // { code: 'getProcessList', name: t('searchOrder.processFlows'), prefixIcon: 'vxe-icon-file-txt', visible: true}
          ]
        ]
@@ -220,6 +221,7 @@
              ElMessage.warning(t('searchOrder.msgList.checkOrder'))
              return
            }
            ElMessage.warning(t('order.printingNumber')+rowClickIndex.value.printingNumber)
            dialogTableVisible.value = true
            sheetIndex.value=4
            if(rowClickIndex.value.processReview===2 && rowClickIndex.value.orderReview===0){
@@ -254,6 +256,25 @@
          }
          case 'print':{

            break
          }
          case 'oneClickStorage': {
            if(rowClickIndex.value.processReview===0||rowClickIndex.value.orderReview===0){
              ElMessage.warning(t('order.orderNotApproved'))
              return
            }
            if(rowClickIndex.value.warehousing>0){
              ElMessage.warning(t('order.orderHasBeenReceived'))
              return
            }
            request.post(`/FinishedGoodsInventory/oneClickStorage/${rowClickIndex.value.orderId}/${userStore.user.userName}`).then((res) => {
              if(res.code==200 && res.data===true){
                ElMessage.success(t('productStock.receivedSuccessfully'))
                router.push({path:'/main/order/selectOrder',query:{random:Math.random()}})
              }else{
                ElMessage.warning(res.msg)
              }
            })
            break
          }

@@ -406,6 +427,16 @@
  })
}

const printingNumber = ()=>{
  request.post(`/order/updateOrderPrintNumber/${rowClickIndex.value.orderId}`).then(res =>{

  })
}

const closeDialog = ()=>{
  selectOrderList()
}

</script>

<template>
@@ -539,11 +570,12 @@
        :key="dialogKey"
        id="print"
        v-model="dialogTableVisible"
        @close="closeDialog"
        destroy-on-close
        style="width: 75%;height:75% "
    >
      <template #header="{ close, titleId, titleClass }">
        <el-button v-print="printContent"  :icon="Printer" circle />
        <el-button v-print="printContent" @click="printingNumber" :icon="Printer" circle />
        <el-button @click="exportFile" :icon="Download" circle />
        <el-button v-if="company.selectOrderReviewShow" :disabled="reviewDisabled" @click="reviewOrder" :icon="CircleCheck" type="primary">{{$t('basicData.review')}}</el-button>
      </template>

 north-glass-erp/src/main/java/com/example/erp/controller/mm/FinishedGoodsInventoryController.java

@@ -175,4 +175,14 @@
        //参数：相应的数据，实体类信息，相应的方法（数据获取），生成的excel名字
        DownExcel.download(response, FinishedOperateLogDTO.class, finishedGoodsInventoryService.exportFinishedOperateLogReport(dates),"orderReport");
    }


    /*订单一键入库*/
    @ApiOperation("订单一键入库")
    @SaCheckPermission("CreateProductStock.add")
    @PostMapping("/oneClickStorage/{orderId}/{userName}")
    public Result oneClickStorage( @PathVariable String  orderId,@PathVariable String  userName){
        return Result.seccess(finishedGoodsInventoryService.oneClickStorage(orderId,userName));

    }
}

 north-glass-erp/src/main/java/com/example/erp/controller/sd/OrderController.java

@@ -193,5 +193,12 @@
        return   Result.seccess(orderService.printOrderProductDetails(orderId,selectedValues));
    }

    @ApiOperation("订单打印计数")
    @PostMapping ("/updateOrderPrintNumber/{orderId}")
    public Result updateOrderPrintNumber(@PathVariable String orderId)  {

        return  Result.seccess(orderService.updateOrderPrintNumber(orderId));
    }


}

 north-glass-erp/src/main/java/com/example/erp/entity/sd/Order.java

@@ -92,6 +92,8 @@
    private Integer warehousing;
    @ExcelProperty("发货")
    private Integer delivery;
    @ExcelProperty("打印次数")
    private Integer printingNumber;
    @ExcelProperty("创建日期")
    private LocalDate createTime;
    @ExcelProperty("修改日期")

 north-glass-erp/src/main/java/com/example/erp/mapper/mm/FinishedGoodsInventoryMapper.java

@@ -115,6 +115,12 @@
                                               @Param("orderNumber") Integer orderNumber,
                                               @Param("quantity") Integer quantity);

    List<OrderDetail> getSelectOrderDetail(String orderId);

    Boolean insertOrderFinishedGoodsInventory(@Param("orderDetail") OrderDetail orderDetail);

    Boolean updateOrderInventory(@Param("orderDetail") OrderDetail orderDetail);


}


 north-glass-erp/src/main/java/com/example/erp/mapper/mm/FinishedOperateLogMapper.java

@@ -77,4 +77,7 @@
                                                           @Param("finishedOperateLog") FinishedOperateLog finishedOperateLog);

    List<FinishedOperateLogDTO> exportFinishedOperateLogReport(List<LocalDate> dates);

    Boolean insertOrderFinishedOperateLog(@Param("orderDetail") OrderDetail orderDetail,@Param("userName") String userName,@Param("oddNumber") String oddNumber);

}

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

@@ -32,10 +32,10 @@
    List <Map<String, Object>> getSelectDeliveryDetailPrinting(@Param("deliveryId") String deliveryId,
                                                         @Param("productId") Integer productId,@Param("orderId") String orderId);

    List <Map<String, Object>> getSelectotherMoney(@Param("orderId") String orderId,@Param("deliveryId") String deliveryId,
                                                               @Param("key") String key,@Param("value") String value);
    Map<String, Object> getSelectotherMoney(@Param("orderId") String orderId,@Param("deliveryId") String deliveryId,
                                                   @Param("orderNumber") Integer orderNumber,@Param("key") String key,@Param("value") String value);

    List <Map<String, Object>> getSelectOrderotherMoney(@Param("orderId") String orderId, @Param("key") String key,@Param("value") String value);
    Map<String, Object> getSelectOrderotherMoney(@Param("orderId") String orderId,@Param("orderNumber") Integer orderNumber, @Param("key") String key,@Param("value") String value);

    List <Map<String, Object>> getSelectOrderDetailPrinting(@Param("productId") Integer productId,@Param("orderId") String orderId);


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

@@ -30,4 +30,6 @@
    List<Order> selectOrder(@Param("order") Order order);

    Integer selectMaxOrderIdByMonth();

    boolean updateOrderPrintNumber(@Param("orderId") String orderId);
}

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

@@ -13,6 +13,7 @@
import com.example.erp.mapper.mm.BasicWarehouseTypeMapper;
import com.example.erp.mapper.mm.FinishedGoodsInventoryMapper;
import com.example.erp.mapper.mm.FinishedOperateLogMapper;
import com.example.erp.mapper.sd.OrderDetailMapper;
import com.example.erp.service.userInfo.SysErrorService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -34,6 +35,8 @@
    FinishedOperateLogMapper finishedOperateLogMapper;
    @Autowired
    BasicWarehouseTypeMapper basicWarehouseTypeMapper;
    @Autowired
    OrderDetailMapper orderDetailMapper;
    @Autowired
    SysErrorService sysErrorService;

@@ -615,8 +618,11 @@
                        finishedOperateLogMapper.updateFinishedOperateLogState(finishedOperateLog,"已作废");
                        //修改库存表入库数量
                        finishedGoodsInventoryMapper.updateInventoryOut(finishedOperateLog);
                        //修改流程卡表入库数量
                        finishedGoodsInventoryMapper.updateflowcardOut(finishedOperateLog);
                        if(finishedOperateLog.getProcessId()!=null){
                            //修改流程卡表入库数量
                            finishedGoodsInventoryMapper.updateflowcardOut(finishedOperateLog);
                        }

                        //修改订单明细表入库数量
                        finishedGoodsInventoryMapper.updateOutOrderNumberConut(finishedOperateLog.getOrderId(),finishedOperateLog.getOperationNumber(),finishedOperateLog.getQuantity());
                        //判断订单是否全部入库
@@ -677,6 +683,44 @@
    }


    public Boolean oneClickStorage(String  orderId,String  userName) {
        boolean saveState = true;
        Object savePoint = TransactionAspectSupport.currentTransactionStatus().createSavepoint();
        try {
            String oddNumber= orderNumberSetting("入库");
            List<OrderDetail> orderDetailList=finishedGoodsInventoryMapper.getSelectOrderDetail(orderId);
            for (OrderDetail orderDetail:orderDetailList){
                Integer finishedGoodsInventoryCount = finishedGoodsInventoryMapper.findOrderNumberdcount(orderDetail.getOrderId(),orderDetail.getOrderNumber());
                System.out.println(finishedGoodsInventoryCount);
                if(finishedGoodsInventoryCount>0){
                    //修改库存表入库数量
                    finishedGoodsInventoryMapper.updateOrderInventory(orderDetail);
                }else{
                    finishedGoodsInventoryMapper.insertOrderFinishedGoodsInventory(orderDetail);
                }
                finishedOperateLogMapper.insertOrderFinishedOperateLog(orderDetail,userName,oddNumber);
                finishedGoodsInventoryMapper.updateIntOrderNumberConut(orderDetail.getOrderId(),orderDetail.getOrderNumber(),Integer.parseInt(orderDetail.getQuantity().toString()));
            }
            finishedGoodsInventoryMapper.updateOrderWarehousingState(orderId,2);

        } catch (Exception e) {
            TransactionAspectSupport.currentTransactionStatus().rollbackToSavepoint(savePoint);
            //将异常传入数据库
            SysError sysError = new SysError();
            sysError.setError(e.toString());
            sysError.setFunc("saveOrder");
            sysErrorService.insert(sysError);
            saveState = false;

        }

        return saveState;

    }








 north-glass-erp/src/main/java/com/example/erp/service/pp/FlowCardService.java

@@ -242,15 +242,16 @@
                Map<String, Object> itemmap = new HashMap<>();
                //流程卡表头表尾数据
                itemmap.put("detail", flowCardMapper.getPrimaryList(flowCard.getProcessId(), flowCard.getTechnologyNumber()));
                itemmap.put("numberList", flowCardMapper.getGlassNumber(flowCard.getTechnologyNumber(),flowCard.getProcessId()));


                //流程卡明细数据
                List<Map<String, Object>> detailList = flowCardMapper.getDetailList(flowCard.getProcessId(), flowCard.getTechnologyNumber());
                List<Map<String, Object>> glassList = flowCardMapper.getGlassNumber(flowCard.getTechnologyNumber(),flowCard.getProcessId());
               // List<Map<String, Object>> numberList = flowCardMapper.getGlassNumber(flowCard.getTechnologyNumber(),flowCard.getProcessId());
                //工艺流程
                List<Map<String, Object>> processList = flowCardMapper.getProcessList(flowCard.getProcessId(), flowCard.getTechnologyNumber());
                itemmap.put("detailList", detailList);
                itemmap.put("processList", processList);
              //  itemmap.put("numberList", numberList);
                list.add(itemmap);

            }

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

@@ -218,7 +218,8 @@
            deliveryOtherMoneyList.forEach(deliveryOtherMoney -> {
                deliveryOtherMoney.setQuantity(0.0);
            });

            double otherMoneys=0.0;
            List <Map<String, Object>> moneryList=new ArrayList<Map<String, Object>>();//最终结果
            //获取对象集合循环进行新增修改
            if (!orderDetaillist.isEmpty()) {
                for (OrderDetail orderDetail : orderDetaillist) {
@@ -243,6 +244,23 @@

                    }
                    //根据订单计算方式进行金额计算


                    if(orderDetail.getOtherColumns()!="{}"&&orderDetail.getOtherColumns()!=null){
                        System.out.println(orderDetail.getOtherColumns());
                        JSONObject jsonObject = JSON.parseObject(orderDetail.getOtherColumns());
                        for(String key : jsonObject.keySet()){
                            boolean isnull = key.contains("M");
                            if(isnull) {
                                Map<String, Object> moneryItemmap = new HashMap<>();
                                Map<String, Object> deliveryDetailOtherMoney = deliveryDetailMapper.getSelectOrderotherMoney(orderDetail.getOrderId(),orderDetail.getOrderNumber(), key, jsonObject.get(key).toString());
                                otherMoneys=otherMoneys+Double.valueOf(deliveryDetailOtherMoney.get("monery").toString());
                                moneryItemmap.put("DeliveryDetailOtherMoney", deliveryDetailOtherMoney);
                                moneryList.add(moneryItemmap);
                            }
                        }

                    }


                    //对循环明细的数据进行累加
@@ -284,7 +302,7 @@
                        deliveryOtherMoneyMapper.insertDeliveryOtherMoney(deliveryOtherMoney);
                    }
                });
                int intMoney= (int) Math.floor(money);
                int intMoney= (int) Math.floor(money+otherMoneys);
                //修改发货明细累加面积数量金额
                deliveryMapper.updatedelivery(Double.valueOf(String.format("%.2f", area)), quantity, Double.valueOf(intMoney), otherMoney.get(), oddNumber);

@@ -360,13 +378,14 @@
        List <Map<String, Object>> moneryList=new ArrayList<Map<String, Object>>();//最终结果
        List<DeliveryDetail> deliveryDetailList=deliveryDetailMapper.getSelectDeliveryPrinting(deliveryDetail);
        String orderId="";
        double otherMoney=0.0;
        for (DeliveryDetail detail : deliveryDetailList) {
            System.out.println(detail);
            orderId=detail.getOrderDetail().getOrderId();
            Map<String, Object> itemmap = new HashMap<>();

            List<Map<String, Object>> deliveryDetailList2 = deliveryDetailMapper.getSelectDeliveryDetailPrinting(detail.getDeliveryId(),
                    detail.getOrderDetail().getProductId(), detail.getOrderDetail().getOrderId());

            for (Map<String, Object> stringObjectMap : deliveryDetailList2) {
                if(stringObjectMap.get("other_columns")!=null){
                    JSONObject jsonObject = JSON.parseObject(stringObjectMap.get("other_columns").toString());
@@ -374,7 +393,9 @@
                        boolean isnull = key.contains("M");
                        if(isnull) {
                            Map<String, Object> moneryItemmap = new HashMap<>();
                            List<Map<String, Object>> deliveryDetailOtherMoney = deliveryDetailMapper.getSelectotherMoney(detail.getOrderDetail().getOrderId(), detail.getDeliveryId(), key, jsonObject.get(key).toString());
                            Map<String, Object> deliveryDetailOtherMoney = deliveryDetailMapper.getSelectotherMoney(detail.getOrderDetail().getOrderId(),
                                    detail.getDeliveryId(),Integer.parseInt(stringObjectMap.get("order_number").toString()), key, jsonObject.get(key).toString());

                            moneryItemmap.put("DeliveryDetailOtherMoney", deliveryDetailOtherMoney);
                            moneryList.add(moneryItemmap);
                        }
@@ -388,6 +409,7 @@

        }
        Delivery delivery=deliveryMapper.getSelectShippingOrderDetailDeliveryPrinting(deliveryDetail);
        delivery.setMoney(delivery.getMoney()+otherMoney);
        map.put("data", list);
        map.put("otherMoney",moneryList);
        map.put("delivery", deliveryMapper.getSelectShippingOrderDetailDeliveryPrinting(deliveryDetail));
@@ -414,7 +436,7 @@
                        boolean isnull = key.contains("M");
                        if(isnull){
                            Map<String, Object> moneryItemmap = new HashMap<>();
                            List<Map<String, Object>> deliveryDetailOtherMoney = deliveryDetailMapper.getSelectOrderotherMoney(detail.getOrderId(),key,jsonObject.get(key).toString());
                            Map<String, Object> deliveryDetailOtherMoney = deliveryDetailMapper.getSelectOrderotherMoney(detail.getOrderId(),Integer.parseInt(stringObjectMap.get("order_number").toString()),key,jsonObject.get(key).toString());
                            moneryItemmap.put("DeliveryDetailOtherMoney", deliveryDetailOtherMoney);
                            moneryList.add(moneryItemmap);
                        }

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

@@ -552,4 +552,8 @@


    }

    public boolean updateOrderPrintNumber(String orderId) {
        return orderMapper.updateOrderPrintNumber(orderId);
    }
}

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

@@ -837,6 +837,41 @@
        ;
    </select>

    <select id="getSelectOrderDetail" >
        select * from sd.order_detail where order_id=#{orderId}
    </select>

    <insert id="insertOrderFinishedGoodsInventory"  useGeneratedKeys="true"  >
        insert into mm.finished_goods_inventory (order_id,
                                                 order_number,
                                                 process_id,
                                                 inventory,
                                                 actual_signal_area,
                                                 area,
                                                 quantity_available,
                                                 warehouse_number,
                                                 storage_region,
                                                 `status`,
                                                 enter_storage_time,
                                                 update_time,
                                                 end_time,
                                                 remark
        )
        values (
                   #{orderDetail.orderId} ,#{orderDetail.orderNumber},"",#{orderDetail.quantity},#{orderDetail.computeArea},
                   #{orderDetail.computeGrossArea},
                   #{orderDetail.quantity},null,"",
                   0,now(),now(),null,""
               )
    </insert>

    <update id="updateOrderInventory">
        update mm.finished_goods_inventory
        set inventory=inventory+${orderDetail.quantity},quantity_available=quantity_available+${orderDetail.quantity},
        update_time=now(),area=actual_signal_area*quantity_available
        where order_number=#{orderDetail.orderNumber}  and order_id=#{orderDetail.orderId}
    </update>





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

@@ -100,7 +100,7 @@
                and fol.remarks regexp #{finishedOperateLog.remarksr}
            </if>
        </where>
        order by fol.`status` desc
        order by fol.operate_time desc
        limit #{offset},#{pageSize};
    </select>

@@ -677,5 +677,23 @@

    </select>

    <insert id="insertOrderFinishedOperateLog"  useGeneratedKeys="true" >
        insert into mm.finished_operate_log(operation_order_number,
                                            order_id,
                                            process_id,
                                            operation_number,
                                            operate_type,
                                            operator,
                                            quantity,
                                            operate_time,
                                            status
        )
        values (
                   #{oddNumber} ,#{orderDetail.orderId},"",#{orderDetail.orderNumber},"入库",#{userName},#{orderDetail.quantity},now(),"未审核"
               )
    </insert>




</mapper>

 north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml

@@ -510,7 +510,8 @@
               round(ogd.total_area, 2)                                     as total_area,
               od.perimeter,
               od.bend_radius,
               concat(od.processing_note,od.remarks) as remarks
               concat(od.processing_note,od.remarks) as remarks,
               od.other_columns
        from flow_card as fc
                 left join sd.order_glass_detail as ogd
                           on fc.order_id = ogd.order_id and fc.order_number = ogd.order_number and

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

@@ -371,7 +371,8 @@
               od.compute_gross_area,
               od.processing_note,
               od.edging_type,
               od.perimeter
               od.perimeter,
               od.other_columns
        from sd.order_detail od
                 left join sd.`order` o on od.order_id = o.order_id
                 left join mm.finished_goods_inventory fgi
@@ -890,7 +891,7 @@
    </select>

    <select id="getSelectOrderPrinting"  >
        select od.order_id,od.product_id,p.remarks as product_name,sum(od.compute_gross_area) as area,sum(od.gross_amount) as money,sum(od.quantity) as quantity from
        select od.order_id,od.product_id,p.remarks as product_name,sum(od.compute_gross_area) as area,sum(od.gross_amount) as gross_amount ,sum(od.quantity) as quantity from
         order_detail od left join product p on od.product_id=p.id

        <where>
@@ -929,7 +930,7 @@
                left join order_other_money oom on oom.order_id=dd.order_id  and oom.column=#{key}
        left join basic_other_money bom on bom.`column`=oom.`column`
        where delivery_id = #{deliveryId}
          and od.order_id = #{orderId}
          and od.order_id = #{orderId} and od.order_number=#{orderNumber} and (od.other_columns!='{}' or od.other_columns!=null)
    </select>

    <select id="getSelectOrderotherMoney" >
@@ -937,7 +938,7 @@
                 from order_detail od
                 left join order_other_money oom on oom.order_id=od.order_id  and oom.column=#{key}
                 left join basic_other_money bom on bom.`column`=oom.`column`
        where  od.order_id = #{orderId}
        where  od.order_id = #{orderId} and od.order_number=#{orderNumber} and (od.other_columns!='{}' or od.other_columns!=null)
    </select>

    <select id="getSelectOrderDetailPrinting" >

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

@@ -235,4 +235,11 @@
        where order_id = #{order.orderId}
    </update>

    <update id="updateOrderPrintNumber">
        update sd.`order` o
            set o.printing_number=o.printing_number+1
        where
            o.order_id = #{orderId}

    </update>
</mapper>