Commit Graph

3139 Commits

Author SHA1 Message Date
caoqianming 22b6b1305f fix: handover拆批请选择车间库存 2025-04-14 15:19:45 +08:00
caoqianming 882b0f2cbd feat: 添加ichat以支持AI对话 2025-04-13 10:12:38 +08:00
caoqianming fda9ecae94 fix: get_alldata_with_batch中小数计算异常捕获 2025-04-11 10:16:51 +08:00
caoqianming 1ff822161a feat: ptest性能检验样品编号字段更改为text 2025-04-11 08:42:10 +08:00
caoqianming 4b87f6fe8e Merge branch 'gzerp' 2025-04-09 15:30:58 +08:00
caoqianming 648aaa465c fix: 光子综合查询对小数和None的处理 2025-04-09 15:30:17 +08:00
caoqianming 060c07abd7 fix: 来料加工和完成筛选完善 2025-04-09 13:19:12 +08:00
caoqianming c0eacd7fa8 fix: decimal存入json字段时使用myjsondecoder 2025-04-09 13:18:42 +08:00
caoqianming 8068cb1ca3 fix: cal_x_task_count分配任务数的bug 2025-04-09 13:18:00 +08:00
caoqianming 15ccfbe6f9 feat: 添加MyJSONEncoder以支持decimal 2025-04-09 10:50:18 +08:00
caoqianming 2a0c97dfb2 fix: ftest当is_ok为True时设置defect为空 2025-04-08 11:38:46 +08:00
caoqianming b34e477593 fix: ftest当is_ok为false时才设置defect_main 2025-04-08 11:06:51 +08:00
caoqianming ef0414b053 fix: material_out_tracking获取时对None的情况进行处理 2025-04-08 08:38:22 +08:00
caoqianming b852e9b740 fix: get_dag时matin matout为空时不报错 2025-04-07 10:18:43 +08:00
caoqianming 61488bb4bd feat: copy时matin matout不自动生成 2025-04-07 10:13:33 +08:00
caoqianming 9f0a9fc699 fix: 通过指定mat_in/mat_out复制工艺路线 bug2 2025-04-03 16:12:35 +08:00
caoqianming 885d932fc8 fix: 通过指定mat_in/mat_out复制工艺路线 bug1 2025-04-03 16:11:54 +08:00
caoqianming b400b13ded feat: 通过指定mat_in/mat_out复制工艺路线 2025-04-03 14:48:14 +08:00
caoqianming a8f9676ed0 fix: get_alldata_with_batch_and_store时保存json数据采用DjangoJSONEncoder以处理decimal 2025-04-03 08:34:57 +08:00
caoqianming a79717abd8 fix: 组合件入库后未添加count的bug 2025-04-02 18:39:31 +08:00
caoqianming 18546d48f5 feat: 销售发货编号非必填 2025-04-02 16:31:12 +08:00
caoqianming 2923fad2a8 feat: HTML_BASE_URL 前缀统一修改 2025-04-02 11:04:46 +08:00
caoqianming 5fe24c381b feat: sysbaseview返回系统版本号 2025-04-02 10:12:30 +08:00
caoqianming 783a56dfea fix: get_can_save_from_save_expr的match转为str 2025-04-02 09:32:33 +08:00
caoqianming 6dfb5c489a fix: 该工艺步骤已存在的校验bug 2025-04-01 15:41:33 +08:00
caoqianming c05c59b004 feat: handover数据库变动/初步更新批次数据关系链 2025-03-31 16:42:18 +08:00
caoqianming cb28f1d9ef feat: 添加mio,mlog,handover关于batch的查询条件 2025-03-31 15:35:39 +08:00
caoqianming 146fe6641f feat: get_batch_dag节点排序改动 2025-03-31 15:11:43 +08:00
caoqianming 3c0e416735 feat: 支持退料交接 2025-03-31 14:17:20 +08:00
caoqianming 88da422f54 feat: mlogchangeserializer增加生产设备选择 2025-03-31 13:36:25 +08:00
caoqianming cb1b2dfae6 fix: cal_x_task_count bug 2025-03-28 10:25:30 +08:00
caoqianming 98d76424c7 feat: route create update 强校验4 2025-03-28 09:20:08 +08:00
caoqianming c541e58006 feat: route create update 强校验3 2025-03-28 09:07:50 +08:00
caoqianming 6b3a34879e feat: route create update 强校验2 2025-03-28 08:49:57 +08:00
caoqianming 4b9e65ba40 feat: route create update 强校验 2025-03-28 08:48:05 +08:00
caoqianming 18e5ca2598 fix: routeserializer material_out_tracking错误 2025-03-28 08:29:25 +08:00
caoqianming 73f0e504c9 feat: batchst g_create 默认relation_type 2025-03-28 08:28:58 +08:00
caoqianming 40370b876f fix: 分配任务的get_routes 参数bug 2025-03-27 17:21:58 +08:00
caoqianming ce38115255 fix: validate_and_return_gjson bug 2025-03-27 13:36:34 +08:00
caoqianming afe53f3687 fix: _validate_subgraph bug 2025-03-27 12:50:07 +08:00
caoqianming c002017a84 feat: 工艺路线支持子图逻辑 2025-03-27 12:40:09 +08:00
caoqianming a31faa0cda feat: 添加route pack dag显示 2025-03-26 17:23:38 +08:00
caoqianming 2d7183f8dd feat: 简化validate dag 的报错提示 2025-03-26 16:45:39 +08:00
caoqianming eaa5d75b99 feat: 工艺路线校验 2025-03-26 16:36:29 +08:00
caoqianming bac30a2925 feat: wpr追溯上游 2025-03-26 15:17:26 +08:00
caoqianming 4e7757f64d feat: 合批时的物料校验 2025-03-26 13:30:39 +08:00
caoqianming 0ddc6692ac feat: handover 合并可指定现有库存 2025-03-26 13:19:30 +08:00
caoqianming 3e074b51e3 feat: routepack变更工艺路线的状态 2025-03-26 09:10:33 +08:00
caoqianming 5c77eb2742 feat: testscan页面2 2025-03-25 16:15:53 +08:00
caoqianming 0c9c38890e feat: testscan页面 2025-03-25 16:04:52 +08:00
caoqianming 8bf3ad06d6 feat: mlog get_queryset bug 2025-03-25 15:40:53 +08:00
caoqianming 546b020dae feat: mloguserserializer handle_user_name 2025-03-25 14:59:01 +08:00
caoqianming 7f2aaf3f86 feat: process添加查询条件 2025-03-25 14:19:29 +08:00
caoqianming 22e64e5b84 fix: 其他入库允许wpr非必填 2025-03-25 11:17:27 +08:00
caoqianming 0e8cce0669 feat: get_batch_dag bug2 2025-03-25 09:54:57 +08:00
caoqianming 11d7e1a772 feat: get_batch_dag bug 2025-03-25 09:51:25 +08:00
caoqianming 52b96dc740 fix: batchst g_create bug 2025-03-25 09:48:17 +08:00
caoqianming 6f28056ed4 feat: 重构以下batchlog 2025-03-25 09:44:22 +08:00
caoqianming b9a3427162 feat: batchst添加查询条件 2025-03-24 15:18:44 +08:00
caoqianming d4df340c1c feat: batchst添加字段以追踪material_start 2025-03-24 15:16:37 +08:00
caoqianming b070b312a8 feat: batchst添加字段以追踪 2025-03-24 15:07:50 +08:00
caoqianming e07f9c877c feat: 添加mloguser字段及逻辑 2025-03-24 14:37:18 +08:00
caoqianming c1a4edf9e5 fix: handover 创建并提交的接口 2025-03-24 09:02:03 +08:00
caoqianming 468cb7b658 feat: handover 创建并提交的接口 2025-03-24 08:42:02 +08:00
caoqianming 5ee10e7cc5 fix: handover 合批时创建关系链的bug 2025-03-24 08:41:43 +08:00
caoqianming f57604492b fix: batchst create bug 2025-03-21 17:54:50 +08:00
caoqianming 9780cd8021 feat: utask编号可不填2 2025-03-21 16:54:52 +08:00
caoqianming d8c421969c feat: utask编号可不填 2025-03-21 16:48:52 +08:00
caoqianming 43ddafa6d7 feat: mio 编号可不填 2025-03-21 16:47:03 +08:00
caoqianming 0842806f83 feat: process添加parent字段 2025-03-21 16:33:30 +08:00
caoqianming 108116342e feat: batchlog数据链 2025-03-21 14:15:10 +08:00
caoqianming 23ad849e36 fix: wpr oinfo bug 2025-03-21 12:15:05 +08:00
caoqianming 8867e76701 feat: wpr oinfo bug 2025-03-21 11:30:56 +08:00
caoqianming 0474d0a943 feat: mioitem wm校验 2025-03-20 11:34:51 +08:00
caoqianming 1289c19aaa feat: MIODo 可不填belong_dept 2025-03-20 11:24:06 +08:00
caoqianming a773f4884b feat: mio number不设置为只读 2025-03-20 10:50:44 +08:00
caoqianming 5e3069b147 feat: mlog count_fields 可不带count_ok_full 2025-03-20 09:51:15 +08:00
caoqianming fa66a9a4d5 fix: wmaterial search bug 2025-03-20 09:38:28 +08:00
caoqianming 3ad7acafc9 fix: wmaterial search bug3 2025-03-20 09:37:07 +08:00
caoqianming cde3d68d7f fix: wmaterial search bug2 2025-03-20 09:34:59 +08:00
caoqianming d136f96bcc fix: wmaterial search bug 2025-03-20 09:33:11 +08:00
caoqianming 77f411887a feat: mio utask number非必填 2025-03-20 09:30:33 +08:00
caoqianming 48988d3237 fix: wmaterial 去除 material__process__exclude 字段 2025-03-20 09:09:41 +08:00
caoqianming 1761dcdf6d feat: mioitemcreate 增加校验 2025-03-19 18:51:31 +08:00
caoqianming a0084f7825 feat: mgroup增加自产和外协字段及相关逻辑校验 2025-03-19 14:32:24 +08:00
caoqianming 459fc3bbe8 feat: mgroup增加自产和外协字段及相关逻辑 2025-03-19 14:27:07 +08:00
caoqianming 1040e55a48 feat: wpr增加wpr_from的相关逻辑 2025-03-19 14:08:34 +08:00
caoqianming da084e21cb feat: wmaterial增加来源批次和物料 2025-03-19 13:35:27 +08:00
caoqianming b9b418e81f feat: FtestWorkCreateUpdateSerializer defect非必填 2025-03-19 11:17:20 +08:00
caoqianming 6d435a21e4 feat: base route支持iframe 2025-03-19 08:59:36 +08:00
caoqianming f92c696a9e feat: base get_user_route排序增加create_time 2025-03-19 08:14:16 +08:00
caoqianming 982fa7f373 fix: mlogbupdate serializer 2025-03-18 14:35:11 +08:00
caoqianming 2238ab119d feat: mpoint增加存储表达式用于决定是否存储 2025-03-18 14:15:22 +08:00
caoqianming 70c415aa1f feat: mlogbinserializer update也进行支持 2025-03-18 13:58:49 +08:00
caoqianming da3c672dd1 feat: qm增加最大不合格率字段 2025-03-18 13:43:15 +08:00
caoqianming 232ecb0f45 fix: MlogbSerializer mlog字段只读 2025-03-18 10:47:46 +08:00
caoqianming 6d6e4e88ae fix: MlogbSerializer mlog字段取消 2025-03-18 10:36:58 +08:00
caoqianming f7e3e7977d feat: mlogb增加count_json 2025-03-18 10:30:13 +08:00
caoqianming c44b71b847 feat: 默认密码从get_sysconfig获取 2025-03-18 10:07:23 +08:00
caoqianming 64af59d22d fix: kingclient 优化 2025-03-17 16:32:56 +08:00