Commit Graph

1140 Commits

Author SHA1 Message Date
zhangzhiqiang
4f2f6196c1 Merge remote-tracking branch 'origin/master' 2023-05-11 15:08:20 +08:00
zhangzhiqiang
68b19747b6 add:任务相关服务 2023-05-11 15:08:09 +08:00
0115eab818 rev: 入库组盘 2023-05-11 14:04:44 +08:00
zhangzhiqiang
eb7d4a2b40 add:半成品入库功能 2023-05-11 11:17:34 +08:00
c91a5f86e7 fix:原料入库主页面 2023-05-10 16:57:32 +08:00
zhangzhiqiang
a17c0eff45 add:半成品代码/仓库flow 2023-05-10 14:36:02 +08:00
38dfe6e96d rev: xml路径修改 2023-05-10 11:10:29 +08:00
zhangzhiqiang
fbde7268ef add:载具 2023-05-10 11:03:23 +08:00
zhangzhiqiang
055ecfc400 add:主数据载具 2023-05-10 10:54:36 +08:00
zhangzhiqiang
2e3072a5d5 add:半成品/原料基础数据 2023-05-10 10:29:10 +08:00
zhangzhiqiang
8916b80dc0 rev:半成品维护 2023-05-10 09:47:12 +08:00
zhangzhiqiang
420eec9ace add:半成品入库 2023-05-09 22:44:20 +08:00
ef710b9b5e rev: 成品入库前后端修改 2023-05-09 21:00:53 +08:00
f6c8f65177 add lucene 2023-05-09 15:37:26 +08:00
9b8d295fe7 rev 在线状态 2023-05-09 14:35:18 +08:00
zhangzhiqiang
b974006173 rev:基础数据维护 2023-05-09 13:54:35 +08:00
e3031c5267 add 封箱拆箱线, rev 测试读写 2023-05-08 11:04:52 +08:00
1e2692e426 Merge branch 'master' of http://121.40.234.130:8899/root/hl_one 2023-05-08 08:50:18 +08:00
53d4e9dd04 角色权限修改 2023-05-08 08:50:13 +08:00
zhangzhiqiang
a7f9ea77ac init project 2023-05-06 17:18:46 +08:00
46990a545c add:新增半成品前端页面 2023-05-06 16:54:13 +08:00
zhangzhiqiang
8df349f377 rev:菜单系统type不一致问题 2023-05-06 14:37:02 +08:00
zhangzhiqiang
f3f0573970 Merge remote-tracking branch 'origin/master' 2023-05-06 14:13:13 +08:00
zhangzhiqiang
a768d4f615 rev:menu不显示 2023-05-06 14:12:55 +08:00
ludj
072645e8bf oshi 监控版本更新 2023-05-05 20:00:22 +08:00
zhangzhiqiang
57730a631e add:修改成品出入库未mybatis 2023-05-05 18:46:17 +08:00
ludj
adc8063ba5 POM文件修改 2023-05-05 18:37:26 +08:00
4ed462645b Merge branch 'master' of http://121.40.234.130:8899/root/hl_one 2023-05-05 18:23:40 +08:00
1c327b5e58 新增原材料出入库、在库管理 2023-05-05 18:23:35 +08:00
ludj
eb2653f67d pom文件修改 2023-05-05 17:45:13 +08:00
047199776d menuId改为menu_id 2023-05-05 16:35:38 +08:00
afd8dc8026 add:新增成品盘点管理前端页面 2023-05-05 16:26:11 +08:00
zhangzhiqiang
5b8a2cb441 init project 2023-05-05 16:17:19 +08:00
5da0c0eb0c rev:修改前端引用路由 2023-05-05 15:43:37 +08:00
zhangzhiqiang
5a898e9f21 init structure 2023-05-05 15:06:20 +08:00
9b17f46d72 Merge remote-tracking branch 'origin/master' 2023-05-05 11:07:56 +08:00
zhangzhiqiang
234d2337d8 Revert "rev:修改结构"
This reverts commit 1ee9d736
2023-05-04 20:40:53 +08:00
zhangzhiqiang
2f8b55fe06 Revert "rev:修改结构"
This reverts commit 1ee9d736
2023-05-04 20:39:31 +08:00
zhangzhiqiang
f6df55e031 init project 2023-05-04 20:35:14 +08:00
zhangzhiqiang
c36e97732b init project 2023-05-04 20:26:55 +08:00
zhangzhiqiang
e23b246afd init project 2023-05-04 18:59:14 +08:00
zhangzhiqiang
abc2af1ceb init project 2023-05-04 13:56:29 +08:00
zhangzhiqiang
16906b4039 init 2023-05-03 11:23:01 +08:00
zhangzhiqiang
fd26e8fd31 Merge remote-tracking branch 'origin/master' 2023-04-28 14:56:59 +08:00
zhangzhiqiang
f87dd1690c init:project structure 2023-04-28 14:56:51 +08:00
f8747d1210 Merge remote-tracking branch 'origin/master' 2023-04-27 15:39:44 +08:00
a23eae3cf2 rev 工作模式 2023-04-27 14:21:16 +08:00
778d8fb7df rev 封箱拆箱 2023-04-27 13:33:04 +08:00
a351d652a0 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	mes/qd/src/views/wms/st/productOut/ViewDialog.vue
#	mes/qd/src/views/wms/st/semiProductIn/AddDialog.vue
#	mes/qd/src/views/wms/st/semiProductOut/AddDialog.vue
2023-04-27 10:16:16 +08:00
zhangzhiqiang
34bca47651 Merge remote-tracking branch 'origin/master' 2023-04-25 19:38:51 +08:00