 sc
|
ae7ff52abf
|
Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage
|
2023-11-25 16:27:43 +08:00 |
|
|
sc
|
741704c8aa
|
Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage
|
2023-11-25 13:22:41 +08:00 |
|
|
sc
|
a0aa6ccbf5
|
Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage
|
2023-11-24 23:47:51 +08:00 |
|
|
sc
|
bc9ec7d4bb
|
Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage
|
2023-11-24 23:47:49 +08:00 |
|
|
sc
|
75e646e193
|
Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage
|
2023-11-24 23:04:08 +08:00 |
|
|
sc
|
8aee8752ff
|
Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage
|
2023-11-24 23:04:05 +08:00 |
|
|
sc
|
0445103ac0
|
Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage
|
2023-11-24 21:14:46 +08:00 |
|
|
sc
|
acebf38128
|
Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage
|
2023-11-24 21:14:44 +08:00 |
|
|
sc
|
6b58182ae9
|
Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage
|
2023-11-24 17:06:57 +08:00 |
|
|
sc
|
7e7987e8f4
|
Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage
|
2023-11-24 17:06:56 +08:00 |
|
|
sc
|
9175f12802
|
Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage
|
2023-11-24 16:58:40 +08:00 |
|
|
sc
|
02582f4c90
|
Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage
|
2023-11-24 16:58:38 +08:00 |
|
|
sc
|
a5826b80e8
|
Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage
|
2023-11-24 16:35:33 +08:00 |
|
|
sc
|
d6e4e0dd60
|
Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage
|
2023-11-24 16:35:31 +08:00 |
|
|
sc
|
0df634ed6e
|
Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage
|
2023-11-24 02:10:24 +08:00 |
|
|
sc
|
c120a2164f
|
配方列表编辑
|
2023-11-24 02:10:23 +08:00 |
|
|
sc
|
cf69c71d3e
|
Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage
|
2023-11-24 01:51:47 +08:00 |
|
|
sc
|
a3fdfef542
|
Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage
|
2023-11-24 01:51:45 +08:00 |
|
|
sc
|
e290681cee
|
Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage
|
2023-11-24 00:45:34 +08:00 |
|
|
sc
|
fa7882c34a
|
Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage
|
2023-11-24 00:45:33 +08:00 |
|
|
sc
|
e324cd18ff
|
Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage
|
2023-11-23 23:35:04 +08:00 |
|
|
sc
|
3cdcbed934
|
Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage
|
2023-11-23 23:35:02 +08:00 |
|
|
sc
|
fa77666ffb
|
Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage
|
2023-11-23 23:07:40 +08:00 |
|
|
sc
|
1d6e6816f3
|
Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage
|
2023-11-23 23:07:39 +08:00 |
|
|
sc
|
c8b271de12
|
Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage
|
2023-11-23 18:40:45 +08:00 |
|
|
sc
|
656f120984
|
Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage
|
2023-11-23 18:40:42 +08:00 |
|
|
sc
|
ab557a192f
|
Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage
|
2023-11-23 18:25:27 +08:00 |
|
|
sc
|
8432d6391a
|
Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage
|
2023-11-23 18:25:25 +08:00 |
|
|
sc
|
f64e213305
|
Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage
|
2023-11-23 17:40:40 +08:00 |
|
|
sc
|
022876ce01
|
Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage
|
2023-11-23 17:40:39 +08:00 |
|
|
sc
|
1b4c17bc7c
|
Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage
|
2023-11-23 17:36:47 +08:00 |
|
|
sc
|
92e5e0e268
|
Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage
|
2023-11-23 17:36:45 +08:00 |
|
|
sc
|
2d92d624d0
|
Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage
|
2023-11-23 17:27:01 +08:00 |
|
|
sc
|
49376cdf02
|
Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage
|
2023-11-23 17:26:59 +08:00 |
|
|
sc
|
cbe00f5d93
|
Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage
|
2023-11-23 17:25:08 +08:00 |
|
|
sc
|
fedcf6abdc
|
记录当前单序号
|
2023-11-23 17:25:06 +08:00 |
|
|
sc
|
9ff7988cce
|
记录当前单序号
|
2023-11-23 13:46:49 +08:00 |
|
|
sc
|
5d2e2140b3
|
Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage
|
2023-11-23 00:30:43 +08:00 |
|
|
sc
|
1e84406190
|
更改原料页面类型选择框
|
2023-11-23 00:30:42 +08:00 |
|
|
sc
|
ae559b8082
|
Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage
|
2023-11-22 23:55:37 +08:00 |
|
|
sc
|
bd64153d83
|
Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage
|
2023-11-22 23:55:35 +08:00 |
|
|
sc
|
23f5f5e5ca
|
Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage
|
2023-11-22 23:37:26 +08:00 |
|
|
sc
|
25a5a4836e
|
Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage
|
2023-11-22 23:37:24 +08:00 |
|
|
sc
|
dab2f14ce3
|
Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage
|
2023-11-22 16:24:35 +08:00 |
|
|
sc
|
d8f1c487d5
|
添加一个新类DataGridHelper,用于更新datagrid
|
2023-11-22 16:24:34 +08:00 |
|
|
sc
|
8d75eeb92c
|
Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage
|
2023-11-22 14:32:13 +08:00 |
|
|
sc
|
c494f25c85
|
系统时间修改为DataContext数据层通知改变
|
2023-11-22 14:32:11 +08:00 |
|
|
sc
|
d4b9a8b295
|
Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage
|
2023-11-22 14:30:14 +08:00 |
|
|
sc
|
f5bf396be5
|
Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage
|
2023-11-22 14:30:11 +08:00 |
|
|
sc
|
0bad135850
|
Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage
|
2023-11-22 14:02:16 +08:00 |
|
|
sc
|
ae35c93165
|
Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage
|
2023-11-22 14:02:15 +08:00 |
|
|
sc
|
de98aeeebb
|
Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage
|
2023-11-22 13:38:29 +08:00 |
|
|
sc
|
020fdc37c8
|
Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage
|
2023-11-22 13:38:27 +08:00 |
|
|
sc
|
eeea77ec27
|
Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage
|
2023-11-22 00:41:13 +08:00 |
|
|
sc
|
c6a3e931d9
|
Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage
|
2023-11-22 00:41:11 +08:00 |
|
|
sc
|
41e0c801a2
|
Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage
|
2023-11-21 17:19:36 +08:00 |
|
|
sc
|
50197a0a89
|
Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage
|
2023-11-21 17:19:35 +08:00 |
|
|
sc
|
1827407b1f
|
Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage
|
2023-11-21 17:17:32 +08:00 |
|
|
sc
|
c884ef0c34
|
Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage
|
2023-11-21 17:17:30 +08:00 |
|
|
sc
|
5def852456
|
Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage
|
2023-11-21 00:18:03 +08:00 |
|
|
sc
|
13b13e817a
|
Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage
|
2023-11-21 00:18:01 +08:00 |
|
|
sc
|
f0c8a79abd
|
Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage
|
2023-11-20 17:17:10 +08:00 |
|
|
sc
|
64e43048a2
|
Merge branch 'master' of http://192.168.0.12:13000/sc/formula_manage
|
2023-11-20 17:17:07 +08:00 |
|
|
sc
|
8721f77c24
|
Merge branch 'master' of http://192.168.0.12:13000/sc/formula_manage
|
2023-11-19 13:54:54 +08:00 |
|
|
sc
|
057a9dde63
|
增加溶解流程设置
|
2023-11-19 13:54:53 +08:00 |
|
|
sc
|
708d54ac0c
|
Merge branch 'master' of http://192.168.0.12:13000/sc/formula_manage
|
2023-11-19 12:05:06 +08:00 |
|
|
sc
|
3f3aa0c817
|
Merge branch 'master' of http://192.168.0.12:13000/sc/formula_manage
|
2023-11-19 12:05:05 +08:00 |
|
|
sc
|
15a43d59df
|
Merge branch 'master' of http://192.168.0.12:13000/sc/formula_manage
|
2023-11-19 11:28:07 +08:00 |
|
|
sc
|
c300cad9de
|
Merge branch 'master' of http://192.168.0.12:13000/sc/formula_manage
|
2023-11-19 11:28:06 +08:00 |
|
|
sc
|
b8839af3fa
|
Merge branch 'master' of http://192.168.0.12:13000/sc/formula_manage
|
2023-11-19 11:23:13 +08:00 |
|
|
sc
|
a3c807f02e
|
Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage
|
2023-11-19 11:23:11 +08:00 |
|
|
sc
|
4a4740ab44
|
Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage
|
2023-11-17 23:24:22 +08:00 |
|
|
sc
|
589a453438
|
Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage
|
2023-11-17 23:24:20 +08:00 |
|
|
sc
|
aee1102b44
|
Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage
|
2023-11-17 19:51:47 +08:00 |
|
|
sc
|
2679b72009
|
Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage
|
2023-11-17 19:51:30 +08:00 |
|
|
sc
|
aed2d7e654
|
Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage
|
2023-11-17 16:23:11 +08:00 |
|
|
sc
|
75cc5dc5c3
|
原料离子类型选项调整
|
2023-11-17 16:23:08 +08:00 |
|
|
sc
|
d1f72ca351
|
Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage
|
2023-11-17 00:09:32 +08:00 |
|
|
sc
|
8c922d5cc0
|
Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage
|
2023-11-17 00:09:31 +08:00 |
|
|
sc
|
aba38a4e3b
|
Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage
|
2023-11-16 22:35:55 +08:00 |
|
|
sc
|
5bad675f46
|
添加原料离子类型项目
|
2023-11-16 22:35:52 +08:00 |
|
|
sc
|
5ac90e6e7f
|
Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage
|
2023-11-15 23:56:19 +08:00 |
|
|
sc
|
7833f7c34b
|
Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage
|
2023-11-15 23:56:18 +08:00 |
|
|
sc
|
2ebe614f43
|
Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage
|
2023-11-15 23:51:18 +08:00 |
|
|
sc
|
a1d6e62944
|
Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage
|
2023-11-15 23:51:15 +08:00 |
|
|
sc
|
44ac7618f3
|
Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage
|
2023-11-14 23:22:58 +08:00 |
|
|
sc
|
d6150ae461
|
Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage
|
2023-11-14 23:22:56 +08:00 |
|
|
sc
|
44de55a6b6
|
Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage
|
2023-11-14 16:55:13 +08:00 |
|
|
sc
|
06d048ad85
|
账号是否启用管理
|
2023-11-14 16:55:11 +08:00 |
|
|
sc
|
9b679dc162
|
Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage
|
2023-11-14 16:31:02 +08:00 |
|
|
sc
|
55deb51005
|
login功能加入用户登录及下拉框显示使用者
|
2023-11-14 16:30:57 +08:00 |
|
|
sc
|
16442b5ec0
|
Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage
|
2023-11-14 13:01:18 +08:00 |
|
|
sc
|
47b35b5afc
|
Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage
|
2023-11-14 13:01:16 +08:00 |
|
|
sc
|
26b8ac1be4
|
Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage
|
2023-11-14 10:31:36 +08:00 |
|
|
sc
|
778b231542
|
机台设置及选择
|
2023-11-14 10:31:33 +08:00 |
|
|
sc
|
eef6960d7a
|
Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage
|
2023-11-14 01:18:18 +08:00 |
|
|
sc
|
9407221589
|
Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage
|
2023-11-14 01:18:15 +08:00 |
|
|
sc
|
847437fc2e
|
Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage
|
2023-11-13 00:13:44 +08:00 |
|
|
sc
|
e2e5e66ac5
|
Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage
|
2023-11-13 00:13:42 +08:00 |
|
|
sc
|
b8364c82a8
|
Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage
|
2023-11-12 22:40:55 +08:00 |
|