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

1220 Commits

Author SHA1 Message Date
liyongde
1aa9a90372 Merge remote-tracking branch 'origin/b_lms' into b_lms 2024-06-12 17:02:44 +08:00
liyongde
a7f84ba0e2 fix: 呼叫套轴校验是否可成组合的分切计划，继续套轴 2024-06-12 17:01:45 +08:00
zhouz
6c5bc123c9 fix:反馈ACS管芯库存 2024-06-12 11:32:20 +08:00
liyongde
c2384e73a4 feat: 手持穿拔轴初始化 2024-06-12 10:13:52 +08:00
liyongde
46c641b96b fix: 任务不显示完整气胀轴编码 2024-06-11 14:48:31 +08:00
zhouz
506dcbe372 Merge branch 'b_lms' of http://121.40.234.130:8899/root/lanzhouhailiang_one into b_lms 2024-06-11 09:53:29 +08:00
zhouz
774fb2baa2 fix:内包间代码逻辑优化 2024-06-11 09:53:22 +08:00
liyongde
9c84311c22 fix: 忘记把变量写进去了 2024-06-11 09:29:59 +08:00
liyongde
14017d88af fix: 气胀轴编码：生产区域+机台编号+分切组+日期+ -轴上下 2024-06-11 09:28:30 +08:00
zhouz
bc4fd0c139 fix:备货区组盘 2024-06-07 14:56:05 +08:00
zhouz
cca9e80cda fix:纸管库存扣减 2024-06-07 09:23:29 +08:00
zhouz
9cb97a4b59 Merge branch 'b_lms' of http://121.40.234.130:8899/root/lanzhouhailiang_one into b_lms 
# Conflicts:
#	lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/SlitterService.java
#	lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/impl/SlitterServiceImpl.java
 2024-06-06 13:52:39 +08:00
zhouz
19a65d3dd7 fix:废箔AGV任务 2024-06-06 13:31:20 +08:00
liyongde
3fa97cac25 fix: ACS请求扣除纸管数量 2024-06-04 17:04:04 +08:00
liyongde
935fdcaf8f fix: 判断纸管、呼叫AGV更换托盘 2024-06-04 15:02:51 +08:00
zhouz
f84e0fb42e Merge branch 'b_lms' of http://121.40.234.130:8899/root/lanzhouhailiang_one into b_lms 2024-06-04 10:37:40 +08:00
zhouz
ce3324a8af fix;表处代码修改 2024-06-04 10:37:35 +08:00
liyongde
e51fd6577a fix: 纸管重量保存失败 2024-06-03 15:59:24 +08:00
liyongde
1395078a48 fix: 分切下料-下单上单更新库存失败 2024-05-31 16:34:33 +08:00
zhouz
cf451f52c9 fix:分切行架任务点位修正 2024-05-31 16:14:27 +08:00
liyongde
588cbc7767 fix: 分切 2024-05-31 15:14:21 +08:00
zhouz
d2140c8469 Merge branch 'b_lms' of http://121.40.234.130:8899/root/lanzhouhailiang_one into b_lms 2024-05-31 10:16:50 +08:00
zhouz
72863a797b fix:桁架下卷 2024-05-31 10:16:43 +08:00
liyongde
179b3eac45 fix: 字段 2024-05-31 10:14:11 +08:00
liuxy
ac608ed2ca rev：出库口自动分配 2024-05-31 09:00:14 +08:00
liyongde
ed4632efd7 add: 分切下料手持功能 2024-05-30 17:57:21 +08:00
liyongde
b6a19862a5 feat: 分切业务任务取消逻辑 2024-05-30 16:58:05 +08:00
liyongde
3e7a8f2784 fix: 分切下料上气胀轴任务位置修改 2024-05-30 09:48:42 +08:00
liuxy
484f52f8f7 Merge branch 'b_lms' of http://121.40.234.130:8899/root/lanzhouhailiang_one into b_lms 
# Conflicts:
#	lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InBussManageServiceImpl.java
 2024-05-29 16:26:56 +08:00
liuxy
54c7167565 rev：成品入库优化 2024-05-29 16:23:45 +08:00
zhouz
20bc00c0ca Merge branch 'b_lms' of http://121.40.234.130:8899/root/lanzhouhailiang_one into b_lms 2024-05-28 09:26:47 +08:00
zhouz
5939a0e520 fix:出入库流程修改 2024-05-28 09:26:40 +08:00
gongbaoxiong
01bf0d484b opt:修改查询木箱信息 2024-05-27 16:11:32 +08:00
zhouz
3b4576ef12 fix:空木箱入库、退货入库将木箱和托盘进行绑定 2024-05-26 11:14:44 +08:00
zhouz
b3b82e2352 Merge branch 'b_lms' of http://121.40.234.130:8899/root/lanzhouhailiang_one into b_lms 2024-05-25 15:49:31 +08:00
zhouz
a44c225026 fix:出库任务给托盘类型 2024-05-25 15:49:27 +08:00
gongbaoxiong
38e3302e40 opt:修改退货入库逻辑 2024-05-25 15:47:06 +08:00
zhouz
b284be33ea fix:入库优化 2024-05-24 15:31:02 +08:00
zhouz
dc785a42eb fix:下发任务给高度类型 2024-05-24 13:50:13 +08:00
zhouz
28b990e002 fix:获取木箱高度类型修改 2024-05-23 17:30:19 +08:00
zhouz
192bdb52cb Merge branch 'b_lms' of http://121.40.234.130:8899/root/lanzhouhailiang_one into b_lms 
# Conflicts:
#	lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/bi/slittingproductionplan/service/dao/PdmBiSlittingproductionplan.java
 2024-05-23 17:25:13 +08:00
zhouz
d1731ab7f3 fix:MES接口相关修改 2024-05-23 17:21:19 +08:00
liyongde
ff125b673e feat: 增加存储acs反馈的子卷重量,修复了已知的问题 2024-05-23 15:02:16 +08:00
liyongde
16cb0f8da4 opt: 子卷判断是送到废品还是成品称重的优化 2024-05-23 10:10:10 +08:00
zhouz
8e5fcb1006 fix:高度校验 2024-05-22 16:09:52 +08:00
zhouz
fbf5640d2d Merge branch 'b_lms' of http://121.40.234.130:8899/root/lanzhouhailiang_one into b_lms 2024-05-22 11:23:36 +08:00
zhouz
c9a45ea457 fix：位置校验 2024-05-22 11:23:32 +08:00
liyongde
ffc2323379 Merge remote-tracking branch 'origin/b_lms' into b_lms 2024-05-21 15:07:53 +08:00
liyongde
a854cb2ecc fix: 气胀轴送暂存区代数校验错误 2024-05-21 15:07:24 +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