Commit Graph

2161 Commits

Author SHA1 Message Date
majian
5059ae3e55 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2024-07-22 18:26:07 +08:00
majian
076b029532 三工位、提示优化 2024-07-22 18:25:42 +08:00
zhou keda
0a8cdfddbb bug 2024-07-22 17:47:06 +08:00
zhou keda
ad604ac5ab bug 2024-07-22 17:04:38 +08:00
zhou keda
46ef173bb5 bug 2024-07-22 12:54:53 +08:00
zhou keda
69b0d1e6ed bug 2024-07-22 12:51:15 +08:00
zhou keda
3a88deb159 bug 2024-07-22 12:46:46 +08:00
zhou keda
6ac4016dee Merge remote-tracking branch 'origin/dev' into dev 2024-07-22 11:29:47 +08:00
zhou keda
525fcb428a bug 2024-07-22 11:29:39 +08:00
majian
c44c926c0c Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev
Conflicts:
	WarehouseMgr/Tnb.WarehouseMgr/WmsMaterialTransferService.cs
2024-07-22 11:05:03 +08:00
majian
401d921f49 二楼空托到码垛线,库存报表变更 2024-07-22 10:59:20 +08:00
zhou keda
922a3bc391 bug 2024-07-22 10:56:50 +08:00
zhou keda
a239258646 bug 2024-07-19 17:22:08 +08:00
zhou keda
5345400596 同步物料 物料清单 2024-07-19 16:51:07 +08:00
majian
9c8d50022c 8线入中储仓接口 2024-07-19 15:11:53 +08:00
zhou keda
02616b6170 bug 2024-07-19 08:54:45 +08:00
zhou keda
ffa87d84de Merge remote-tracking branch 'origin/dev' into dev 2024-07-19 08:50:22 +08:00
zhou keda
6e3bda642a bug 2024-07-19 08:50:02 +08:00
majian
d9f53c2024 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2024-07-18 23:54:54 +08:00
majian
9912976239 随料架更新料箱位置,下任务顺序变更 2024-07-18 23:54:39 +08:00
zhou keda
9326b55a8e 同步单位 2024-07-18 14:05:49 +08:00
majian
fd8806b204 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev
Conflicts:
	apihost/Tnb.API.Entry/Configurations/ConnectionStrings.json
2024-07-18 12:33:38 +08:00
majian
5666f0262e 转库单同步调整 库存报表调整 2024-07-18 12:31:05 +08:00
zhou keda
5bbd7eb25f bug 2024-07-18 12:04:52 +08:00
majian
7f7f21c271 静置仓到成品 2024-07-18 10:29:56 +08:00
majian
1374ba7a56 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2024-07-18 10:29:11 +08:00
zhou keda
d8a9562ffa 添加其他数据库 2024-07-18 08:40:24 +08:00
majian
019651b023 电梯下发逻辑变更 2024-07-17 22:50:24 +08:00
zhou keda
e16a2dfe37 bug 2024-07-17 17:22:31 +08:00
majian
c6ae917bc9 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2024-07-17 14:58:41 +08:00
majian
b6d3588335 1 2024-07-17 14:58:35 +08:00
zhou keda
757bdf8cb9 注塑定点配送修改 2024-07-17 14:12:52 +08:00
zhou keda
251acac591 回滚上个提交 2024-07-17 14:12:22 +08:00
zhou keda
44d586e85b 注塑定点配送修改 2024-07-17 14:10:31 +08:00
zhou keda
96875e8afc bug 2024-07-17 12:07:27 +08:00
majian
03775c8a12 静置仓逻辑编写,返回提示修改 bug,包材出库逻辑变更 2024-07-17 11:23:23 +08:00
zhou keda
ff038ff1d5 组装提报仓库 库位修改 2024-07-17 09:32:56 +08:00
zhou keda
73e496b989 bug 2024-07-16 17:26:49 +08:00
majian
bf39c08837 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2024-07-16 12:45:43 +08:00
majian
bfc22c7326 灭菌线、信号变更 2024-07-16 12:45:35 +08:00
zhou keda
97045e3bbe bug 2024-07-16 12:37:34 +08:00
zhou keda
a66d0c0a9a ... 2024-07-16 10:11:26 +08:00
majian
1f5dfa5a2e Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2024-07-16 09:37:48 +08:00
majian
41bb4584cc 输送线信号变更 2024-07-16 09:37:37 +08:00
zhou keda
ae17e639eb Merge remote-tracking branch 'origin/dev' into dev 2024-07-16 09:21:25 +08:00
zhou keda
25b0c4e78d bug 2024-07-16 09:21:16 +08:00
majian
009f9b2911 优化 2024-07-15 23:34:42 +08:00
majian
a3532f00f9 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2024-07-15 18:06:41 +08:00
majian
56f8531044 待灭菌仓流程,erp采购订单接口,日志完善 2024-07-15 18:06:26 +08:00
zhou keda
3d07942f32 其他入库 2024-07-15 17:32:34 +08:00