10002327
|
43356a7228
|
生成PBOM时，bom没有子项的话，仅生成EBOM正式表3
|
2024-09-24 21:24:31 +08:00 |
|
10002327
|
935f4f596e
|
生成PBOM时，bom没有子项的话，仅生成EBOM正式表2
|
2024-09-24 21:07:00 +08:00 |
|
10002327
|
3f51dd3317
|
pbom正式表发布电控系统优化2
|
2024-09-24 20:55:38 +08:00 |
|
10002327
|
9f2af14cea
|
Merge remote-tracking branch 'origin/master' into master-checkVirtualPackage-lhj0920
|
2024-09-24 20:24:55 +08:00 |
|
10002327
|
b995a19db8
|
生成PBOM时，bom没有子项的话，仅生成EBOM正式表，不生成PBOM任务
|
2024-09-24 18:32:50 +08:00 |
10001392
|
e4a10e4b3c
|
Merge remote-tracking branch 'origin/feature/DM/rakor-change-sap'
|
2024-09-24 18:23:55 +08:00 |
|
10001392
|
d18478badc
|
Merge remote-tracking branch 'origin/feature/DM/bug-sap-menge'
|
2024-09-24 18:23:43 +08:00 |
|
10001392
|
1e869f6462
|
Merge remote-tracking branch 'origin/DM/nflg-新需求'
|
2024-09-24 18:23:09 +08:00 |
大米
|
841c20dff8
|
pbom-异常检查
|
2024-09-24 17:18:24 +08:00 |
|
luolm
|
79504b297d
|
Merge remote-tracking branch 'origin/DM/nflg-新需求' into DM/nflg-新需求
|
2024-09-23 21:47:57 +08:00 |
|
luolm
|
3d7128d95c
|
pbom-正式版查询问题
(cherry picked from commit 2607d23cb8)
|
2024-09-23 21:47:39 +08:00 |
|
luolm
|
271015fcc2
|
Merge remote-tracking branch 'origin/master'
|
2024-09-23 21:47:05 +08:00 |
|
luolm
|
2607d23cb8
|
pbom-正式版查询问题
|
2024-09-23 21:46:55 +08:00 |
|
10001392
|
60ae7f1a9c
|
发货直发制作包，物料自动申请，流程类别传1
|
2024-09-23 15:36:36 +08:00 |
 曹鹏飞
|
04c38bf7b4
|
fix(ebom): 导入到SAP取消用户根节点不导入的限制
|
2024-09-21 16:03:40 +08:00 |
|
大米
|
ec497a742c
|
ebom-pbom版本对齐问题
|
2024-09-20 18:00:42 +08:00 |
|
10002327
|
0e1fd46fd7
|
生成发货包时21编码校验物料描述就好，不用去校验名称
|
2024-09-20 11:37:13 +08:00 |
|
10001392
|
f45dda1ccf
|
Merge remote-tracking branch 'origin/master-convertToPBom-lhj09014'
|
2024-09-18 11:11:03 +08:00 |
|
10001392
|
aeb0bf8522
|
Merge remote-tracking branch 'origin/master-xiantao5-lhj0905'
|
2024-09-18 11:10:50 +08:00 |
|
10002327
|
f6816350a3
|
电气BOM正式表查询无须添加时间条件
|
2024-09-18 10:08:57 +08:00 |
|
10002327
|
a3be198926
|
pbom判断缺BOM
|
2024-09-18 09:37:48 +08:00 |
|
曹鹏飞
|
293c41b5ac
|
fix(导入到SAP): 数量(BigDecimal类型)转字符串时，使用更安全的toPlainString方法避免生成科学计数法表示
|
2024-09-18 09:29:27 +08:00 |
|
10001392
|
00ef7c7bdb
|
Merge remote-tracking branch 'origin/master-convertToPBom-lhj09014' into test
|
2024-09-18 08:37:45 +08:00 |
|
10002327
|
bebe0e3fe6
|
电控系统发货包优化9.18
|
2024-09-18 08:34:28 +08:00 |
|
10001392
|
9dba2ff267
|
Merge remote-tracking branch 'origin/DM/nflg-新需求' into test
|
2024-09-18 08:30:50 +08:00 |
|
luolm
|
cb8abd0349
|
pbom-版本处理
|
2024-09-17 22:12:31 +08:00 |
|
luolm
|
f115ca8236
|
pbom-版本处理
|
2024-09-17 22:07:35 +08:00 |
|
大米
|
6788ab790a
|
Merge branch 'DM/nflg-新需求' into test
|
2024-09-14 18:03:53 +08:00 |
|
大米
|
4f26f1425f
|
转PBOM -直发包问题
|
2024-09-14 17:36:49 +08:00 |
|
10001392
|
674909b5e3
|
Merge remote-tracking branch 'origin/master-convertToPBom-lhj09014' into test
|
2024-09-14 11:19:05 +08:00 |
|
10002327
|
2af307b195
|
电控系统发货包优化2
|
2024-09-14 11:16:09 +08:00 |
|
10002327
|
9e5a5f1fec
|
Merge remote-tracking branch 'origin/master-convertToPBom-lhj09014' into test
|
2024-09-14 10:41:25 +08:00 |
|
10002327
|
032e790ce1
|
电控系统发货包优化
|
2024-09-14 10:39:19 +08:00 |
|
10001392
|
8551220347
|
Merge remote-tracking branch 'origin/DM/nflg-新需求' into test
|
2024-09-14 08:58:58 +08:00 |
|
大米
|
b947077459
|
转PBOM -直发重复问题
|
2024-09-14 08:57:22 +08:00 |
|
10001392
|
462fd5601c
|
Merge remote-tracking branch 'origin/DM/nflg-新需求' into test
|
2024-09-13 17:25:03 +08:00 |
|
大米
|
dfaf9c402b
|
转pbom-报错修复
|
2024-09-13 17:13:13 +08:00 |
|
10001392
|
f03dedfbd6
|
Merge remote-tracking branch 'origin/DM/nflg-新需求' into test
|
2024-09-13 16:44:54 +08:00 |
|
大米
|
2b08fb890d
|
pbom-重复问题修复
|
2024-09-13 16:44:11 +08:00 |
|
10001392
|
799f29f121
|
Merge remote-tracking branch 'origin/DM/nflg-新需求' into test
|
2024-09-13 10:35:32 +08:00 |
|
大米
|
969af82393
|
ebom转PBOM报错问题-版本号问题
|
2024-09-13 10:16:02 +08:00 |
|
大米
|
802203f4d4
|
ebom转PBOM
|
2024-09-12 18:14:51 +08:00 |
|
大米
|
bbcc2d5fb1
|
ebom转PBOM
|
2024-09-12 17:27:39 +08:00 |
|
10001392
|
11279f4335
|
Merge remote-tracking branch 'origin/DM/ebom导入加单位'
|
2024-09-12 17:06:02 +08:00 |
|
10001392
|
ac185808ca
|
Merge remote-tracking branch 'origin/DM/异常检查'
|
2024-09-12 17:05:49 +08:00 |
|
大米
|
b95b3eff73
|
pBOM-编辑添加新行
|
2024-09-12 16:16:35 +08:00 |
|
10001392
|
f7158e5bf8
|
Merge remote-tracking branch 'origin/DM/ebom导入加单位' into test
|
2024-09-12 09:54:27 +08:00 |
|
大米
|
cbf7dedf55
|
EBOM-导入加单位
|
2024-09-12 09:51:39 +08:00 |
|
10001392
|
2fb5ade975
|
Merge remote-tracking branch 'origin/DM/ebom导入加单位' into test
|
2024-09-12 09:18:17 +08:00 |
|
大米
|
7466c73393
|
EBOM-导入加单位
|
2024-09-12 09:13:02 +08:00 |
|
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 |
|
曹鹏飞
|
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
|
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
|
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
|
c9a570f706
|
Merge remote-tracking branch 'origin/master-order-20240830'
|
2024-09-04 16:44:57 +08:00 |
|
10001392
|
8447cf9ad9
|
【生产订单管理】
|
2024-09-04 16:42:44 +08:00 |
|
大米
|
f888d1ef70
|
一般零部件单位不为KG时数量置空
|
2024-09-04 14:57:09 +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 |
|
大米
|
1e392b6a46
|
转pbom处理-2
|
2024-09-03 17:38:22 +08:00 |
|
10001392
|
1b4ce3963a
|
Merge remote-tracking branch 'origin/feature/DM/nflg-bom-transition'
|
2024-09-03 11:33:40 +08:00 |
|
曹鹏飞
|
82af5dc6f5
|
Merge branch 'feature/DM/nflg-bom-transition' of http://192.168.0.40:3000/root/nflg_project into feature/DM/nflg-bom-transition
|
2024-09-03 10:56:40 +08:00 |
|
曹鹏飞
|
57e0e2a336
|
feat(pbom): 导入到SAP移除跳过用户根节点物料的限制
|
2024-09-03 10:56:17 +08:00 |
|
10002327
|
6f14256fb5
|
虚拟包按发货-直发-制作的顺序排序
|
2024-09-03 09:17:01 +08:00 |
|
大米
|
57aa6603ce
|
转pbom处理
|
2024-09-02 18:59:15 +08:00 |
|
10001392
|
6e9466004b
|
【生产订单】
|
2024-09-02 17:58:05 +08:00 |
|
大米
|
a0337e5a41
|
EBOM-编辑-更新物料行时更新物料单位
|
2024-09-02 14:34:15 +08:00 |
|
大米
|
79740360fa
|
EBOM-编辑-更新物料行时更新物料单位
|
2024-09-02 14:28:46 +08:00 |
|
10001392
|
848087523c
|
【生产订单管理】
|
2024-09-02 14:10:11 +08:00 |
|
10001392
|
fa3dfc210e
|
【生产订单管理】
|
2024-09-02 11:19:49 +08:00 |
|
10001392
|
91be7b8de1
|
物料主数据
1、【物料申请】制作物料英文描述
|
2024-09-02 11:19:37 +08:00 |
|
10002327
|
2ab79e68bc
|
去掉修改排序号的值
|
2024-09-02 10:46:06 +08:00 |
|
10002327
|
ef5e9e23ae
|
PBOM库存地点、ebom排序问题
|
2024-08-30 18:05:41 +08:00 |
|
10002327
|
5fdbceff47
|
PBOM库存地点、ebom排序问题
|
2024-08-30 18:02:35 +08:00 |
|
大米
|
4bc3d6c99b
|
版本号处理
|
2024-08-30 17:14:10 +08:00 |
|
大米
|
6f4e2a22ac
|
直发包，发货前装配包物料不合并
|
2024-08-30 16:54:37 +08:00 |
|
大米
|
48d3a83e89
|
仙桃不导入1010工厂
|
2024-08-30 11:00:48 +08:00 |
|
大米
|
3f6cde7e7a
|
pbom-升级版本号获取
|
2024-08-30 09:36:09 +08:00 |
|
10001392
|
7fe4cbacde
|
Merge remote-tracking branch 'origin/feature/DM/nflg-bom-transition-sit' into feature/DM/nflg-bom-transition
|
2024-08-29 08:38:52 +08:00 |
|
大米
|
897e779f24
|
EBOM草稿发布时-ebom升级处理
|
2024-08-29 08:36:15 +08:00 |
|
10001392
|
2ec207ff97
|
Merge remote-tracking branch 'origin/feature/DM/nflg-bom-transition-sit' into feature/DM/nflg-bom-transition
|
2024-08-29 07:59:18 +08:00 |
|
luoliming
|
72941481fa
|
1-eBOM草稿-转Pbom
|
2024-08-28 23:47:18 +08:00 |
|
10001392
|
4b873c151d
|
Merge remote-tracking branch 'origin/feature/DM/nflg-bom-transition-sit' into feature/DM/nflg-bom-transition
|
2024-08-28 22:01:06 +08:00 |
|
10001392
|
df4b9ceaa2
|
Merge remote-tracking branch 'origin/master-pbom-lhj0827' into feature/DM/nflg-bom-transition
|
2024-08-28 22:00:33 +08:00 |
|
luoliming
|
6e79ebe3ff
|
Merge remote-tracking branch 'origin/feature/DM/nflg-bom-transition-sit' into feature/DM/nflg-bom-transition-sit
|
2024-08-28 21:58:47 +08:00 |
|
luoliming
|
647b7c2674
|
1-eBOM-正式转Pbom
|
2024-08-28 21:58:11 +08:00 |
|
10002327
|
c6451c8189
|
PBOM子表字段【source_parent_material_no】赋值
|
2024-08-28 18:59:43 +08:00 |
|
10001392
|
4fb3dfa2b2
|
Merge remote-tracking branch 'origin/feature/DM/nflg-bom-transition-sit' into feature/DM/nflg-bom-transition
|
2024-08-28 16:21:51 +08:00 |
|
大米
|
a908b2d6f3
|
pbom发布报错物料处理
|
2024-08-28 16:19:23 +08:00 |
|
大米
|
c250e91514
|
EBOM-getChild方法优化
|
2024-08-28 14:46:09 +08:00 |
|
10001392
|
22fc635e7c
|
Merge remote-tracking branch 'origin/feature/DM/nflg-bom-transition-sit' into feature/DM/nflg-bom-transition
|
2024-08-28 14:25:07 +08:00 |
|
大米
|
b8ff69b50c
|
转EBOM时- PBOM发布报错修复4
|
2024-08-28 14:24:58 +08:00 |
|
大米
|
ca7bbdc353
|
转EBOM时- PBOM发布报错修复3
|
2024-08-28 14:23:04 +08:00 |
|
10001392
|
bc87bd8a99
|
Merge remote-tracking branch 'origin/master-pbom-lhj0827' into feature/DM/nflg-bom-transition
|
2024-08-28 11:34:12 +08:00 |
|
10002327
|
e98b0f063a
|
PBOM子表SourceParentMaterialNo赋值
|
2024-08-28 11:32:53 +08:00 |
|
10001392
|
fab3d4f66c
|
Merge remote-tracking branch 'origin/feature/DM/nflg-bom-transition-sit' into feature/DM/nflg-bom-transition
|
2024-08-28 11:18:41 +08:00 |
|
大米
|
ef3287ba9c
|
转EBOM时- PBOM发布报错修复2
|
2024-08-28 11:17:50 +08:00 |
|
大米
|
ba1209700a
|
转EBOM时- PBOM发布报错修复2
|
2024-08-28 11:17:46 +08:00 |
|
曹鹏飞
|
05679a70fd
|
feat(pbom): 取消从SAP导入进来的数据，不再导入到SAP去的限制
|
2024-08-27 21:51:36 +08:00 |
|
曹鹏飞
|
a6cb884797
|
Merge branch 'feature/DM/nflg-bom-transition' of http://192.168.0.40:3000/root/nflg_project into feature/DM/nflg-bom-transition
|
2024-08-27 19:00:31 +08:00 |
|
曹鹏飞
|
4e7fb24723
|
fix(dqbom): 优化导入时T项物料项目类别的设置逻辑
|
2024-08-27 19:00:08 +08:00 |
|
10001392
|
dcad5ecf4e
|
Merge remote-tracking branch 'origin/feature/DM/nflg-bom-transition-sit' into feature/DM/nflg-bom-transition
|
2024-08-27 15:02:43 +08:00 |
|
大米
|
3a25f5d4bb
|
转EBOM时- PBOM发布报错修复
|
2024-08-27 15:01:42 +08:00 |
|
大米
|
38fcbdbf17
|
Merge remote-tracking branch 'origin/feature/DM/nflg-bom-transition' into feature/DM/nflg-bom-transition
|
2024-08-27 14:59:34 +08:00 |
|
大米
|
2990decaff
|
转EBOM时- PBOM发布报错修复
|
2024-08-27 14:59:20 +08:00 |
|
10001392
|
a31d2263e7
|
Merge remote-tracking branch 'origin/feature/DM/nflg-bom-transition-sit' into feature/DM/nflg-bom-transition
|
2024-08-27 14:28:17 +08:00 |
|
大米
|
2126d03ee0
|
转EBOM时-bug修复-PBOM发布报错
|
2024-08-27 14:26:23 +08:00 |
|
10001392
|
a06a883caa
|
Merge remote-tracking branch 'origin/feature/DM/nflg-bom-transition-sit' into feature/DM/nflg-bom-transition
|
2024-08-27 14:03:29 +08:00 |
|
大米
|
3b7db353b0
|
转EBOM时-bug修复-PBOM发布报错
|
2024-08-27 14:00:32 +08:00 |
|
10001392
|
f6b8242d57
|
Merge remote-tracking branch 'origin/feature/DM/nflg-bom-transition-sit' into feature/DM/nflg-bom-transition
|
2024-08-27 13:42:28 +08:00 |
|
大米
|
460de25178
|
转EBOM时-parent表数量为1
|
2024-08-27 13:38:36 +08:00 |
|
10001392
|
80de53535a
|
Merge remote-tracking branch 'origin/feature/DM/nflg-bom-transition-sit' into feature/DM/nflg-bom-transition
|
2024-08-27 11:05:25 +08:00 |
|
大米
|
a36e57f1dc
|
PBOM-全新逻辑： 1、直发包为升级问题
2、31生成了A00.1版本
|
2024-08-27 11:02:09 +08:00 |
|
大米
|
9d18245de5
|
PBOM-全新逻辑： 1、直发包为升级问题
2、31生成了A00.1版本
|
2024-08-27 11:00:49 +08:00 |
|
10001392
|
e1ddef2101
|
Merge remote-tracking branch 'origin/feature/DM/nflg-bom-transition-sit' into feature/DM/nflg-bom-transition
|
2024-08-27 08:55:06 +08:00 |
|
10002327
|
58ac1426be
|
pbom发布和导入SAP时项目类别为F项，则给POTX1 赋值来源EBOM的父级物料编码
|
2024-08-27 08:41:56 +08:00 |
|
大米
|
be3251253d
|
PBOM-工作表新增行加工厂
|
2024-08-26 17:37:56 +08:00 |
|
大米
|
7b91469737
|
EBOM正式转PBOM全新逻辑-优化
|
2024-08-26 15:35:44 +08:00 |
|
大米
|
4882f91925
|
Merge branch 'feature/DM/nflg-bom-transition_转pbom新逻辑' into feature/DM/nflg-bom-transition-sit
|
2024-08-26 11:56:24 +08:00 |