Commit Graph

24 Commits

Author SHA1 Message Date
9aeff869a6 rev: 成品入库分配修改 2023-05-15 11:53:40 +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
db6ca6d0ac fix:删除引用分配页面 2023-05-11 16:19:17 +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
38dfe6e96d rev: xml路径修改 2023-05-10 11:10:29 +08:00
zhangzhiqiang
055ecfc400 add:主数据载具 2023-05-10 10:54:36 +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
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
46990a545c add:新增半成品前端页面 2023-05-06 16:54:13 +08:00
1c327b5e58 新增原材料出入库、在库管理 2023-05-05 18:23:35 +08:00
afd8dc8026 add:新增成品盘点管理前端页面 2023-05-05 16:26:11 +08:00
5da0c0eb0c rev:修改前端引用路由 2023-05-05 15:43:37 +08:00
zhangzhiqiang
5a898e9f21 init structure 2023-05-05 15:06:20 +08:00