Commit Graph

770 Commits

Author SHA1 Message Date
zhoukeda
dd049ceeed 备件领用 2023-07-11 14:39:34 +08:00
alex
3b1dc1f026 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-07-10 14:58:55 +08:00
alex
ee4bbf62fe 修改判空条件代码逻辑 2023-07-10 14:58:52 +08:00
FanLian
6543735610 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-07-10 13:57:44 +08:00
FanLian
0213fb907a bug 2023-07-10 13:57:39 +08:00
alex
ba03f549bc 1 2023-07-10 13:41:19 +08:00
alex
0e058a0f65 消除warning 2023-07-10 13:37:04 +08:00
alex
217d4a02e0 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-07-10 13:35:01 +08:00
alex
8f9924e918 调整Entity目录结构 2023-07-10 13:34:54 +08:00
FanLian
d662984b38 增加接口输入限制 2023-07-10 10:20:30 +08:00
alex
3f351cf23f MES齐套搭配方案查询接口,忽略中间变量 2023-07-07 17:15:05 +08:00
FanLian
284b36a043 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-07-07 16:49:47 +08:00
FanLian
630678ff23 增加MES-WMS接口 2023-07-07 16:49:39 +08:00
zhoukeda
844b76b823 消除warning 2023-07-07 15:54:43 +08:00
zhoukeda
c112472256 Merge remote-tracking branch 'origin/dev' into dev 2023-07-07 14:49:43 +08:00
zhoukeda
dace6212de 模具领用归还 2023-07-07 14:49:35 +08:00
alex
70634df84d 出库签收代码调整 2023-07-07 09:03:40 +08:00
alex
9488c6b6ca WmsOutStockService 删除测试代码 2023-07-06 17:00:36 +08:00
FanLian
fbae50c42d Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-07-06 16:44:47 +08:00
FanLian
5671bbce2f 1 2023-07-06 16:44:40 +08:00
FanLian
7b3cba1099 增加生产出库接口 2023-07-06 16:44:32 +08:00
alex
e89676da3f 1 2023-07-06 16:40:15 +08:00
alex
5497a0923b Mes->Wms 生产入库接口调整 2023-07-06 16:04:46 +08:00
alex
9ba46e24a3 解决ProductionMgr编译不过去的问题 2023-07-06 15:06:34 +08:00
zhoukeda
f81c6cfc34 1 2023-07-06 14:29:47 +08:00
alex
8e67f5cbec 1 2023-07-06 14:21:57 +08:00
alex
72d48abc5d Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-07-06 14:04:06 +08:00
alex
8eb5f3ece2 优化wareHouseService 不分函数,提取冗余不分代码增加代码可读性,维护性 2023-07-06 14:04:00 +08:00
zhoukeda
0a186ad2a1 BUG 2023-07-06 11:32:05 +08:00
zhoukeda
902c0eb301 推送规则,异常停机推送 2023-07-06 11:18:02 +08:00
alex
c6e46b4ad9 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-07-06 08:54:57 +08:00
alex
c54274301c 新增进出库策略,修改起禁用状态函数 2023-07-06 08:54:50 +08:00
zhoukeda
179c50b8ba 生产bom修改 2023-07-06 08:39:22 +08:00
alex
2dc3f4d3e5 优化部分代码 2023-07-05 11:32:07 +08:00
alex
3957bd3e5c 1 2023-07-05 10:45:10 +08:00
alex
2f07cd3e0e Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-07-05 10:04:55 +08:00
alex
9ce1f54f2f 优化根据明细ID获取出入库明细代码 2023-07-05 10:04:48 +08:00
zhoukeda
af948e482d bug 2023-07-05 09:52:49 +08:00
alex
6779adab6f 消除warning 2023-07-04 17:56:30 +08:00
alex
679bb67ac2 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-07-04 17:34:20 +08:00
alex
fca6b414eb 1 2023-07-04 17:34:14 +08:00
zhoukeda
3969f09b31 流程bug 2023-07-04 17:33:20 +08:00
FanLian
6310748276 修改use相关的 2023-07-04 11:31:19 +08:00
FanLian
6bb96832f0 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-07-04 11:03:33 +08:00
FanLian
ff66b1fa04 更改location的is_use字段为string 2023-07-04 11:03:28 +08:00
alex
4e42d12e21 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-07-04 09:45:27 +08:00
alex
418133e475 wms 服务消除warning 2023-07-04 09:45:22 +08:00
FanLian
a4298ca2d9 1 2023-07-04 09:35:13 +08:00
FanLian
df89a9a526 1 2023-07-04 09:26:37 +08:00
alex
5e36ac1a15 1 2023-07-04 09:22:42 +08:00