Commit Graph

Select branches

Hide Pull Requests

base

dev_cqm

dev_sj

master

#2

#3

#4

#5

#6

#7

2.6.2025031919

2.6.2025033109

2.6.2025040115

2.6.2025040211

2.6.2025040316

2.6.2025040710

2.6.2025040813

2.6.2025040913

2.6.2025041113

2.6.2025041613

2.6.2025042311

2.6.2025042816

2.6.2025043014

2.6.2025050816

2.6.2025051208

2.6.2025051609

2.6.2025051913

2.6.2025052615

2.6.2025060409

2.6.2025060617

2.6.2025060913

2.6.2025061715

2.6.2025062015

2.7.2025062414

2.7.2025070310

2.7.2025071516

2.7.2025073110

2.7.2025080409

2.7.2025080716

2.7.2025081813

2.7.2025082616

2.7.2025082816

2.8.2025090815

2.8.2025091616

2.8.2025092816

2.8.2025101011

3.0.2025110710

3.0.2025122514

3.0.2026010716

3.1.2026031316

3.1.2026033008

3.1.2026042912

3.1.2026071608

3.1.2026071614

3.1.2026072309

3.1.2026072316

3.1.2026072713

Mono Color

• e47c853578 fix: count_working获取逻辑优化 caoqianming 2025-04-22 09:34:34 +0800
• 9362a81bc6 feat: 日志完善负值校验 caoqianming 2025-04-21 15:43:54 +0800
• 5498d98e38 feat: base增加PositiveDecimalField caoqianming 2025-04-19 22:41:26 +0800
• a31aa7e337 feat: update_material_count时更新组合件数量 caoqianming 2025-04-18 14:13:34 +0800
• a97804e455 fix: 订单检索条件错误 caoqianming 2025-04-17 11:13:59 +0800
• 2f9e054558 feat: 工艺步骤增加排序字段 caoqianming 2025-04-15 18:14:00 +0800
• 29e15f0f8e feat: 物料筛选low_inm进行优化 caoqianming 2025-04-15 18:13:41 +0800
• cafa1c9c87 fix: mio_saleout时正确计算delivered_count caoqianming 2025-04-15 17:44:43 +0800
• bf368bcd26 feat: 变更order状态 caoqianming 2025-04-15 15:09:03 +0800
• b9372204a6 feat: update_inm关于销售发货/其他出库的bug caoqianming 2025-04-15 11:06:16 +0800
• 9ad947770a feat: fmlog添加is_fix字段校验 caoqianming 2025-04-15 10:30:02 +0800
• 1623d2d684 feat: fmlog添加is_fix字段 caoqianming 2025-04-14 22:49:31 +0800
• 4a5f6d9d0e fix: get_alldata_with_batch中小数计算异常捕获 caoqianming 2025-04-11 10:16:51 +0800
• b948688ab9 feat: ptest性能检验样品编号字段更改为text caoqianming 2025-04-11 08:42:10 +0800
• 91a499c00b fix: 光子综合查询对小数和None的处理 caoqianming 2025-04-09 15:30:17 +0800
• 3b78c4e993 fix: decimal存入json字段时使用myjsondecoder caoqianming 2025-04-09 13:18:42 +0800
• c8ce78f50d feat: 添加MyJSONEncoder以支持decimal caoqianming 2025-04-09 10:50:18 +0800
• b5514afa2b fix: get_alldata_with_batch_and_store时保存json数据采用DjangoJSONEncoder以处理decimal caoqianming 2025-04-03 08:34:57 +0800
• 04daccb733 fix: 组合件入库后未添加count的bug caoqianming 2025-04-02 18:39:31 +0800
• e8cd841ef1 feat: 销售发货编号非必填 caoqianming 2025-04-02 16:31:12 +0800
• 2831c9b58b feat: HTML_BASE_URL 前缀统一修改 caoqianming 2025-04-02 11:04:46 +0800
• 3175bcf4dc feat: sysbaseview返回系统版本号 caoqianming 2025-04-02 10:12:30 +0800
• 5354c064a1 fix: base log delay=True减少冲突 caoqianming 2025-04-02 10:11:00 +0800
• 6e9b2c8264 change: base 改变log backupcount为30 caoqianming 2025-03-31 15:08:23 +0800
• 6aae02044f perf: base settings里日志记录handler优化 caoqianming 2025-03-31 15:04:39 +0800
• 4bccc5a62b feat: 完善版本追踪 caoqianming 2025-03-31 11:10:47 +0800
• da5400996f feat: utask编号可不填2 caoqianming 2025-03-21 16:54:52 +0800
• 0b20199284 feat: utask编号可不填 caoqianming 2025-03-21 16:48:52 +0800
• 88bc901c84 feat: mio 编号可不填 caoqianming 2025-03-21 16:47:03 +0800
• 87b935ab04 feat: MIODo 可不填belong_dept caoqianming 2025-03-20 11:24:06 +0800
• c3108641f3 feat: mio number不设置为只读 caoqianming 2025-03-20 10:50:44 +0800
• 7b1a6853ab fix: wmaterial search bug caoqianming 2025-03-20 09:38:28 +0800
• 5ae9e235df fix: wmaterial search bug3 caoqianming 2025-03-20 09:37:07 +0800
• b327da2342 fix: wmaterial search bug2 caoqianming 2025-03-20 09:34:59 +0800
• a581d40ef9 fix: wmaterial search bug caoqianming 2025-03-20 09:33:11 +0800
• 3a263735b0 feat: mio utask number非必填 caoqianming 2025-03-20 09:30:33 +0800
• 4cc8236bcb fix: wmaterial 去除 material__process__exclude 字段 caoqianming 2025-03-20 09:09:41 +0800
• 0f728d8b29 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server caoqianming 2025-04-24 09:18:05 +0800
• 960787d7d8 feat: 6车间合格率统计decimal invalid caoqianming 2025-04-24 09:18:03 +0800
• 7e6ca8cf70 feat:修改大模型文件 zty 2025-04-23 16:54:49 +0800
• 8183073026 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server 合并 zty 2025-04-23 16:49:00 +0800
• b66157edb8 feat: model add note zty 2025-04-23 16:48:52 +0800
• aa0add371a feat: ichat添加表 caoqianming 2025-04-23 16:47:01 +0800
• e2d63ed056 feat: 缺陷项分类字段数据库约束放开 caoqianming 2025-04-23 13:46:03 +0800
• dd4d958f86 fix: batchst的version字段bug caoqianming 2025-04-23 13:02:11 +0800
• 2987853afb feat: 通过django settings延迟获取BASE_PROJECT_CODE caoqianming 2025-04-23 12:42:50 +0800
• 74581dc906 feat: base 将配置文件放到单独的config文件夹中防止误操作 caoqianming 2025-04-23 12:39:16 +0800
• cbc667d50c release: 2.6.2025042311 2.6.2025042311 caoqianming 2025-04-23 12:24:27 +0800
• ba9d7d041d release: 2.6.2025042311 caoqianming 2025-04-23 11:03:38 +0800
• 75503fc7e8 feat: 切分工序切分数量支持1 caoqianming 2025-04-23 10:59:59 +0800
• 433d85456e fix: mlog的need_inout逻辑3 caoqianming 2025-04-23 09:28:45 +0800
• 32185abffd fix: mlog的need_inout逻辑2 caoqianming 2025-04-22 16:33:52 +0800
• c2539185e2 feat: mlog增加team字段 caoqianming 2025-04-22 15:49:42 +0800
• 3811c055f9 feat: mlog的need_inout逻辑 caoqianming 2025-04-22 15:27:02 +0800
• 6e12ca3137 feat: 批次关系链时创建新批次支持使用已有批次号2 caoqianming 2025-04-22 14:30:19 +0800
• f22ba2752f feat: 批次关系链时创建新批次支持使用已有批次号 caoqianming 2025-04-22 14:29:33 +0800
• ea00a38406 feat: mlogb返回test_user_name caoqianming 2025-04-22 10:16:10 +0800
• 3d0536745a fix: count_working获取逻辑优化2 caoqianming 2025-04-22 09:56:23 +0800
• e329c8cbc8 fix: count_working获取逻辑优化 caoqianming 2025-04-22 09:34:34 +0800
• 8ac3ad3477 feat: mlogb添加test_user/need_inout字段用于处理抽检逻辑 caoqianming 2025-04-22 09:19:19 +0800
• 42c249330e fix: mlogbin解决负值校验存在的bug caoqianming 2025-04-22 09:14:11 +0800
• f12d8ce03c feat: 工艺步骤返回组合而成的name caoqianming 2025-04-22 09:08:44 +0800
• 311e9e9e04 feat: 校验只有合并时才能提供新批次号 caoqianming 2025-04-22 08:43:05 +0800
• 5cab0d018b feat: 交接查询可查询子批次号 caoqianming 2025-04-21 16:27:31 +0800
• ced7515d80 feat: 日志完善负值校验 caoqianming 2025-04-21 15:43:54 +0800
• 2ea3dc79cb feat: 批号追加工段标识2 caoqianming 2025-04-21 13:22:39 +0800
• 82587b1736 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server caoqianming 2025-04-21 11:33:11 +0800
• 786d178edc feat: 批号追加工段标识 caoqianming 2025-04-21 11:32:57 +0800
• 181d477425 fix: 日志和交接记录操作数正值校验 caoqianming 2025-04-19 23:40:42 +0800
• 0489a545e8 fix: inm校验非正数 caoqianming 2025-04-19 23:24:43 +0800
• e24d92fe9b feat: base增加PositiveDecimalField caoqianming 2025-04-19 22:41:26 +0800
• adcde59bd1 fix: 其他入库时batchst.g_create传参错误 caoqianming 2025-04-19 21:23:21 +0800
• 101a51050d Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server caoqianming 2025-04-19 21:15:35 +0800
• 9e4e5a28c6 fix:: 交接记录提交时校验count>0 caoqianming 2025-04-19 21:11:45 +0800
• 00e352d8ef feat: 改版交接需要触发统计数量 caoqianming 2025-04-18 14:52:03 +0800
• 1e379d412c feat: 物料统计数量接口 caoqianming 2025-04-18 14:18:41 +0800
• 2b9e3322ac feat: update_material_count时更新组合件数量 caoqianming 2025-04-18 14:13:34 +0800
• 6678e39518 feat: 采购和其他入库可入已有批次 caoqianming 2025-04-18 11:29:32 +0800
• b44fec0695 feat: 合并的交接需要校验物料是否一致 caoqianming 2025-04-17 14:05:56 +0800
• 6d904341a0 feat: 交接需要校验物料是否一致 caoqianming 2025-04-17 13:30:30 +0800
• 369c452dd5 fix: 正常交接后的物料状态不变 caoqianming 2025-04-17 11:17:05 +0800
• fafe39c1bd fix: 存在fmlog时将route带给mlog并进行物料校验 caoqianming 2025-04-17 11:16:40 +0800
• 044b489388 fix: do_in保证production_dept赋值 caoqianming 2025-04-17 11:16:08 +0800
• 1aad0bc481 fix: 订单检索条件错误 caoqianming 2025-04-17 11:13:59 +0800
• 5f2385ccd1 fix: fmlog填写mtask或route即可 caoqianming 2025-04-17 09:06:34 +0800
• 896be043f5 feat: 返工可选择不合格品/根据工艺路线决定返工后是合格不合格还是返修完成 caoqianming 2025-04-16 19:14:18 +0800
• 9179803fda feat: 检验项和缺陷项删除的时候同步删除qct caoqianming 2025-04-16 19:12:49 +0800
• b5c21b7472 feat: fmlog添加工艺步骤字段及相应返回数据 caoqianming 2025-04-16 17:59:20 +0800
• 4bc126ca97 release: 2.6.2025041613 2.6.2025041613 caoqianming 2025-04-16 13:49:06 +0800
• 300023ff81 fix: 交接分批bug/加工前不良的bug caoqianming 2025-04-16 13:43:38 +0800
• e0217e86c4 feat: 添加count_json_from字段及相应逻辑 caoqianming 2025-04-16 11:31:23 +0800
• 4c7f2b24f8 feat: 车间库存按任务筛选时count>0 caoqianming 2025-04-16 08:57:12 +0800
• 7a3c5be4eb feat: 工艺步骤增加排序字段 caoqianming 2025-04-15 18:14:00 +0800
• d3263236f9 feat: 物料筛选low_inm进行优化 caoqianming 2025-04-15 18:13:41 +0800
• 50b264929b fix: mio_saleout时正确计算delivered_count caoqianming 2025-04-15 17:44:43 +0800
• 4874f6356e feat: 变更order状态 caoqianming 2025-04-15 15:09:03 +0800
• d864405c0d feat: 扣减库存不足增加提示 caoqianming 2025-04-15 15:08:42 +0800
• 8c27b1a03c feat: update_inm关于销售发货/其他出库的bug2 caoqianming 2025-04-15 14:31:58 +0800
• afc884eb7f feat: update_inm关于销售发货/其他出库的bug caoqianming 2025-04-15 11:06:16 +0800
• c670bd69e1 feat: fmlog添加is_fix字段校验 caoqianming 2025-04-15 10:30:02 +0800