Commit Graph
100 Commits
Author SHA1 Message Date
sc 2b274a6502 Merge branch 'master' of http://192.168.0.12:13000/sc/formula_manage 2024-04-27 23:56:16 +08:00
sc d8276da446 Merge branch 'master' of http://192.168.0.12:13000/sc/formula_manage 2024-04-27 23:56:14 +08:00
sc c8f7f01340 Merge branch 'master' of http://192.168.0.12:13000/sc/formula_manage 2024-04-27 23:51:06 +08:00
sc 5a1df6c8c6 Merge branch 'master' of http://192.168.0.12:13000/sc/formula_manage 2024-04-27 23:51:00 +08:00
sc cd632545bd Merge branch 'master' of http://192.168.0.12:13000/sc/formula_manage 2024-04-26 21:33:07 +08:00
sc fe5566f730 Merge branch 'master' of http://192.168.0.12:13000/sc/formula_manage 2024-04-26 21:33:05 +08:00
sc d580eed74e Merge branch 'master' of http://192.168.0.12:13000/sc/formula_manage 2024-04-25 23:24:02 +08:00
sc 7567cce849 Merge branch 'master' of http://192.168.0.12:13000/sc/formula_manage 2024-04-25 23:24:00 +08:00
sc 89cd7d3e6b Merge branch 'master' of http://192.168.0.12:13000/sc/formula_manage 2024-04-22 22:01:43 +08:00
sc ff58075e7b Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage 2024-04-22 22:01:41 +08:00
sc e0bdc68e8e Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage 2024-04-18 17:09:58 +08:00
sc 8fc4999ccc 添加新单号清屏 2024-04-18 17:09:57 +08:00
sc 701c3abf26 Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage 2024-04-18 16:13:17 +08:00
sc be7cfcdcaf 原料代码输入判定 2024-04-18 16:13:14 +08:00
sc 3b65c73608 Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage 2024-04-18 15:39:38 +08:00
sc 3e7638a199 清楚后部输入空格 2024-04-18 15:39:37 +08:00
sc 57b2d5b356 Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage 2024-04-18 15:30:36 +08:00
sc 6471eec033 目标重量换算问题修复 2024-04-18 15:30:34 +08:00
sc 3c41c2f150 Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage 2024-04-18 14:47:23 +08:00
sc 7c3d3ecf3a 修改重复原料判断逻辑 2024-04-18 14:47:22 +08:00
sc ca2d99f28b Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage 2024-04-18 13:28:23 +08:00
sc 7ccfe7ba81 添加ex生效状态判断 2024-04-18 13:28:21 +08:00
sc 97c12e373b Merge branch 'master' of http://192.168.0.12:13000/sc/formula_manage 2024-04-15 21:59:20 +08:00
sc ca3156e314 Merge branch 'master' of http://192.168.0.12:13000/sc/formula_manage 2024-04-15 21:59:18 +08:00
sc 41f15e168d Merge branch 'master' of http://192.168.0.12:13000/sc/formula_manage 2024-04-15 20:48:13 +08:00
sc 84ef66268e Merge branch 'master' of http://192.168.0.12:13000/sc/formula_manage 2024-04-15 20:48:11 +08:00
sc ec55b35065 Merge branch 'master' of http://192.168.0.12:13000/sc/formula_manage 2024-04-14 23:32:49 +08:00
sc bf8f9a368a Merge branch 'master' of http://192.168.0.12:13000/sc/formula_manage 2024-04-14 23:32:48 +08:00
sc f3e9acf822 Merge branch 'master' of http://192.168.0.12:13000/sc/formula_manage 2024-04-14 23:15:55 +08:00
sc ee4bc611ea 添加Code128(包含128A,128B,128C)类 2024-04-14 23:15:53 +08:00
sc 958279bd74 Merge branch 'master' of http://192.168.0.12:13000/sc/formula_manage 2024-04-14 22:38:37 +08:00
sc 4928ff1178 Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage 2024-04-14 22:38:32 +08:00
sc a5942b3285 Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage 2024-04-03 23:14:12 +08:00
sc f3b5d1eca2 Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage 2024-04-03 23:14:07 +08:00
sc 1e2bfad5a1 Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage 2024-04-03 23:07:19 +08:00
sc 0af25953b6 添加扩展程序状态显示 2024-04-03 23:07:17 +08:00
sc 505dfebd05 Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage 2024-04-03 22:32:05 +08:00
sc 3c0270843f Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage 2024-04-03 22:32:04 +08:00
sc c54ccea98c Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage 2024-04-03 22:19:52 +08:00
sc 3d267018b1 添加ex页面 2024-04-03 22:19:50 +08:00
sc 6903e2264c Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage 2024-04-03 21:02:32 +08:00
sc 4ba15a8e69 修改引导事件 2024-04-03 21:02:30 +08:00
sc 94ad77a58b Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage 2024-04-03 13:58:30 +08:00
sc 03810f8e10 提醒页面倒计时60秒Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage 2024-04-03 13:58:28 +08:00
sc fceb6cdea2 Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage 2024-04-03 13:57:55 +08:00
sc a6c37286f9 注册提示页面提前提醒 2024-04-03 13:57:53 +08:00
sc 900b9e59e9 Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage 2024-04-03 13:46:03 +08:00
sc eab45768e4 注册提醒页面关闭倒计时 2024-04-03 13:46:01 +08:00
sc 6ce7ce1cc2 Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage 2024-04-03 13:08:58 +08:00
sc c17474c77f 添加注册到期提示页面 2024-04-03 13:08:56 +08:00
sc de5d7202c2 Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage 2024-04-02 15:42:20 +08:00
sc 59ba780070 CDKEY提示修改 2024-04-02 15:41:45 +08:00
sc 9dafd3115e Merge branch 'master' of http://192.168.0.12:13000/sc/formula_manage 2024-04-01 00:15:06 +08:00
sc 8a4d7c6d4f CDKEY保存逻辑修改 2024-04-01 00:15:05 +08:00
sc 3af7ead309 Merge branch 'master' of http://192.168.0.12:13000/sc/formula_manage 2024-03-31 23:50:34 +08:00
sc 8c38e3e12b 增加注册码功能 2024-03-31 23:50:31 +08:00
sc f7ec9127b6 Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage 2024-03-29 21:07:21 +08:00
sc bfa5b59496 Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage 2024-03-29 21:07:20 +08:00
sc 4d261383e3 Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage 2024-03-29 18:11:28 +08:00
sc 81c98ec936 添加CRC16校验 2024-03-29 18:11:25 +08:00
sc c8ed59e183 Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage 2024-03-29 15:36:18 +08:00
sc 169753f266 添加CDKEY界面 2024-03-29 15:36:17 +08:00
sc 17d66e2bf2 Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage 2024-03-29 15:26:54 +08:00
sc 3d553d1eed Merge branch 'master' of http://192.168.0.12:13000/sc/formula_manage 2024-03-29 15:26:52 +08:00
sc 87980cc2da Merge branch 'master' of http://192.168.0.12:13000/sc/formula_manage 2024-03-27 23:32:18 +08:00
sc 424b63f0c5 修改SQL查询语句 2024-03-27 23:32:17 +08:00
sc d0131a2795 Merge branch 'master' of http://192.168.0.12:13000/sc/formula_manage 2024-03-27 22:58:28 +08:00
sc 16f0c6ecf4 Merge branch 'master' of http://192.168.0.12:13000/sc/formula_manage 2024-03-27 22:58:27 +08:00
sc 1b60fe900b Merge branch 'master' of http://192.168.0.12:13000/sc/formula_manage 2024-03-27 22:57:40 +08:00
sc e6d467057a 添加颜色名称页面 2024-03-27 22:57:39 +08:00
sc 714168f47f Merge branch 'master' of http://192.168.0.12:13000/sc/formula_manage 2024-03-27 22:24:35 +08:00
sc f558f56d42 添加客户管理页面 2024-03-27 22:24:33 +08:00
sc f8ec8a6759 Merge branch 'master' of http://192.168.0.12:13000/sc/formula_manage 2024-03-27 21:52:40 +08:00
sc 4324fdd74b sql语句修改 2024-03-27 21:52:38 +08:00
sc a5efa3ca59 Merge branch 'master' of http://192.168.0.12:13000/sc/formula_manage 2024-03-26 23:36:46 +08:00
sc e7dd94bb39 添加去除空白字符串代码(TrimEnd()) 2024-03-26 23:36:45 +08:00
sc 714de60f95 Merge branch 'master' of http://192.168.0.12:13000/sc/formula_manage 2024-03-26 23:30:57 +08:00
sc 861d823ce9 添加布种管理页面 2024-03-26 23:30:56 +08:00
sc 254d5db8ef Merge branch 'master' of http://192.168.0.12:13000/sc/formula_manage 2024-03-26 00:01:53 +08:00
sc 2d4314a07f 添加登录者日志 2024-03-26 00:01:52 +08:00
sc a3477a1f1a Merge branch 'master' of http://192.168.0.12:13000/sc/formula_manage 2024-03-25 23:23:50 +08:00
sc 9f75476c47 Merge branch 'master' of http://192.168.0.12:13000/sc/formula_manage 2024-03-25 23:23:49 +08:00
sc 48d8ecd8ca Merge branch 'master' of http://192.168.0.12:13000/sc/formula_manage 2024-03-25 23:01:38 +08:00
sc 292e41a5c4 添加RECIPE配方管理页面 2024-03-25 23:01:36 +08:00
sc d8abe646b7 Merge branch 'master' of http://192.168.0.12:13000/sc/formula_manage 2024-03-25 20:31:22 +08:00
sc 693f291adc Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage 2024-03-25 20:31:19 +08:00
sc d3527f0f5c Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage 2024-03-25 19:32:07 +08:00
sc 9858f2fcaf Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage 2024-03-25 19:32:04 +08:00
sc b524ca8050 Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage 2024-03-24 17:24:18 +08:00
sc 621ea71c97 Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage 2024-03-24 17:24:16 +08:00
sc 3a54fe47c5 Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage 2024-03-24 13:21:20 +08:00
sc 33f6e28cfa Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage 2024-03-24 13:21:18 +08:00
sc 165f707221 Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage 2024-03-24 12:38:11 +08:00
sc b2e0d05648 Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage 2024-03-24 12:38:08 +08:00
sc 8e64f6b27d Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage 2024-03-24 11:14:52 +08:00
sc b215016d91 Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage 2024-03-24 11:14:50 +08:00
sc b69ee37cbb Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage 2024-03-20 13:49:18 +08:00
sc e7053ceab3 Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage 2024-03-20 13:49:16 +08:00
sc 4c2f130667 Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage 2024-03-20 13:46:11 +08:00
sc 28c61a4255 Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage 2024-03-20 13:46:09 +08:00