PhilPan
|
bddd6ac805
|
重新组织目录
|
2023-04-21 09:26:04 +08:00 |
|
PhilPan
|
41580fe1fb
|
Merge branch 'dev' of ssh://git.tuotong-tech.com:9105/tnb/tnb.server into dev
|
2023-04-21 09:16:56 +08:00 |
|
PhilPan
|
e78b94948b
|
merge
|
2023-04-21 09:16:26 +08:00 |
|
zhoukeda
|
27806e96a3
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-04-21 09:13:57 +08:00 |
|
zhoukeda
|
76ca8e4984
|
物料清单
|
2023-04-21 09:13:41 +08:00 |
|
PhilPan
|
41ff8e3556
|
添加各模块空项目
|
2023-04-21 09:12:33 +08:00 |
|
DEVICE8\12494
|
13f2b211bb
|
Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev
|
2023-04-21 09:06:54 +08:00 |
|
DEVICE8\12494
|
ab92c80838
|
组织管理代码调整
|
2023-04-21 09:06:49 +08:00 |
|
PhilPan
|
d9ad2fd345
|
查询组织列表增加条件参数
|
2023-04-20 16:59:21 +08:00 |
|
PhilPan
|
95cc47ebac
|
调整项目依赖
|
2023-04-20 10:00:18 +08:00 |
|
DEVICE8\12494
|
95fb16a3bf
|
1
|
2023-04-19 13:41:48 +08:00 |
|
DEVICE8\12494
|
fa52f42d97
|
1
|
2023-04-19 13:41:32 +08:00 |
|
DEVICE8\12494
|
7bd4d48b63
|
新增生产工单排产功能接口
|
2023-04-19 13:38:51 +08:00 |
|
PhilPan
|
b8873eac2e
|
添加重写默认接口的sample
|
2023-04-19 10:32:56 +08:00 |
|
PhilPan
|
a86dd288c2
|
数据库配置修改为tianyi
|
2023-04-17 14:48:26 +08:00 |
|
DEVICE8\12494
|
edf4e9310d
|
Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev
|
2023-04-14 09:54:53 +08:00 |
|
DEVICE8\12494
|
2fc2b6a85e
|
1
|
2023-04-14 09:54:48 +08:00 |
|
zhoukeda
|
61ea54dbc1
|
添加rider忽略
|
2023-04-13 16:45:41 +08:00 |
|
PhilPan
|
e4ddf1b8b3
|
默认接口提交和返回值不序列化
|
2023-04-12 16:42:09 +08:00 |
|
DEVICE8\12494
|
51d59218b0
|
MOM,工艺模版管理，生成树代码调整
|
2023-04-07 17:36:18 +08:00 |
|
DEVICE8\12494
|
adba94e833
|
调整进入getKeyData的判断条件
|
2023-04-07 17:13:11 +08:00 |
|
DEVICE8\12494
|
9d85cceab6
|
Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev
|
2023-04-07 14:32:12 +08:00 |
|
DEVICE8\12494
|
3867c1978d
|
生成实体类代码调整
|
2023-04-07 14:32:05 +08:00 |
|
pofi
|
4502845d5e
|
修复代码生成错误
|
2023-04-07 14:07:40 +08:00 |
|
DEVICE8\12494
|
2bbe6991f8
|
1
|
2023-04-06 18:25:48 +08:00 |
|
DEVICE8\12494
|
536f11aac1
|
1、数据库操作，生成实体类，清除表数据默认linkid改为单例模式
2、MOM 基础数据-工艺管理-工艺路线模版，左侧树代码调整
|
2023-04-06 17:24:16 +08:00 |
|
DEVICE8\12494
|
f3c8f1cd06
|
Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev
|
2023-04-06 14:11:00 +08:00 |
|
DEVICE8\12494
|
98278bad9e
|
1、根据数据表，删除表数据接口迁移至DataModel 已有接口下
2、将根据表明生成实体类，代码迁移至已有数据接口DataModel下
|
2023-04-06 14:10:53 +08:00 |
|
pofi
|
645a8beef7
|
Merge branch 'dev' of ssh://git.tuotong-tech.com:9105/tnb/tnb.server into dev
|
2023-04-04 20:19:23 +08:00 |
|
pofi
|
7741e44a80
|
回滚到3.4.5
|
2023-04-04 20:19:16 +08:00 |
|
DEVICE8\12494
|
34b3dac9f1
|
1
|
2023-04-04 19:13:39 +08:00 |
|
DEVICE8\12494
|
72f25fad66
|
1、系统权限，组织管理，返回用户列表新增组织分类字段
2、新增根据表名清除表数据字段
3、根据表名动态建类功能接口
|
2023-04-04 19:13:12 +08:00 |
|
DEVICE8\12494
|
92291d66c2
|
新增基础数据接口库，MOM工艺路线模版左侧树形结构返回
|
2023-04-04 14:43:57 +08:00 |
|
DEVICE8\12494
|
96fa7faf39
|
Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev
|
2023-03-30 16:22:04 +08:00 |
|
DEVICE8\12494
|
f1e9e5a113
|
合并冲突
|
2023-03-30 16:21:49 +08:00 |
|
pofi
|
ba4fbbd6e2
|
在FormDataParsing单独使用新的SugarClient实例
|
2023-03-30 14:54:09 +08:00 |
|
DEVICE8\12494
|
a6cbcc59d6
|
新增健康状况检查接口
|
2023-03-30 12:39:07 +08:00 |
|
pofi
|
0a6fba29cd
|
增加心跳接口
|
2023-03-30 11:39:17 +08:00 |
|
DEVICE8\12494
|
401b717fc2
|
解决异步查询时，异常
|
2023-03-30 09:43:27 +08:00 |
|
pofi
|
f9e3a01602
|
切换数据库时打印sql，增加获取主键的接口
|
2023-03-28 18:04:15 +08:00 |
|
pofi
|
975744d5ec
|
Merge branch 'dev' of ssh://git.tuotong-tech.com:9105/tnb/tnb.server into dev
|
2023-03-28 17:01:21 +08:00 |
|
pofi
|
bf847beeae
|
从缓存读取数据连接和用户名称
|
2023-03-28 17:01:15 +08:00 |
|
DEVICE8\12494
|
11b6bb5545
|
Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev
|
2023-03-28 16:14:54 +08:00 |
|
DEVICE8\12494
|
c80a41baed
|
调整预览接口空对象，异常
|
2023-03-28 16:14:47 +08:00 |
|
pofi
|
d636034f06
|
简化startup
|
2023-03-28 15:29:09 +08:00 |
|
pofi
|
847a858d4c
|
调整项目依赖
|
2023-03-27 19:09:57 +08:00 |
|
DEVICE8\12494
|
eb859fe730
|
控制模版数据转换，将json字符串反序列化List<string>时，代码调整
|
2023-03-27 16:15:35 +08:00 |
|
pofi
|
2cbaa39611
|
更新core包
|
2023-03-24 10:53:01 +08:00 |
|
pofi
|
12f1b65a82
|
更新core包
|
2023-03-24 09:43:31 +08:00 |
|
pofi
|
3de92dab06
|
merge from 2023-03-14
|
2023-03-24 09:37:07 +08:00 |
|