Commit Graph

75 Commits

Author SHA1 Message Date
zhengxuming
39bcf7df00 fix:原料入库 2025-07-30 11:19:42 +08:00
zhengxuming
c9e8e45fa4 Merge branch 'master' of http://121.40.234.130:7788/lyd/zhuzhouzhongwu 2025-07-28 17:30:05 +08:00
zhengxuming
6731808828 fix:原料入库点位顺序更改 2025-07-28 17:29:37 +08:00
11e3c82bf8 feat: 解包退料 2025-07-28 17:01:00 +08:00
zhengxuming
f54971f3ea Merge branch 'master' of http://121.40.234.130:7788/lyd/zhuzhouzhongwu 2025-07-25 18:02:48 +08:00
zhengxuming
36fa4b43c7 Merge branch 'master' of http://121.40.234.130:7788/lyd/zhuzhouzhongwu
# Conflicts:
#	lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dto/StrategyStructParam.java
#	lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/impl/SchBasePointServiceImpl.java
2025-07-25 18:02:26 +08:00
b68bcea5d8 feat: 直接入库 2025-07-25 17:59:30 +08:00
zhengxuming
63168a7911 add:株洲中钨来料入库功能 2025-07-25 17:59:28 +08:00
529d697fe8 fix: 解包上料/下料/工单功能 2025-07-25 15:10:43 +08:00
8dfb0a9007 feat: 解包下料任务完成操作 2025-07-24 16:40:07 +08:00
e58c2ab587 feat: 解包下料 2025-07-24 15:56:18 +08:00
zhengxuming
2b1b731ee5 add:仓位新增占用状态字段 2025-07-23 19:30:40 +08:00
077cb10318 feat: 解包上料 2025-07-22 18:47:59 +08:00
c68d22c00d Merge remote-tracking branch 'origin/master' 2025-07-22 09:04:09 +08:00
f4641a148f feat: 解包工单功能 2025-07-22 09:03:45 +08:00
zhengxuming
39e15b0dec fix:logo调整 2025-07-21 14:33:30 +08:00
zhengxuming
a83519f9c4 fix:acs logo调整,git忽略文件交通 2025-07-21 14:26:05 +08:00
bdd0fe292c fix: 修复原框架问题 2025-07-21 08:50:28 +08:00
1c910ca154 Merge remote-tracking branch 'origin/master' 2025-07-17 14:27:46 +08:00
0d942210b3 init: 初始化项目:logo,标题 2025-07-17 14:26:20 +08:00
zhengxuming
1579776d8d fix:logo调整 2025-07-17 14:25:21 +08:00
zhengxuming
dc87e7dd26 Add 'acs/' from commit 'e256468765ea555bed4c02ba2b9b2c6fa3a3c767'
git-subtree-dir: acs
git-subtree-mainline: 9ddaabe33f
git-subtree-split: e256468765
2025-07-17 13:21:33 +08:00
c72ef64c82 init: 初始化项目 2025-07-17 11:14:46 +08:00
9ddaabe33f Add 'lms/' from commit '1d360075f1fd0da5ae6f039329e716a9095f1323'
git-subtree-dir: lms
git-subtree-mainline: 6e59051fd0
git-subtree-split: 1d360075f1
2025-07-17 10:59:15 +08:00
6e59051fd0 Initial commit 2025-07-17 10:52:32 +08:00
zhangzq
1d360075f1 opt:单据管理字段优化 2025-07-15 20:31:13 +08:00
zhangzq
d3d96f5d52 fix:出库时组盘表状态 2025-07-15 20:06:13 +08:00
zhangzq
6fe6aeb5b3 fix:修复出库逻辑,add:增加仓库监控看板 2025-07-15 20:01:33 +08:00
e256468765 rev:优化agv驱动 2025-07-11 17:58:27 +08:00
zhangzq
02f56f7a8d fix:出库逻辑 2025-07-11 15:28:39 +08:00
zhangzq
db4b49c58f fix:优化大屏 2025-07-10 20:33:41 +08:00
6b06611a59 add:搭建标准版acs 2025-07-10 20:28:25 +08:00
zhangzq
ab98c3ccbd init:版本说明 2025-07-10 19:49:53 +08:00
zhangzq
a9ab9ed8dc init:版本说明 2025-07-10 10:11:36 +08:00
zhangzq
60ee30e57d init:版本说明 2025-07-08 16:56:11 +08:00
zhangzq
71dbe86f89 init:版本说明 2025-07-08 16:55:07 +08:00
zhangzq
977494b2bc init 2025-07-08 14:54:44 +08:00
zhangzq
d97a65a656 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/mapper/MdPbStoragevehicleextMapper.xml
2025-07-08 14:51:13 +08:00
0ff0f0cd42 add:前端下拉框VO。 2025-07-08 10:49:07 +08:00
46dd98d5cd opt:出库完成相关逻辑修改。 2025-07-07 21:07:08 +08:00
054e2a7b17 opt:出库完成相关逻辑修改。 2025-07-07 17:08:40 +08:00
a1a73e188a add:空载具出入库任务。 2025-07-04 18:22:43 +08:00
2f89793173 opt:优化物料出库,出库确认。 2025-07-04 09:41:42 +08:00
96d188ecfd add:增加手持出库 2025-07-03 09:41:51 +08:00
zhangzq
dce821dfd7 Merge remote-tracking branch 'origin/master' 2025-07-03 09:32:05 +08:00
12515d5ec7 add:增加手持物料组盘,组盘入库,拣选回库相关逻辑。 2025-07-02 09:40:56 +08:00
zhangzq
ae2c25b1a0 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/ios_manage/service/impl/PdaIosInServiceImpl.java
#	nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/GroupPlate.java
2025-07-01 19:56:55 +08:00
753a4eaf79 项目初始化 2025-07-01 10:22:35 +08:00
fee412a92f add:增加手持入库业务 2025-06-30 21:55:34 +08:00
zhangzq
d427b9e093 fix:PC出入库 2025-06-30 20:04:44 +08:00