From 7302d21d8578afc3fbc8632f960ce07d38bf03d8 Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期一, 08 十二月 2025 14:01:04 +0800
Subject: [PATCH] 修改订单号生成规则

---
 north-glass-erp/northglass-erp/src/stores/sd/companySet/常州吉利.js |   35 +++++++++++++++++++++++++++++------
 1 files changed, 29 insertions(+), 6 deletions(-)

diff --git "a/north-glass-erp/northglass-erp/src/stores/sd/companySet/\345\270\270\345\267\236\345\220\211\345\210\251.js" "b/north-glass-erp/northglass-erp/src/stores/sd/companySet/\345\270\270\345\267\236\345\220\211\345\210\251.js"
index 9cad759..9cb5376 100644
--- "a/north-glass-erp/northglass-erp/src/stores/sd/companySet/\345\270\270\345\267\236\345\220\211\345\210\251.js"
+++ "b/north-glass-erp/northglass-erp/src/stores/sd/companySet/\345\270\270\345\267\236\345\220\211\345\210\251.js"
@@ -3,33 +3,56 @@
 export default defineStore('companyInfo', {
 
     state: () => ({
+        position:{
+            outside:'(鍐�)',
+            inside:'(澶�)',
+        },
+        edgingType:false,//浜у搧鍒涘缓纾ㄨ竟绫诲瀷鏄惁蹇呴��
+        hollow:'*',
+        notChangeProduct:false,//澶╂触true锛屽叾浠杅alse锛屾槸鍚﹀紑鍚潪鏈汉鍒涘缓鐨勪骇鍝佷笉鑳戒慨鏀�
+        timeOut:false,//閲戝崕true锛屽叾浠杅alse锛屾槸鍚﹀紑鍚秴鏃舵敼鍙樺閫夋鐘舵��
+        connectMes:true,//甯稿窞,涔変箤true锛屽叾浠杅alse锛屾樉绀鸿鍗曟姤宸ヨ浆绉绘槸鍚﹀惎鐢�
         companyName: '甯稿窞甯傚悏鍒╃幓鐠冩湁闄愬叕鍙�',
         address:'甯稿窞甯傚ぉ瀹佸尯閮戦檰闀囧ぇ鏄庡崡璺�8鍙�',
         telephone:'022-59280088',
         fax:'022-59280066',
-        errorArea:0.4,
+        errorArea:0.4,//缁撶畻闈㈢Н璇樊
         widHeiLength:{//璁㈠崟瀹介珮闀垮害
             regexp:/^(\d{1,4})$/,//姝e垯鍥涗綅鏁存暟
             //regexp:/^(0|[1-9][0-9]{0,3}([.][0-9]{1,2})?)$/,//姝e垯0.00-9999.99
             msg:'basicData.msg.range9999Dec'
         },
         orderIdType:'month',//鍚庣鐢熸垚璁㈠崟鍙风被鍨嬶紝day:姣忓ぉ鐢熸垚锛宮onth:姣忔湀鐢熸垚
+        orderIdTypeLetter:'NG',//璁㈠崟鍙峰墠闈㈠瓧姣�
+        orderIdTypeMantissa:2,//璁㈠崟鍙峰熬鏁颁繚鐣欎綅鏁�  orderIdTypeLetter闀垮害+orderIdTypeMantissa =4
         deliveryIdType:'month',//鍚庣鐢熸垚鍙戣揣鍗曞彿绫诲瀷锛宒ay:姣忓ぉ鐢熸垚锛宮onth:姣忔湀鐢熸垚
-        columnName:'寮傚舰鍙傛暟',
+        deliveryDate:7,//璁㈠崟鍒涘缓閫佽揣鏃ユ湡 澶╂触7澶╋紝甯稿窞7澶╋紝涔変箤15澶╋紝鏂扮枂15澶�
+        columnName:'寮傚舰鍙傛暟',//鎵撳嵃鐢熶骇鍗曟椂闇�瑕佹樉绀虹殑鍒楀悕锛屾病鏈変负绌�
         selectOrderReviewShow:false, //璁㈠崟棣栭〉鍔犲伐鍗曞鏍告寜閽槸鍚︽樉绀�
         productName:"product_abbreviation", //浜у搧鍒涘缓鏌ラ噸瀛楁
         decValue:2,//璁㈠崟淇濆瓨闈㈢Н浣嶆暟
-        label:2,//鏍囩绫诲瀷
+        label:2,//鏍囩绫诲瀷,甯稿窞涓�2锛屽叾浠栦负1
         calculateType:2,//璁㈠崟璁$畻鏂瑰紡
         reportType:2,//鎶ュ伐鏄惁鏌ヨ鏍峰搧璁㈠崟2鏌ヨ锛�1涓嶆煡璇�
         qualityInsStatus:2,//璺ㄥ伐搴忚川妫�瀹℃牳锛�1涓嶉渶瑕侊紝2闇�瑕�
         remarkSwitch:2,//娴佺▼鍗′笂鏄惁鏄剧ず鍏跺畠澶囨敞锛�1鏄剧ず锛�2涓嶆樉绀�
-        icon:"濂ラ涔呴��",//鍟嗘爣鍙傛暟
+        icon:"濂ラ涔呴��",//鍟嗘爣鍙傛暟锛屾病鏈変负绌�
         printShowTitle:true,//娴佺▼鍗¤嚜瀹氫箟鎵撳嵃鏄惁鏄剧ず鏍囩
         longSide:6500,//璁㈠崟鍒涘缓鏈�闀胯竟鎻愮ず棰滆壊
         showDeliveryCreator:true,//鍙戣揣鍗曞垱寤轰汉鍏堟樉绀烘垨鑰呭悗鏄剧ず false鍚庢樉绀�
-        deliveryRemark: ['澶囨敞:鏈壒鐜荤拑涓轰紭绛夊悎鏍煎搧锛岃鍦ㄥ嵏璐ф椂,褰撻潰娑堢偣楠屾敹銆佸鏈夎川閲忛棶棰樺湪涓�鍛ㄥ唴涓庢湰鍏徃鑱旂郴,鍚﹀垯姒備笉璐熻矗锛�'],
-        deliveryOutbound: true,//鍙戣揣榛樿鍑哄簱
+        deliveryRemark: ['澶囨敞:鏈壒鐜荤拑涓轰紭绛夊悎鏍煎搧锛岃鍦ㄥ嵏璐ф椂,褰撻潰娑堢偣楠屾敹銆佸鏈夎川閲忛棶棰樺湪涓�鍛ㄥ唴涓庢湰鍏徃鑱旂郴,鍚﹀垯姒備笉璐熻矗锛�'],//鎵撳嵃鍙戣揣鍗曠殑澶囨敞
+        deliveryOutbound: true,//鍙戣揣榛樿鍑哄簱,榛樿鍑哄簱涓簍rue
+        flowCardMerge: 1,//娴佺▼鍗″悎鐗囨墦鍗帮紝1鍚堝苟锛屽叾浠栦笉鍚堝苟
+        printBtn:0,//鎵撳嵃鐣岄潰涓変釜鎸夐挳涓槸鍚︽樉绀烘爣绛炬墦鍗扮浉鍏虫寜閽紝0鏄剧ず甯稿窞锛�1澶╂触鍏跺畠涓嶆樉绀�
+        printNumber:true,//澶氶�夎鍗曟墦鍗版祦绋嬪崱鏄惁鏄剧ず鍙充笂瑙掑簭鍙蜂箟涔宖alse,鍏跺畠true
+        materialOutboundColor:false,//搴撳瓨鏌ヨ鍏ュ簱瓒呰繃涓�瀹氭椂闂存敼鍙橀鑹诧紝娲涢槼true锛屽叾浠杅alse
+        storageBtn:false,//鏄惁鏄剧ず鎶ュ伐鍏ュ簱鐩稿叧鍐呭锛屾礇闃硉rue锛屽叾浠杅alse
+        teamsType:false,//鏄惁寮�鍚彮缁勪笅鎷夋锛屾礇闃硉rue锛屽叾浠杅alse
+        alienFunction:false,//鏄惁寮�鍚紓褰㈠姛鑳斤紝鏆傛椂閮芥槸false
+        replenishQRCode:1,//鏄惁琛ョ墖浜岀淮鐮佹槸鍚︽媶鍒嗗眰,1鎷嗗垎锛�2涓嶆媶
+        soleQRCode:false,//娴佺▼鍗″悎骞朵簩缁寸爜鏄剧ず鍗曞眰锛屼箟涔宼rue.鍏跺畠false
+        reportTime:"08:00",//娆$牬銆佷骇閲忔姤琛ㄩ粯璁ゆ椂闂�
+        processFontSize:false,//娴佺▼鍗″姞宸ヨ姹傚瓧浣撳姞澶�
         //澶╂触
         printLabel: {
             custom: (item1) => {

--
Gitblit v1.8.0