Commit Graph

1358 Commits

Author SHA1 Message Date
zhangzhiqiang
b5e24c4fa8 add:物料基础 2023-05-15 20:39:47 +08:00
zhangzhiqiang
cc9f55ace0 add:基础管理/物料分类 2023-05-15 19:47:30 +08:00
9aeff869a6 rev: 成品入库分配修改 2023-05-15 11:53:40 +08:00
zhangzhiqiang
535b1a6b8c rev:仓储基础管理维护 2023-05-15 11:23:04 +08:00
zhangzhiqiang
382f8e5503 rev:冲突处理 2023-05-15 09:53:32 +08:00
0bb532221b rev:冲突解决 2023-05-15 09:39:46 +08:00
0f6b643ed3 rev:冲突处理 2023-05-15 09:37:42 +08:00
bad9c80a5f Merge branch 'master' of http://121.40.234.130:8899/root/hl_one 2023-05-15 09:34:39 +08:00
eb1d33da9d rev: 代码提交 2023-05-15 09:29:48 +08:00
a097053f14 解决冲突 2023-05-15 09:23:47 +08:00
577c8ee65d Merge branch 'master' of http://121.40.234.130:8899/root/hl_one
# Conflicts:
#	mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/controller/storage/StIvtBsrealstorattrController.java
#	mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/controller/storage/StIvtStructattrController.java
#	mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/service/storage/IStIvtStructattrService.java
#	mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/service/storage/impl/StIvtStructattrServiceImpl.java
2023-05-15 09:23:08 +08:00
27454e664e add:新增原材料入库功能 2023-05-15 09:11:58 +08:00
4b3cba9ff2 add:入库分配 2023-05-15 08:58:59 +08:00
zhangzhiqiang
474df3f5d8 add:添加仓库记录表服务/修改仓库基础数据服务 2023-05-15 00:27:04 +08:00
4895d08d02 Merge remote-tracking branch 'origin/master' 2023-05-12 11:12:15 +08:00
36fa3dfd95 fix:出入库枚举修改 2023-05-11 16:48:25 +08:00
0e6913243c Merge branch 'master' of http://121.40.234.130:8899/root/hl_one 2023-05-11 16:19:22 +08:00
db6ca6d0ac fix:删除引用分配页面 2023-05-11 16:19:17 +08:00
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