zhengxuming
|
0d1a54a6ff
|
fix:单据状态枚举调整
|
2025-08-07 16:31:25 +08:00 |
|
zhengxuming
|
b835a0618e
|
fix:新增分配数量 处理数量逻辑
|
2025-08-07 16:03:26 +08:00 |
|
zhengxuming
|
e75f14e431
|
Merge branch 'master' of http://121.40.234.130:7788/lyd/zhuzhouzhongwu
|
2025-08-06 18:15:56 +08:00 |
|
zhengxuming
|
c5c4ab28b5
|
fix:来料入库优化
|
2025-08-06 18:14:55 +08:00 |
|
|
|
aca0eef363
|
opt: 任务完成人、单据新增参数不对应
|
2025-08-06 17:27:24 +08:00 |
|
|
|
97c83d6470
|
opt: 1
|
2025-08-06 15:00:08 +08:00 |
|
|
|
aeb1fca18e
|
Merge remote-tracking branch 'origin/master'
|
2025-08-05 18:01:41 +08:00 |
|
zhengxuming
|
752e8d1e5b
|
Merge branch 'master' of http://121.40.234.130:7788/lyd/zhuzhouzhongwu
|
2025-08-05 17:58:36 +08:00 |
|
zhengxuming
|
b1aeeec7d9
|
fix:空载具入库/出库
|
2025-08-05 17:57:40 +08:00 |
|
|
|
56434a5a25
|
Merge commit '064c69ceffb8b5cd0fbf3e334391576d1118a246'
|
2025-08-05 17:25:02 +08:00 |
|
|
|
064c69ceff
|
Squashed 'acs/' changes from e256468..6a70aba
6a70aba add：新增手动下发充电任务
8f9fa38 add:重新提交前端文件
git-subtree-dir: acs
git-subtree-split: 6a70aba6c93df402b0b3caa2271e517629b7fb1f
|
2025-08-05 17:25:01 +08:00 |
|
|
|
22984276ac
|
Merge remote-tracking branch 'origin/master'
|
2025-08-05 16:29:53 +08:00 |
|
zhengxuming
|
fc1e53879b
|
fix:退料/退空桶
|
2025-08-05 15:43:20 +08:00 |
|
|
|
b0d385b75d
|
fix: 解包任务下发
|
2025-08-05 15:28:53 +08:00 |
|
|
|
5eee43988d
|
Merge remote-tracking branch 'origin/master'
|
2025-08-05 10:49:40 +08:00 |
|
|
|
a1a820d522
|
fix: 部分改动
|
2025-08-05 10:47:14 +08:00 |
|
zhengxuming
|
bbaaa3d7de
|
空载具出库
|
2025-08-05 09:44:02 +08:00 |
|
zhengxuming
|
838cfecc09
|
fix:叫料/退料
|
2025-08-04 20:12:05 +08:00 |
|
zhengxuming
|
9a235d481d
|
fix:空载具入库
|
2025-08-04 18:59:24 +08:00 |
|
zhengxuming
|
1bf135a0ff
|
fix:组盘查询
|
2025-08-04 17:38:33 +08:00 |
|
zhengxuming
|
7651ca4d56
|
fix:来料入库接口
|
2025-08-04 17:15:47 +08:00 |
|
zhengxuming
|
6ce05ca36d
|
fix:原料入库单据编号
|
2025-08-04 14:36:14 +08:00 |
|
zhengxuming
|
d225e38f13
|
Merge branch 'master' of http://121.40.234.130:7788/lyd/zhuzhouzhongwu
|
2025-08-04 14:27:37 +08:00 |
|
zhengxuming
|
dd91ed8792
|
fix:原料入库单据编号
|
2025-08-04 14:25:49 +08:00 |
|
|
|
37d633fed9
|
fix: 1
|
2025-08-04 11:07:43 +08:00 |
|
zhengxuming
|
63e897c6c6
|
Merge branch 'master' of http://121.40.234.130:7788/lyd/zhuzhouzhongwu
|
2025-08-04 09:26:11 +08:00 |
|
zhengxuming
|
460e0632d4
|
add:MES产线功能
|
2025-08-04 09:23:47 +08:00 |
|
|
|
ec9bb93c1c
|
feat：人车安全、其他优化
|
2025-08-01 17:22:29 +08:00 |
|
|
|
689237654c
|
fix: 日志、定时任务
|
2025-07-31 16:03:02 +08:00 |
|
|
|
9adfce31ea
|
fix: logback-spring.xml
|
2025-07-30 17:54:22 +08:00 |
|
|
|
79e439a104
|
opt: lucene日志
|
2025-07-30 17:32:50 +08:00 |
|
|
|
587971b7e7
|
feat: mes交互工具
|
2025-07-30 16:17:34 +08:00 |
|
zhengxuming
|
97c50162b3
|
add:MES接口
|
2025-07-30 15:00:08 +08:00 |
|
|
|
022a04a933
|
Merge remote-tracking branch 'origin/master'
|
2025-07-30 13:28:15 +08:00 |
|
|
|
05e7181bb8
|
feat: 添加供应商
|
2025-07-30 13:27:36 +08:00 |
|
zhengxuming
|
a502fbaa88
|
Merge branch 'master' of http://121.40.234.130:7788/lyd/zhuzhouzhongwu
|
2025-07-30 11:20:43 +08:00 |
|
zhengxuming
|
39bcf7df00
|
fix:原料入库
|
2025-07-30 11:19:42 +08:00 |
|
|
|
9c207b18e6
|
feat: 供应商导入数据、导出模板功能
|
2025-07-30 10:46:05 +08:00 |
|
|
|
2de0b7149b
|
feat: 物料、单位导入数据、导出模板功能
|
2025-07-29 17:32:34 +08:00 |
|
|
|
a76c7657f5
|
opt: 部分优化
|
2025-07-29 15:29:07 +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 |
|
