|
|
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 |
|
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 |
|
zhangzhiqiang
|
b974006173
|
rev:基础数据维护
|
2023-05-09 13:54:35 +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 |
|
|
|
047199776d
|
menuId改为menu_id
|
2023-05-05 16:35:38 +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 |
|
zhangzhiqiang
|
f87dd1690c
|
init：project structure
|
2023-04-28 14:56:51 +08:00 |
|
zhangzhiqiang
|
f0c1387064
|
rev:接口联调
|
2023-04-25 19:38:44 +08:00 |
|
zhangzhiqiang
|
8c3e1d0a3a
|
add:物料项点
|
2023-04-24 19:08:57 +08:00 |
|
zhangzhiqiang
|
1ee9d7362b
|
rev:修改结构
|
2023-04-23 14:04:45 +08:00 |
|
|
|
82334dccf0
|
rev:修改区域选择
|
2023-04-14 14:35:22 +08:00 |
|
zhangzhiqiang
|
729f61216a
|
rev:成品入库
|
2023-04-14 11:13:56 +08:00 |
|
|
|
aa9be88be3
|
add:增加半成品入库前端页面
|
2023-04-14 10:26:13 +08:00 |
|
|
|
204d771420
|
rev: 字段修改
|
2023-04-10 20:02:17 +08:00 |
|
|
|
6202b514c2
|
fix: 修复任务类型信息，添加acs任务类型
|
2023-04-06 20:16:41 +08:00 |
|
|
|
70a26fc2c5
|
rev: 修改任务类型
|
2023-04-04 10:36:58 +08:00 |
|
|
|
a657c83600
|
rev: 成品出库修改发货区功能
|
2023-04-04 10:29:48 +08:00 |
|
|
|
83f60e9524
|
Merge branch 'master' of http://121.40.234.130:8899/root/hl_one
|
2023-04-03 19:49:12 +08:00 |
|
|
|
b6626bdbbb
|
rev: 修改任务状态的获取
|
2023-04-03 19:47:50 +08:00 |
|
|
|
8a7730e59f
|
add：增加成品出库功能
|
2023-04-03 17:17:36 +08:00 |
|
|
|
45afaa2ea9
|
fix: 修复缓存线位置展示
|
2023-03-31 13:50:11 +08:00 |
|
|
|
a4886fe4bf
|
opt: 下发任务时候状态判断使用枚举，前端显示完成类型后移
|
2023-03-31 10:43:05 +08:00 |
|
|
|
0646a9d6ee
|
fix: 修复设备修改重复code的BUG以及工序的添加
|
2023-03-31 09:57:51 +08:00 |
|
|
|
8cba52a5da
|
rev: 成品入库功能修改
|
2023-03-30 16:08:19 +08:00 |
|
|
|
51aac3036b
|
fix: 修复工单前端物料对话框不请空，修复与前端接口字段一致，修复反馈前端信息
|
2023-03-30 14:33:55 +08:00 |
|
|
|
391804f8bf
|
add:新增成品入库功能
|
2023-03-29 19:54:48 +08:00 |
|
|
|
b3878b8b59
|
新增点位上下区域动态修改
|
2023-03-29 10:39:56 +08:00 |
|
|
|
b83498741d
|
代码更新
|
2023-03-25 17:14:33 +08:00 |
|
zhangzhiqiang
|
4a94968944
|
fix:工单管理
|
2023-03-24 17:16:22 +08:00 |
|
|
|
7faf39babb
|
Merge branch 'master' of http://121.40.234.130:8899/root/hl_one
|
2023-03-24 17:04:29 +08:00 |
|
|
|
5d56fcb458
|
代码生成
|
2023-03-24 17:04:11 +08:00 |
|
|
|
a1e194462b
|
Merge branch 'master' of http://121.40.234.130:8899/root/hl_one
|
2023-03-24 16:58:01 +08:00 |
|
|
|
f9f66b0528
|
修改
|
2023-03-24 16:57:57 +08:00 |
|
zhangzhiqiang
|
a9de349650
|
fix:工单管理
|
2023-03-24 14:45:38 +08:00 |
|
|
|
ebbdf15408
|
缓存线区域
|
2023-03-24 11:22:57 +08:00 |
|
