10001392
|
a2e0d72842
|
Merge remote-tracking branch 'origin/feature/DM/bug-dqbomtopbom'
|
2024-09-11 11:39:06 +08:00 |
|
10001392
|
c065330bde
|
Merge remote-tracking branch 'origin/feature/DM/bug-projecttype'
|
2024-09-11 11:38:54 +08:00 |
|
10001392
|
bc1a959489
|
【物料变更】大批量导入
|
2024-09-11 11:34:23 +08:00 |
 曹鹏飞
|
99af9030d1
|
Merge branch 'feature/DM/bug-dqbomtopbom' into test
|
2024-09-11 10:27:44 +08:00 |
|
曹鹏飞
|
28de32c99e
|
fix(dqbom): 修复转正式bom的一个错误
|
2024-09-11 10:26:49 +08:00 |
jing's
|
a9d059ace0
|
Merge branch 'feature/DM/nflg-bom-transition' into test
|
2024-09-11 10:18:45 +08:00 |
|
曹鹏飞
|
678379a69e
|
Merge branch 'feature/DM/bug-projecttype' into test
|
2024-09-11 10:11:51 +08:00 |
|
曹鹏飞
|
ffb2975ad6
|
fix(ebom): 从excel导入和编辑导入时，去掉项目类别前后的空格
|
2024-09-11 10:10:35 +08:00 |
|
jing's
|
842b9b48ff
|
Merge branch 'feature/DM/nflg-bom-transition'
|
2024-09-11 09:48:34 +08:00 |
|
jing's
|
defc69ab65
|
项目类型编辑去掉前后空格
|
2024-09-11 09:48:01 +08:00 |
|
10001392
|
fe244d93f8
|
Merge remote-tracking branch 'origin/feature/DM/nflg-bom-transition' into test
|
2024-09-11 08:19:13 +08:00 |
|
10001392
|
c309ee7b3f
|
Merge remote-tracking branch 'origin/master-order-20240910' into test
|
2024-09-11 08:16:38 +08:00 |
|
10001392
|
0e3c3c3186
|
【生产订单】优化
|
2024-09-11 08:13:42 +08:00 |
|
jing's
|
f243456805
|
Merge branch 'feature/DM/nflg-bom-transition'
|
2024-09-10 16:45:30 +08:00 |
|
jing's
|
e2d4d5bbe4
|
忽略T项检查
|
2024-09-10 16:44:07 +08:00 |
大米
|
94e04540ac
|
转PBOM-虚拟包处理
|
2024-09-10 15:43:22 +08:00 |
|
大米
|
6d2abfa7a8
|
转PBOM-虚拟包处理
|
2024-09-10 15:36:06 +08:00 |
|
大米
|
2b4db51c18
|
1、pbom-编辑去掉验证
2、转pbom-直发包跳过
|
2024-09-10 11:22:41 +08:00 |
|
大米
|
77c84b12c6
|
1、pbom-编辑去掉验证
2、转pbom-直发包跳过
|
2024-09-10 11:15:44 +08:00 |
|
大米
|
c003903a61
|
生成虚拟包问题
|
2024-09-10 10:31:41 +08:00 |
|
大米
|
8b1974235e
|
EBOM转PBOM-问题
|
2024-09-10 10:16:41 +08:00 |
|
10001392
|
40d6126e7c
|
Merge remote-tracking branch 'origin/DM/异常检查' into test
|
2024-09-09 16:39:52 +08:00 |
|
大米
|
425dfa2678
|
EBOM-正式转PBOM-多任务问题
|
2024-09-09 16:38:57 +08:00 |
|
大米
|
ff6d7641bd
|
转pbom-pbom中有手工新增的时，兼容历史数据
|
2024-09-09 15:52:15 +08:00 |
|
10001392
|
f5245b9f6b
|
Merge remote-tracking branch 'origin/DM/异常检查' into test
|
2024-09-09 15:20:06 +08:00 |
|
大米
|
afd82d5c15
|
EBOM-初始化项目类别：跳过已发布版BOM
|
2024-09-09 15:14:31 +08:00 |
10002327
|
35ab3987ae
|
Merge remote-tracking branch 'origin/master-xiantao5-lhj0905' into test
|
2024-09-09 15:06:08 +08:00 |
|
10002327
|
29130e5d04
|
BOM完整性检查；仙桃发货包增加发货前装配包
|
2024-09-09 14:44:44 +08:00 |
|
大米
|
46252f8f4d
|
提层-F项缺BOM处理
|
2024-09-09 09:29:59 +08:00 |
luoliming
|
fe657fc14f
|
bug-修复
|
2024-09-08 15:43:58 +08:00 |
|
大米
|
96f7923e26
|
PBOM发布时，pbom在工作表时，当创建人为本人或版本大于当前版本则覆盖
|
2024-09-05 19:45:41 +08:00 |
|
大米
|
ed45236c00
|
pbom-发布只发布自己的
|
2024-09-05 19:37:13 +08:00 |
|
10001392
|
fc13cf3700
|
Merge remote-tracking branch 'origin/master-xiantao-lhj0830'
|
2024-09-05 10:49:18 +08:00 |
10002327
|
7ccae15631
|
Merge pull request '清除redis缓存' (#15) from master-xiantao-lhj0830 into test
Reviewed-on: http://192.168.0.40:3000/root/nflg_project/pulls/15
|
2024-09-05 10:19:20 +08:00 |
|
10002327
|
c02ecb336d
|
清除redis缓存
|
2024-09-05 10:12:46 +08:00 |
|
10001392
|
510d546378
|
Merge remote-tracking branch 'origin/feature/DM/nflg-bom-transition'
|
2024-09-05 09:34:47 +08:00 |
|
10001392
|
fc68fc6da3
|
Merge remote-tracking branch 'origin/master-hlq-20240905' into test
|
2024-09-05 09:33:33 +08:00 |
|
10001392
|
9e930b2aaa
|
【物料变更】提示语
【标准部件】非标导出加字段：选型说明，备注
|
2024-09-05 09:31:08 +08:00 |
|
10001392
|
c9a570f706
|
Merge remote-tracking branch 'origin/master-order-20240830'
|
2024-09-04 16:44:57 +08:00 |
|
10001392
|
73e41dfd77
|
Merge remote-tracking branch 'origin/master-order-20240830' into test
|
2024-09-04 16:44:05 +08:00 |
|
10001392
|
8447cf9ad9
|
【生产订单管理】
|
2024-09-04 16:42:44 +08:00 |
|
大米
|
f888d1ef70
|
一般零部件单位不为KG时数量置空
|
2024-09-04 14:57:09 +08:00 |
|
10001392
|
f1ac6f9c23
|
Merge remote-tracking branch 'origin/feature/DM/nflg-bom-transition' into test
|
2024-09-04 13:31:46 +08:00 |
|
jing's
|
86be029466
|
暂存 提交 子数据检查是否在主数据
|
2024-09-04 11:43:07 +08:00 |
|
大米
|
195fff751f
|
pbom-发布，只变化T项时，直接更新T项
|
2024-09-04 11:08:52 +08:00 |
|
大米
|
6ec9c55415
|
pbom-升级使用新的版本规则
|
2024-09-04 09:23:25 +08:00 |
|
大米
|
1462232721
|
转pbom处理-2
|
2024-09-03 18:44:16 +08:00 |
|
10001392
|
e3a8343f1a
|
Merge remote-tracking branch 'origin/master-hlq-20240903' into test
|
2024-09-03 18:04:25 +08:00 |
|
10001392
|
976e61abfb
|
【物料申请】制作大类201001电控柜及器件包英文描述选填
|
2024-09-03 18:01:43 +08:00 |
|
大米
|
1e392b6a46
|
转pbom处理-2
|
2024-09-03 17:38:22 +08:00 |