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

廖井涛

2024-11-27 d61be83018956c6132c5aba6c1cecf57ba6e06cc

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

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

@@ -10,6 +10,7 @@
import QRCode from "qrcode";
import companyInfo from "@/stores/sd/companyInfo";
import userInfo from "@/stores/userInfo"
import {add} from '@/utils/decimal'
//语言获取
const company = companyInfo()
const {t} = useI18n()
@@ -196,7 +197,7 @@
      totalQuantity += collection.quantity * 1;
      //每个序号面积
      collection.total_area = parseFloat((collection.width * collection.height * collection.quantity / 1000000).toFixed(2))
      totalArea += collection.total_area * 1;
      totalArea = add(totalArea, collection.total_area)
      totalWeight += collection.width * collection.height * collection.quantity / 1000000 * collection.separation * 2.5 * 1;
      //每个序号周长
      collection.perimeter = parseFloat(((collection.width * 2 + collection.height * 2) * collection.quantity / 1000).toFixed(3))
@@ -210,14 +211,14 @@

const AreaQuantitySummary = () => {


  console.log(produceList.value)
  for (let i = 0; i < produceList.value.length; i++) {
    // éåŽ†å½“前项目的 detail æ•°ç»„
    for (let j = 0; j < produceList.value[i].detail.length; j++) {
      // ç´¯åŠ æ•°é‡
      totalQuantity += produceList.value[i].detail[j].quantity;
      totalQuantity = add(totalQuantity,produceList.value[i].detail[j].quantity)
      // ç´¯åŠ é¢ç§¯
      totalArea += produceList.value[i].detail[j].gross_area;
      totalArea = add(totalArea,produceList.value[i].detail[j].gross_area)
    }
  }

@@ -316,7 +317,7 @@
          æ•°é‡ï¼š
          <label>{{ itemsum.quantity }}</label>
          é¢ç§¯ï¼š
          <label>{{ parseFloat(itemsum.gross_area.toFixed(2)) }}</label>
          <label>{{ itemsum.gross_area }}</label>
          é‡é‡ï¼š
          <label>{{ parseFloat(itemsum.weight.toFixed(2)) }}</label>
        </td>

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

@@ -35,13 +35,13 @@
  request.post(`/delivery/getSelectDeliveryPrinting`,form.value).then((res) => {
    if(res.code==200){
      produceList.value = deepClone(res.data.data)
      console.log(produceList.value)
      delivery.value=deepClone(res.data.delivery)
      money.value=deepClone(res.data.money)
      otherMoney.value=deepClone(res.data.otherMoney)
      produceList.value.forEach(item => {
        sumMoney+=item.DeliveryDetail.money
      })
      console.log(otherMoney.value)
      otherMoney1=[]
      otherMoney=deepClone(res.data.otherMoney)
      for(let i=0;i<otherMoney.length;i++){

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

@@ -38,6 +38,8 @@
    if(res.code==200){
      productIdData.value=deepClone(res.data.data)
      produceList.value = deepClone(res.data.data)

      console.log(produceList.value)
      delivery.value=deepClone(res.data.delivery)
      money.value=deepClone(res.data.money)
      produceList.value.forEach(item => {
@@ -208,7 +210,9 @@
        <th style="width: 10%;">面积</th>
        <th style="width: 10%;">单价</th>
        <th style="width: 12%;">金额</th>
        <th style="width: 20%;" colspan="2">加工要求</th>
        <th v-if="company.showDeliveryCreator" style="width: 20%;" colspan="2">加工要求</th>
        <th v-if="!company.showDeliveryCreator" style="width: 10%;" colspan="1">加工要求</th>
        <th v-if="!company.showDeliveryCreator" style="width: 10%;" colspan="1">备注</th>
      </tr>
      <template v-for="(item, index) in produceList" :key="index" >
        <tr>
@@ -226,7 +230,9 @@
          <td>{{items.compute_gross_area}}</td>
          <td>{{items.price}}</td>
          <td>{{items.gross_amount}}</td>
          <td colspan="2">{{items.processingNote}}</td>
          <td v-if="company.showDeliveryCreator" colspan="2">{{items.processingNote}}</td>
          <td v-if="!company.showDeliveryCreator" >{{items.processingNote}}</td>
          <td v-if="!company.showDeliveryCreator" >{{items.remarks}}</td>
        </tr>
        <tr class="day-in" >
          <td style="font-size: 15px;font-weight: bold;" colspan="3">小计:</td>

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

@@ -135,7 +135,7 @@
            hollowThickness:'* Hollow thickness',
            hollowGasType:'* Inflation mode',
            hollowType:'* Sealing compound',
            hollowGlueDepth:'* Default glue depth',
            hollowGlueDepth:'Default glue depth',
            hollow:'Hollow spacer',
            hollowUpdate:'Hollow spacers modified',
            interlayerThickness:'*Lamination thickness',

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

@@ -135,7 +135,7 @@
            hollowThickness:'* Ð¡Ñ€ÐµÐ´Ð½ÑÑ Ñ‚олщина',
            hollowGasType:'* Ð¡Ð¿Ð¾ÑÐ¾Ð± Ð½Ð°Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ',
            hollowType:'* Ð“ель',
            hollowGlueDepth:'* Ð“лубина ÐºÐ»ÐµÑ Ð¿Ð¾ ÑƒÐ¼Ð¾Ð»Ñ‡Ð°Ð½Ð¸ÑŽ',
            hollowGlueDepth:'Глубина ÐºÐ»ÐµÑ Ð¿Ð¾ ÑƒÐ¼Ð¾Ð»Ñ‡Ð°Ð½Ð¸ÑŽ',
            hollow:'Пустой',
            hollowUpdate:'Пустое Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ðµ',
            interlayerThickness:'* Ð¢Ð¾Ð»Ñ‰Ð¸Ð½Ð° ÑÐ»Ð¾Ñ',

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

@@ -135,7 +135,7 @@
           hollowThickness:'*中空厚度',
           hollowGasType:'*充气方式:',
           hollowType:'*封胶',
           hollowGlueDepth:'*默认胶深:',
           hollowGlueDepth:'默认胶深:',
           hollow:'中空间隔物',
           hollowUpdate:'中空间隔物修改',
           interlayerThickness:'*夹层厚度',

 north-glass-erp/northglass-erp/src/stores/sd/companySet/Ìì½ò±±²£.js

@@ -7,6 +7,7 @@
        address:'天津宝坻区节能环保工业区天兴路西侧宝中道南侧',
        telephone:'022-59280088',
        fax:'022-59280066',
        errorArea:0.4,
        widHeiLength:{//订单宽高长度
            regexp:/^(0|[1-9][0-9]{0,4}([.][0-9]{1,2})?)$/,//正则0.00-99999.99
            //regexp:/^(0|[1-9][0-9]{0,3}([.][0-9]{1,2})?)$/,//正则0.00-9999.99

 north-glass-erp/northglass-erp/src/stores/sd/companySet/³£ÖݼªÀû.js

@@ -7,6 +7,7 @@
        address:'常州市天宁区郑陆镇大明南路8号',
        telephone:'022-59280088',
        fax:'022-59280066',
        errorArea:0.4,
        widHeiLength:{//订单宽高长度
            regexp:/^(\d{1,4})$/,//正则四位整数
            //regexp:/^(0|[1-9][0-9]{0,3}([.][0-9]{1,2})?)$/,//正则0.00-9999.99

 north-glass-erp/northglass-erp/src/stores/sd/companySet/н®ºãöÎ.js

@@ -8,6 +8,7 @@
        address:'新疆五家渠工业园兵团新型建材工业园区工一路11号附1号',
        telephone:'13419168999',
        fax:'',
        errorArea:0.4,
        widHeiLength:{//订单宽高长度
            regexp:/^(0|[1-9][0-9]{0,4}([.][0-9]{1,2})?)$/,//正则0.00-99999.99
            //regexp:/^(0|[1-9][0-9]{0,3}([.][0-9]{1,2})?)$/,//正则0.00-9999.99

 north-glass-erp/northglass-erp/src/stores/sd/companySet/½ð»ªÌì³É.js

@@ -7,6 +7,7 @@
        address:'浙江省金华市金东区曹宅镇工业功能区鹤岩街28号2号',
        telephone:'189 3119 1362 èµ–厂长',
        fax:'',
        errorArea:0.3,
        widHeiLength:{//订单宽高长度
            regexp:/^(0|[1-9][0-9]{0,4}([.][0-9]{1,2})?)$/,//正则0.00-99999.99
            //regexp:/^(0|[1-9][0-9]{0,3}([.][0-9]{1,2})?)$/,//正则0.00-9999.99

 north-glass-erp/northglass-erp/src/views/pp/glassOptimize/ProjectMange.vue

@@ -159,7 +159,7 @@
  },
  {
    code: 'delproject',
    initialState: ['1', '2', '10', '20', '100'], // å‡è®¾è¿™äº›çŠ¶æ€ä¸‹çš„工程都允许删除，你可根据实际业务调整
    initialState: ['1', '2', '10', '20', '100'],
    targetState: null,
    successMsg: '工程删除成功！',
    failureMsg: '工程删除失败，请联系管理员！',
@@ -185,6 +185,16 @@
  };
  return stateMapping[targetState] || targetState;
}
//右键菜单条件判断
function checkOperationCondition(config, row) {
  if (!config.requiresRow ||!row) {
    return false;
  }
  if (Array.isArray(config.initialState)) {
    return config.initialState.includes(String(row.state));
  }
  return config.initialState === String(row.state);
}
// å³é”®èœå•ç‚¹å‡»äº‹ä»¶
const gridEvents = {
  menuClick({ menu, row }) {
@@ -192,28 +202,37 @@
    if ($grid) {
      const config = operationConfigs.find(c => c.code === menu.code);
      if (config) {
        if (config.requiresRow &&!row) {
          ElMessage.warning('未选中工程，请选中工程后再进行当前操作！');
          return;
        }
        if (config.code === 'compute') {
          config.actionFunction();
        } else if (config.code === 'Export') {
        if (config.code === 'Export') {
          config.gridRef.value.exportData();
          ElMessage.success(config.successMsg);
        } else if (config.code === 'delproject') {
          deleteProject(row.projectNumber, config); // è°ƒç”¨åˆ é™¤å·¥ç¨‹çš„函数，传入工程编号和配置信息
        } else
          if (config.requiresRow && config.initialState.includes(String(row.state))) {
          row.state = config.targetState;
          const index = produceList.value.findIndex(item => item === row);
          if (index!== -1) {
            produceList.value.splice(index, 1, {...row });
            xGrid.value.reloadData(produceList.value);
          return;
        }
        if (config.code === 'delproject') {
          if (!row) {
            ElMessage.warning(config.checkMessage);
            return;
          }
          updateProjectStateAndHandleResponse(row, row.projectNumber, config.targetState, config.successMsg);
        } else {
          const isInitialStateMatched = config.initialState.includes(String(row.state));
          if (!isInitialStateMatched) {
            ElMessage.warning(config.checkMessage);
            return;
          }
          deleteProject(row.projectNumber, config);
        } else if (!checkOperationCondition(config, row)) {
          ElMessage.warning(config.checkMessage);
          return;
        } else {
          if (config.code === 'compute') {
            config.actionFunction();
          } else {
            row.state = config.targetState;
            const index = produceList.value.findIndex(item => item === row);
            if (index!== -1) {
              produceList.value.splice(index, 1, {...row });
              xGrid.value.reloadData(produceList.value);
            }
            updateProjectStateAndHandleResponse(row, row.projectNumber, config.targetState, config.successMsg);
          }
        }
      } else {
        console.error(`未找到操作选项 ${menu.code} å¯¹åº”的配置，请检查配置项`);
@@ -221,7 +240,6 @@
    }
  }
};

// å°è£…发送右键菜单请求、处理响应以及错误回滚等逻辑的函数
function rollbackStateAndReloadGrid(row, targetState) {
  row.state = getOriginalState(targetState);

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

@@ -25,9 +25,9 @@
let sizeCheckVisible = ref(false)
let orderIdVisible = ref(false)
const maxTableLen =ref(500)
let errorArea = ref(0.4)
const userStore = useUserInfoStore()
const company = companyInfo()
let errorArea = ref(company.errorArea)
const router = useRouter()
const route = useRoute()
const xGrid = ref()

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

@@ -2462,6 +2462,7 @@
             (select (@row_number := @row_number + 1) as id,process_id as process_id from (select process_id from pp.optimize_detail tt where project_no =#{projectNo} group by process_id) tt,(select @row_number := 0) as t) a
             on a.process_id=opd.process_id
        where opd.project_no = #{projectNo}
        order by opd.stock_id,opd.polys_id
        group by  order_id,od.order_number
        order by ogd.child_width desc,ogd.child_height desc
    </select>
</mapper>

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

@@ -1011,7 +1011,8 @@
               ifnull(od.processing_note,"") as processingNote,
               ifnull(od.building_number,"") as buildingNumber,
               dd.price,
               od.other_columns
               od.other_columns,
               od.remarks
        from delivery_detail dd
                 left join order_detail od on dd.order_id = od.order_id and dd.order_number = od.order_number
                 left join product p on od.product_id = p.id
@@ -1050,7 +1051,8 @@
               ifnull(od.processing_note,"") as processingNote,
               ifnull(od.building_number,"") as buildingNumber,
               od.price,
               od.other_columns
               od.other_columns,
               od.remarks
        from  order_detail od
        where  od.order_id = #{orderId}
          and od.product_id = #{productId}