root/longdianningxing
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,800 Commits 1 Branch 0 Tags
81d06decbb3093d01abca8c8fc6594c626fbb392
Commit Graph

905 Commits

Author SHA1 Message Date
gongbaoxiong
5ed5153bb4 opt:优化现场联调产生的一些问题 2024-06-12 18:49:27 +08:00
zhouz
6c5bc123c9 fix:反馈ACS管芯库存 2024-06-12 11:32:20 +08:00
zhouz
ce3324a8af fix;表处代码修改 2024-06-04 10:37:35 +08:00
zhouz
5939a0e520 fix:出入库流程修改 2024-05-28 09:26:40 +08:00
gongbaoxiong
38e3302e40 opt:修改退货入库逻辑 2024-05-25 15:47:06 +08:00
zhouz
28b990e002 fix:获取木箱高度类型修改 2024-05-23 17:30:19 +08:00
zhouz
d1731ab7f3 fix:MES接口相关修改 2024-05-23 17:21:19 +08:00
zhouz
8e5fcb1006 fix:高度校验 2024-05-22 16:09:52 +08:00
zhouz
c9a45ea457 fix：位置校验 2024-05-22 11:23:32 +08:00
zhouz
46541d0c50 Merge branch 'b_lms' of http://121.40.234.130:8899/root/lanzhouhailiang_one into b_lms 2024-05-21 14:53:55 +08:00
zhouz
8664d7943f fix:异常任务相关处理 2024-05-21 14:53:49 +08:00
gongbaoxiong
ca892b7644 opt:修改输送线到满轴位四个点任务逻辑； 2024-05-20 17:30:01 +08:00
zhouz
7b868f213c fix:新增退货入库业务 2024-05-18 11:33:10 +08:00
zhouz
20904af6d5 Merge branch 'b_lms' of http://121.40.234.130:8899/root/lanzhouhailiang_one into b_lms 2024-05-17 17:02:49 +08:00
zhouz
6746f0a088 fix:入库修改 2024-05-17 17:02:43 +08:00
liuxy
738f5d7e28 Merge branch 'b_lms' of http://121.40.234.130:8899/root/lanzhouhailiang_one into b_lms 2024-05-16 18:57:46 +08:00
liuxy
624e3ac2c9 rev: 仓位不区分库区 2024-05-16 18:57:33 +08:00
baoge
96515306bd opt:修改入库木箱获取方式 2024-05-16 17:09:19 +08:00
baoge
5fbe891da9 opt:修改入库木箱获取方式 2024-05-16 17:08:33 +08:00
zhouz
10f431ca71 fix:入库新增高度要求 2024-05-15 20:26:02 +08:00
baoge
8eb06a6dcc opt:获取纸管长度 2024-05-15 19:50:31 +08:00
baoge
070946f905 opt:获取纸管长度 2024-05-15 19:49:41 +08:00
baoge
e6b3461cd9 opt:子卷装箱测试 2024-05-15 19:19:58 +08:00
baoge
68b6ddb793 opt:子卷装箱测试 2024-05-14 22:49:10 +08:00
liyongde
7b771a0a9c Merge branch 'b_lms' of http://121.40.234.130:8899/root/lanzhouhailiang_one into b_lms 2024-05-13 11:11:37 +08:00
liyongde
3282f15af7 add: 输送机申请贴标demo 2024-05-13 11:10:46 +08:00
zhouz
095809680d Merge branch 'b_lms' of http://121.40.234.130:8899/root/lanzhouhailiang_one into b_lms 2024-05-12 15:12:04 +08:00
zhouz
28059f4269 rev:空木箱入库修改 2024-05-12 15:12:00 +08:00
baoge
4667761c9c Merge remote-tracking branch 'origin/b_lms' into b_lms 
# Conflicts:
#	lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoInBoxTrussTask.java
#	lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InBoxManageServiceImpl.java
 2024-05-11 22:12:54 +08:00
baoge
34def7f32a opt:空木箱入库增加层数 2024-05-11 22:09:26 +08:00
liuxy
94f09d2397 rev： 空托盘入库托盘类型，仓位顺序，前端页面优化 2024-05-11 17:13:43 +08:00
liuxy
52b4c905f7 rev:二期任务类型 2024-05-11 12:32:45 +08:00
zhouz
034907e722 Merge branch 'b_lms' of http://121.40.234.130:8899/root/lanzhouhailiang_one into b_lms 2024-05-11 09:25:17 +08:00
zhouz
e79f50f09b rev:空木箱入库给ACS木箱信息字段 2024-05-11 09:25:11 +08:00
baoge
a07df96854 opt:处理代码冲突 2024-05-10 14:19:13 +08:00
zhouz
d03c915e92 dev:新增备货区代码 2024-05-09 20:01:54 +08:00
zhouz
f3a03ae6ea rev:修改表处问题 2024-04-29 09:34:10 +08:00
zhouz
c76498597a Merge branch 'b_lms' of http://121.40.234.130:8899/root/lanzhouhailiang_one into b_lms 2024-04-26 13:28:48 +08:00
zhouz
4b1b5c0552 rev:编码生成BUG，载具新增功能修改 2024-04-26 13:28:42 +08:00
liyongde
c021bcdfa8 add: 反馈子卷重量 2024-04-24 18:52:39 +08:00
liyongde
f61baa473b fix: 二期内包间拔轴请求、套轴请求的纸管信息、套管工位请求判断去成品还是废箔的接口API定义 2024-04-24 15:34:39 +08:00
zhouz
b57ed27a56 rev:新增表处中转功能 2024-04-24 09:41:37 +08:00
zhouz
38fcac9e4a dev:兰州二期生箔修改 2024-04-22 19:02:40 +08:00
zhouz
7443ad209d rev:生箔一期更新 2024-04-18 17:54:02 +08:00
liyongde
7f86fb0aaf add: 插入生箔工单 2024-04-17 15:24:40 +08:00
zhouz
85ad76ab6a rev:修改查询冷却区点位 2024-04-12 17:26:29 +08:00
zhouz
c4d7da838f Merge branch 'b_lms' of http://121.40.234.130:8899/root/lanzhouhailiang_one into b_lms 2024-04-12 15:54:00 +08:00
zhouz
e492d71238 rev:查询冷却区点位 2024-04-12 15:53:55 +08:00
liyongde
2b1ae4f3c4 fix: 解决冲突 2024-04-11 16:15:08 +08:00
zhouz
cd49cd952d dev:新增点位类型字段 2024-04-02 16:57:13 +08:00