Commit Graph

100 Commits

Author SHA1 Message Date
zhoukeda
e16fc6ac4a 工序工位存入bas_process_station 2023-04-28 14:38:14 +08:00
DEVICE8\12494
0a2bb034cf Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-04-27 18:40:42 +08:00
DEVICE8\12494
264f03bb15 调整框架多组合代码,组合条件查询 2023-04-27 18:40:38 +08:00
zhoukeda
e22fd748a9 生产bom保存接口 2023-04-27 16:59:17 +08:00
zhoukeda
70cac6bc83 开关类型控件保存为数字类型 2023-04-27 11:08:28 +08:00
DEVICE8\12494
5499158756 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-04-26 17:58:58 +08:00
DEVICE8\12494
6118106b72 组织管理,新增设备与工位绑定、解绑功能 2023-04-26 17:58:53 +08:00
zhoukeda
6b12b09324 增加接口 2023-04-26 17:20:58 +08:00
zhoukeda
c155218229 回退 2023-04-26 16:32:15 +08:00
zhoukeda
a2eb375553 修改命名空间 2023-04-26 16:25:40 +08:00
DEVICE8\12494
631bb0c0e8 生产管理,新增修改任务单接口 2023-04-26 14:08:11 +08:00
DEVICE8\12494
4bfceebed8 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-04-26 10:56:07 +08:00
DEVICE8\12494
cb86df09e0 1 2023-04-26 10:56:00 +08:00
PhilPan
5d6e9265a8 去掉IDE1006警告,修改BaseEntity 2023-04-26 10:44:11 +08:00
PhilPan
a1f848fcd7 修改引用 2023-04-26 10:19:42 +08:00
PhilPan
2c9d9b9ad5 修改引用 2023-04-26 10:18:36 +08:00
DEVICE8\12494
f13a3c2ac8 1 2023-04-26 10:15:10 +08:00
DEVICE8\12494
b891501756 1 2023-04-26 10:15:07 +08:00
DEVICE8\12494
26d6e12e35 调整相关类命名空间,及接口命名规范 2023-04-26 09:58:10 +08:00
PhilPan
04f0d7b339 api命名规范,字典常量规范 2023-04-26 09:44:19 +08:00
DEVICE8\12494
b1f04f8a43 1 2023-04-25 17:27:38 +08:00
DEVICE8\12494
6999acbeb4 生产管理,新增机台调整接口 2023-04-25 17:27:22 +08:00
DEVICE8\12494
967c013d16 生产管理新增,同组工单下发,取消同组工单 2023-04-25 15:54:27 +08:00
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