 caoqianming
|
22b6b1305f
|
fix: handover拆批请选择车间库存
|
2025-04-14 15:19:45 +08:00 |
|
caoqianming
|
fda9ecae94
|
fix: get_alldata_with_batch中小数计算异常捕获
|
2025-04-11 10:16:51 +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
|
a8f9676ed0
|
fix: get_alldata_with_batch_and_store时保存json数据采用DjangoJSONEncoder以处理decimal
|
2025-04-03 08:34:57 +08:00 |
|
caoqianming
|
2923fad2a8
|
feat: HTML_BASE_URL 前缀统一修改
|
2025-04-02 11:04:46 +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
|
73f0e504c9
|
feat: batchst g_create 默认relation_type
|
2025-03-28 08:28:58 +08:00 |
|
caoqianming
|
c002017a84
|
feat: 工艺路线支持子图逻辑
|
2025-03-27 12:40:09 +08:00 |
|
caoqianming
|
eaa5d75b99
|
feat: 工艺路线校验
|
2025-03-26 16:36:29 +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
|
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
|
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
|
108116342e
|
feat: batchlog数据链
|
2025-03-21 14:15:10 +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
|
48988d3237
|
fix: wmaterial 去除 material__process__exclude 字段
|
2025-03-20 09:09:41 +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
|
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
|
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
|
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
|
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 |
|
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
|
b067ec2ea7
|
fix: handover validate handoverbw的bug
|
2025-03-14 09:57:28 +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
|
ed80edbef8
|
fix: 调整数据结构
|
2025-03-13 16:46:32 +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
|
7cca8b7277
|
fix: handover需要进行3层校验
|
2025-03-13 12:02:43 +08:00 |
|
caoqianming
|
31ef257a60
|
feat: attrs["count"] = len(attrs["handoverb"])
|
2025-03-13 10:58:09 +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
|
456f05a83e
|
feat: 针对加工前不良的处理2
|
2025-03-07 10:42:27 +08:00 |
|
caoqianming
|
330d44e2a3
|
feat: 优化一下mlogbdefect的代码结构
|
2025-03-07 10:09:49 +08:00 |
|
caoqianming
|
8a715ed136
|
feat: wpm revert支持加工强不良
|
2025-03-07 09:20:20 +08:00 |
|
caoqianming
|
925bc2027c
|
feat: mlogb_submit支持加工前不良
|
2025-03-07 08:51:22 +08:00 |
|
caoqianming
|
2a9bd7ef6a
|
feat: mlogbdefect defect可为空代表合格品
|
2025-03-07 08:51:01 +08:00 |
|
caoqianming
|
1844fa7228
|
feat: mlogb添加字段
|
2025-03-06 19:00:04 +08:00 |
|
caoqianming
|
e2fbc63293
|
feat: 支持传入加工前不良的数据
|
2025-03-06 18:51:18 +08:00 |
|
caoqianming
|
73b3ab9377
|
feat: handover增加筛选条件
|
2025-03-06 16:36:32 +08:00 |
|
caoqianming
|
f7843621df
|
feat: wm 增加 来料/完成 筛选
|
2025-03-06 16:15:08 +08:00 |