Commit Graph

2822 Commits

Author SHA1 Message Date
d0674f6ffb Merge remote-tracking branch 'origin/master_merge' into master_merge 2024-07-24 15:31:56 +08:00
8f70ad21e4 feat:追加日志、上单下单取消报错、改切工单母卷检测 2024-07-24 15:31:38 +08:00
cf1ec61e51 add:异常口出库 2024-07-24 15:15:38 +08:00
8459f52a6f feat:手持提示下一个套好纸管的气胀轴位置以及对应子卷信息 2024-07-24 13:42:22 +08:00
cf62dbe85c feat:添加日志描述 2024-07-24 11:21:51 +08:00
5bf31101b1 fix: 空集合过滤 2024-07-23 22:28:09 +08:00
d9fd64d144 Merge remote-tracking branch 'origin/master_merge' into master_merge 2024-07-23 19:02:31 +08:00
b4f28a15cd fix: 工单显示重量 2024-07-23 19:02:20 +08:00
d75f17c7ad rev:子卷装箱:根据子卷号带出木箱料号 2024-07-23 14:25:05 +08:00
zhouz
2809297f74 fix:删除部分不需要文件 2024-07-23 14:12:15 +08:00
zhouz
8ebf74f6ca fix:MES相关接口修改、空木箱入库校验 2024-07-23 14:11:38 +08:00
7f7e0b35cd add: 手持备货区管理 2024-07-23 13:46:59 +08:00
2995e10beb add: 手持备货区管理 2024-07-23 13:25:19 +08:00
ed14ab3723 add: 手持备货区管理 2024-07-23 10:13:30 +08:00
4309424e3f rev:木箱库存 2024-07-23 10:04:21 +08:00
f38295279e rev:二期出库重量修改 2024-07-23 09:23:22 +08:00
ab9967fe87 rev:修改 2024-07-22 18:49:23 +08:00
2fb86740c9 Merge branch 'master_merge' of http://121.40.234.130:8899/root/lanzhouhailiang_one into master_merge 2024-07-22 18:48:54 +08:00
991ee8d86b rev:二期入库 2024-07-22 18:48:41 +08:00
2b9dd14bf8 Merge remote-tracking branch 'origin/master_merge' into master_merge 2024-07-22 18:45:19 +08:00
64b70c1dd6 opt: 自动任务添加日志 2024-07-22 18:45:04 +08:00
eff3a1f585 rev:二期入库 2024-07-22 18:42:19 +08:00
d1a0ad4234 Merge remote-tracking branch 'origin/master_merge' into master_merge 2024-07-22 17:47:03 +08:00
1cdf3ee430 opt: 手持下任务校验 2024-07-22 17:46:47 +08:00
fb77c78ea6 fix:二期改切计划审核 2024-07-22 17:10:37 +08:00
4f27e7c1dc add: 木箱库存查询 2024-07-22 14:19:36 +08:00
b97e38307e Merge remote-tracking branch 'origin/master_merge' into master_merge 2024-07-22 11:14:46 +08:00
3ec71dc051 fix: leftjoin的空值问题 2024-07-22 11:13:45 +08:00
361407a5e4 rev:调拨出库 2024-07-22 11:03:58 +08:00
9977b2cee6 fix: 手持暂存查询新增禁用提示、内包间气胀轴回暂存库校验终点 2024-07-22 09:56:00 +08:00
0719a5b90f fix: 送气胀轴加个锁 2024-07-21 20:31:48 +08:00
1923c5303a opt:增加取货完成信号校验,任务添加队列日志记录 2024-07-21 18:18:39 +08:00
bf5ec5c605 fix: 手持暂存下料修改 2024-07-20 17:42:38 +08:00
e23b64122a add: 手持查询暂存位置的数据 2024-07-20 16:48:55 +08:00
a9db3d0804 fix: 手持分切下卷提示信息 2024-07-20 15:52:13 +08:00
f967f0a08a fix: 暂时过滤1700,1800的frp套轴,新增ACS请求气胀轴库出气胀轴,手持查询优化 2024-07-20 13:50:30 +08:00
2b3f0f251b rev:回传 2024-07-20 13:28:02 +08:00
d21648c6e9 rev:子卷装箱 2024-07-20 11:25:26 +08:00
8ed0f989b0 opt:增加子卷质检相关校验。 2024-07-20 01:16:20 +08:00
4f304aed13 Merge remote-tracking branch 'origin/master_merge' into master_merge 2024-07-19 19:01:35 +08:00
ee6c444b49 fix: 手持下料查询 2024-07-19 19:01:13 +08:00
470eeeb89a rev: 二期入库回传 2024-07-19 17:55:35 +08:00
79fa7584fd rev: 二期手工分配 2024-07-19 16:15:45 +08:00
6ee2dcc5a9 rev:二期入库创建人修改,入库完成自动回传mes 2024-07-19 13:56:30 +08:00
d59e5d22a1 add:新增表 2024-07-19 10:33:13 +08:00
c87492af54 fix:去除测试参数,测试代码,修改补空任务触发时间。 2024-07-18 23:41:22 +08:00
0154f6ccf9 fix:去除测试参数,测试代码,修改补空任务触发时间。 2024-07-18 22:25:49 +08:00
de9e24bf05 fix: 初始化恢复子卷套轴可手动选择,新增气胀轴库出轴API 2024-07-18 18:48:31 +08:00
0f748b1aea rev:木箱出库任务卡控 2024-07-18 11:03:37 +08:00
6daf96858d fix:修复分切多个分切计划过滤 2024-07-17 23:25:42 +08:00