 caoqianming
|
5285bf0252
|
feat: ftestprocess update 更详细的报错信息
|
2025-07-15 09:42:03 +08:00 |
|
caoqianming
|
3fe723b397
|
feat: 数采做成单独服务
|
2025-07-14 13:42:29 +08:00 |
|
caoqianming
|
b8c799b938
|
Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory
|
2025-07-14 10:53:24 +08:00 |
|
caoqianming
|
5a98d1bea7
|
feat: 测试cd
|
2025-07-14 10:48:31 +08:00 |
|
caoqianming
|
4b52c28b5e
|
fix: batchst并发创建的处理
|
2025-07-10 13:24:00 +08:00 |
|
caoqianming
|
e2c7847c74
|
feat: gen_number_with_rule 偏离6小时
|
2025-07-08 16:41:25 +08:00 |
|
caoqianming
|
024cae6fa3
|
feat: base complexquery value支持多种类型
|
2025-07-07 15:38:59 +08:00 |
|
caoqianming
|
523b4b2a42
|
feat: complexquery 支持isnull
|
2025-07-07 15:27:04 +08:00 |
|
caoqianming
|
d76d77fa49
|
feat: wpr 增加复杂查询接口
|
2025-07-07 14:49:57 +08:00 |
|
caoqianming
|
3858b3b9f9
|
feat: 返工不限制物料选择
|
2025-07-07 14:49:38 +08:00 |
|
caoqianming
|
05ebb25dc7
|
feat: 按个选入消耗时统计mlog数据优化2
|
2025-07-07 11:16:55 +08:00 |
|
caoqianming
|
45647d2149
|
feat: 按个选入消耗时统计mlog数据优化
|
2025-07-07 11:08:29 +08:00 |
|
caoqianming
|
28acc48768
|
feat: mlog添加操作时间校验
|
2025-07-07 10:44:31 +08:00 |
|
caoqianming
|
30bb96cf6c
|
feat: 按个选入消耗时统计mlog数据
|
2025-07-07 10:34:40 +08:00 |
|
caoqianming
|
e57e087006
|
fix: 优化ana_wpr4
|
2025-07-04 22:17:02 +08:00 |
|
caoqianming
|
33f79b5cc5
|
feat: 优化ana_wpr3
|
2025-07-04 20:14:58 +08:00 |
|
caoqianming
|
14f3b215c4
|
feat: BatchSt.g_create取消传入check_mat
|
2025-07-04 13:22:45 +08:00 |
|
caoqianming
|
e9059c93bd
|
feat: 优化ana_wpr2
|
2025-07-04 11:02:34 +08:00 |
|
caoqianming
|
662bef04ab
|
feat: 优化ana_wpr
|
2025-07-04 10:51:22 +08:00 |
|
caoqianming
|
403477afd0
|
feat: wpr_bxerp返回批号
|
2025-07-04 10:08:16 +08:00 |
|
caoqianming
|
1e128041cd
|
fix: 日志多步骤导致的返工填写bug2
|
2025-07-04 08:50:03 +08:00 |
|
caoqianming
|
433218feed
|
fix: 日志多步骤导致的返工填写bug
|
2025-07-04 08:35:46 +08:00 |
|
caoqianming
|
e3067e115a
|
feat: 获取该批次的DAG图数据 支持仅直接关系
|
2025-07-03 14:54:20 +08:00 |
|
caoqianming
|
79f1322c27
|
feat: 批次追踪链优化2
|
2025-07-03 14:38:16 +08:00 |
|
caoqianming
|
17284dcf4f
|
feat: 批次追踪链优化
|
2025-07-03 13:58:31 +08:00 |
|
caoqianming
|
89aca50f44
|
fix: 正常交接收料工段与送料工段不能相同
|
2025-07-03 11:36:18 +08:00 |
|
caoqianming
|
dd5ef95fa4
|
feat: ana_wpr忽略模块导入错误
|
2025-07-03 10:57:10 +08:00 |
|
caoqianming
|
1a621aca34
|
feat: 生产日志返回提交人姓名
|
2025-07-02 16:41:54 +08:00 |
|
caoqianming
|
4b2bcc6d29
|
feat: 修改mlog_submit和mlog_revert以支持日志多个工艺步骤
|
2025-07-02 15:40:59 +08:00 |
|
caoqianming
|
1d840e7c9d
|
feat: 正常交接收料工段与送料工段不能相同
|
2025-07-02 10:46:11 +08:00 |
|
caoqianming
|
e2f3c95748
|
feat: handover_revert自己交给自己无需处理
|
2025-07-02 10:38:01 +08:00 |
|
caoqianming
|
864fb783dc
|
fix: base ticket list 添加create_by_name
|
2025-07-01 09:34:30 +08:00 |
|
caoqianming
|
8a4ddd0307
|
feat: base ticket list 添加create_by_name
|
2025-07-01 09:09:18 +08:00 |
|
caoqianming
|
620e547da5
|
feat: 单日志支持多工艺步骤
|
2025-06-30 16:17:09 +08:00 |
|
caoqianming
|
a3b0455fb4
|
feat: 单个统计的触发
|
2025-06-30 15:07:00 +08:00 |
|
caoqianming
|
fdf717aecb
|
fix: 针对未知bug先添加拦截校验
|
2025-06-30 09:41:08 +08:00 |
|
caoqianming
|
a5e8fe3dde
|
feat: wpr data字段数据库同步
|
2025-06-27 17:14:02 +08:00 |
|
caoqianming
|
5ae9030152
|
feat: 优化wpr change_or_new
|
2025-06-27 16:52:15 +08:00 |
|
caoqianming
|
e86f4e79d4
|
feat: mlog添加cnumber查询条件
|
2025-06-27 16:49:50 +08:00 |
|
caoqianming
|
76cdd08e9a
|
fix: wpr change_or_new时根据number获取最后一个
|
2025-06-27 15:09:27 +08:00 |
|
caoqianming
|
a0ed107491
|
fix: 出入库明细撤回bug
|
2025-06-27 15:02:01 +08:00 |
|
caoqianming
|
e6d8509971
|
feat: 出入库明细支持撤回并删除-在一个事务2
|
2025-06-27 13:34:38 +08:00 |
|
caoqianming
|
c054095f94
|
feat: 出入库明细支持撤回并删除-在一个事务
|
2025-06-27 13:33:34 +08:00 |
|
caoqianming
|
10b63cdad5
|
feat: 出入库明细支持撤回并删除2
|
2025-06-27 13:31:54 +08:00 |
|
caoqianming
|
30379bdab5
|
feat: 出入库明细支持撤回并删除
|
2025-06-27 13:29:39 +08:00 |
|
caoqianming
|
1bb449c0db
|
feat: batch_gxerp添加count_notok
|
2025-06-26 13:56:39 +08:00 |
|
caoqianming
|
e25f392175
|
feat: handover_revert尝试支持全部撤回2
|
2025-06-26 11:02:29 +08:00 |
|
caoqianming
|
c4cde1c5ea
|
feat: handover_revert尝试支持全部撤回
|
2025-06-26 10:54:32 +08:00 |
|
caoqianming
|
a6d53471fc
|
fix: batch_gxerp添加count_pn_jgqbl 2
|
2025-06-26 09:14:52 +08:00 |
|
caoqianming
|
d03f106055
|
feat: batch_gxerp 添加need_inout查询条件
|
2025-06-26 09:07:12 +08:00 |
|
caoqianming
|
b500ad6615
|
feat: wpr添加对外编号字段
|
2025-06-25 18:19:16 +08:00 |
|
caoqianming
|
f3263caed0
|
feat:: batch_gxerp添加count_pn_jgqbl
|
2025-06-25 17:33:50 +08:00 |
|
caoqianming
|
ab22415e0f
|
feat: ofm 完善1
|
2025-06-25 17:29:46 +08:00 |
|
caoqianming
|
31f4e2869d
|
feat: sql查询有风险提示更完善
|
2025-06-25 11:23:59 +08:00 |
|
caoqianming
|
43e9642917
|
fix: 光子get_alldata_with_batch 其他入库获取错误2
|
2025-06-24 14:34:14 +08:00 |
|
caoqianming
|
c338509854
|
fix: 光子get_alldata_with_batch 人员获取错误2
|
2025-06-24 14:28:22 +08:00 |
|
caoqianming
|
037008d7c9
|
fix: 光子get_alldata_with_batch 人员获取错误
|
2025-06-24 13:52:44 +08:00 |
|
caoqianming
|
9ff72b2da1
|
fix: 光子get_alldata_with_batch优化2
|
2025-06-24 11:23:45 +08:00 |
|
caoqianming
|
53972fd22a
|
feat: 光子get_alldata_with_batch优化
|
2025-06-24 09:30:09 +08:00 |
|
caoqianming
|
cb09cee753
|
feat: 添加行政管理App
|
2025-06-24 08:47:22 +08:00 |
|
caoqianming
|
b0df18f01a
|
feat: cd 设置清空缓冲区2
|
2025-06-23 17:49:02 +08:00 |
|
caoqianming
|
c5e4cc48a4
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
|
2025-06-23 17:00:41 +08:00 |
|
caoqianming
|
8e33e084b4
|
feat: cd 设置清空缓冲区
|
2025-06-23 17:00:39 +08:00 |
 zty
|
ce54f326ee
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
|
2025-06-23 13:55:55 +08:00 |
|
zty
|
1242b3d43a
|
feat:enm/service修改排班记录生成时间
|
2025-06-23 13:55:53 +08:00 |
|
caoqianming
|
108fe0ae9f
|
feat: mlogbout单个产品不支持直接修改
|
2025-06-23 13:44:28 +08:00 |
|
caoqianming
|
f0cacf6777
|
feat: mioitem添加material__type查询条件
|
2025-06-20 15:28:49 +08:00 |
|
caoqianming
|
307935cb16
|
fix: wpr不合格的话先save再创建wm.defect
|
2025-06-20 13:28:55 +08:00 |
|
caoqianming
|
3683ddbdeb
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
|
2025-06-20 11:11:32 +08:00 |
|
caoqianming
|
fec244765a
|
fix: 该交接单不支持撤销的bug
|
2025-06-20 11:11:31 +08:00 |
|
zty
|
6a5ec34ef8
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
|
2025-06-20 09:44:57 +08:00 |
|
zty
|
7942a5168b
|
fix: wpm/service 优化煤粉热值获取方式
|
2025-06-20 09:44:52 +08:00 |
|
caoqianming
|
db2e8934ba
|
feat: 增加交接撤回功能
|
2025-06-19 17:25:33 +08:00 |
|
caoqianming
|
4f08374ca6
|
feat: mlogbin的bug
|
2025-06-19 15:43:02 +08:00 |
|
caoqianming
|
dce573f892
|
fix: mioitem price 计算bug
|
2025-06-19 14:23:49 +08:00 |
|
caoqianming
|
3b04bdf067
|
feat: mioitem返回mio数据
|
2025-06-19 14:11:24 +08:00 |
|
caoqianming
|
741b64142b
|
feat: mioitem添加单价字段
|
2025-06-19 10:37:09 +08:00 |
|
caoqianming
|
25c1cce41a
|
feat: materialsimpleserializer返回bin_number_main
|
2025-06-18 16:30:41 +08:00 |
|
caoqianming
|
8805237a44
|
feat: 物料增加主库位号
|
2025-06-18 16:29:38 +08:00 |
|
caoqianming
|
a819566c23
|
fix: wmaterial添加can_handover字段
|
2025-06-18 10:56:39 +08:00 |
|
caoqianming
|
6af708d4f0
|
feat: wmaterial添加can_handover字段
|
2025-06-18 10:31:35 +08:00 |
|
caoqianming
|
8d6f2bfd20
|
fix: mlogbinupdate时的bug
|
2025-06-17 08:36:48 +08:00 |
|
caoqianming
|
2b039dd4f7
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
|
2025-06-16 17:43:18 +08:00 |
|
caoqianming
|
1366f432ee
|
feat: mlogbin的编辑与mlogbout的联动
|
2025-06-16 17:42:43 +08:00 |
|
caoqianming
|
31421ca0aa
|
feat: mlogb首次创建需要更新count_ok_full
|
2025-06-15 22:19:52 +08:00 |
|
caoqianming
|
95b10371b9
|
feat: 支持从wpr处获取切片数4
|
2025-06-13 16:36:51 +08:00 |
|
caoqianming
|
a820d6803e
|
feat: 支持从wpr处获取切片数3
|
2025-06-13 16:25:06 +08:00 |
|
caoqianming
|
e774992d3a
|
feat: workchain通过线程执行
|
2025-06-13 16:23:35 +08:00 |
|
caoqianming
|
4955ad1f11
|
feat: 支持从wpr处获取切片数2
|
2025-06-13 16:23:07 +08:00 |
|
caoqianming
|
ab0c962053
|
feat: mlogbin联动mlogbout
|
2025-06-13 16:22:50 +08:00 |
|
caoqianming
|
4bd6eab9f4
|
feat: mlogbin 和 update时cal_count_notok cal_mlog传False
|
2025-06-13 15:56:43 +08:00 |
|
caoqianming
|
b9a7138e72
|
feat: mlogbin 和 update时cal_count_notok
|
2025-06-13 15:24:53 +08:00 |
|
caoqianming
|
cf7673cd98
|
feat: 支持从wpr处获取切片数
|
2025-06-13 14:31:48 +08:00 |
|
caoqianming
|
680608e16f
|
fix: mlogserializer需要同步count_real
|
2025-06-13 14:29:31 +08:00 |
|
caoqianming
|
6d87a69d8d
|
fix: cal_mlog_count_from_mlogb 需要传参触发
|
2025-06-13 11:23:02 +08:00 |
|
caoqianming
|
c02bb6d3db
|
fix: mlog 数值计算bug
|
2025-06-13 09:03:43 +08:00 |
|
caoqianming
|
dbad152218
|
fix: wmaterial get在传入query参数时完善can_do的逻辑
|
2025-06-12 10:37:19 +08:00 |
|
caoqianming
|
bb56becb5d
|
feat: ichat 添加workchain接口
|
2025-06-12 09:07:43 +08:00 |
|
caoqianming
|
b3000b013f
|
feat: utask添加优先级字段
|
2025-06-11 11:32:07 +08:00 |
|
caoqianming
|
0719ef8f42
|
feat: gen_number_with_rule bug2
|
2025-06-11 11:02:50 +08:00 |
|
caoqianming
|
fea3c320a9
|
feat: gen_number_with_rule bug
|
2025-06-11 10:58:31 +08:00 |
|
caoqianming
|
bfc37f69af
|
feat: 优化get_tyy_data 2
|
2025-06-10 13:35:38 +08:00 |
|
caoqianming
|
8efd28633c
|
feat: 优化get_tyy_data
|
2025-06-10 12:42:02 +08:00 |
|
caoqianming
|
5e0c515929
|
feat: batch_gxerp添加加工前缺陷
|
2025-06-10 10:05:53 +08:00 |
|
caoqianming
|
438d06af2f
|
feat: 增加check_sql_safe 稳定性
|
2025-06-10 08:48:13 +08:00 |
|
caoqianming
|
84690e7b54
|
feat: 放开出入库的物料匹配
|
2025-06-09 15:50:08 +08:00 |
|
caoqianming
|
2e3e8f997c
|
feat: 采购入库节点可复用2
|
2025-06-09 15:44:31 +08:00 |
|
caoqianming
|
7d29b9c4eb
|
feat: 采购入库节点可复用
|
2025-06-09 15:37:17 +08:00 |
|
caoqianming
|
77c4c54eb1
|
feat: inm 和 wpm添加wpr number的查询条件
|
2025-06-09 13:31:46 +08:00 |
|
caoqianming
|
11f06c36f7
|
feat: 优化设备采集cd
|
2025-06-09 13:03:03 +08:00 |
|
caoqianming
|
b9cad6bbd8
|
feat: get_tyy_data 不更新的bug
|
2025-06-09 10:09:32 +08:00 |
|
caoqianming
|
27b225face
|
feat: mlogb cal_count_pn_jgqbl
|
2025-06-06 17:44:19 +08:00 |
|
caoqianming
|
be5dc161de
|
feat: mlogbw也进行mlogb.cal_count_notok()
|
2025-06-06 17:25:39 +08:00 |
|
caoqianming
|
53c9afbca9
|
fix: mlog 的cal_count_notok_full的bug 4
|
2025-06-06 17:11:00 +08:00 |
|
caoqianming
|
519672ef3f
|
fix: mlog 的cal_count_notok_full的bug 3
|
2025-06-06 16:50:24 +08:00 |
|
caoqianming
|
6e93d7cd68
|
fix: mlog 的cal_count_notok_full的bug 2
|
2025-06-06 16:46:41 +08:00 |
|
caoqianming
|
c2770eed57
|
fix: mlog 的cal_count_notok_full的bug
|
2025-06-06 16:45:38 +08:00 |
|
caoqianming
|
4cc28b3583
|
feat: cal_mlog_count_from_mlogb 添加count_ok_full
|
2025-06-06 16:39:16 +08:00 |
|
caoqianming
|
ff2b098210
|
feat: 优化batches_to
|
2025-06-06 16:26:52 +08:00 |
|
caoqianming
|
fa221218f9
|
feat: cal_count_notok 完全合格数有bug
|
2025-06-06 15:58:33 +08:00 |
|
caoqianming
|
bb9e2f337a
|
feat: batch_gxerp 全工段查询
|
2025-06-06 10:48:19 +08:00 |
|
caoqianming
|
7d0491ac24
|
fix: 光芯批次统计"尺寸检验_完全合格率"
|
2025-06-05 14:16:41 +08:00 |
|
caoqianming
|
dff602abd1
|
fix: 光芯批次统计错误
|
2025-06-05 14:01:01 +08:00 |
|
caoqianming
|
60c484ee7f
|
feat: cd BrokenPipeError时尝试再建立连接3
|
2025-06-05 13:39:24 +08:00 |
|
caoqianming
|
facee9342c
|
feat: cd BrokenPipeError时尝试再建立连接2
|
2025-06-05 11:15:16 +08:00 |
|
caoqianming
|
370c905781
|
feat: cd BrokenPipeError时尝试再建立连接
|
2025-06-05 11:05:55 +08:00 |
|
caoqianming
|
bd9d5a5dc2
|
feat: 获取到重复的缺陷项 打日志
|
2025-06-05 10:50:17 +08:00 |
|
caoqianming
|
f06ad961f7
|
feat: can_fix 排除维修完成品
|
2025-06-05 08:40:55 +08:00 |
|
caoqianming
|
9d1af24994
|
fix: handover_submit batches获取bug2
|
2025-06-05 08:24:20 +08:00 |
|
caoqianming
|
014b48e135
|
fix: update_mb_item在检验时只做负数校验
|
2025-06-04 16:40:33 +08:00 |
|
caoqianming
|
265a15c9fc
|
fix: handover_submit batches获取bug
|
2025-06-04 15:23:19 +08:00 |
|
caoqianming
|
9ede95a5d6
|
feat: batchst 添加first_time isnull筛选
|
2025-06-04 10:19:29 +08:00 |
|
caoqianming
|
a34514160d
|
feat: 获取first_time, last_time独立出一个方法
|
2025-06-04 10:05:06 +08:00 |
|
caoqianming
|
1f9800db16
|
fix: 自动生成物料bug
|
2025-05-30 15:39:13 +08:00 |
|
caoqianming
|
9e9501a065
|
fix: 优化 gen_material_out 防止自引用
|
2025-05-30 14:04:35 +08:00 |
|
caoqianming
|
ec42e70118
|
fix: 优化 gen_number_with_rule
|
2025-05-30 11:11:06 +08:00 |
|
caoqianming
|
7429b7d5fb
|
feat: 修改gen_number_with_rule 以获取的最后编号为准
|
2025-05-30 10:13:57 +08:00 |
|
caoqianming
|
8994b39917
|
fix: batches_to_limit 获取bug
|
2025-05-30 09:56:07 +08:00 |
|
caoqianming
|
f689b7609c
|
feat: handover拆批时校验批次号是否可用
|
2025-05-30 09:07:17 +08:00 |
|
caoqianming
|
45e02eae5f
|
feat: 优化batches_to以达到自然排序功能
|
2025-05-29 15:30:49 +08:00 |
|
caoqianming
|
5d33301389
|
feat: batches_to 获取已指向的批次号
|
2025-05-29 15:08:42 +08:00 |
|
caoqianming
|
ad5d8db283
|
feat: get_qct接口进行校验
|
2025-05-29 10:55:52 +08:00 |
|
caoqianming
|
4cd4ba3c9d
|
feat: get_tyy_data优化保持socket连接
|
2025-05-29 10:20:46 +08:00 |
|
caoqianming
|
725a471fd8
|
fix: batchst reuse_node逻辑完善2
|
2025-05-29 10:16:23 +08:00 |
|
caoqianming
|
49efafcaff
|
fix: batchst reuse_node逻辑完善
|
2025-05-29 09:39:04 +08:00 |
|
caoqianming
|
82958e047b
|
fix: base ordering排序错误
|
2025-05-29 08:39:59 +08:00 |
|
caoqianming
|
70d80dafd2
|
feat: wmaterial提供canfix的tag查询
|
2025-05-28 16:30:50 +08:00 |
|
caoqianming
|
37dc922c34
|
feat: base ComplexQueryMixin 支持order查询2
|
2025-05-26 16:35:52 +08:00 |
|
caoqianming
|
f4fd214110
|
feat: base ComplexQueryMixin 支持order查询
|
2025-05-26 16:31:17 +08:00 |
|
caoqianming
|
a4f2b6eb55
|
fix: batchlog创建时避免回环
|
2025-05-26 15:26:22 +08:00 |
|
caoqianming
|
e47464805e
|
feat: bachst添加复杂查询接口
|
2025-05-26 13:28:43 +08:00 |
|
caoqianming
|
d385fefc4f
|
feat: base 独立出ComplexQueryMixin
|
2025-05-26 13:23:32 +08:00 |
|
caoqianming
|
ed6b6c2776
|
feat: base with_children查询去除限制
|
2025-05-26 13:11:15 +08:00 |
|
caoqianming
|
f41068e923
|
feat: handover根据wm完善batch字段
|
2025-05-26 12:10:47 +08:00 |
|
caoqianming
|
6539bc2e61
|
feat: handoverfilter完善cbatch查询
|
2025-05-26 11:18:36 +08:00 |
|
caoqianming
|
3a69075b9f
|
feat: 处理dag时返回edge更多信息
|
2025-05-26 11:07:08 +08:00 |
|
caoqianming
|
eefd3691e6
|
fix: batch_gxerp 优化
|
2025-05-26 10:33:09 +08:00 |
|
caoqianming
|
74e176ce97
|
feat: base 性能优化调整位置
|
2025-05-23 09:54:52 +08:00 |
|
caoqianming
|
9c1ba20d36
|
perf: 优化mlog和handover的查询
|
2025-05-23 09:54:24 +08:00 |
|
caoqianming
|
62f261fd75
|
feat: 所有batch设为textfield并添加索引
|
2025-05-23 09:24:34 +08:00 |
|
caoqianming
|
359dd8f898
|
feat: mb添加batch查询条件
|
2025-05-23 08:44:44 +08:00 |
|
caoqianming
|
1445a14a9a
|
feat: ana batch时等待10s
|
2025-05-22 16:50:15 +08:00 |
|
caoqianming
|
0735b5d2b7
|
fix: BatchLog创建时获取source再创建target
|
2025-05-22 16:48:15 +08:00 |
|
caoqianming
|
6b7088997f
|
feat: batchst复用节点仅限mio创建的
|
2025-05-22 15:22:49 +08:00 |
|
caoqianming
|
8a7c3830c9
|
feat: 各工段批次生产进度统计
|
2025-05-22 13:31:41 +08:00 |
|
caoqianming
|
68d065a2e3
|
fix: 取消提交日志时时间校验
|
2025-05-22 09:16:53 +08:00 |
|
caoqianming
|
fdb454d6e5
|
feat: 修改服务器时间时传递密码
|
2025-05-22 09:09:17 +08:00 |
|
caoqianming
|
36790a72b4
|
feat: 导入棒管检验测试通过
|
2025-05-21 14:56:50 +08:00 |
|
caoqianming
|
a2e45d6954
|
feat: 修改导入权限
|
2025-05-21 13:56:14 +08:00 |
|
zty
|
c254d99c3c
|
feat: enm 修改采集保存时间到秒
|
2025-05-21 09:52:38 +08:00 |
|
zty
|
446f705eb3
|
feat: auth1 utils enm 修改阿里云发送短信引入方式
|
2025-05-21 09:51:46 +08:00 |
|
caoqianming
|
dbea38f82b
|
feat: daoru棒管test
|
2025-05-20 16:44:36 +08:00 |
|
caoqianming
|
a672a76eee
|
feat: mlog和handover添加cbatch查询条件2
|
2025-05-20 16:03:36 +08:00 |
|
caoqianming
|
8fb204a93d
|
feat: mlog和handover添加cbatch查询条件
|
2025-05-20 14:26:58 +08:00 |
|
caoqianming
|
5011ef8076
|
fix: is_fix支持个到个的bug
|
2025-05-20 10:09:09 +08:00 |
|
caoqianming
|
126ef8a1b8
|
feat: mloginit支持handle_users
|
2025-05-20 08:41:59 +08:00 |
|
caoqianming
|
3500cd25c8
|
feat: batch_gxerp 完全总合格数
|
2025-05-19 16:18:31 +08:00 |
|
caoqianming
|
d0027679e6
|
feat: batch_gxerp调整
|
2025-05-19 13:37:10 +08:00 |
|
caoqianming
|
5fe2b4db48
|
feat: qct排序支持number
|
2025-05-19 11:35:23 +08:00 |
|
caoqianming
|
b1487957b5
|
feat: 完善变更服务器时间的接口2
|
2025-05-19 10:16:49 +08:00 |
|
caoqianming
|
1a1f64f9fe
|
feat: 完善变更服务器时间的接口
|
2025-05-19 10:08:58 +08:00 |
|
caoqianming
|
0f0b055101
|
feat: 添加变更服务器时间的接口
|
2025-05-19 09:34:14 +08:00 |
|
caoqianming
|
2e0727a2c0
|
feat: wpr detail
|
2025-05-16 16:50:57 +08:00 |
|
caoqianming
|
b9ca9b802a
|
feat: mlogbw添加wpr等查询条件
|
2025-05-16 16:42:22 +08:00 |
|
caoqianming
|
05bf1def23
|
feat: wpr增加自动编号逻辑2
|
2025-05-16 16:04:37 +08:00 |
|
caoqianming
|
88a5d55425
|
feat: wpr增加自动编号逻辑
|
2025-05-16 15:53:33 +08:00 |
|
caoqianming
|
9f3b3a52a7
|
feat: get_tyy_data优化3
|
2025-05-16 11:18:55 +08:00 |
|
caoqianming
|
518379ea35
|
feat: get_tyy_data优化2
|
2025-05-16 11:12:07 +08:00 |
|
caoqianming
|
1d7c2ebb35
|
feat: get_tyy_data优化
|
2025-05-16 10:59:10 +08:00 |
|
caoqianming
|
d1ccc9043f
|
feat: mlog添加b_mlog__batch查询条件
|
2025-05-16 10:12:39 +08:00 |
|
caoqianming
|
767cfb18e2
|
feat: 车间库存不足提示更准确2
|
2025-05-16 09:05:19 +08:00 |
|
caoqianming
|
5a08b5d22c
|
feat: 车间库存不足提示更准确
|
2025-05-16 08:55:31 +08:00 |
|
caoqianming
|
3075d8ab8e
|
feat: batchst追加查询data__has_key条件
|
2025-05-15 16:29:22 +08:00 |
|
caoqianming
|
156f6b4844
|
feat: mlogb_summary选用need_inout为True的数据
|
2025-05-15 15:35:03 +08:00 |
|
caoqianming
|
0057e4c181
|
fix: count_ok_full为None的批次处理
|
2025-05-15 15:19:37 +08:00 |
|
caoqianming
|
cbeecea2dc
|
fix: need_inout 传true时也得处理
|
2025-05-15 14:49:40 +08:00 |
|
caoqianming
|
ca9d46c8d5
|
feat: equip_last_mlog增加报错提示
|
2025-05-15 10:39:33 +08:00 |
|
caoqianming
|
bd7bbbef0e
|
feat: wpr获取material_start
|
2025-05-15 10:03:14 +08:00 |
|
caoqianming
|
9c69711f38
|
feat: mlog返回子级详情
|
2025-05-15 09:50:37 +08:00 |
|
caoqianming
|
8a61ca9eb1
|
fix: 检验表消失的bug
|
2025-05-14 16:21:38 +08:00 |
|
caoqianming
|
eb8087fdf9
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
|
2025-05-14 16:16:35 +08:00 |
|
caoqianming
|
c50e4bf3a7
|
fix: batch_gxerp bug
|
2025-05-14 16:16:33 +08:00 |
|
zty
|
01539a32da
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
|
2025-05-14 13:58:03 +08:00 |
|
zty
|
8834d66066
|
feat: ichat 修改大模型的提问
|
2025-05-14 13:58:01 +08:00 |
|
caoqianming
|
356310db3f
|
feat: 触发批次统计分析在线程里sleep下
|
2025-05-14 12:57:11 +08:00 |
|
caoqianming
|
f32adf3702
|
fix: 获取检验模板只用单个2
|
2025-05-14 11:04:36 +08:00 |
|
caoqianming
|
57dfab3bb9
|
fix: 获取检验模板只用单个
|
2025-05-14 11:01:21 +08:00 |
|
caoqianming
|
d9f66d2970
|
feat: 获取检验模板只用单个
|
2025-05-14 10:49:13 +08:00 |
|
caoqianming
|
6fcda8c0a7
|
fix: wpr获取mb的state
|
2025-05-14 09:27:46 +08:00 |
|
caoqianming
|
a4a9dd257f
|
feat: qct获取通用检验表
|
2025-05-14 08:59:26 +08:00 |
|
caoqianming
|
f6a99f542f
|
feat: develop添加mylogger
|
2025-05-13 12:57:56 +08:00 |
|
caoqianming
|
be6d51af7d
|
feat: wpr添加初始物料字段
|
2025-05-13 11:00:45 +08:00 |
|
caoqianming
|
98bf81f5e0
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
|
2025-05-12 16:47:06 +08:00 |
|
caoqianming
|
56afccf0a4
|
feat: wpr获取新编号
|
2025-05-12 16:47:04 +08:00 |
|
zty
|
88c029f66d
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
|
2025-05-12 09:54:18 +08:00 |
|
zty
|
f3ab4476a4
|
feat: ichat /增加ichat模块，优化对话流处理
|
2025-05-12 09:54:13 +08:00 |
|
caoqianming
|
09072f7998
|
feat: 光芯质检表格
|
2025-05-09 16:51:55 +08:00 |
|
caoqianming
|
ad1bbaa32e
|
feat: base 短信发送功能启动抛出异常2
|
2025-05-09 09:13:35 +08:00 |
|
caoqianming
|
1c8489a0b4
|
feat: base 短信发送功能启动抛出异常
|
2025-05-09 09:10:39 +08:00 |
|
caoqianming
|
06e04858df
|
feat: batchst字段同步数据库
|
2025-05-08 16:24:06 +08:00 |
|
caoqianming
|
954f5d262f
|
feat: 完善清空数据的接口
|
2025-05-08 16:13:50 +08:00 |
|
caoqianming
|
8a501c2681
|
feat: batchst添加字段并更新光子的统计2
|
2025-05-08 15:13:04 +08:00 |
|
caoqianming
|
c29d1e99d8
|
feat: batchst添加字段并更新光子的统计
|
2025-05-08 14:56:40 +08:00 |
|
caoqianming
|
20384ca33c
|
feat: 由输入转输出需考虑到加工前不良的影响
|
2025-05-08 13:53:59 +08:00 |
|
caoqianming
|
5e2fd57b89
|
feat: labeltemplate获取标签指令接口
|
2025-05-08 13:22:02 +08:00 |
|
caoqianming
|
8a75fcbc42
|
feat: labeltemplate添加name查询条件
|
2025-05-08 13:12:32 +08:00 |
|
caoqianming
|
cdb4e65159
|
feat: 初步添加光芯的批次分析函数
|
2025-05-08 13:12:07 +08:00 |
|
caoqianming
|
dae8d50d2c
|
fix: gen_commands bug
|
2025-05-08 10:45:25 +08:00 |
|
caoqianming
|
a9f55eb61c
|
feat: 支持传入label_template_name
|
2025-05-08 10:37:58 +08:00 |
|
caoqianming
|
7aafa5d9f7
|
fix: labeltemplate filter bug
|
2025-05-07 10:25:40 +08:00 |
|
caoqianming
|
cc12d80c92
|
feat: myjsonfield优化
|
2025-05-07 10:25:07 +08:00 |
|
caoqianming
|
2128b4e847
|
feat: mioitem添加排序字段
|
2025-05-06 10:54:09 +08:00 |
|
caoqianming
|
adf21e716d
|
fix: 标签模板筛选bug
|
2025-05-06 10:35:08 +08:00 |
|
caoqianming
|
c05432ce56
|
feat: 标签物料根据模板打印功能
|
2025-05-06 10:32:50 +08:00 |
|
zty
|
a4ba33550e
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
|
2025-04-30 14:33:05 +08:00 |
|
zty
|
a5a862f7fb
|
feat:ichat 修改接口 去掉langchain
|
2025-04-30 14:33:01 +08:00 |
|
caoqianming
|
725dd4d554
|
fix: mio_saleout缺少import
|
2025-04-30 14:20:15 +08:00 |
|
caoqianming
|
da69e654bc
|
feat: 生产入库和领料支持b类合格品
|
2025-04-30 14:19:49 +08:00 |
|
caoqianming
|
a2cba2128f
|
feat: 添加标签模板接口
|
2025-04-30 13:43:17 +08:00 |
|
caoqianming
|
dd6dcad74a
|
feat: 完善光子批次统计数据
|
2025-04-30 08:51:21 +08:00 |
|
caoqianming
|
f35d2d7d9e
|
fix: getattr(item, field) is not None
|
2025-04-29 15:14:02 +08:00 |
|
caoqianming
|
ac610a53ce
|
feat: 组合件和入库检验追加统计分析
|
2025-04-29 14:43:09 +08:00 |
|
caoqianming
|
7c752ec39b
|
feat: get_alldata_with_batch添加内容
|
2025-04-29 14:42:29 +08:00 |
|
caoqianming
|
e59c83aa3f
|
feat: 支持个号转批号6
|
2025-04-28 15:59:29 +08:00 |
|
caoqianming
|
ced3e7a16c
|
feat: 支持个号转批号5
|
2025-04-28 15:50:36 +08:00 |
|
caoqianming
|
6b8fa4e58c
|
feat: 支持个号转批号4
|
2025-04-28 15:45:05 +08:00 |
|
caoqianming
|
7131697802
|
feat: 支持个号转批号3
|
2025-04-28 15:32:04 +08:00 |
|
caoqianming
|
7338d09f5d
|
feat: 支持个号转批号的配置2
|
2025-04-28 15:25:41 +08:00 |
|
caoqianming
|
0ff9aa1e5a
|
feat: 支持个号转批号的配置
|
2025-04-28 14:43:22 +08:00 |
|
caoqianming
|
c5a7a19f74
|
feat: 尝试从个号追踪到历史记录的个号2
|
2025-04-28 14:12:00 +08:00 |
|
caoqianming
|
25a111bc6b
|
feat: 同步数据库
|
2025-04-28 13:51:00 +08:00 |
|
caoqianming
|
849e63da3e
|
feat: 尝试从个号追踪到历史记录的个号
|
2025-04-28 13:48:22 +08:00 |
|
caoqianming
|
76a48d46ee
|
feat: 个到批时支持若是一个还是沿用原有批号
|
2025-04-28 11:28:45 +08:00 |
|
caoqianming
|
76adab1571
|
feat: 批次追踪链条还是可以复用批次
|
2025-04-28 11:08:47 +08:00 |
|
caoqianming
|
9d634940d3
|
feat: mlog结合工序支持批到个
|
2025-04-28 10:24:28 +08:00 |
|
caoqianming
|
a0346f00bf
|
fix: wpr复用number的bug2
|
2025-04-28 09:17:01 +08:00 |
|
caoqianming
|
cd0045c561
|
feat: mlogbw支持批量创建
|
2025-04-27 14:12:37 +08:00 |
|
caoqianming
|
8a83f8b7d8
|
fix: cal_count_notok锁定mlogb以防止并发修改
|
2025-04-27 13:41:45 +08:00 |
|
caoqianming
|
2ca9b3ce02
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
|
2025-04-27 12:17:24 +08:00 |
|
caoqianming
|
8697288d69
|
feat: mlogbwcreate校验增加wm所属
|
2025-04-27 12:17:13 +08:00 |
|
zty
|
89c8cac7c1
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
|
2025-04-27 09:21:23 +08:00 |
|
zty
|
c0277ad9a6
|
feat: ichat 修改LLM 的接口
|
2025-04-27 09:21:19 +08:00 |
|
caoqianming
|
139aa6de27
|
feat: wmaterial筛选条件优化来料已完成
|
2025-04-26 00:07:44 +08:00 |
|
caoqianming
|
cdb9083def
|
fix: batchst恢复成batch单一校验
|
2025-04-25 23:41:59 +08:00 |
|
caoqianming
|
c8d05bed68
|
feat: 获取该批次的dag数据需要传入version
|
2025-04-25 21:35:37 +08:00 |
|
caoqianming
|
be57fec29f
|
fix: 获取batchst时默认使用version=1
|
2025-04-25 16:27:48 +08:00 |
|
caoqianming
|
d6fe5af39c
|
feat: 单填写mlog支持返工
|
2025-04-25 15:24:38 +08:00 |
|
caoqianming
|
6033216869
|
fix: mloginit在返工时不接收route
|
2025-04-25 14:21:24 +08:00 |
|
caoqianming
|
000ea6fc27
|
fix: 生产入库时存入生产车间
|
2025-04-25 13:34:58 +08:00 |
|
caoqianming
|
295edf65d2
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
|
2025-04-25 11:27:15 +08:00 |
|
caoqianming
|
439bfeb7d6
|
fix: 返工校验输入物料选择错误
|
2025-04-25 11:27:14 +08:00 |
|
zty
|
8f6a6eb973
|
feat:ichat 修改大模型接口
|
2025-04-25 10:56:17 +08:00 |
|
caoqianming
|
84380931fd
|
fix: 完善负数校验2
|
2025-04-24 16:12:38 +08:00 |
|
caoqianming
|
ca7d56a462
|
fix: 完善负数校验
|
2025-04-24 16:07:55 +08:00 |
|
caoqianming
|
9df6294617
|
feat: mlogbupdate支持变更批号
|
2025-04-24 13:44:30 +08:00 |
|
caoqianming
|
1cb4128be2
|
fix: mlogbupdate时attrs遍历时修改的bug
|
2025-04-24 13:36:18 +08:00 |
|
caoqianming
|
0f728d8b29
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
|
2025-04-24 09:18:05 +08:00 |
|
caoqianming
|
960787d7d8
|
feat: 6车间合格率统计decimal invalid
|
2025-04-24 09:18:03 +08:00 |
|
zty
|
7e6ca8cf70
|
feat:修改大模型文件
|
2025-04-23 16:54:49 +08:00 |
|
zty
|
8183073026
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
合并
|
2025-04-23 16:49:00 +08:00 |
|
zty
|
b66157edb8
|
feat: model add note
|
2025-04-23 16:48:52 +08:00 |
|
caoqianming
|
aa0add371a
|
feat: ichat添加表
|
2025-04-23 16:47:01 +08:00 |
|
caoqianming
|
e2d63ed056
|
feat: 缺陷项分类字段数据库约束放开
|
2025-04-23 13:46:03 +08:00 |
|
caoqianming
|
dd4d958f86
|
fix: batchst的version字段bug
|
2025-04-23 13:02:11 +08:00 |
|
caoqianming
|
2987853afb
|
feat: 通过django settings延迟获取BASE_PROJECT_CODE
|
2025-04-23 12:42:50 +08:00 |
|
caoqianming
|
ba9d7d041d
|
release: 2.6.2025042311
|
2025-04-23 11:03:38 +08:00 |
|
caoqianming
|
75503fc7e8
|
feat: 切分工序切分数量支持1
|
2025-04-23 10:59:59 +08:00 |
|
caoqianming
|
433d85456e
|
fix: mlog的need_inout逻辑3
|
2025-04-23 09:28:45 +08:00 |
|
caoqianming
|
32185abffd
|
fix: mlog的need_inout逻辑2
|
2025-04-22 16:33:52 +08:00 |
|
caoqianming
|
c2539185e2
|
feat: mlog增加team字段
|
2025-04-22 15:49:42 +08:00 |
|
caoqianming
|
3811c055f9
|
feat: mlog的need_inout逻辑
|
2025-04-22 15:27:02 +08:00 |
|
caoqianming
|
6e12ca3137
|
feat: 批次关系链时创建新批次支持使用已有批次号2
|
2025-04-22 14:30:19 +08:00 |
|
caoqianming
|
f22ba2752f
|
feat: 批次关系链时创建新批次支持使用已有批次号
|
2025-04-22 14:29:33 +08:00 |
|
caoqianming
|
ea00a38406
|
feat: mlogb返回test_user_name
|
2025-04-22 10:16:10 +08:00 |
|
caoqianming
|
3d0536745a
|
fix: count_working获取逻辑优化2
|
2025-04-22 09:56:23 +08:00 |
|
caoqianming
|
e329c8cbc8
|
fix: count_working获取逻辑优化
|
2025-04-22 09:34:34 +08:00 |
|
caoqianming
|
8ac3ad3477
|
feat: mlogb添加test_user/need_inout字段用于处理抽检逻辑
|
2025-04-22 09:19:19 +08:00 |
|
caoqianming
|
42c249330e
|
fix: mlogbin解决负值校验存在的bug
|
2025-04-22 09:14:11 +08:00 |
|
caoqianming
|
f12d8ce03c
|
feat: 工艺步骤返回组合而成的name
|
2025-04-22 09:08:44 +08:00 |
|
caoqianming
|
311e9e9e04
|
feat: 校验只有合并时才能提供新批次号
|
2025-04-22 08:43:05 +08:00 |
|
caoqianming
|
5cab0d018b
|
feat: 交接查询可查询子批次号
|
2025-04-21 16:27:31 +08:00 |
|
caoqianming
|
ced7515d80
|
feat: 日志完善负值校验
|
2025-04-21 15:43:54 +08:00 |
|
caoqianming
|
2ea3dc79cb
|
feat: 批号追加工段标识2
|
2025-04-21 13:22:39 +08:00 |
|
caoqianming
|
82587b1736
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
|
2025-04-21 11:33:11 +08:00 |
|
caoqianming
|
786d178edc
|
feat: 批号追加工段标识
|
2025-04-21 11:32:57 +08:00 |
|
caoqianming
|
181d477425
|
fix: 日志和交接记录操作数正值校验
|
2025-04-19 23:40:42 +08:00 |
|
caoqianming
|
0489a545e8
|
fix: inm校验非正数
|
2025-04-19 23:24:43 +08:00 |
|
caoqianming
|
e24d92fe9b
|
feat: base增加PositiveDecimalField
|
2025-04-19 22:41:26 +08:00 |
|
caoqianming
|
adcde59bd1
|
fix: 其他入库时batchst.g_create传参错误
|
2025-04-19 21:23:21 +08:00 |
|
caoqianming
|
101a51050d
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
|
2025-04-19 21:15:35 +08:00 |
|
caoqianming
|
9e4e5a28c6
|
fix:: 交接记录提交时校验count>0
|
2025-04-19 21:11:45 +08:00 |
|
caoqianming
|
00e352d8ef
|
feat: 改版交接需要触发统计数量
|
2025-04-18 14:52:03 +08:00 |
|
caoqianming
|
1e379d412c
|
feat: 物料统计数量接口
|
2025-04-18 14:18:41 +08:00 |
|
caoqianming
|
2b9e3322ac
|
feat: update_material_count时更新组合件数量
|
2025-04-18 14:13:34 +08:00 |
|
caoqianming
|
6678e39518
|
feat: 采购和其他入库可入已有批次
|
2025-04-18 11:29:32 +08:00 |
|
caoqianming
|
b44fec0695
|
feat: 合并的交接需要校验物料是否一致
|
2025-04-17 14:05:56 +08:00 |
|
caoqianming
|
6d904341a0
|
feat: 交接需要校验物料是否一致
|
2025-04-17 13:30:30 +08:00 |
|
caoqianming
|
369c452dd5
|
fix: 正常交接后的物料状态不变
|
2025-04-17 11:17:05 +08:00 |
|
caoqianming
|
fafe39c1bd
|
fix: 存在fmlog时将route带给mlog并进行物料校验
|
2025-04-17 11:16:40 +08:00 |
|
caoqianming
|
044b489388
|
fix: do_in保证production_dept赋值
|
2025-04-17 11:16:08 +08:00 |
|
caoqianming
|
1aad0bc481
|
fix: 订单检索条件错误
|
2025-04-17 11:13:59 +08:00 |
|
caoqianming
|
5f2385ccd1
|
fix: fmlog填写mtask或route即可
|
2025-04-17 09:06:34 +08:00 |
|
caoqianming
|
896be043f5
|
feat: 返工可选择不合格品/根据工艺路线决定返工后是合格不合格还是返修完成
|
2025-04-16 19:14:18 +08:00 |
|
caoqianming
|
9179803fda
|
feat: 检验项和缺陷项删除的时候同步删除qct
|
2025-04-16 19:12:49 +08:00 |
|
caoqianming
|
b5c21b7472
|
feat: fmlog添加工艺步骤字段及相应返回数据
|
2025-04-16 17:59:20 +08:00 |
|
caoqianming
|
300023ff81
|
fix: 交接分批bug/加工前不良的bug
|
2025-04-16 13:43:38 +08:00 |
|
caoqianming
|
e0217e86c4
|
feat: 添加count_json_from字段及相应逻辑
|
2025-04-16 11:31:23 +08:00 |
|
caoqianming
|
4c7f2b24f8
|
feat: 车间库存按任务筛选时count>0
|
2025-04-16 08:57:12 +08:00 |
|
caoqianming
|
7a3c5be4eb
|
feat: 工艺步骤增加排序字段
|
2025-04-15 18:14:00 +08:00 |
|
caoqianming
|
d3263236f9
|
feat: 物料筛选low_inm进行优化
|
2025-04-15 18:13:41 +08:00 |
|
caoqianming
|
50b264929b
|
fix: mio_saleout时正确计算delivered_count
|
2025-04-15 17:44:43 +08:00 |
|
caoqianming
|
4874f6356e
|
feat: 变更order状态
|
2025-04-15 15:09:03 +08:00 |
|
caoqianming
|
d864405c0d
|
feat: 扣减库存不足增加提示
|
2025-04-15 15:08:42 +08:00 |
|
caoqianming
|
8c27b1a03c
|
feat: update_inm关于销售发货/其他出库的bug2
|
2025-04-15 14:31:58 +08:00 |
|
caoqianming
|
afc884eb7f
|
feat: update_inm关于销售发货/其他出库的bug
|
2025-04-15 11:06:16 +08:00 |
|
caoqianming
|
c670bd69e1
|
feat: fmlog添加is_fix字段校验
|
2025-04-15 10:30:02 +08:00 |
|
caoqianming
|
cd294bc53c
|
fix: 返修交接后物料状态都变为返修品
|
2025-04-14 23:03:34 +08:00 |
|
caoqianming
|
88bf75baaf
|
feat: fmlog添加is_fix字段
|
2025-04-14 22:49:31 +08:00 |
|
caoqianming
|
1cbbade280
|
feat: 单个日志填写时带入wm_in的batch
|
2025-04-14 22:26:42 +08:00 |
|
caoqianming
|
c791bde5be
|
fix: handover拆批请选择车间库存2
|
2025-04-14 15:29:36 +08:00 |
|
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 |
|
caoqianming
|
2b1d22df85
|
feat: pm改成小数字段
|
2025-03-17 10:45:33 +08:00 |
|
caoqianming
|
53a3105f10
|
fix: 转成 小数后的to_representation bug
|
2025-03-17 10:33:11 +08:00 |
|
caoqianming
|
5bda6adf92
|
fix: mlogdefect 非必填
|
2025-03-17 10:06:21 +08:00 |
|
caoqianming
|
10a5d3301e
|
feat: 日志变更模型以支持小数
|
2025-03-17 09:55:31 +08:00 |
|
caoqianming
|
8928bb4307
|
fix: wpr delete在撤销时可以触发
|
2025-03-14 18:19:31 +08:00 |
|
caoqianming
|
443a818aec
|
feat: 一次填写的也mlogb_from
|
2025-03-14 18:14:43 +08:00 |
|
caoqianming
|
8f079c9d5d
|
feat: 通过is_fix支持ftestwork转mlog
|
2025-03-14 17:07:08 +08:00 |
|
caoqianming
|
9489f80b3f
|
fix: 个到个的拆分bug9
|
2025-03-14 16:32:55 +08:00 |
|
caoqianming
|
42f5c20f86
|
fix: 个到个的拆分bug8
|
2025-03-14 16:32:02 +08:00 |
|
caoqianming
|
099fe4b18b
|
fix: 个到个的拆分bug7
|
2025-03-14 16:10:40 +08:00 |