Commit Graph

Select branches

Hide Pull Requests

dev

Mono Color

• 3258b61764 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev chenwenkai 2024-10-29 10:31:47 +08:00
• 45d5eff708 BIP异常信息接口：采购订单删除，修改接口 chenwenkai 2024-10-29 10:31:39 +08:00
• 3316377d3e 跨层回写工位，其他出选择列表接口 majian 2024-10-29 09:08:56 +08:00
• bd984ed0aa 修改注塑生产提报 chenwenkai 2024-10-28 15:49:15 +08:00
• 44128eb79b 现场问题处理 erp添加unicode majian 2024-10-28 10:45:24 +08:00
• fad3f116aa Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev chenwenkai 2024-10-28 10:21:49 +08:00
• f65b9af402 bip委外加工入库修改 chenwenkai 2024-10-28 10:21:34 +08:00
• 967055778f 盘点单接口 报表优化 majian 2024-10-25 17:58:09 +08:00
• 9fd13a55fc Merge remote-tracking branch 'origin/dev' into dev zhou keda 2024-10-25 17:41:04 +08:00
• 611900639c 长管签收自动投料 zhou keda 2024-10-25 17:40:55 +08:00
• 7335b7aa27 bip采购到货修改 chenwenkai 2024-10-25 17:34:28 +08:00
• 077aabeba5 Revert "bip采购到货更改到货交易类型" chenwenkai 2024-10-25 17:30:53 +08:00
• 8d4f3ef3b1 bip采购到货更改到货交易类型 chenwenkai 2024-10-25 17:27:09 +08:00
• 6aae58644d bip采购收货增加到货交易类型字段 chenwenkai 2024-10-25 16:56:34 +08:00
• 7b6a2c31aa BIP采购入库子表相同物料回传汇总一条 chenwenkai 2024-10-25 14:26:38 +08:00
• 83f0754103 bip采购到货和委外加工入库修改 chenwenkai 2024-10-24 15:34:43 +08:00
• ccf9941e64 BIP采购入库对接修改；BIP委外加工入库修改 chenwenkai 2024-10-24 14:33:13 +08:00
• dc2cf67ee6 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev chenwenkai 2024-10-23 17:06:18 +08:00
• 169f2c9c22 修改预任务下发，去除载具id和code chenwenkai 2024-10-23 17:06:12 +08:00
• a05971631b Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev majian 2024-10-23 15:30:23 +08:00
• 5e675754e0 现场问题处理 人工入空托盘堆垛 塑车间信号点位统一整理为配置项等 majian 2024-10-23 15:30:15 +08:00
• 088781b66d 1.PDA静脉线配送起点和终点改为可选可扫；2.点击配送不需要填写载具，生成预任务申请 chenwenkai 2024-10-23 15:25:51 +08:00
• 5e5b3d4374 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev chenwenkai 2024-10-22 13:54:56 +08:00
• 48299687c2 1.质检不合格，选择时间区间；2.生产入库记录增加工单类型及物料的查询条件；3.产成品入库同步BIP成功后，相关信息记录到生产入库记录 chenwenkai 2024-10-22 13:54:43 +08:00
• a96bdb4091 质检报表完善 majian 2024-10-21 18:01:21 +08:00
• 8ac0824412 1 majian 2024-10-21 17:08:14 +08:00
• 7c9a64e5eb Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev chenwenkai 2024-10-21 17:01:55 +08:00
• d1bf8c1bb1 委外入库bug修改 chenwenkai 2024-10-21 17:01:36 +08:00
• 7865fd5c2d 报表调整 灭菌转库调整 majian 2024-10-18 17:09:33 +08:00
• f365035a89 收货控制 自动空托盘出库调整 majian 2024-10-18 14:42:23 +08:00
• 013c706b42 委外质检确认结果保存 chenwenkai 2024-10-18 13:52:09 +08:00
• 8ae060e8d6 采购/委外调整 majian 2024-10-18 13:42:03 +08:00
• abe6bd70b3 任务下发增加主表编码 chenwenkai 2024-10-18 11:40:38 +08:00
• feb34c0938 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev chenwenkai 2024-10-17 14:38:38 +08:00
• efbb84b149 委外入库bip测试接口地址 chenwenkai 2024-10-17 14:38:27 +08:00
• 9d74b03416 bip委外回传 majian 2024-10-17 14:25:53 +08:00
• 5e572577c7 原材来质检任务报表 majian 2024-10-16 15:17:57 +08:00
• c88f6a9281 数据库连接字符串还原 10840 2024-10-16 13:44:42 +08:00
• c81eaa0357 修改委外发货物料id和编码获取错误 10840 2024-10-16 13:40:34 +08:00
• 21fb6ef381 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev majian 2024-10-16 10:26:29 +08:00
• 68f270c47b 原材料质检记录接口 majian 2024-10-16 10:26:12 +08:00
• 1b65d45580 Merge remote-tracking branch 'origin/dev' into dev zhou keda 2024-10-15 17:28:50 +08:00
• bbd35204ff 到货类型id zhou keda 2024-10-15 17:28:40 +08:00
• 4ef60c8c7c Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev majian 2024-10-15 14:31:18 +08:00
• ca45839b2a 分拣任务变更 现场问题处理 majian 2024-10-15 14:30:59 +08:00
• c24946fad6 到货类型编码 zhou keda 2024-10-15 13:42:44 +08:00
• c3fd844523 委外到货修改 zhou keda 2024-10-14 17:48:51 +08:00
• d0f6bfb459 不是注塑的提报载具直接合格 zhou keda 2024-10-14 17:13:26 +08:00
• da3db7aee6 1 zhou keda 2024-10-14 11:52:40 +08:00
• 38383eb4cb 1 zhou keda 2024-10-14 11:51:30 +08:00
• 0de05a1487 Merge remote-tracking branch 'origin/dev' into dev zhou keda 2024-10-14 11:46:49 +08:00
• 4db77bc3e0 委外到货bug zhou keda 2024-10-14 11:44:52 +08:00
• f809590fb6 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev majian 2024-10-14 11:17:42 +08:00
• 8c047af86e 出库时物料状态控制，采购订单收货单到货数量调整、报表调整 majian 2024-10-12 17:09:59 +08:00
• 9259c5fca5 委外到货 zhou keda 2024-10-12 17:07:17 +08:00
• f2bc936ea7 erp物料同步开关 zhou keda 2024-10-12 14:06:16 +08:00
• 20ff2d213a 入库容差 zhou keda 2024-10-12 11:44:48 +08:00
• 10d7470b56 注塑空箱配送控制 zhou keda 2024-10-12 11:34:57 +08:00
• 16d0cae943 调拨入库部门修改 zhou keda 2024-10-12 09:52:35 +08:00
• 3dcb952e30 委外收货 majian 2024-10-11 17:37:46 +08:00
• 1fdb2c8861 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev majian 2024-10-11 15:42:47 +08:00
• c02f9216d5 销售发货合并 majian 2024-10-11 15:42:40 +08:00
• ffc93851fe 生产提报绑定载具增加规格型号 zhou keda 2024-10-11 15:41:41 +08:00
• 90755153be bug zhou keda 2024-10-11 15:19:11 +08:00
• f8dd16e8fb Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev majian 2024-10-11 14:34:23 +08:00
• 24da1906e9 生产报告部门vid zhou keda 2024-10-11 13:56:51 +08:00
• 908b02bc5e Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev majian 2024-10-11 11:37:29 +08:00
• e3f9561ad1 bug zhou keda 2024-10-11 11:31:27 +08:00
• 294442b933 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev majian 2024-10-11 11:05:36 +08:00
• 45b26f1f5c 现场问题处理 majian 2024-10-11 11:05:28 +08:00
• 7142f40a10 1 zhou keda 2024-10-11 11:05:08 +08:00
• 1a76482a74 bug zhou keda 2024-10-11 10:58:26 +08:00
• 77dd50faed bug zhou keda 2024-10-11 10:13:13 +08:00
• 8049743296 bug zhou keda 2024-10-10 16:36:47 +08:00
• 88d83e46d3 物料保质期 zhou keda 2024-10-10 15:59:13 +08:00
• 8a5ff0ebe6 bug zhou keda 2024-10-10 12:02:16 +08:00
• a4ce415b62 bug zhou keda 2024-10-10 10:41:43 +08:00
• a3596e4e5b 载具解绑服务加了2个不需要事务的接口 zhou keda 2024-10-10 09:06:03 +08:00
• 7438376ab1 Merge remote-tracking branch 'origin/dev' into dev zhou keda 2024-10-09 18:21:19 +08:00
• 0578e5b508 bug zhou keda 2024-10-09 18:21:09 +08:00
• c675ec3e07 外协入库与四楼自动移库逻辑修改、现场问题处理 majian 2024-10-09 18:12:33 +08:00
• 05714f027d bug zhou keda 2024-10-09 17:32:15 +08:00
• 17b3ceaeda BUG zhou keda 2024-10-09 17:10:22 +08:00
• 9132435364 bug zhou keda 2024-10-09 16:52:28 +08:00
• d0e77bef3e 自动签收后直接自动投料 zhou keda 2024-10-09 15:58:38 +08:00
• 70f2f1d559 材料出库单加研究项目 zhou keda 2024-10-09 14:36:09 +08:00
• fc4fc7ed3f erp研发项目 zhou keda 2024-10-09 13:42:39 +08:00
• b3223e7966 产成品入库增加来源单据号 来源单据行标识 zhou keda 2024-10-09 10:55:44 +08:00
• dc5cce35ee bug zhou keda 2024-10-09 09:24:28 +08:00
• 92d5a5400f 同步erp用户 zhou keda 2024-10-09 08:44:01 +08:00
• e26e405006 导出时列表重写了就调用重写的1 zhou keda 2024-10-08 14:30:06 +08:00
• 79e1108b9b Merge remote-tracking branch 'origin/dev' into dev zhou keda 2024-10-08 14:29:38 +08:00
• a9c146b1b8 导出时列表重写了就调用重写的 zhou keda 2024-10-08 14:29:27 +08:00
• a5dbc35e57 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev majian 2024-10-08 11:33:48 +08:00
• 2a3a56814b 现场问题 majian 2024-10-08 11:33:35 +08:00
• 63a565a9db 挤出批号修改 zhou keda 2024-10-08 11:15:20 +08:00
• f5c0e0e41f 自制单据行号优化 zhou keda 2024-10-08 10:57:30 +08:00
• 7152324b26 erp接口备注加方法名 zhou keda 2024-10-08 09:43:00 +08:00
• 4af8cc9d86 Merge remote-tracking branch 'origin/dev' into dev zhou keda 2024-09-30 16:22:17 +08:00
• 0ce27506cd 注塑挤出下发列表页显示批号 zhou keda 2024-09-30 16:22:07 +08:00