Commit Graph

3799 Commits

Author SHA1 Message Date
caoqianming a5f32dbeda Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory 2025-09-10 15:35:18 +08:00
caoqianming e491d7b4fe fix: wpr list filter bug 2025-09-10 15:35:17 +08:00
zty 1ea9ef48a6 Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory 2025-09-10 15:21:19 +08:00
zty 9db173cdb9 feat: vehicle 增加serializer 返回字段 2025-09-10 15:21:19 +08:00
caoqianming 2369c1469e feat: wpr list返回batch 2025-09-10 15:03:24 +08:00
caoqianming 27416dfeaa Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory 2025-09-10 14:49:35 +08:00
caoqianming ec8881fb02 feat: 增加wpr tag查询条件以支持todo等 2025-09-10 14:49:35 +08:00
zty f6f842c17f feat: 修改车辆的字段 2025-09-10 14:36:30 +08:00
zty 172e2397be feat: ofm 车辆管理迁移文件 2025-09-10 14:27:38 +08:00
zty 71bc4e76f0 Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory 2025-09-10 14:26:25 +08:00
zty ba8b258ee7 feat: ofm 车辆审批 2025-09-10 14:26:23 +08:00
caoqianming 8b7a87abb6 fix: 出入库记录和交接记录提交处理时都进行单个的强校验 2025-09-10 13:11:51 +08:00
caoqianming d42bc29d2c feat: 出入库记录和交接记录提交处理时都进行单个的强校验 2025-09-10 11:26:37 +08:00
caoqianming 6b423c80eb feat: 添加物料明细与批次不匹配的校验2 2025-09-09 16:49:51 +08:00
caoqianming df4b062209 feat: 添加物料明细与批次不匹配的校验 2025-09-09 16:38:58 +08:00
caoqianming d84b8e94fd feat: gen_number_with_rule 优化一下 2025-09-09 16:19:05 +08:00
caoqianming 6d09e5e4f3 feat: handover_submit增强校验 2025-09-09 15:39:13 +08:00
caoqianming bc555b7bea feat: mlog list 支持返回mlogbw number 2025-09-09 14:05:59 +08:00
caoqianming 3906b0f744 feat: gen_number_with_rule按生产日志中的工段过滤 2025-09-09 13:37:56 +08:00
caoqianming d19fee8e6f feat: gen_number_with_rule 完善 2025-09-09 11:28:04 +08:00
caoqianming 81a16fd37e feat: 工段未配置班次提醒 2025-09-09 11:23:09 +08:00
caoqianming ddb4a6930d Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory 2025-09-09 10:37:56 +08:00
caoqianming cbc5d558d9 feat: 板段号生成逻辑修改 2025-09-09 10:37:56 +08:00
zty 0183234497 Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory 2025-09-08 16:31:24 +08:00
zty 068e391845 feat: ofm-印章绑定审批修改 2025-09-08 16:31:20 +08:00
caoqianming 0a12927518 feat: batch bxerp含缺陷统计 2025-09-08 15:18:10 +08:00
caoqianming 3be13dd920 feat: mlog list 添加update_time 2025-09-08 14:51:11 +08:00
caoqianming 8cc9c46a95 feat: 工艺步骤中辅料使用的校验 2025-09-08 14:29:19 +08:00
caoqianming 2e2ac78bad feat: mlogb添加parent isnull查询 2025-09-08 13:33:48 +08:00
caoqianming 0b1f71e652 Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory 2025-09-08 11:18:10 +08:00
caoqianming 94a218c09a feat: 次批触发输出产生 2025-09-08 11:18:09 +08:00
zty de1e5b4d41 feat: 修改印章的model 和 serializer 2025-09-08 11:13:06 +08:00
zty 0e783a92e0 Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory 2025-09-08 09:58:00 +08:00
zty 3e90dd6820 feat: 修改 ofm sevice 印章模块 2025-09-08 09:57:58 +08:00
caoqianming 10d4a64c3a feat: base 优化safe_get_or_create 2025-09-08 09:28:04 +08:00
zty f97f51e72c feat: 修改ofm seal 过滤查询功能 2025-09-05 14:49:50 +08:00
caoqianming 6b246f147d Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory 2025-09-05 14:32:43 +08:00
caoqianming fdb49e1147 feat: mioitemcreate 批次号可不填 2025-09-05 14:32:42 +08:00
zty ca18fece21 Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory 2025-09-05 11:10:16 +08:00
zty 6a6d46583b feat: 行政管理 -印章管理 2025-09-05 11:10:15 +08:00
caoqianming 41c1653d13 feat: ftest默认为合格 2025-09-05 09:47:20 +08:00
caoqianming c20580e263 fix: mlogbwstarttest bug4 2025-09-04 17:23:00 +08:00
caoqianming a6fcdab836 fix: mlogbwstarttest bug3 2025-09-04 17:20:31 +08:00
caoqianming 026ebccef5 fix: mlogbwstarttest bug2 2025-09-04 17:18:38 +08:00
caoqianming f1aa922946 fix: mlogbwstarttest bug 2025-09-04 17:08:19 +08:00
caoqianming a7fd4b9448 feat: MlogbDefect 添加count_has 的处理 2025-09-04 16:59:20 +08:00
caoqianming 65d47008a4 feat: mlogbdefect添加count_has 字段 2025-09-04 16:48:41 +08:00
caoqianming 65726e967f feat: update_mb_item defect处理更严谨 2025-09-04 16:48:10 +08:00
caoqianming 2524feca72 feat: 取消最后一步产出与工艺包不一致 的校验 2025-09-04 15:07:07 +08:00
caoqianming 01b30e21d3 feat: 出入库记录添加乐观锁 2025-09-04 14:42:14 +08:00
caoqianming 4cffb8a563 feat: 出入库明细可默认批次为无 2025-09-04 10:55:56 +08:00
caoqianming 0c08543e9c feat: 导入物料明细时可默认批次号为 无批次 2025-09-04 10:44:32 +08:00
caoqianming e6a1363b43 feat: 导入物料明细时可默认批次号为 无批次 2025-09-04 10:40:52 +08:00
caoqianming 3d188a72f3 feat: 导入物料明细时可默认批次号3 2025-09-04 10:25:42 +08:00
caoqianming 6104a2e6be feat: 导入物料明细时可默认批次号2 2025-09-04 10:08:44 +08:00
caoqianming abd1ac9d56 feat: batch_bxerp考虑mlogbw_from 2025-09-04 08:54:21 +08:00
caoqianming cc45163775 feat: mlog_submit mlogbdefect增加筛选条件 2025-09-04 08:53:37 +08:00
caoqianming f82db7bb6f feat: 导入物料明细时可默认批次号 2025-09-03 11:27:58 +08:00
caoqianming c4539260a8 feat: 光芯批次统计增加班次返回 2025-09-02 16:45:40 +08:00
caoqianming 872e59ffe1 feat: route update 时from_route存在则不可修改关键信息3 2025-09-02 15:53:24 +08:00
caoqianming 7d2f11f194 feat: route update 时from_route存在则不可修改关键信息2 2025-09-02 15:22:29 +08:00
caoqianming bf3803a0e8 feat: mlog_submit 进行操作时间校验 2025-09-02 15:17:59 +08:00
caoqianming a6b320bad6 feat: route update 时from_route存在则不可修改关键信息 2025-09-02 15:16:55 +08:00
caoqianming ba0e86d834 fix: ftestwork submit 校验wm和mb bug 2025-09-02 14:30:25 +08:00
caoqianming 28671451b0 feat: mlogchange支持work_start_time 2025-09-02 12:15:29 +08:00
caoqianming 45af751350 feat: MlogSerializer 处理 work_start_time 的 bug2 2025-09-02 11:32:05 +08:00
caoqianming c997cba6a5 feat: route采用引用方式允许重复创建 2025-09-02 11:23:37 +08:00
caoqianming 9af23216b6 feat: MlogSerializer 处理 work_start_time 的 bug 2025-09-02 11:09:12 +08:00
caoqianming 81561b5238 fix: MlogbInUpdateSerializer 联动count_use 和 count_real 2025-09-02 09:10:52 +08:00
zty f7cc3b438f Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory 2025-09-02 08:48:03 +08:00
zty 5c163cdcbb feat: 修改能管采集的点位 2025-09-02 08:48:01 +08:00
caoqianming 67f7afd3fc Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory 2025-09-02 08:40:20 +08:00
caoqianming 1929fd30a6 feat: mlog work_start_time必填 2025-09-02 08:40:20 +08:00
zty c38457e947 Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory 2025-09-01 17:05:21 +08:00
zty 8f6e401fdd feat: ftestwork submit支持mb 2025-09-01 17:05:20 +08:00
caoqianming 6582a4dae1 feat: toggle_state 使用 routepack.update权限 2025-09-01 16:06:00 +08:00
caoqianming 30f8d484d1 fix: batchlog batches_to 优化 2025-09-01 13:17:35 +08:00
caoqianming 31d0dc4829 feat: ftestwork支持对materialbatch检查 2025-08-29 13:11:58 +08:00
caoqianming 9d1c5415e1 feat: batchst返回material_start相关信息 2025-08-29 09:48:09 +08:00
caoqianming a249258ba6 feat: 添加定时任务以标记mtask 状态2 2025-08-28 16:43:10 +08:00
caoqianming 4fa0b33254 feat: 添加定时任务以标记mtask 状态 2025-08-28 16:37:23 +08:00
caoqianming 5e9c15c4a5 feat: 添加定时任务以标记mtask为已完成 2025-08-28 16:08:18 +08:00
caoqianming 786e885071 feat: update_mtask 不再触发状态改变 2025-08-28 16:07:41 +08:00
caoqianming 41485d7143 feat: 子任务提交会触发大任务提交 2025-08-28 15:40:24 +08:00
caoqianming 73b225fa19 feat: 优化mlog list查询2 2025-08-28 10:52:11 +08:00
caoqianming c47b66af6c feat: 优化mlog list查询 2025-08-28 09:54:56 +08:00
caoqianming 1d0861e0e7 feat: 增加直接userid获取token的接口 2025-08-27 15:47:57 +08:00
caoqianming fa243faf34 feat: mlog 添加索引 2025-08-27 15:35:04 +08:00
caoqianming ebe0e4cc6a fix: 增加mlogbw start_test接口以优化批量操作 2025-08-27 15:10:40 +08:00
caoqianming 894142712f feat: mlog view 暂时性能优化 2025-08-27 14:23:56 +08:00
caoqianming cd4b686f11 feat: 增加mlogbw start_test接口以优化批量操作 2025-08-27 11:11:04 +08:00
caoqianming 9ce5d29fa6 feat: 优化mlogbw bulk update 3 2025-08-27 10:07:35 +08:00
caoqianming 3e8bce688a feat: 优化mlogbw bulk update 2 2025-08-27 10:04:45 +08:00
caoqianming fa7d3095de feat: 优化mlogbw bulk update 2025-08-27 10:02:50 +08:00
caoqianming 316931fb40 feat: 添加mlog和handover的锁 2025-08-26 16:34:49 +08:00
caoqianming 8a039094cf feat: base 添加悲观锁及其装饰器 2025-08-26 16:34:25 +08:00
caoqianming f0b24da22f feat: number_to_batch 支持结合工序 2025-08-26 10:35:21 +08:00
caoqianming 5496058226 feat: 物料清单的导出 2025-08-25 15:37:05 +08:00
caoqianming 3810860f13 feat: mlogbw create 优化 2025-08-25 11:17:50 +08:00
caoqianming 0a6959a36c fix: mlogbw create 调换一下if顺序 2025-08-25 09:44:32 +08:00
caoqianming 4823acb004 fix: mlogbw create cal_count_notok bug 2025-08-25 08:58:47 +08:00
caoqianming 8b6d6fd668 fix: handover revert 可传入handler2 2025-08-21 20:17:02 +08:00
caoqianming c58c79a18a fix: handover revert 可传入handler 2025-08-21 20:13:09 +08:00
caoqianming 41a3418110 feat: material添加img字段 2025-08-21 17:34:39 +08:00
caoqianming 05955abd9c fix: base ComplexQueryMixin 默认null值排最后 2025-08-21 09:24:14 +08:00
caoqianming 0cf04c50b3 feat: 过滤来料未完成的优化 2025-08-20 17:39:43 +08:00
caoqianming 01e7d73bee feat: mlog quick添加mlogb 2025-08-20 15:03:58 +08:00
caoqianming 58024cc33d feat: batch_gzerp添加库存等字段 2025-08-19 16:01:18 +08:00
caoqianming 4921383de1 feat: check_sql_safe 优化一下 2025-08-19 15:11:03 +08:00
caoqianming bbfa512bb1 feat: quick返回mlogId 2025-08-19 11:32:48 +08:00
caoqianming d019e708cd feat: mlog submit revert支持放置到车间 2025-08-19 11:22:21 +08:00
caoqianming d9326bc264 feat: 可根据work_start_time 推出handle_date 2025-08-19 10:39:46 +08:00
caoqianming a8ed1c3083 feat: MlogInitSerializer 可传入handle_date 2025-08-19 10:35:45 +08:00
caoqianming 2bb1cf2844 feat: 去除commands命令权限 2025-08-19 08:56:29 +08:00
caoqianming 0dab1714f3 feat: 交接记录在审批状态下对撤销的处理 2025-08-18 16:52:23 +08:00
caoqianming fbce5ec64f feat: base retreat 撤回功能提到wfservice里 2025-08-18 16:51:23 +08:00
caoqianming efd25b040b fix: 导入出入库明细 2025-08-18 13:34:21 +08:00
caoqianming ee9fce675d feat: 导入出入库明细 2025-08-18 11:04:24 +08:00
caoqianming 7f619a36b0 feat: mlogbw增加type查询区分inout 2025-08-14 14:58:50 +08:00
caoqianming 84c701bdeb fix: 快速创建日志接口 2025-08-14 11:09:42 +08:00
caoqianming ca3e811b1b feat: 快速创建日志接口 2025-08-14 11:05:33 +08:00
caoqianming 1d778dbdf0 feat: 添加wamterial ava_qs方法 2025-08-14 09:48:23 +08:00
caoqianming c69c33e85a feat: mlogbw添加排序以支持直接展示 2025-08-14 08:44:23 +08:00
caoqianming 8ecd7d25b0 fix: mlogb__batch bug 2025-08-13 14:45:21 +08:00
caoqianming e03faeffc4 feat: WMaterialFilter filter tag优化 2025-08-13 10:03:00 +08:00
caoqianming c7b1c8a8b8 feat: mlogbw添加筛选条件2 2025-08-13 09:15:46 +08:00
caoqianming ddefbd49b2 feat: mlogbw添加筛选条件 2025-08-13 08:44:56 +08:00
caoqianming 10745394e3 feat: MIOItemCreateSerializer 添加pack_index4 2025-08-08 16:44:59 +08:00
caoqianming 82f6f4ee5e feat: MIOItemCreateSerializer 添加pack_index3 2025-08-08 14:34:57 +08:00
caoqianming 46c9c5abab feat: MIOItemCreateSerializer 添加pack_index2 2025-08-08 13:53:21 +08:00
caoqianming 09e390b37b feat: MIOItemCreateSerializer 添加pack_index 2025-08-08 13:47:25 +08:00
caoqianming 98a9806c4b feat: MaterialBatch返回can_mio2 2025-08-07 15:44:04 +08:00
caoqianming d3f83605aa feat: MaterialBatch返回can_mio 2025-08-07 15:39:43 +08:00
caoqianming 783f288926 feat: wpr 不做删除 2025-08-07 15:07:03 +08:00
caoqianming 40eb07eb12 feat: number_out_last 改为原始sql查询 2025-08-07 14:38:06 +08:00
caoqianming 835c5f78dd feat: base query_one_dict优化 2025-08-07 14:37:41 +08:00
caoqianming e30241dc22 feat: mioitemw 返回wpr_number_out 2025-08-07 14:25:55 +08:00
caoqianming b9376cc2d6 feat: 捕获number_out_last异常 2025-08-07 13:47:57 +08:00
caoqianming 05fcc4a00a feat: mlogbw返回wpr_number_out 2025-08-07 13:44:17 +08:00
caoqianming cf25d0d280 feat: 获取物料的缺陷项列表 2025-08-07 11:08:29 +08:00
caoqianming c7f6abf6a6 feat: route添加params_json字段 2025-08-07 10:37:59 +08:00
caoqianming a42d48775c feat: wpr增加can_use筛选条件2 2025-08-07 10:05:33 +08:00
caoqianming aa72953d17 feat: wpr增加can_use筛选条件 2025-08-07 09:31:53 +08:00
caoqianming 925666d3ef fix: number_out_last获取bug2 2025-08-06 14:29:08 +08:00
caoqianming b7823d56a8 fix: number_out_last获取bug 2025-08-06 08:59:29 +08:00
caoqianming 0a6de249ee feat: 光子批次统计增加组合件信息7 2025-08-05 16:02:58 +08:00
caoqianming d130f75076 feat: 光子批次统计增加组合件信息6 2025-08-05 16:01:01 +08:00
caoqianming dbde5a1327 feat: mlog 创建和编辑时可变更team字段 2025-08-05 15:45:30 +08:00
caoqianming 9b4a44be51 feat: get_qct 未有检验模板 2025-08-05 15:10:00 +08:00
caoqianming 05ea28f334 fix: wpr number_out_last 前缀参数 2025-08-05 14:31:34 +08:00
caoqianming c14229f6f5 feat: 光子批次统计增加组合件信息4 2025-08-05 13:19:45 +08:00
caoqianming 94b0719f38 feat: 光子批次统计增加组合件信息3 2025-08-05 11:24:36 +08:00
caoqianming 24a389d566 feat: 光子批次统计增加组合件信息2 2025-08-05 11:17:27 +08:00
caoqianming 8a2244a0cc feat: ftestwork_submit 触发批次统计分析 2025-08-05 10:09:46 +08:00
caoqianming 1c24e9948b feat: 光子批次统计增加组合件信息 2025-08-04 15:33:22 +08:00
caoqianming 763c64d5d0 feat: wmaterial添加筛选条件defect__isnull 2025-08-04 15:18:38 +08:00
caoqianming 3251c87eb3 fix: mioitem 返回信息时展示组合件信息2 2025-08-04 11:32:50 +08:00
caoqianming c790b3bd4a fix: mioitem 返回信息时展示组合件信息 2025-08-04 11:30:46 +08:00
caoqianming 884b10d6bc feat: mioitem 返回信息时展示组合件信息 2025-08-04 11:21:35 +08:00
caoqianming 7d2fee8409 feat: 仅合格品支持退回 2025-08-04 10:09:23 +08:00
caoqianming 7f89e8a72d feat: ftestwork_submit 关于不合格逻辑的bug 2025-08-01 17:11:09 +08:00
caoqianming 011577f9a5 fix: mioitem 检索bug 2025-08-01 15:31:43 +08:00
caoqianming 9b5e1bd9a7 feat: 出入库记录支持对子件批次
的搜索
2025-08-01 15:05:45 +08:00
caoqianming 28900d3218 feat: 装箱字段简化 2025-08-01 14:16:54 +08:00
caoqianming 393e528434 feat: 注册装箱功能路由2 2025-08-01 13:50:43 +08:00
caoqianming 2f0ce5c171 feat: 注册装箱功能路由 2025-08-01 13:47:46 +08:00
caoqianming 04d4c560ef feat: 装箱操作 2025-08-01 11:31:02 +08:00
caoqianming 5514e8b561 feat: 支持消耗物料的检验3 2025-08-01 11:12:46 +08:00
caoqianming 264083ebd5 feat: 支持消耗物料的检验2 2025-08-01 10:57:18 +08:00
caoqianming 808b8ac229 feat: 支持消耗物料的检验 2025-08-01 10:44:03 +08:00
caoqianming 70069a5a07 feat: WproutSerializer 支持传入none 2025-07-31 15:12:15 +08:00
caoqianming 33709bbb60 feat: assgin_number_out 支持置空 2025-07-31 15:02:57 +08:00
caoqianming bbef553bd5 fix: assgin_number_out bug 2025-07-31 14:40:53 +08:00
caoqianming 1fccdd042c feat: 添加发货单 2025-07-31 14:05:02 +08:00
caoqianming de953085cd fix: 销售发货时update_mb_item的bug 2025-07-31 13:46:39 +08:00
caoqianming ad9ef9efa5 feat: 通过fmlog查询batch 2025-07-31 10:41:16 +08:00
caoqianming 06de49f335 feat: 优化number_out_last 2025-07-31 09:31:10 +08:00
caoqianming eebc5238ae feat: MIOItem序列化器添加note 2025-07-30 16:02:18 +08:00
caoqianming 5755c508d7 feat: wpr分配出库对外编号 序列化器改动 2025-07-30 15:55:04 +08:00
caoqianming 84198f4d91 feat: wpr分配出库对外编号 2025-07-30 15:35:06 +08:00
caoqianming b5889374eb feat: 来料未完成的筛选控制物料类型为半成品、成品 2025-07-30 13:27:35 +08:00
caoqianming c98ce36c16 feat: 添加number_out_last的接口说明 2025-07-29 10:03:59 +08:00
caoqianming 5c21d6042b feat: 销售发货时可以设置对外编号 2025-07-28 16:56:55 +08:00
caoqianming 7f31ec8add feat: 物料导入模板及逻辑修改 2025-07-28 14:58:27 +08:00
caoqianming 739c4b0d65 fix: purout操作后续的bug 2025-07-28 14:31:33 +08:00
caoqianming b45eadc53c fix: 出入库类型错误bug 2025-07-28 14:25:55 +08:00
caoqianming 5d335fdd6a feat: mio创建时type得传入并校验 2025-07-28 13:50:28 +08:00
caoqianming 382a5a827c feat: 支持领用出库和退还入库 2025-07-28 13:41:16 +08:00
caoqianming b3b77db0c1 feat: wm todo排除repaired 2025-07-27 13:15:35 +08:00
caoqianming fa38cfdbdd feat: 交接记录关联审批暂不支持撤销 2025-07-25 22:53:49 +08:00
caoqianming 45c224c10e feat: handover返回ticket_字段 2025-07-25 16:18:53 +08:00
caoqianming b1f6798c65 feat: dataset添加enabled字段 2025-07-25 11:34:56 +08:00
caoqianming 0c7c1e4f17 feat: 支持采购退货 2025-07-24 10:50:11 +08:00
caoqianming 2fbe1620fb feat: wpr_bxerp 返工的不纳入统计 2025-07-23 13:43:11 +08:00
caoqianming 66a1d6df7f feat: 交接记录添加审批工单 2025-07-23 09:20:38 +08:00
caoqianming 3cacea1b06 feat: 批次统计分析时logerror后return 2025-07-22 15:56:26 +08:00
caoqianming a91b75ae7a feat: 获取qct type参数获取错误 2025-07-22 13:38:48 +08:00
caoqianming c35cdb6d0a feat: qct 增加筛选条件 2025-07-18 16:32:47 +08:00
caoqianming d732652c9f feat: qctmat添加字段以支持消耗物料参数填写 2025-07-18 16:01:32 +08:00
caoqianming 3985401361 feat: mlogbw编辑时可删除ftest3 2025-07-18 10:15:43 +08:00