Commit Graph

1843 Commits

Author SHA1 Message Date
zhouz
e79f50f09b rev:空木箱入库给ACS木箱信息字段 2024-05-11 09:25:11 +08:00
a07df96854 opt:处理代码冲突 2024-05-10 14:19:13 +08:00
zhouz
ce168c147b Merge branch 'b_lms' of http://121.40.234.130:8899/root/lanzhouhailiang_one into b_lms 2024-05-09 20:02:00 +08:00
zhouz
d03c915e92 dev:新增备货区代码 2024-05-09 20:01:54 +08:00
dee0cf57ae fix: 纸管信息设置到点位上 2024-05-09 17:00:10 +08:00
1877e6a1f2 add:仓位初始化 2024-05-08 10:10:32 +08:00
zhouz
66571afda4 Merge branch 'b_lms' of http://121.40.234.130:8899/root/lanzhouhailiang_one into b_lms 2024-04-29 09:34:17 +08:00
zhouz
f3a03ae6ea rev:修改表处问题 2024-04-29 09:34:10 +08:00
819e8948a0 rev: 分切呼叫套轴不区分锂电标箔,只区分气胀轴尺寸 2024-04-29 08:43:43 +08:00
537295a272 fix: 只做拔轴任务的纸管信息 2024-04-28 08:53:01 +08:00
d36aeaced6 Merge branch 'b_lms' of http://121.40.234.130:8899/root/lanzhouhailiang_one into b_lms 2024-04-26 18:11:32 +08:00
9282e10873 refactor: 代码生成器 2024-04-26 18:11:13 +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
d2275d700f fix: 分切缓存状态修改 2024-04-26 10:33:18 +08:00
c021bcdfa8 add: 反馈子卷重量 2024-04-24 18:52:39 +08:00
f61baa473b fix: 二期内包间拔轴请求、套轴请求的纸管信息、套管工位请求判断去成品还是废箔的接口API定义 2024-04-24 15:34:39 +08:00
zhouz
b57ed27a56 rev:新增表处中转功能 2024-04-24 09:41:37 +08:00
zhouz
9177f733f7 Merge branch 'b_lms' of http://121.40.234.130:8899/root/lanzhouhailiang_one into b_lms 2024-04-22 19:02:44 +08:00
zhouz
38fcac9e4a dev:兰州二期生箔修改 2024-04-22 19:02:40 +08:00
0877a0dc3a fix: 组成的纸管信息 2024-04-22 15:06:38 +08:00
zhouz
7443ad209d rev:生箔一期更新 2024-04-18 17:54:02 +08:00
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
b021b2a5a1 fix: 内包间桁架任务添加纸管信息 2024-04-12 14:22:39 +08:00
2b1ae4f3c4 fix: 解决冲突 2024-04-11 16:15:08 +08:00
c9d2be2405 fix: 套管下发任务的时候需要携带需要的纸管信息和当前纸管信息 2024-04-11 14:46:34 +08:00
zhouz
75cd58da75 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/wms/pdm/wql/pdm.xls
2024-04-02 17:01:50 +08:00
zhouz
cd49cd952d dev:新增点位类型字段 2024-04-02 16:57:13 +08:00
5387ed5419 fix: 去除指定时间 2024-04-02 09:34:33 +08:00
a15652e458 dev:cookie保存不了 2024-04-01 08:54:09 +08:00
8503e685dc rev:修改登录 2024-03-27 16:01:16 +08:00
af02b2b27e Merge branch 'b_lms' of http://121.40.234.130:8899/root/lanzhouhailiang_one into b_lms 2024-03-26 17:38:58 +08:00
9d168f202c rev:ES删除 2024-03-26 17:38:51 +08:00
d15b0f016c fix: 手持一二期权限 2024-03-25 14:01:50 +08:00
00088cc2e3 Merge branch 'b_lms' of http://121.40.234.130:8899/root/lanzhouhailiang_one into b_lms 2024-03-21 10:13:37 +08:00
c1b6bee8f8 rev:表处优化 2024-03-21 10:13:25 +08:00
0dee6fed5d rev:参数修改 2024-03-21 09:40:37 +08:00
0fc22f8885 add:增加装箱对接位桁架任务尾卷信息 2024-03-20 17:19:36 +08:00
773a951f1f rev:修改确认子卷木箱规格页面能;
add:增加数据库字段执行sql;
2024-03-20 13:40:26 +08:00
eba9ebf754 feat: 分切的部分注释、魔法值提取 2024-03-20 09:06:02 +08:00
d0b46cc42a Merge branch 'b_lms' of http://121.40.234.130:8899/root/lanzhouhailiang_one into b_lms 2024-03-19 14:49:14 +08:00
22d7a97b27 rev:样式修改 2024-03-19 14:49:05 +08:00
00c520344a add:仓储手持功能 2024-03-15 15:59:24 +08:00
cabcd9d233 rev:出入库异常任务 2024-03-14 17:50:04 +08:00
7b9c7ea911 opt: 分切 2024-03-14 17:39:06 +08:00
d949018c11 rev:出入库异常任务 2024-03-14 10:21:58 +08:00
b0c711d5cc Merge branch 'b_lms' of http://121.40.234.130:8899/root/lanzhouhailiang_one into b_lms 2024-03-14 09:31:56 +08:00