Commit Graph

1684 Commits

Author SHA1 Message Date
fei.pan
70de358f97 完善通用接口输入参数 2023-11-21 00:19:45 +08:00
yang.lee
079eec500b Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-11-20 11:51:20 +08:00
yang.lee
82dfc486bf 载具新增批量新增接口 2023-11-20 11:51:13 +08:00
zhoukeda
962df6c8de Merge remote-tracking branch 'origin/dev' into dev 2023-11-20 11:23:30 +08:00
zhoukeda
ed23045258 组装任务下发添加创建时间 2023-11-20 11:23:20 +08:00
yang.lee
fd31f60c46 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-11-20 09:34:31 +08:00
yang.lee
337e9945cf 调整自定义日志 2023-11-20 09:34:23 +08:00
hlb
584c5bf188 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-11-18 15:56:38 +08:00
hlb
21659115b0 回库时业务为 载具移入 2023-11-18 15:56:29 +08:00
yang.lee
8a37f57cf6 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-11-17 16:02:05 +08:00
yang.lee
f963b7067c 根据明细Id获取出入库明细信息,新增仓库翻译 2023-11-17 16:01:56 +08:00
fei.pan
e5ab4d6887 初步完成代码级重写通用接口功能 2023-11-17 14:05:05 +08:00
zhoukeda
47fe9030d6 Merge remote-tracking branch 'origin/dev' into dev 2023-11-17 10:35:59 +08:00
zhoukeda
48f390cdb7 重写设备列表接口 2023-11-17 10:35:51 +08:00
yang.lee
5522f09780 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-11-17 10:06:24 +08:00
yang.lee
ba9b905a06 wms基础数据基类改为基础配置基类,同时增加不同业务的启用、禁用功能 2023-11-17 10:06:17 +08:00
fei.pan
9915cbd4f9 修改泛型通用接口 2023-11-16 17:31:39 +08:00
yang.lee
4689be2ed1 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-11-16 17:24:02 +08:00
yang.lee
c946fd6e80 根据盘点任务ID获取盘点任务明细,新增参数备注 2023-11-16 17:23:57 +08:00
qianjiawei
5fe7cd1589 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-11-16 17:15:05 +08:00
qianjiawei
5f957eff80 模具退还 2023-11-16 17:15:00 +08:00
yang.lee
4e01fd4176 1 2023-11-16 16:41:15 +08:00
yang.lee
ecfe6fb0b8 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-11-16 16:21:49 +08:00
yang.lee
5333dc96c0 盘点任务,业务代码调整 2023-11-16 16:21:44 +08:00
qianjiawei
b3c8ac3779 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-11-16 16:17:30 +08:00
qianjiawei
b31862a2de 模具与物料、设备接口修改 2023-11-16 16:17:14 +08:00
fei.pan
42e853f365 修复通用接口错误 2023-11-16 15:27:24 +08:00
yang.lee
9afd85bb89 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-11-16 15:15:35 +08:00
yang.lee
255f307c8d 修改 盘点任务代码 2023-11-16 15:15:30 +08:00
fei.pan
9e42729e04 修复最新简化集合方式的报错 2023-11-16 15:15:00 +08:00
fei.pan
dca3712828 修复表达式简化的错误 2023-11-16 14:58:54 +08:00
fei.pan
a5f3d473e6 修复排序错误 2023-11-16 14:55:37 +08:00
hlb
5b49890a4f 修改类型 批次盘点-区域盘点 2023-11-16 14:51:58 +08:00
hlb
5bab741657 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-11-16 14:50:33 +08:00
hlb
9bf7d055d5 修改物料盘点和批次盘点条件 2023-11-16 14:50:22 +08:00
zhoukeda
79b5bec1be 1 2023-11-16 14:36:58 +08:00
hlb
24d8377f33 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-11-16 14:06:38 +08:00
yang.lee
1cf5b63c57 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-11-16 14:06:32 +08:00
yang.lee
70b8700cc3 将自定义日志属性移动到BaseWareHouseService 2023-11-16 14:06:27 +08:00
hlb
e1920db0bb 发货和收货确认后生成单据时增加审核状态和同步状态 2023-11-16 14:06:21 +08:00
qianjiawei
6d930b53e5 BUG 2023-11-16 13:50:51 +08:00
qianjiawei
18c1b89569 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-11-16 13:36:28 +08:00
qianjiawei
8860044e92 模具质检BUG 2023-11-16 13:36:15 +08:00
yang.lee
b187c92e41 1 2023-11-16 11:56:40 +08:00
yang.lee
86c0c0ee3a 修复bug 2023-11-16 11:53:47 +08:00
yang.lee
68195fe844 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-11-16 11:53:39 +08:00
yang.lee
ff37e58ef8 修复bug 2023-11-16 11:53:19 +08:00
zhoukeda
6b642324f7 1 2023-11-16 09:49:15 +08:00
zhoukeda
e29d74844c 任务单操作记录列表修改 2023-11-16 09:26:53 +08:00
yang.lee
98d0fd1004 1 2023-11-15 14:30:26 +08:00