Commit Graph

1561 Commits

Author SHA1 Message Date
yanps
fb79480ae1 add: 内包间日志增加 2024-01-09 09:30:09 +08:00
fefdead3f5 rev:内包间逻辑优化 2024-01-09 08:38:37 +08:00
zhangzq
eeeffbb708 opt:发货区管理接口优化 2024-01-08 17:39:11 +08:00
f6f19e73a1 rev:logo图标更换 rev:木箱外表打印校验 2024-01-08 09:53:46 +08:00
d9e041712b Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one 2024-01-08 08:58:22 +08:00
6bbd9a33e5 rev:内包间优化 2024-01-08 08:58:14 +08:00
yanps
ad01512522 opt: 内包间A1优化 2024-01-06 18:18:39 +08:00
7850601b6c rev:成品报废回传修改 2024-01-05 17:53:44 +08:00
ludj
1db820fccd rev:pom文件更新 2024-01-05 16:27:25 +08:00
b413168cac Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one 2024-01-05 15:57:25 +08:00
65ac6ccf47 rev:内包间优化 2024-01-05 15:57:04 +08:00
ee632a69cd add: 线程、tomcat监控 2024-01-05 14:09:39 +08:00
zhangzq
62023a452e opt:日志优化2 2024-01-05 01:45:43 +08:00
ludj
ba5c9ad5d1 rev:配置文件更新 2024-01-04 20:00:13 +08:00
yanps
4d4f35bd21 Merge branch 'master' of 121.40.234.130:root/lanzhouhailiang_one 2024-01-04 09:37:30 +08:00
yanps
f69d754c9c add: 烘箱行架增加日志和套轴等待 2024-01-04 09:36:49 +08:00
13d3d648f7 rev:出库导出 2024-01-02 16:05:04 +08:00
c883a4d1ee rev:内包间优化 2023-12-31 12:41:59 +08:00
yanps
8e5c76a0a1 fix: 行架任务被分切输送线截取 2023-12-31 09:10:09 +08:00
a40bc3fa12 Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one 2023-12-29 16:17:39 +08:00
49f0f677ad rev:出库导出 2023-12-29 16:17:05 +08:00
e458d66bb6 rev:搬运气胀轴 2023-12-29 16:03:16 +08:00
yanps
624898d4fb fix:内包间行架 2023-12-29 13:36:20 +08:00
6bf3f60a51 rev:新-入库查询报表、新-出库查询报表 2023-12-29 13:23:33 +08:00
ludj
14eb8b81c5 rev:去掉SWAGGER 2023-12-29 09:43:11 +08:00
zhangzq
a7e2b8d7cd opt:日志优化 2023-12-28 19:42:34 +08:00
zhangzq
ca77135394 opt:日志优化 2023-12-28 19:34:08 +08:00
3bbc5dfef3 rev:临期报表 2023-12-28 11:07:28 +08:00
e0d4df181c Merge remote-tracking branch 'origin/master' 2023-12-28 09:32:49 +08:00
d296565a51 fix:内包间行架日志添加 2023-12-28 09:32:12 +08:00
1a1f45c950 rev:内包间取放货点位查询优化 2023-12-28 09:27:30 +08:00
9b9374de04 Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one 2023-12-27 17:36:24 +08:00
5a4848aa3c rev:纸管出库逻辑优化 2023-12-27 17:35:52 +08:00
f1e4d5f3f8 fix:内包间行架rgv问题修复 2023-12-27 16:51:41 +08:00
09b420978c Merge remote-tracking branch 'origin/master' 2023-12-27 15:47:35 +08:00
c5915c8434 fix:内包间行架rgv问题修复 2023-12-27 15:47:09 +08:00
d90e133f82 add: 报废出库回传mes 2023-12-27 15:29:43 +08:00
d53c970bf0 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/indoor_manipulator/IndoorManipulatorDeviceDriver.java
2023-12-27 10:32:42 +08:00
6e5ba08885 fix:内包间行架rgv问题修复 2023-12-27 10:29:08 +08:00
yanps
adc6d7f74d opt: 优化内包间行架任务下发 2023-12-26 21:55:40 +08:00
116f8a0cfe Merge remote-tracking branch 'origin/master' 2023-12-26 19:34:17 +08:00
7739e9062b fix:rgv行架冲突问题 2023-12-26 19:33:19 +08:00
3f50358523 rev:系统参数修改 2023-12-26 17:13:32 +08:00
2d20869770 rev:成品日报更新 2023-12-26 17:08:39 +08:00
ludj
0ec00360d5 rev:去掉ACS的SWAGGER、日志修改 2023-12-26 16:51:54 +08:00
ceaa8a0b34 Merge remote-tracking branch 'origin/master' 2023-12-26 10:24:47 +08:00
fc48074907 fix:rgv行架冲突问题 2023-12-26 10:24:22 +08:00
ludj
e316b1a60e Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one 2023-12-25 17:09:17 +08:00
ludj
9695725e76 rev: 日志配置更新 2023-12-25 17:08:57 +08:00
24026c4c2e Merge remote-tracking branch 'origin/master' 2023-12-25 17:02:09 +08:00