Commit Graph

282 Commits

Author SHA1 Message Date
z
8735b44898 库存更改 2025-07-04 18:53:50 +08:00
BinBin Song
7ef1c6dcb5 逻辑调整 2025-07-04 10:27:29 +08:00
BinBin Song
76e2746e35 样式调整 2025-07-03 22:35:40 +08:00
BinBin Song
12d7e4b3d3 采购单打印 2025-07-03 22:27:17 +08:00
z
cb48e3d994 问题修改 2025-07-03 18:39:15 +08:00
z
0d9eba2cee 测试问题修改 2025-07-03 14:14:24 +08:00
Ledo
2a83e629a8 派工单打印斜线问题 2025-07-03 13:44:02 +08:00
Ledo
d776ac7f35 派工单打印斜线问题 2025-07-03 13:42:57 +08:00
Ledo
12d6f70cb2 工艺设计结束时间问题和派工单打印问题 2025-07-03 12:24:41 +08:00
z
9670e001a7 问题修改 2025-07-02 14:45:30 +08:00
z
aed6cebbf7 标准件采购问题修改 2025-07-02 09:47:57 +08:00
z
9672f1323b 库存界面跳转修改 2025-07-01 17:55:06 +08:00
BinBin Song
f9a52e3732 Merge branch 'main' of http://120.48.141.82:3000/licq/heli-mes 2025-07-01 15:28:46 +08:00
z
1af7bb7430 添加自动出入库逻辑 2025-07-01 15:12:14 +08:00
Ledo
917680e1c6 工艺设计完结后未刷新页面修正 2025-07-01 12:26:38 +08:00
z
8c5d56854f 零件采购问题修改 2025-07-01 08:31:18 +08:00
BinBin Song
b7c9d76b8f 采购单 2025-06-30 23:28:28 +08:00
Ledo
8ecf0e1cfe 小程序端不提示错误问题和设计时间问题 2025-06-30 22:49:17 +08:00
Ledo
6aed54f04e 时间超时问题 2025-06-30 22:47:13 +08:00
z
e7ac6592f1 采购订单添加应收 2025-06-30 17:05:12 +08:00
wb_zhanghaoyuan
cdbc8fdb2a 零件采购fix 2025-06-30 13:47:20 +08:00
wb_zhanghaoyuan
4b7d0a2c08 零件采购fix 2025-06-30 13:46:51 +08:00
z
6a80317365 修改bug 2025-06-29 17:05:14 +08:00
zhy
773bed8910 零件采购 2025-06-28 22:16:03 +08:00
zhy
8dcad5dba7 零件采购 2025-06-28 03:02:43 +08:00
zhy
14350a1465 零件采购 2025-06-28 02:39:50 +08:00
BinBin Song
d5f25b6f66 Merge branch 'main' of http://120.48.141.82:3000/licq/heli-mes 2025-06-27 22:45:29 +08:00
BinBin Song
9cad43eaa6 打印样式 2025-06-27 21:52:15 +08:00
Ledo
0c04b14352 派工单人员问题 2025-06-27 21:51:21 +08:00
z
5721d201bd 标准件收货 2025-06-27 20:43:29 +08:00
wb_zhanghaoyuan
2e9df0c375 零件采购 2025-06-27 17:59:02 +08:00
wb_zhanghaoyuan
775f03825a 零件采购 2025-06-27 14:16:15 +08:00
wb_zhanghaoyuan
d42f96606b 零件采购 2025-06-27 11:34:02 +08:00
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
z
a8a4adb162 问题修改 2025-06-26 19:05:32 +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
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
5f630f1f1b 零件采购单审批 2025-06-25 11:52:26 +08:00
z
1d17fc5d3c 库存补充 2025-06-25 08:27:07 +08:00
zhy
00b39b070b 零件采购单审批 2025-06-25 04:18:15 +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
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
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
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
a1bcb1976c 按新要求修改 2025-06-06 08:42:21 +08:00
Ledo
74db1306cd 按新要求修改 2025-06-06 08:40:13 +08:00
z
4dadedc6a6 按要求修改 2025-06-05 19:27:00 +08:00
Ledo
48adb5b70a 按新要求修改 2025-06-05 15:30:14 +08:00