 caoqianming
|
76a48d46ee
|
feat: 个到批时支持若是一个还是沿用原有批号
|
2025-04-28 11:28:45 +08:00 |
|
caoqianming
|
9d634940d3
|
feat: mlog结合工序支持批到个
|
2025-04-28 10:24:28 +08:00 |
|
caoqianming
|
cd0045c561
|
feat: mlogbw支持批量创建
|
2025-04-27 14:12:37 +08:00 |
|
caoqianming
|
c8d05bed68
|
feat: 获取该批次的dag数据需要传入version
|
2025-04-25 21:35:37 +08:00 |
|
caoqianming
|
439bfeb7d6
|
fix: 返工校验输入物料选择错误
|
2025-04-25 11:27:14 +08:00 |
|
caoqianming
|
75503fc7e8
|
feat: 切分工序切分数量支持1
|
2025-04-23 10:59:59 +08:00 |
|
caoqianming
|
c2539185e2
|
feat: mlog增加team字段
|
2025-04-22 15:49:42 +08:00 |
|
caoqianming
|
ea00a38406
|
feat: mlogb返回test_user_name
|
2025-04-22 10:16:10 +08:00 |
|
caoqianming
|
5cab0d018b
|
feat: 交接查询可查询子批次号
|
2025-04-21 16:27:31 +08:00 |
|
caoqianming
|
e0217e86c4
|
feat: 添加count_json_from字段及相应逻辑
|
2025-04-16 11:31:23 +08:00 |
|
caoqianming
|
8bf3ad06d6
|
feat: mlog get_queryset bug
|
2025-03-25 15:40:53 +08:00 |
|
caoqianming
|
6f28056ed4
|
feat: 重构以下batchlog
|
2025-03-25 09:44:22 +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
|
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
|
da084e21cb
|
feat: wmaterial增加来源批次和物料
|
2025-03-19 13:35:27 +08:00 |
|
caoqianming
|
982fa7f373
|
fix: mlogbupdate serializer
|
2025-03-18 14:35:11 +08:00 |
|
caoqianming
|
70c415aa1f
|
feat: mlogbinserializer update也进行支持
|
2025-03-18 13:58:49 +08:00 |
|
caoqianming
|
f7e3e7977d
|
feat: mlogb增加count_json
|
2025-03-18 10:30:13 +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 |
|
caoqianming
|
a66d47ec47
|
fix: 个到个的拆分bug6
|
2025-03-14 16:06:49 +08:00 |
|
caoqianming
|
c8cde0a436
|
fix: 个到个的拆分bug5
|
2025-03-14 16:01:54 +08:00 |
|
caoqianming
|
6fa9c9182b
|
fix: 个到个的拆分bug4
|
2025-03-14 15:35:37 +08:00 |
|
caoqianming
|
82b4f39fed
|
fix: 个到个的拆分bug3
|
2025-03-14 15:28:26 +08:00 |
|
caoqianming
|
60a7827e1b
|
fix: 个到个的拆分bug2
|
2025-03-14 15:20:32 +08:00 |
|
caoqianming
|
5ba937ecd8
|
fix: 个到个的拆分bug
|
2025-03-14 14:29:36 +08:00 |
|
caoqianming
|
7488900ac8
|
feat: mlogbw destory bug
|
2025-03-14 13:17:53 +08:00 |
|
caoqianming
|
f58b84a4ee
|
feat: 物料编号允许非不同物料的重复
|
2025-03-13 17:37:54 +08:00 |
|
caoqianming
|
dafdb8f608
|
fix: 调整数据结构4
|
2025-03-13 17:13:34 +08:00 |
|
caoqianming
|
9ef752cb05
|
fix: 调整数据结构3
|
2025-03-13 17:11:02 +08:00 |
|
caoqianming
|
a350d97202
|
fix: 调整数据结构2
|
2025-03-13 16:58:07 +08:00 |
|
caoqianming
|
38dc9199e2
|
feat: 调整数据结构
|
2025-03-13 16:33:59 +08:00 |
|
caoqianming
|
f43726a884
|
fix: mlogbin 删除时未对应删除mlogbout的bug
|
2025-03-13 12:48:16 +08:00 |
|
caoqianming
|
64ca8b97ad
|
fix: mlogbw删除bug2
|
2025-03-12 14:55:43 +08:00 |
|
caoqianming
|
8bd3e120df
|
fix: mlogbw删除bug
|
2025-03-12 14:53:28 +08:00 |
|
caoqianming
|
e52b894603
|
fix: mlogbw delete bug3
|
2025-03-12 14:28:11 +08:00 |
|
caoqianming
|
459d2348d4
|
fix: mlogbw delete bug2
|
2025-03-12 14:24:01 +08:00 |
|
caoqianming
|
d847b84fd8
|
fix: mlogbw delete bug
|
2025-03-12 14:21:37 +08:00 |
|
caoqianming
|
90e0e7ad3b
|
fix: mlogbin delete数据
|
2025-03-12 14:10:34 +08:00 |
|
caoqianming
|
8d67c06e63
|
feat: 生成产出出错2的bug
|
2025-03-12 13:34:56 +08:00 |
|
caoqianming
|
378648436f
|
fix: 生成产出出错3的bug
|
2025-03-12 11:22:50 +08:00 |
|
caoqianming
|
5a05710ff2
|
feat: 增加mlogbw_to以进行追踪
|
2025-03-12 09:23:38 +08:00 |
|
caoqianming
|
5bd17c4a37
|
feat: mio自动生成编号
|
2025-03-11 12:40:45 +08:00 |
|
caoqianming
|
f59cb2cbc2
|
feat: 个拆批2
|
2025-03-10 17:58:09 +08:00 |
|
caoqianming
|
75ec24702c
|
feat: 个拆批
|
2025-03-10 17:48:11 +08:00 |
|
caoqianming
|
8f46507a6b
|
feat: mlogbin时从单个拆分为多个批次2
|
2025-03-10 16:03:50 +08:00 |
|
caoqianming
|
85cc38c842
|
feat: mlogbin时从单个拆分为多个批次
|
2025-03-10 16:00:01 +08:00 |
|
caoqianming
|
f295956c69
|
fix: mlogbw cal_count_notok
|
2025-03-10 11:29:43 +08:00 |
|
caoqianming
|
fbb18ae990
|
feat: 部分bug修复
|
2025-03-09 11:36:17 +08:00 |
|
caoqianming
|
cb45e0bab1
|
feat: 子任务可为空以及一些查询条件
|
2025-03-07 13:00:00 +08:00 |
|
caoqianming
|
25d63c0b27
|
feat: fmlog update 更新是否可用字段
|
2025-03-07 11:00:57 +08:00 |
|
caoqianming
|
74f0db77ed
|
feat: Handoverb 支持拆批
|
2025-03-06 14:15:45 +08:00 |
|
caoqianming
|
afdcc5374e
|
feat: 添加wmaterial检索字段
|
2025-03-06 09:02:07 +08:00 |
|
caoqianming
|
df427d60b2
|
fix: mlog ftestwork submit关于合格b类的调整
|
2025-03-04 15:45:56 +08:00 |
|
caoqianming
|
aa32047bf7
|
fix: 一些bug调整
|
2025-03-04 12:33:51 +08:00 |
|
caoqianming
|
46d586430e
|
fix: FmlogViewSet test
|
2025-03-03 19:09:17 +08:00 |
|
caoqianming
|
9907bf7c43
|
feat: mlog填写支持defect定义
|
2025-03-03 18:21:03 +08:00 |
|
caoqianming
|
666fbd306b
|
fix: 获取qct提出到model
|
2025-03-03 15:13:28 +08:00 |
|
caoqianming
|
12416a4f61
|
fix: mlogbw create bug2
|
2025-02-28 16:30:47 +08:00 |
|
caoqianming
|
9eb3abefc4
|
fix: mlogbw create bug
|
2025-02-28 16:27:23 +08:00 |
|
caoqianming
|
31e8b92d29
|
feat: mlogbin create时处理qct
|
2025-02-28 15:50:23 +08:00 |
|
caoqianming
|
286a5306e3
|
feat: 批次处理做兼容性处理
|
2025-02-28 15:31:38 +08:00 |
|
caoqianming
|
77f7a454a1
|
feat: mlogbw变更出发mlogbdefect
|
2025-02-28 11:28:40 +08:00 |
|
caoqianming
|
c71bb0d8f6
|
fix: 不能删除该产出明细更新限制条件
|
2025-02-26 11:27:25 +08:00 |
|
caoqianming
|
2010078665
|
perf: 优化mlog list速度3
|
2025-02-25 17:33:41 +08:00 |
|
caoqianming
|
4e6aa547b5
|
perf: 优化mlog list速度2
|
2025-02-25 17:30:40 +08:00 |
|
caoqianming
|
6653befcdb
|
perf: 优化mlog list速度
|
2025-02-25 16:33:54 +08:00 |
|
caoqianming
|
debf07a7b9
|
feat: mlogbdetail 返回时携带tracking
|
2025-02-24 16:20:56 +08:00 |
|
caoqianming
|
2e8ca4a14d
|
fix: mlogbin perform_create处理返工的bug
|
2025-02-24 16:12:46 +08:00 |
|
caoqianming
|
2663f20953
|
feat: 返修逻辑完成
|
2025-02-24 13:22:43 +08:00 |
|
caoqianming
|
c585f2fc11
|
feat: mlogbin支持mtask非必填
|
2025-02-19 14:29:55 +08:00 |
|
caoqianming
|
44486b64a3
|
feat: mlogbw的输出不允许删除
|
2025-02-11 11:12:14 +08:00 |
|
caoqianming
|
5b7b1bf276
|
fix: 获取可交接到的工段进行去重
|
2025-02-08 09:45:05 +08:00 |
|
caoqianming
|
550a3281bc
|
fix: 获取可交接到的工段2
|
2025-02-07 13:34:25 +08:00 |
|
caoqianming
|
2488e500ce
|
fix: 获取可交接到的工段
|
2025-02-07 10:12:27 +08:00 |
|
caoqianming
|
b96846d2c0
|
feat: 获取可交接到的工段
|
2025-02-07 10:04:12 +08:00 |
|
caoqianming
|
805d4ac4fe
|
fix: 切分融合的单件生成2
|
2025-01-17 15:42:24 +08:00 |
|
caoqianming
|
5b7f8e1359
|
fix: 切分融合的单件生成
|
2025-01-17 14:54:09 +08:00 |
|
caoqianming
|
713c51bdbd
|
feat: 切分融合的单件生成
|
2025-01-17 14:45:31 +08:00 |
|
caoqianming
|
58b3863763
|
feat: 删除次批时无需删除输出2
|
2025-01-10 16:00:36 +08:00 |
|
caoqianming
|
79cb50709e
|
feat: 删除次批时无需删除输出
|
2025-01-10 15:51:49 +08:00 |
|
caoqianming
|
155f305071
|
feat: mlogbin 在merge时向下取整
|
2025-01-10 14:55:45 +08:00 |
|
caoqianming
|
695590589e
|
fix: 追踪到个的才需要赋予质检表
|
2025-01-10 11:27:08 +08:00 |
|
caoqianming
|
b8fd5fd13b
|
feat: 追踪到个的才需要赋予质检表
|
2025-01-10 10:34:59 +08:00 |
|
caoqianming
|
0429ac6988
|
feat: mlogbin无需加载qct
|
2025-01-09 16:56:01 +08:00 |
|
caoqianming
|
4f1bbaa574
|
feat: mlogbin初始化质检表的bug
|
2025-01-09 16:37:30 +08:00 |
 zty
|
d1bd74fd5d
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
|
2025-01-09 16:19:43 +08:00 |
|
zty
|
d60cc99b48
|
feat: wpm/sflog 增加enstat 数据
|
2025-01-09 16:19:39 +08:00 |
|
caoqianming
|
56808f21ca
|
feat: mlog删除时同步删除ftest2
|
2025-01-09 15:42:12 +08:00 |
|
caoqianming
|
f241194c40
|
feat: mlog删除时同步删除ftest
|
2025-01-09 15:36:19 +08:00 |
|
caoqianming
|
180724bee5
|
Merge remote-tracking branch 'origin/master'
|
2025-01-09 14:17:07 +08:00 |
|
caoqianming
|
5b0063e42d
|
fix: mlogbin delete bug
|
2025-01-09 14:14:32 +08:00 |
|
zty
|
4a3934b4fd
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
|
2025-01-09 13:36:58 +08:00 |
|
zty
|
07c996964d
|
feat: wpm/sflog 增加 enstat 数据
|
2025-01-09 13:36:54 +08:00 |
|
caoqianming
|
6fbe0a7b1c
|
fix: mlogbw删除的bug
|
2025-01-09 10:51:04 +08:00 |
|
caoqianming
|
3c6aa3ea18
|
feat: 去除mlogbdefects2
|
2025-01-09 10:12:01 +08:00 |
|
caoqianming
|
860e2157b1
|
feat: 去除mlogbdefects2
|
2025-01-09 10:09:48 +08:00 |
|
caoqianming
|
3751b2f2e2
|
feat: 去除mlogbdefect
|
2025-01-09 10:07:51 +08:00 |
|
caoqianming
|
f209d1767d
|
feat: mlogbin也需要找寻质检表
|
2025-01-09 09:37:57 +08:00 |
|
caoqianming
|
bc44d0335a
|
feat: mlogbin删除时需要删除子集ftest记录2
|
2025-01-09 09:03:32 +08:00 |
|
caoqianming
|
b20dee64df
|
feat: mlogbin删除时需要删除子集ftest记录
|
2025-01-09 08:58:24 +08:00 |
|
caoqianming
|
51123ee0c5
|
feat: mlogbw增加质检保存bug
|
2025-01-09 08:43:32 +08:00 |
|
caoqianming
|
5f88433a25
|
feat: mlogbw增加质检统计
|
2025-01-08 16:21:18 +08:00 |
|
caoqianming
|
2331bec13b
|
feat: 增加MlogbDefect以进行统计
|
2025-01-08 15:02:41 +08:00 |
|
caoqianming
|
8eddeb4f70
|
fix: mlogb质检
|
2025-01-08 10:29:12 +08:00 |
|
caoqianming
|
95b98df8cf
|
fix: mlogb找寻质检表
|
2025-01-07 15:41:04 +08:00 |
|
caoqianming
|
7c9feb23ac
|
feat: mlogb添加qct字段以便调用检验表
|
2025-01-07 15:29:19 +08:00 |
|
caoqianming
|
98f4af2f8c
|
fix: 如果是主要输入物料且是主批次，才需生成输出3
|
2025-01-07 14:38:34 +08:00 |
|
caoqianming
|
abd6ca53f1
|
feat: Mlogb返回增加树型结构
|
2025-01-07 14:31:10 +08:00 |
|
caoqianming
|
e333b84c1b
|
feat: Mlogb添加parent字段
|
2025-01-07 14:24:00 +08:00 |
|
caoqianming
|
d3a304b918
|
feat: Mlogb的排序
|
2025-01-07 14:08:32 +08:00 |
|
caoqianming
|
011df65e4c
|
fix: 如果是主要输入物料且是主批次，才需生成输出
|
2025-01-07 14:07:25 +08:00 |
|
caoqianming
|
0e428f6c9d
|
feat: 如果是主要输入物料且是主批次，才需生成输出
|
2025-01-07 11:10:07 +08:00 |
|
caoqianming
|
9f56968385
|
fix: change_or_new该物料编号已存在不可使用
|
2025-01-06 16:12:33 +08:00 |
|
caoqianming
|
afb3b23486
|
feat: mlogbin自动创建mlogbout数量2
|
2025-01-06 14:09:10 +08:00 |
|
caoqianming
|
b454972943
|
feat: mlogbin自动创建mlogbout数量
|
2025-01-06 13:46:23 +08:00 |
|
caoqianming
|
fc56ecea08
|
fix: mlogbin创建mlogbw的错误2
|
2025-01-06 10:40:33 +08:00 |
|
caoqianming
|
84723967dc
|
fix: mlogbin创建mlogbw的错误
|
2025-01-06 10:33:33 +08:00 |
|
caoqianming
|
d784ac8a3c
|
feat: 生产日志追踪到个完善
|
2025-01-06 10:23:51 +08:00 |
|
caoqianming
|
8d0d5ebcd0
|
fix: 主要是wpmw change_or_new的修正
|
2025-01-03 14:37:57 +08:00 |
|
caoqianming
|
cd6e78961b
|
fix: def cal_mlogb_count bug
|
2025-01-02 17:14:56 +08:00 |
|
caoqianming
|
426be9d805
|
feat: 添加mlogbw接口
|
2025-01-02 15:36:55 +08:00 |
|
caoqianming
|
7d2d74ee80
|
feat: 日志操作时对有ticket的进行处理
|
2024-12-17 13:37:22 +08:00 |
|
caoqianming
|
bdd644a527
|
fix: 日志撤销的同时将任务变更状态
|
2024-12-16 13:06:02 +08:00 |
|
caoqianming
|
bcbaba330d
|
feat: batchst增加batch__startswith__in筛选条件
|
2024-12-04 10:16:41 +08:00 |
|
caoqianming
|
fb43bdde85
|
feat: 完善get_alldata_with_batch
|
2024-12-03 10:36:23 +08:00 |
|
caoqianming
|
d9a1512a92
|
feat: 定义batchst默认排序为batch
|
2024-12-02 14:33:44 +08:00 |
|
caoqianming
|
de6e5d315a
|
feat: 记录batchst 最后操作时间
|
2024-12-02 14:13:17 +08:00 |
|
caoqianming
|
17697d6482
|
feat: 添加batchst路由
|
2024-12-02 13:39:43 +08:00 |
|
caoqianming
|
6396eff968
|
feat: fmlog 移除route字段
|
2024-11-28 17:06:42 +08:00 |
|
caoqianming
|
d52bd4e064
|
feat: mlog 变化不再创建日志
|
2024-11-23 23:12:45 +08:00 |
|
caoqianming
|
1cb64b26af
|
feat: mlog list 接口一点优化
|
2024-11-19 09:25:36 +08:00 |
|
caoqianming
|
7c85d3df65
|
fix: mlog select_related_fields bug2
|
2024-11-18 17:38:11 +08:00 |
|
caoqianming
|
af72749b8a
|
fix: mlog select_related_fields bug
|
2024-11-18 17:27:41 +08:00 |
|
caoqianming
|
71db15bacd
|
feat: 添加cms模块创建article表
|
2024-11-18 10:42:33 +08:00 |
|
caoqianming
|
95739bc3bb
|
feat: wmaterial增加查询条件
|
2024-11-14 12:12:14 +08:00 |
|
caoqianming
|
7d9582fe34
|
feat: mlogb添加字段以追踪原料批次
|
2024-11-13 15:56:40 +08:00 |
|
caoqianming
|
7510b2fc31
|
feat: 报废提交不需要限制接收人
|
2024-09-06 10:11:44 +08:00 |
|
caoqianming
|
beb6b79709
|
fix: mlog view select related
|
2024-09-05 15:00:40 +08:00 |
|
caoqianming
|
1243a50463
|
feat: mlog返回routepack_name
|
2024-09-05 14:17:21 +08:00 |
|
caoqianming
|
a1871a3763
|
feat: mloginit 可填end_time及test_user_name 返回
|
2024-09-05 13:14:12 +08:00 |
|
caoqianming
|
e5ac627834
|
feat: wmaterial filter_queryset默认返回非报废品
|
2024-09-05 12:29:36 +08:00 |
|
caoqianming
|
6e7e6c584e
|
feat: 一二级日志录入
|
2024-09-04 15:25:14 +08:00 |
|
caoqianming
|
170f3db824
|
feat: 添加fmlog
|
2024-09-04 09:04:37 +08:00 |