 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 |