Merge branch 'master' of https://git.suwa3d.com/dongchangxi/make2

tools/cal_weight_excel.py

@@ -87,7 +87,9 @@ def main(action, pid, sizes,orderId=0):
         '1/10尺寸': [0],  
         '1/10': [0],     
         '1/12尺寸': [0],
-        '1/12': [0],     
+        '1/12': [0],
+        '1/14尺寸': [0],
+        '1/14': [0],       
         '1/16尺寸': [0],
         '1/16': [0],    
         '1/18尺寸': [0], 
@@ -111,7 +113,7 @@ def main(action, pid, sizes,orderId=0):
         
         if arrSize[1] in df.columns:
             new_data[arrSize[1]+"尺寸"] = [str(size/10)+"cm"]
-            new_data[arrSize[1]] = [str(weight)]
+            new_data[arrSize[1]] = [str(weight)+'g']
     
     # 更新数据
     # 将新数据转换为 DataFrame