Commit Graph

238 Commits

Author SHA1 Message Date
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
z
da94a7b417 Merge remote-tracking branch 'origin/main' 2025-06-20 18:59:39 +08:00
z
fb1a942ac1 采购订单修改 2025-06-20 18:59:28 +08:00
wb_zhanghaoyuan
0410a72c5c 零件采购订单生成 2025-06-20 18:56:11 +08:00
wb_zhanghaoyuan
f75e13f58d 零件采购订单生成 2025-06-20 18:42:43 +08:00
zhy
bf5966f386 Merge remote-tracking branch 'origin/main' 2025-06-20 00:56:40 +08:00
zhy
8665c29089 零件采购订单计划 2025-06-20 00:56:02 +08:00
Ledo
0b4d4d8cad 二维码生成 2025-06-20 00:45:21 +08:00
wb_zhanghaoyuan
2db6477093 Merge remote-tracking branch 'origin/main' 2025-06-19 18:47:17 +08:00
wb_zhanghaoyuan
226a035f78 新增零件采购菜单 2025-06-19 18:46:47 +08:00
z
0b026dcf5f 应付调整以及物料需求计划问题修改 2025-06-19 17:31:47 +08:00
z
6c2eab4775 待办关注 2025-06-18 15:13:51 +08:00
BinBin Song
c43b6513e4 Merge branch 'main' of http://120.48.141.82:3000/licq/heli-mes 2025-06-17 20:47:46 +08:00
BinBin Song
69508f5256 UI调整 2025-06-17 20:47:31 +08:00
z
12c03c004d Merge remote-tracking branch 'origin/main' 2025-06-17 20:45:52 +08:00
z
9be047b579 零件跟标准件物料需求计划 2025-06-17 20:45:09 +08:00
BinBin Song
f7f9f8042d fix 2025-06-17 20:41:08 +08:00
z
d331c4675b 推送按钮逻辑 2025-06-10 21:13:28 +08:00
Ledo
88ce02275f BOM二维码 2025-06-09 15:21:29 +08:00
z
98a9303e0a 配置文件更新 2025-06-09 09:09:13 +08:00
z
ad3d01a10a Merge remote-tracking branch 'origin/main' 2025-06-06 16:00:37 +08:00
z
b5e9f3514c 出库界面列表添加领料人 2025-06-06 16:00:10 +08:00
Ledo
b5bc9c2ca3 前端样式调整 2025-06-06 12:21:59 +08:00
z
ef585eda43 备注列调整 2025-06-06 11:42:37 +08:00
z
599da2fa4b 回款记录页面调整 2025-06-06 11:33:36 +08:00
Ledo
6136224687 文档补充 2025-06-06 09:06:50 +08:00
Ledo
a1bcb1976c 按新要求修改 2025-06-06 08:42:21 +08:00
Ledo
74db1306cd 按新要求修改 2025-06-06 08:40:13 +08:00