Commit Graph

2627 Commits

Author SHA1 Message Date
DEVICE8\12494
32898552dc Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-04-25 08:59:41 +08:00
DEVICE8\12494
6a2a7c119f 调整生产管理代吗 2023-04-25 08:59:35 +08:00
PhilPan
2405b2ce52 接口地址按MVC风格示例 2023-04-24 18:33:04 +08:00
zhoukeda
ca15917996 改字段名 2023-04-24 16:57:53 +08:00
DEVICE8\12494
83350bf3c1 1 2023-04-23 16:53:02 +08:00
PhilPan
e15a432926 修改appsetting.json 2023-04-23 16:51:47 +08:00
PhilPan
46fe08a147 恢复appsetting 2023-04-23 16:48:00 +08:00
PhilPan
971a02b43b meger 2023-04-23 16:46:36 +08:00
PhilPan
47c764b8ef 优化pg获取所有表信息 2023-04-23 16:43:53 +08:00
PhilPan
3657f83184 部门接口加上扩展属性 2023-04-23 16:43:22 +08:00
DEVICE8\12494
2723aa7862 排产代码逻辑调整 2023-04-23 16:38:44 +08:00
DEVICE8\12494
f0fde866c8 生产管理-生产工单排产代码调整 2023-04-23 13:41:40 +08:00
DEVICE8\12494
67113fabf8 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-04-21 16:54:20 +08:00
DEVICE8\12494
a1bf240ff2 生产管理 2023-04-21 16:54:16 +08:00
DEVICE8\12494
e915a1949c 1 2023-04-21 16:54:05 +08:00
zhoukeda
119de0aef4 修改ebom相关名称 2023-04-21 16:20:56 +08:00
PhilPan
db3aca5590 重新组织目录 2023-04-21 09:27:30 +08:00
PhilPan
e0bb1ee185 重新组织目录 2023-04-21 09:26:33 +08:00
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