Commit Graph

1118 Commits

Author SHA1 Message Date
majian
9c8d50022c 8线入中储仓接口 2024-07-19 15:11:53 +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
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
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
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
zhou keda
c17bf876c1 erp 其他出库接口 2024-07-15 14:26:05 +08:00
majian
53384c7be5 人工入空托 2024-07-13 23:10:31 +08:00
majian
724372b20a 人工空托盘入库 2024-07-13 22:52:14 +08:00
majian
2dc8f04e4e 二楼流程优化 电梯bug修复 2024-07-13 22:08:30 +08:00
majian
692e75de19 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2024-07-12 15:12:00 +08:00
majian
f4cf422a83 电梯控制bug处理 包材出库逻辑变更 2024-07-12 15:11:11 +08:00
zhou keda
6c533477a7 用户导入 2024-07-12 15:01:12 +08:00
majian
614681284d 包材入库 包材出库 PDA空载具出库bug、其它bug处理 2024-07-10 23:01:33 +08:00
zhou keda
f48a82adb4 转库单接口增加是否要子表字段 2024-07-10 16:46:50 +08:00
majian
3b660e1238 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2024-07-09 14:07:21 +08:00
majian
d39859c105 库存报表,日志完善 2024-07-09 14:06:59 +08:00
zhou keda
6262a94edc 物料签收bug 2024-07-08 17:41:30 +08:00
majian
e005082c12 erp转库单同步 2024-07-05 14:03:21 +08:00
majian
c5fc62d3ce Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2024-07-04 16:34:11 +08:00
majian
9ea9b4378d erp转库单的同步,签收逻辑修改 2024-07-04 16:34:04 +08:00
zhou keda
f635d5542e bug 2024-07-04 16:13:08 +08:00
majian
077b08efbe Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2024-07-04 10:54:05 +08:00
majian
cbe419274e erp转库单同步 2024-07-04 10:53:58 +08:00