ScanUtils/ScanInput.py

@@ -178,7 +178,8 @@ class ScanInput(QWidget):
         # filePath = "test.txt"  # 指定文件路径
 
         try:
-            with open(filePath, "w") as f:
+            with open(filePath, "w",encoding='utf-8') as f:
+            # with open(filePath, "w") as f:
                 text = self.ui.plainTextEdit.toPlainText()
                 f.write(text)
                 # 将文件标记为已保存

ScanUtils/VersionSet.py

@@ -13,8 +13,10 @@ from Config import Configuration
 from ui.VersionSet import Ui_Form
 
 softwareIconPath = r'D:\PycharmProjects\Scan\ScanUtils\pic\scan.png'
+# softwareIconPath = r':pic/scan.png'
 
 folderName = 'material'
+VERSION = '2.2'
 
 # class MySlot(QObject):
 #     def get(self,msg):
@@ -38,7 +40,7 @@ class VersionSet(QWidget):
 
         self.setWindowIcon(QIcon(softwareIconPath))
 
-        self.setWindowTitle("生产物料扫码记录")
+        self.setWindowTitle('生产物料扫码记录V{0}'.format(VERSION))
 
         self.setWindowFlags(self.windowFlags() | Qt.CustomizeWindowHint)#QtCore.Qt.WindowStaysOnTopHint顶层显示
         #禁用最小化
@@ -50,28 +52,25 @@ class VersionSet(QWidget):
         self.closeToDlg = closeToDlg
         self.widgetInit()
 
-
-
-
     # 设置参数
     def getParamDict(self, newRule = True):
         paramDict = {}
         if newRule:#新规则2023年4月20日
-            paramDict['芯片主版本'] = (('HX02', 2), ('HX03', 3))#4位
-            paramDict['芯片次版本'] = (('第1版(A)', 1), ('第2版(B)', 2), ('第3版(C)', 3), ('第4版(D)', 4), ('第5版(E)', 5))#4位
+            paramDict['芯片主版本'] = (('HX02', 2), ('HX03', 3), ('HX05', 4))#4位
+            paramDict['芯片次版本'] = (('第1版(A)', 1), ('第2版(B)', 2), ('第3版(C)', 3), ('第4版(D)', 4), ('第5版(E)', 5), ('第6版(F)', 6))#4位
 
             paramDict['数字电容容值'] = (('无电容', 0), ('1uF', 1), ('4.7uF', 2), ('10uF', 3), ('22uF', 4), ('33uF', 5), ('47uF', 6), ('68uF', 7), ('100uF', 8))#4位
             # 2022年9月28日由3位扩展到5位
-            paramDict['数字电容品牌'] = (('试验品牌', 0), ('AVX', 1), ('Vishay', 2), ('Sunlord', 3), ('火炬', 4), ('湘江', 5), ('振华', 6), ('丰华', 7), ('国巨', 8))
+            paramDict['数字电容品牌'] = (('试验品牌', 0), ('AVX', 1), ('Vishay', 2), ('Sunlord', 3), ('火炬', 4), ('湘江', 5), ('振华', 6), ('丰华', 7), ('国巨', 8), ('三星', 9))
             paramDict['电容耐压'] = (('16V', 0), ('20V', 1), ('25V', 2))#3位
 
             paramDict['起爆电容容值'] = (('无电容', 0), ('33uF', 1), ('47uF', 2), ('68uF', 3), ('100uF', 4), ('220uF', 5))#3位
-            paramDict['起爆电容品牌'] = (('试验品牌', 0), ('AVX', 1), ('Vishay', 2), ('Sunlord', 3))#3位
+            paramDict['起爆电容品牌'] = (('试验品牌', 0), ('AVX', 1), ('Vishay', 2), ('Sunlord', 3), ('永铭', 4), ('丰宾', 5), ('米朗', 6))#3位
 
             paramDict['引火件形式'] = (('无', 0), ('焊接刚性药头', 1), ('贴片刚性药头', 2), ('贴片发热电阻', 3), ('碗状电阻器', 4))#3位
-            paramDict['桥丝规格'] = (('16um(7.9~8.6欧)', 0), ('2欧姆', 1))#5位
+            paramDict['桥丝规格'] = (('16um(7.9~8.6欧)', 0), ('2欧姆', 1), ('8欧姆', 2), ('20um', 3), ('22um', 4), ('25um', 5), ('30um', 6))#5位
             paramDict['脚线焊接方式'] = (('无孔焊接', 0), ('有孔焊接', 1), ('铭威铆接', 2), ('创德铆接', 3))#4位
-            paramDict['PCB供应商'] = (('丰达兴', 0), ('闽威', 1))
+            paramDict['PCB供应商'] = (('丰达兴', 0), ('闽威', 1), ('镓锐', 2), ('联宇宏', 3))
         else:#旧规则
             paramDict['芯片主版本'] = (('HX02', 2), ('HX03', 3))  # 4位
             paramDict['芯片次版本'] = (('第1版(A)', 1), ('第2版(B)', 2), ('第3版(C)', 3), ('第4版(D)', 4), ('第5版(E)', 5))  # 4位