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

chenlu

2024-07-25 ba6eac2b22016a81d989cbf560694c15ca9aa6b9

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

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

@@ -39,7 +39,6 @@
    data.value= res.data
    productIdData.value=data.value.orderProductDetail
    data.value.orderProductDetail.forEach(item => {

      grossNum.value.quantity += getQuantity(item.productDetail)
      grossNum.value.grossArea += getArea(item.productDetail)
      grossNum.value.perimeter += getPerimeter(item.productDetail)

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

@@ -254,6 +254,7 @@
            calculationAreaPrompt5:'订单重复是否继续创建',

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

    },
@@ -414,7 +415,8 @@
        printStatus:'打印次数',
        labelPrinting2:'标签打印2',
        addAutomatically:'自动填充',
        selectFill:'选中填充'
        selectFill:'选中填充',
        engineeringPrinting:'工程打印'
    },
    reportingWorks:{
        glassNumber:'编号',
@@ -673,6 +675,10 @@
        money:'金额',

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

    },
    replenish:{

 north-glass-erp/northglass-erp/src/stores/sd/order/orderInfo.js

@@ -6,7 +6,9 @@
    state: () => ({
        orderId:null,
        reviewList:[],
        selectDate:ref(["",""])
        selectDate:ref(["",""]),
        selectDeliveryDate:ref(["",""]),
        selectOrderListDate:ref(["",""])
    }),
    actions: {

@@ -24,6 +26,8 @@
        },
        clearSelectDate(){
            this.selectDate=["",""]
            this.selectDeliveryDate=["",""]
            this.selectOrderListDate=["",""]
        }
    },
    persist: true

 north-glass-erp/northglass-erp/src/views/mm/basicData/WarehouseCreateBasicData.vue

@@ -27,6 +27,12 @@
  { label: t('mainIngredientStock.materialReturnType'),
    value: "returningType",
  },
  /*{ label: t('mainIngredient.originalFilm'),
    value: "originalFilm",
  },
  { label: t('mainIngredient.accessories'),
    value: "accessories",
  },*/
])

let props = defineProps({
@@ -57,6 +63,12 @@
  else if(basic.value.operateType[0]==='returningType'){
    basic.value.type=t('mainIngredientStock.materialReturnType')
  }
  /*else if(basic.value.operateType[0]==='originalFilm'){
    basic.value.type=t('mainIngredient.originalFilm')
  }
  else if(basic.value.operateType[0]==='accessories'){
    basic.value.type=t('mainIngredient.accessories')
  }*/
  if(basic.value.operateType[0]==='' || basic.value.input===''){
    return
  }
@@ -109,7 +121,7 @@
            v-model="basic.operateType"
            :options="options"
            clearable
            placeholder=""
            :placeholder="$t('processCard.pleaseSelect')"
            :disabled="props.rowIndex"
        />
      </el-col>

 north-glass-erp/northglass-erp/src/views/mm/mainIngredientStock/ReturnToStorage.vue

@@ -201,7 +201,7 @@
  },//表头参数
  columns:[
    {type:'expand',fixed:"left",slots: { content:'content' },width: '60'},
    {title: '操作', width: '110', slots: { default: 'button_slot' },fixed:"left"},
    {title: t('basicData.operate'), width: '110', slots: { default: 'button_slot' },fixed:"left"},
    { type: 'seq',fixed:"left", title: t('basicData.Number'), width: '80' },
    {field: 'reviewedState',title: t('basicData.review'), width: 50, slots: { default: 'state' },},
    {field: 'returningId', width:'150', title: t('mainIngredientStock.returningId'), sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},

 north-glass-erp/northglass-erp/src/views/mm/mainIngredientStock/ReturnToStorageCreate.vue

@@ -536,7 +536,7 @@
      <el-row>
        <el-col  :span="2"><el-text>{{$t('mainIngredientStock.returningType')}}：</el-text></el-col>
        <el-col  :span="3">
          <el-select v-model="titleUploadData.returningType"  clearable placeholder=""  >
          <el-select v-model="titleUploadData.returningType"  clearable :placeholder="$t('processCard.pleaseSelect')"  >
            <el-option
                v-for="item in titleSelectJson['returningType']"
                :key="item.id"

 north-glass-erp/northglass-erp/src/views/mm/mainIngredientStock/SelectIngredientsStock.vue

@@ -705,7 +705,7 @@
        <el-row>
          <el-col  :span="2"><el-text>{{$t('mainIngredientStock.inventoryOrganization')}}：</el-text></el-col>
          <el-col  :span="4">
            <el-select v-model="titleUploadData.inventoryOrganization"  clearable placeholder=""  >
            <el-select v-model="titleUploadData.inventoryOrganization"  clearable :placeholder="$t('processCard.pleaseSelect')"  >
              <el-option
                  v-for="item in titleSelectJson['inventoryOrganization']"
                  :key="item.id"

 north-glass-erp/northglass-erp/src/views/mm/mainProductStock/FinishedProductOut.vue

@@ -215,7 +215,7 @@
    {field: 'productId', width: '100',title: t('order.productId'), filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: 'productName',width: '200', title: t('order.product'), filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: 'deliveryDetail.quantity',width: '100', title: t('delivery.deliveryQuantity'), filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: 'warehouseNum',width: '140', title: t('productStock.inventoryQuantity'), filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: 'finishedGoodsInventory.quantityAvailable',width: '140', title: t('productStock.inventoryQuantity'), filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: 'delivery.customerName',width: '200', title: t('customer.customerName'), filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: 'width', width: '100',title: t('order.width'), filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: 'height',width: '100', title: t('order.height'), filters:[{ data: '' }],slots: { filter: 'num1_filter' }},

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

@@ -28,7 +28,7 @@
        <el-breadcrumb-item @click="changeRouter(3)" :class="indexFlag===3?'indexTag':''" :to="{ path: '/main/processCard/ProductionScheduling' }">{{$t('processCard.scheduling')}}
        </el-breadcrumb-item>
        <el-breadcrumb-item @click="changeRouter(4)" :class="indexFlag===4?'indexTag':''" :to="{ path: '/main/processCard/SelectPrintFlowCard' }" >{{ $t('basicData.print') }}</el-breadcrumb-item>
        <el-breadcrumb-item @click="changeRouter(5)" :class="indexFlag===5?'indexTag':''" :to="{ path: '/main/processCard/SelectPrintProject' }" >工程打印</el-breadcrumb-item>
        <el-breadcrumb-item @click="changeRouter(5)" :class="indexFlag===5?'indexTag':''" :to="{ path: '/main/processCard/SelectPrintProject' }" >{{$t('processCard.engineeringPrinting')}}</el-breadcrumb-item>
        <el-breadcrumb-item @click="changeRouter(4)" :class="indexFlag===4?'indexTag':''" :to="{ path: '/main/processCard/SelectPrintFlowCard' }" style="display: none">{{ $t('basicData.print') }}</el-breadcrumb-item>
      </el-breadcrumb>
    </div>

 north-glass-erp/northglass-erp/src/views/sd/basicData/SearchBasicData.vue

@@ -261,7 +261,7 @@
            @change="handleChange"
            :options="options"
            clearable
            placeholder=""
            :placeholder="$t('processCard.pleaseSelect')"
        />
      </el-col>
    </el-row>

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

@@ -637,11 +637,11 @@
        <el-col  :span="3"><el-input v-model="titleUploadData.salesman" :readonly="true"/></el-col>
        <el-col  :span="2"><el-text>{{$t('delivery.shipper')}}:</el-text></el-col>
        <el-col  :span="5"><el-input v-model="titleUploadData.creator" :readonly="true"/></el-col>
        <el-col  :span="1"><el-text>运费单价:</el-text></el-col>
        <el-col  :span="1"><el-text>{{$t('delivery.freightPrice')}}:</el-text></el-col>
        <el-col  :span="1"><el-input v-model="titleUploadData.freightPrice" /></el-col>
        <el-col  :span="1"><el-text>运费数量:</el-text></el-col>
        <el-col  :span="1"><el-text>{{$t('delivery.freightQuantity')}}:</el-text></el-col>
        <el-col  :span="1"><el-input v-model="titleUploadData.freightQuantity" /></el-col>
        <el-col  :span="1"><el-text>运费金额:</el-text></el-col>
        <el-col  :span="1"><el-text>{{$t('delivery.freight')}}:</el-text></el-col>
        <el-col  :span="2"><el-input v-model="titleUploadData.freight" :readonly="true"/></el-col>
      </el-row>
    </div>

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

@@ -13,9 +13,11 @@
import {CircleCheck, Download, Printer} from "@element-plus/icons-vue/global";
import PrintSheet1 from "@/components/sd/delivery/PrintSheet1.vue";
import PrintSheet2 from "@/components/sd/delivery/PrintSheet2.vue";
import useOrderInfoStore from "@/stores/sd/order/orderInfo";

//语言获取
const { t } = useI18n()
const orderInfo = useOrderInfoStore()
const router = useRouter()
const userStore = useUserInfoStore()
const username = userStore.user.userName
@@ -89,13 +91,13 @@
})

//第一次调用
request.post(`/Delivery/getSelectShippingOrder/1/${total.pageSize}/${selectDate.value}`,filterData.value).then((res) => {
request.post(`/Delivery/getSelectShippingOrder/1/${total.pageSize}/${orderInfo.selectDeliveryDate}`,filterData.value).then((res) => {

  if(res.code==200){
    total.dataTotal = res.data.total.total*1
    total.pageTotal= res.data.total.pageTotal

    selectDate.value = res.data.selectDate
    orderInfo.selectDeliveryDate = res.data.selectDate
    pageNum.value=1
    produceList = deepClone(res.data.data)
    xGrid.value.loadData(produceList)
@@ -129,7 +131,7 @@
  }else{
    filterData.value[column.property] = value
  }
  request.post(`/Delivery/getSelectShippingOrder/1/${total.pageSize}/${selectDate.value}`,filterData.value).then((res) => {
  request.post(`/Delivery/getSelectShippingOrder/1/${total.pageSize}/${orderInfo.selectDeliveryDate}`,filterData.value).then((res) => {

    if(res.code==200){
      total.dataTotal = res.data.total.total*1
@@ -147,7 +149,7 @@


const selectOrderList = ()=>{
  request.post(`/Delivery/getSelectShippingOrder/${pageNum.value}/${total.pageSize}/${selectDate.value}`,filterData.value).then((res) => {
  request.post(`/Delivery/getSelectShippingOrder/${pageNum.value}/${total.pageSize}/${orderInfo.selectDeliveryDate}`,filterData.value).then((res) => {

    if(res.code==200){
      if (res.data.total!=null){
@@ -261,7 +263,7 @@
      options: [
        [
          { code: 'sheet1', name: t('basicData.print'), prefixIcon: 'vxe-icon-file-txt', visible: true},
          { code: 'sheet2', name: t('basicData.print')+'无金额', prefixIcon: 'vxe-icon-file-txt', visible: true},
          { code: 'sheet2', name: t('basicData.print')+ t('delivery.noMoney'), prefixIcon: 'vxe-icon-file-txt', visible: true},
        ]
      ]
    }
@@ -333,7 +335,7 @@
<template>
  <div style="width: 100%;height: 100%">
    <el-date-picker
        v-model="selectDate"
        v-model="orderInfo.selectDeliveryDate"
        type="daterange"
        :start-placeholder="$t('basicData.startDate')"
        :end-placeholder="$t('basicData.endDate')"

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

@@ -8,9 +8,11 @@
import useUserInfoStore from "@/stores/userInfo";
import {ElMessage} from "element-plus";
import { useI18n } from 'vue-i18n'
import useOrderInfoStore from "@/stores/sd/order/orderInfo";

//语言获取
const { t } = useI18n()
const orderInfo = useOrderInfoStore()
const router = useRouter()
const userStore = useUserInfoStore()
const username = userStore.user.userName
@@ -68,12 +70,12 @@


//第一次调用
request.post(`/Delivery/getSelectOrderInventory/1/${total.pageSize}/${selectDate.value}`,filterData.value).then((res) => {
request.post(`/Delivery/getSelectOrderInventory/1/${total.pageSize}/${orderInfo.selectOrderListDate}`,filterData.value).then((res) => {

  if(res.code==200){
    total.dataTotal = res.data.total.total*1
    total.pageTotal= res.data.total.pageTotal
    selectDate.value = res.data.selectDate
    orderInfo.selectOrderListDate = res.data.selectDate
    pageNum.value=1
    produceList = deepClone(res.data.data)
    xGrid.value.loadData(produceList)
@@ -103,12 +105,12 @@
  }else{
    filterData.value[column.property] = value
  }
  request.post(`/Delivery/getSelectOrderInventory/1/${total.pageSize}/${selectDate.value}`,filterData.value).then((res) => {
  request.post(`/Delivery/getSelectOrderInventory/1/${total.pageSize}/${orderInfo.selectOrderListDate}`,filterData.value).then((res) => {

    if(res.code==200){
      total.dataTotal = res.data.total.total*1
      total.pageTotal= res.data.total.pageTotal
      selectDate.value = res.data.selectDate
      orderInfo.selectOrderListDate = res.data.selectDate
      pageNum.value=1
      produceList = deepClone(res.data.data)
      xGrid.value.loadData(produceList)
@@ -121,7 +123,7 @@
}

const selectOrderList = ()=>{
  request.post(`/Delivery/getSelectOrderInventory/${pageNum.value}/${total.pageSize}/${selectDate.value}`,filterData.value).then((res) => {
  request.post(`/Delivery/getSelectOrderInventory/${pageNum.value}/${total.pageSize}/${orderInfo.selectOrderListDate}`,filterData.value).then((res) => {

    if(res.code==200){
      if (res.data.total!=null){
@@ -305,7 +307,7 @@
<template>
  <div  style="width: 100%;height: 100%">
    <el-date-picker
        v-model="selectDate"
        v-model="orderInfo.selectOrderListDate"
        type="daterange"
        :start-placeholder="$t('basicData.startDate')"
        :end-placeholder="$t('basicData.endDate')"

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

@@ -200,16 +200,6 @@
        }
      }
    ],
    quantity: [
        //type: 'number', min: 0, message: '请输入大于等于0的数值' ,
      {
        validator ({ cellValue }) {
          const regex = /^[1-9]\d*$/
          if (!regex.test(cellValue)) {
            return new Error(t('basicData.msg.greater0'))
          }
        }}
    ],
    bendRadius:[
      {
        validator ({ cellValue }) {
@@ -359,9 +349,15 @@
              creator:userStore.user.userName,
              creatorId:userStore.user.userId
            }
            const grossAreaList = $grid.getTableData().fullData.filter(
                item=>item.grossArea === 0
            )
            const errorAreaList = $grid.getTableData().fullData.filter(
                item=>item.width*item.height/1000000 < errorArea.value*1
            )
            if(grossAreaList.length>0){
              alert(t('order.msg.grossAreaIsNot0'))
            }
            if(errorAreaList.length){
              ElMessageBox.confirm(`${t('order.msg.calculationAreaPrompt1')}
                  ${errorAreaList.length}
@@ -618,7 +614,7 @@
            let numbers=numbersArr[numbersArr.length-1]
            var subStr1 = val.substring(numbers.index);
            var subStr2 = val.substring(0, numbers.index);
            let number = parseInt(subStr1.match(/\d/))
            let number = parseInt(subStr1)
            var reg =new RegExp(number,"g")
            dataList.forEach((item,index) =>{
              if(index>=result.start ){
@@ -630,6 +626,7 @@
            })

          }
          computedMoney(result.cell)
          gridOptions.menuConfig.body.options[0][5].disabled=false
          break
        }
@@ -647,7 +644,7 @@
            let numbers=numbersArr[numbersArr.length-1]
            var subStr1 = val.substring(numbers.index);
            var subStr2 = val.substring(0, numbers.index);
            let number = parseInt(subStr1.match(/\d/))
            let number = parseInt(subStr1)
            var reg =new RegExp(number,"g")
            dataList.forEach((item,index) =>{
              if(index >= result.start && index <= result.end){
@@ -667,6 +664,7 @@
            })*/

          }
          computedMoney(result.cell)
          gridOptions.menuConfig.body.options[0][5].disabled = false
          break
        }

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

@@ -35,6 +35,7 @@
    {field: 'perimeter',width:120, title: t('order.perimeter'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
    {field: 'price',width:120, title: t('order.price'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
    {field: 'grossAmount',width:120, title: t('order.grossAmount'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
    {field: 'order.otherMoney',width:120, title: t('basicData.otherAmounts'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
    {field: 'order.alType',width:120, title: t('order.alType'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
    // {field: 'prodID',width:120, title: '订单类型',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
    {field: 'order.salesman',width:120, title: t('order.salesman'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},

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

@@ -35,6 +35,7 @@
    {field: 'perimeter',width:120, title: t('order.perimeter'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
    {field: 'price',width:120, title: t('order.price'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
    {field: 'grossAmount',width:120, title: t('order.grossAmount'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
    {field: 'order.otherMoney',width:120, title: t('basicData.otherAmounts'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
    {field: 'order.alType',width:120, title: t('order.alType'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
    // {field: 'prodID',width:120, title: '订单类型',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
    {field: 'order.salesman',width:120, title: t('order.salesman'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},

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

@@ -103,12 +103,13 @@
      {type: 'seq', title: t('basicData.Number'), width: 80 ,fixed:"left",},

      {field:'createOrder',title: t('searchOrder.createOrder'), width: 40, slots: { default: 'state' }},
      {field:'processReview',title: t('order.technology'), width: 40, slots: { default: 'state' }},
      {field:'orderReview',title: t('basicData.review'), width: 40, slots: { default: 'state' }},
      {field:'productionOrder',title: t('searchOrder.production'), width: 40, slots: { default: 'state' }},
      {field:'processingCard',title: t('searchOrder.process'), width: 40, slots: { default: 'state' }},
      {field:'warehousing',title: t('searchOrder.storage'), width: 40, slots: { default: 'state' }},
      {field:'delivery',title: t('searchOrder.delivery'), width: 40, slots: { default: 'state' }},
      {field:'processReview',title: t('order.technology'), width: 40, filters:[{ data: '' }], slots: { default: 'state',filter: 'num2_filter' }},
      {field:'orderReview',title: t('basicData.review'), width: 40, filters:[{ data: '' }], slots: { default: 'state',filter: 'num2_filter' }},
      {field:'productionOrder',title: t('searchOrder.production'), width: 40, filters:[{ data: '' }], slots: { default: 'state',filter: 'num2_filter' }},
      {field:'processingCard',title: t('searchOrder.process'), width: 40, filters:[{ data: '' }], slots: { default: 'state',filter: 'num2_filter' }},
      {field:'warehousing',title: t('searchOrder.storage'), width: 40, filters:[{ data: '' }], slots: { default: 'state',filter: 'num2_filter' }},
      {field:'delivery',title: t('searchOrder.delivery'), width: 40,filters:[{ data: '' }], slots: { default: 'state',filter: 'num2_filter' }},


      {field: 'orderId',width:120,  title: t('order.orderId'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
      {field: 'customerId',width:120,  title: t('customer.customerNumber'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
@@ -342,8 +343,9 @@
    }else{
      filterData.value[column.property] = value
    }
    request.post(`/order/getOrderList/1/${total.pageSize}/${orderType.value}/${orderInfo.selectDate}`,filterData.value).then((res) => {
    request.post(`/order/getOrderList/${pageNum.value}/${total.pageSize}/${orderType.value}/${orderInfo.selectDate}`,filterData.value).then((res) => {
      if(res.code==200){
        console.log(res.data.data)
        total.dataTotal = res.data.total.total*1
        total.pageTotal=parseInt(res.data.total)
        pageNum.value=1
@@ -360,7 +362,7 @@

  const selectOrderList = ()=>{
    request.post(`/order/getOrderList/${pageNum.value}/${total.pageSize}/${orderType.value}/${orderInfo.selectDate}`
        ,filterData).then((res) => {
        ,filterData.value).then((res) => {
      if(res.code==200){
        total.dataTotal = res.data.total.total*1
        total.pageTotal = res.data.total.pageTotal
@@ -538,6 +540,17 @@
            </div>
          </div>
        </template>
        <template #num2_filter="{ column, $panel }">
          <div>
            <div v-for="(option, index) in column.filters" :key="index">
              <vxe-select v-model="option.data"  @change="changeFilterEvent($event, option, $panel)">
                <vxe-option value="0" label="未选中"></vxe-option>
                <vxe-option value="1" label="部分选中"></vxe-option>
                <vxe-option value="2" label="选中"></vxe-option>
              </vxe-select>
            </div>
          </div>
        </template>

        <template #toolbar_buttons>
          <vxe-select @change="changeOrderType" v-model="orderType" :placeholder="$t('searchOrder.orderType')">

 north-glass-erp/src/main/java/com/example/erp/dto/sd/OrderDTO.java

@@ -38,7 +38,7 @@
    @ExcelProperty("单价")
    private Double price;
    @ExcelProperty("总金额")
    private Long grossAmount;
    private Double grossAmount;
    @ExcelProperty("一级类别")
    private String levelOne;
    @ExcelProperty("二级类别")

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

@@ -139,7 +139,7 @@
            //将异常传入数据库
            SysError sysError = new SysError();
            sysError.setError(e.toString());
            sysError.setFunc("saveOrder");
            sysError.setFunc("addSelectWarehousing");
            sysErrorService.insert(sysError);
            saveState = false;

@@ -219,6 +219,9 @@
                            }
                        }

                    }else{
                        TransactionAspectSupport.currentTransactionStatus().rollbackToSavepoint(savePoint);
                        saveState = false;
                    }
                }
            }
@@ -228,7 +231,7 @@
            //将异常传入数据库
            SysError sysError = new SysError();
            sysError.setError(e.toString());
            sysError.setFunc("saveOrder");
            sysError.setFunc("addDeliveryDetail");
            sysErrorService.insert(sysError);
            saveState = false;

@@ -298,7 +301,7 @@
            //将异常传入数据库
            SysError sysError = new SysError();
            sysError.setError(e.toString());
            sysError.setFunc("saveOrder");
            sysError.setFunc("updateFinishedGoodsInventoryAllocate");
            sysErrorService.insert(sysError);
            saveState = false;

@@ -381,7 +384,7 @@
            //将异常传入数据库
            SysError sysError = new SysError();
            sysError.setError(e.toString());
            sysError.setFunc("saveOrder");
            sysError.setFunc("updateFinishedGoodsInventoryTakeOut");
            sysErrorService.insert(sysError);
            saveState = false;

@@ -464,7 +467,7 @@
            //将异常传入数据库
            SysError sysError = new SysError();
            sysError.setError(e.toString());
            sysError.setFunc("saveOrder");
            sysError.setFunc("updateFinishedGoodsInventoryRework");
            sysErrorService.insert(sysError);
            saveState = false;

@@ -511,7 +514,7 @@
            //将异常传入数据库
            SysError sysError = new SysError();
            sysError.setError(e.toString());
            sysError.setFunc("saveOrder");
            sysError.setFunc("updateFinishedGoodsInventoryToExamine");
            sysErrorService.insert(sysError);
            saveState = false;

@@ -548,7 +551,7 @@
            //将异常传入数据库
            SysError sysError = new SysError();
            sysError.setError(e.toString());
            sysError.setFunc("saveOrder");
            sysError.setFunc("cancelFinishedGoodsInventoryToExamine");
            sysErrorService.insert(sysError);
            saveState = false;

@@ -674,7 +677,7 @@
            //将异常传入数据库
            SysError sysError = new SysError();
            sysError.setError(e.toString());
            sysError.setFunc("saveOrder");
            sysError.setFunc("cancelFinishedGoodsInventoryStorage");
            sysErrorService.insert(sysError);
            saveState = false;

@@ -716,7 +719,7 @@
            //将异常传入数据库
            SysError sysError = new SysError();
            sysError.setError(e.toString());
            sysError.setFunc("saveOrder");
            sysError.setFunc("oneClickStorage");
            sysErrorService.insert(sysError);
            saveState = false;


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

@@ -479,16 +479,6 @@
            orderProductDetailMap.put("productId",map.get("productId"));
            orderProductDetailMap.put("productName",map.get("productName"));
            List<OrderDetail> orderDetails = orderDetailMapper.getOrderProductByProductId(map.get("productId"),orderId);
            orderDetails.forEach(orderDetail->{

                orderDetail.setGrossArea(
                        Double.parseDouble(String.format("%.3f",Double.parseDouble(
                                String.format("%.3f",
                                orderDetail.getWidth()*orderDetail.getHeight()/1000000)
                                ) * orderDetail.getQuantity()))
                );
            });

            orderProductDetailMap.put("productDetail",orderDetails);
            orderProductDetail.add(orderProductDetailMap);
        });

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

@@ -552,6 +552,12 @@
            <if test="deliveryDetail.deliveryNumber != null and deliveryDetail.deliveryNumber != ''">
                and dd.delivery_number like concat('%',#{deliveryDetail.deliveryNumber},'%')
            </if>
            <if test="deliveryDetail.orderDetail!=null and deliveryDetail.orderDetail.productId != null and deliveryDetail.orderDetail.productId != ''">
                and od.product_id like concat('%',#{deliveryDetail.orderDetail.productId},'%')
            </if>
            <if test="deliveryDetail.orderDetail!=null and deliveryDetail.orderDetail.productName != null and deliveryDetail.orderDetail.productName != ''">
                and od.product_name like concat('%', #{deliveryDetail.orderDetail.productName},'%')
            </if>
            <if test="deliveryDetail.orderId != null and deliveryDetail.orderId != ''">
                and dd.order_id like concat('%', #{deliveryDetail.orderId},'%')
            </if>
@@ -628,6 +634,12 @@
            </if>
            <if test="deliveryDetail.deliveryNumber != null and deliveryDetail.deliveryNumber != ''">
                and dd.delivery_number like concat('%',#{deliveryDetail.deliveryNumber},'%')
            </if>
            <if test="deliveryDetail.orderDetail!=null and deliveryDetail.orderDetail.productId != null and deliveryDetail.orderDetail.productId != ''">
                and od.product_id like concat('%',#{deliveryDetail.orderDetail.productId},'%')
            </if>
            <if test="deliveryDetail.orderDetail!=null and deliveryDetail.orderDetail.productName != null and deliveryDetail.orderDetail.productName != ''">
                and od.product_name like concat('%', #{deliveryDetail.orderDetail.productName},'%')
            </if>
            <if test="deliveryDetail.orderId != null and deliveryDetail.orderId != ''">
                and dd.order_id like concat('%', #{deliveryDetail.orderId},'%')
@@ -726,6 +738,12 @@
            <if test="deliveryDetail.deliveryNumber != null and deliveryDetail.deliveryNumber != ''">
                and dd.delivery_number like concat('%',#{deliveryDetail.deliveryNumber},'%')
            </if>
            <if test="deliveryDetail.orderDetail!=null and deliveryDetail.orderDetail.productId != null and deliveryDetail.orderDetail.productId != ''">
                and od.product_id like concat('%',#{deliveryDetail.orderDetail.productId},'%')
            </if>
            <if test="deliveryDetail.orderDetail!=null and deliveryDetail.orderDetail.productName != null and deliveryDetail.orderDetail.productName != ''">
                and od.product_name like concat('%', #{deliveryDetail.orderDetail.productName},'%')
            </if>
            <if test="deliveryDetail.orderId != null and deliveryDetail.orderId != ''">
                and dd.order_id like concat('%', #{deliveryDetail.orderId},'%')
            </if>
@@ -812,6 +830,12 @@
            <if test="deliveryDetail.deliveryNumber != null and deliveryDetail.deliveryNumber != ''">
                and dd.delivery_number like concat('%',#{deliveryDetail.deliveryNumber},'%')
            </if>
            <if test="deliveryDetail.orderDetail!=null and deliveryDetail.orderDetail.productId != null and deliveryDetail.orderDetail.productId != ''">
                and od.product_id like concat('%',#{deliveryDetail.orderDetail.productId},'%')
            </if>
            <if test="deliveryDetail.orderDetail!=null and deliveryDetail.orderDetail.productName != null and deliveryDetail.orderDetail.productName != ''">
                and od.product_name like concat('%', #{deliveryDetail.orderDetail.productName},'%')
            </if>
            <if test="deliveryDetail.orderId != null and deliveryDetail.orderId != ''">
                and dd.order_id like concat('%', #{deliveryDetail.orderId},'%')
            </if>

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

@@ -108,6 +108,7 @@
        <result column="creator" property="order.creator"/>
        <result column="verifier" property="order.verifier"/>
        <result column="customer_batch" property="order.customerBatch"/>
        <result column="other_money" property="order.otherMoney"/>

    </resultMap>

@@ -136,7 +137,7 @@
        <if test="orderDetail.order!=null and  orderDetail.order.customerId != null and orderDetail.order.customerId != ''">
            and b.customer_id like concat('%',#{orderDetail.order.customerId},'%')
        </if>
        <if test="orderDetail.order!=null and  orderDetail.order.customerId != null and orderDetail.order.customerName != ''">
        <if test="orderDetail.order!=null and  orderDetail.order.customerName != null and orderDetail.order.customerName != ''">
            and b.customer_name like concat('%',#{orderDetail.order.customerName},'%')
        </if>
        <if test="orderDetail.order!=null and  orderDetail.order.project != null and orderDetail.order.project != ''">
@@ -278,7 +279,7 @@
        <if test="orderDetail.order!=null and  orderDetail.order.customerId != null and orderDetail.order.customerId != ''">
            and b.customer_id like concat('%',#{orderDetail.order.customerId},'%')
        </if>
        <if test="orderDetail.order!=null and  orderDetail.order.customerId != null and orderDetail.order.customerName != ''">
        <if test="orderDetail.order!=null and  orderDetail.order.customerName != null and orderDetail.order.customerName != ''">
            and b.customer_name like concat('%',#{orderDetail.order.customerName},'%')
        </if>
        <if test="orderDetail.order!=null and  orderDetail.order.project != null and orderDetail.order.project != ''">
@@ -428,6 +429,7 @@
        b.batch,
        a.product_id,
        a.product_name,
        b.other_money,
        sum(a.quantity) as quantity,
        sum(a.gross_area) as gross_area,
        sum(a.compute_gross_area) as compute_gross_area,
@@ -468,7 +470,7 @@
        <if test="orderDetail.order!=null and  orderDetail.order.customerId != null and orderDetail.order.customerId != ''">
            and b.customer_id like concat('%',#{orderDetail.order.customerId},'%')
        </if>
        <if test="orderDetail.order!=null and  orderDetail.order.customerId != null and orderDetail.order.customerName != ''">
        <if test="orderDetail.order!=null and  orderDetail.order.customerName != null and orderDetail.order.customerName != ''">
            and b.customer_name like concat('%',#{orderDetail.order.customerName},'%')
        </if>
        <if test="orderDetail.order!=null and  orderDetail.order.project != null and orderDetail.order.project != ''">
@@ -585,6 +587,10 @@

        <if test="orderDetail.order!=null and  orderDetail.order.customerBatch != null and orderDetail.order.customerBatch != ''">
            and b.customer_batch like concat('%',#{orderDetail.order.customerBatch},'%')
        </if>

        <if test="orderDetail.order!=null and  orderDetail.order.otherMoney != null ">
            and b.other_money  regexp REGEXP_REPLACE(#{orderDetail.order.otherMoney},'\\.0+$','')
        </if>
        group by b.order_id,a.product_id
        order by b.order_id desc
@@ -613,7 +619,7 @@
        <if test="orderDetail.order!=null and  orderDetail.order.customerId != null and orderDetail.order.customerId != ''">
            and b.customer_id like concat('%',#{orderDetail.order.customerId},'%')
        </if>
        <if test="orderDetail.order!=null and  orderDetail.order.customerId != null and orderDetail.order.customerName != ''">
        <if test="orderDetail.order!=null and  orderDetail.order.customerName != null and orderDetail.order.customerName != ''">
            and b.customer_name like concat('%',#{orderDetail.order.customerName},'%')
        </if>
        <if test="orderDetail.order!=null and  orderDetail.order.project != null and orderDetail.order.project != ''">
@@ -731,6 +737,10 @@
        <if test="orderDetail.order!=null and  orderDetail.order.customerBatch != null and orderDetail.order.customerBatch != ''">
            and b.customer_batch like concat('%',#{orderDetail.order.customerBatch},'%')
        </if>

        <if test="orderDetail.order!=null and  orderDetail.order.otherMoney != null ">
            and b.other_money  regexp REGEXP_REPLACE(#{orderDetail.order.otherMoney},'\\.0+$','')
        </if>
        group by b.order_id,a.product_id
        ) as ss
    </select>
@@ -744,9 +754,7 @@
               a.product_name,
               a.price,
               sum(a.quantity) as quantity,
               a.gross_amount,
               a.width,
               a.height,
               sum(a.gross_amount) as gross_amount,
               a.shape,
               sum(a.area) as area,
               sum(a.gross_area) as gross_area,

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

@@ -130,25 +130,22 @@
           <if test="order.deliveryAddress != null and order.deliveryAddress != ''">
               and o.delivery_address REGEXP #{order.deliveryAddress}
           </if>
        <if test="order.delivery != null and order.delivery != ''">
        <if test="order.delivery != null ">
            and o.delivery = #{order.delivery}
        </if>
        <if test="order.createOrder != null and order.createOrder != ''">
            and o.create_order = #{order.createOrder}
        </if>
        <if test="order.processReview != null and order.processReview != ''">
        <if test="order.processReview != null ">
            and o.process_review = #{order.processReview}
        </if>
        <if test="order.orderReview != null and order.orderReview != ''">
        <if test="order.orderReview != null ">
            and o.order_review = #{order.orderReview}
        </if>
        <if test="order.productionOrder != null and order.productionOrder != ''">
        <if test="order.productionOrder != null ">
            and o.production_order = #{order.productionOrder}
        </if>
        <if test="order.processingCard != null and order.processingCard != ''">
        <if test="order.processingCard != null ">
            and o.processing_card = #{order.processingCard}
        </if>
        <if test="order.warehousing != null and order.warehousing != ''">
        <if test="order.warehousing != null ">
            and o.warehousing = #{order.warehousing}
        </if>
        group by o.id
@@ -163,7 +160,7 @@
        from
        `order` as o
        where date (o.create_time)>=#{startDate} and date(o.create_time) &lt;= #{endDate}
            <if test="orderType!= null and orderType != ''">
            <if test="orderType!= null and orderType != 0">
                and o.create_order = #{orderType}
            </if>

@@ -218,6 +215,24 @@
            <if test="order.deliveryAddress != null and order.deliveryAddress != ''">
                and o.delivery_address REGEXP #{order.deliveryAddress}
            </if>
        <if test="order.delivery != null ">
            and o.delivery = #{order.delivery}
        </if>
        <if test="order.processReview != null ">
            and o.process_review = #{order.processReview}
        </if>
        <if test="order.orderReview != null ">
            and o.order_review = #{order.orderReview}
        </if>
        <if test="order.productionOrder != null ">
            and o.production_order = #{order.productionOrder}
        </if>
        <if test="order.processingCard != null ">
            and o.processing_card = #{order.processingCard}
        </if>
        <if test="order.warehousing != null ">
            and o.warehousing = #{order.warehousing}
        </if>
        order by o.id desc
    </select>