Commit Graph

265 Commits

Author SHA1 Message Date
BinBin Song
a39a6a1c64 Merge branch 'main' of http://120.48.141.82:3000/licq/heli-mes 2025-06-27 08:56:39 +08:00
BinBin Song
2db14bf061 样式调整 2025-06-27 08:56:36 +08:00
BinBin Song
10b0cd36e1 样式调整 2025-06-26 22:32:32 +08:00
wb_zhanghaoyuan
e2fc1967b8 Merge remote-tracking branch 'origin/main' 2025-06-26 20:38:32 +08:00
wb_zhanghaoyuan
1a14def1db 零件采购 2025-06-26 20:38:25 +08:00
Ledo
26f1261d54 BOM初始值 2025-06-26 20:17:11 +08:00
z
a8a4adb162 问题修改 2025-06-26 19:05:32 +08:00
Ledo
daca9ec9f8 mapper补充 2025-06-26 18:39:07 +08:00
Ledo
4871fe23a8 搜索列表时不再记忆选中情况 2025-06-26 18:39:07 +08:00
wb_zhanghaoyuan
9c4a1f5e3d Merge remote-tracking branch 'origin/main' 2025-06-26 15:49:44 +08:00
wb_zhanghaoyuan
4a4b649a85 零件采购单审批fix 2025-06-26 15:49:37 +08:00
Ledo
979bd2c4a2 弹框单选问题 2025-06-26 15:45:26 +08:00
Ledo
ae449377a3 确实字段补充 2025-06-26 15:10:49 +08:00
Ledo
af4352ae89 修正补分字段必须录入问题 2025-06-26 14:37:58 +08:00
zhy
ee8e60d024 零件采购单审批 2025-06-26 09:20:09 +08:00
BinBin Song
9cc741e16e 小程序样式调整 2025-06-25 22:31:55 +08:00
Ledo
9284906254 调整部分数据不再写入数据库 2025-06-25 21:48:12 +08:00
BinBin Song
0cfaf4353d 零件采购订单打印 2025-06-25 21:24:18 +08:00
BinBin Song
a9b5cc21a7 Merge branch 'main' of http://120.48.141.82:3000/licq/heli-mes 2025-06-25 20:49:19 +08:00
BinBin Song
e266dff4f9 样式调整 2025-06-25 20:49:15 +08:00
z
2afc4bf2fa Merge remote-tracking branch 'origin/main' 2025-06-25 19:10:21 +08:00
z
fbab81db2c 入库单管理页面 2025-06-25 19:09:52 +08:00
wb_zhanghaoyuan
5c9e2a7e13 零件采购单审批 2025-06-25 19:01:38 +08:00
Ledo
11893e4cd2 部分代码恢复及修改 2025-06-25 16:03:35 +08:00
BinBin Song
fea38d7741 Merge branch 'main' of http://120.48.141.82:3000/licq/heli-mes 2025-06-25 15:46:53 +08:00
BinBin Song
031c891874 样式调整 2025-06-25 15:46:50 +08:00
BinBin Song
a07f9d6259 打印 2025-06-25 14:47:40 +08:00
wb_zhanghaoyuan
350e1c8cdb Merge remote-tracking branch 'origin/main' 2025-06-25 11:52:32 +08:00
wb_zhanghaoyuan
5f630f1f1b 零件采购单审批 2025-06-25 11:52:26 +08:00
z
b0efeacd84 字段恢复 2025-06-25 11:43:36 +08:00
z
1d17fc5d3c 库存补充 2025-06-25 08:27:07 +08:00
zhy
8f323c5038 Merge remote-tracking branch 'origin/main' 2025-06-25 04:18:32 +08:00
zhy
00b39b070b 零件采购单审批 2025-06-25 04:18:15 +08:00
Ledo
972f286896 修改BOM导入和相关物料选择方法 2025-06-24 22:36:41 +08:00
Ledo
8f67e9baad 修改BOM导入和相关物料选择方法 2025-06-24 21:51:19 +08:00
wb_zhanghaoyuan
92d4f9aade Merge remote-tracking branch 'origin/main' 2025-06-24 20:31:40 +08:00
wb_zhanghaoyuan
6a399695ef 零件采购单审批 2025-06-24 20:31:33 +08:00
Ledo
d03e64cb00 修改BOM导入和相关物料选择方法 2025-06-24 20:29:17 +08:00
wb_zhanghaoyuan
ceafe8a8ba Merge remote-tracking branch 'origin/main'
# Conflicts:
#	mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/purchaseordermakedetail/PurchaseOrderMakeDetailDO.java
#	mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/partpurchaseorder/PartPurchaseOrderServiceImpl.java
2025-06-24 15:53:39 +08:00
wb_zhanghaoyuan
97d4ce2230 零件采购单审批 2025-06-24 15:51:18 +08:00
Ledo
7fc0aecd26 注释还原 2025-06-24 13:53:10 +08:00
Ledo
ed4cb263dd 采购订单生成、标准件采购 2025-06-24 13:43:23 +08:00
z
3476f72d74 问题修改 2025-06-24 09:19:47 +08:00
zhy
031cfd1c1a 零件采购单审批 2025-06-23 22:57:42 +08:00
zhy
070b5419b3 零件采购单审批 2025-06-23 22:38:39 +08:00
wb_zhanghaoyuan
487f6294ab 零件采购单审批 2025-06-23 20:03:49 +08:00
wb_zhanghaoyuan
c8086d22ef 零件采购订单生成fix 2025-06-23 17:57:11 +08:00
z
1595733b09 零件采购订单管理 2025-06-22 00:08:59 +08:00
zhy
913318d152 零件采购订单计划 2025-06-21 20:43:05 +08:00
zhy
2ec805965f 零件采购订单计划 2025-06-21 00:55:00 +08:00