Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造代码优化

# Conflicts: # zpl_print/models/common.py
2024-03-14 14:24:26 +08:00
parent 59677c0304 35e2e4354a
commit 70218f29ac
38 changed files with 1334 additions and 496 deletions
--- a/zpl_print/models/common.py
+++ b/zpl_print/models/common.py
@@ -10,6 +10,7 @@ class Common(models.Model):
    def print_zpl(self, zpl_str):
        # WinDll_path = "D://桌面//pythonZPL//tsc_python_sdk_example//TSC_Python_SDK_Example//tsc_sample//libs//TSCLIB.dll"
        WinDll_path = "D://jikimo-dev//jikimo//SF//zpl_print//libs//TSCLIB.dll"
+        # WinDll_path = "D://桌面//pythonZPL//zebra_zpl//libs//TSCLIB.dll"
        try:
            tsclibrary = ctypes.WinDLL(WinDll_path)
            tsclibrary.openportW("USB")