Commit Graph

Select branches

Hide Pull Requests

master

Mono Color

• 7d5a0d61dc Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one ZHOUZ\Noble'lift 2024-03-22 09:38:59 +08:00
• baf3ceb384 rev:改切计划新增木箱字段 ZHOUZ\Noble'lift 2024-03-22 09:38:51 +08:00
• 6d52122194 Merge remote-tracking branch 'origin/master' LENOVO 2024-03-21 17:20:56 +08:00
• 6119fed7f7 fix: 载具类型添加 LENOVO 2024-03-21 17:20:22 +08:00
• 84af73051c rev:任务看板优化 tuqiang 2024-03-21 17:14:44 +08:00
• d1571b8284 fix: 现场联调加堆垛机修改 LENOVO 2024-03-21 16:53:49 +08:00
• b548ca5205 rev：出库页面优化 liuxy 2024-03-21 10:33:09 +08:00
• 00088cc2e3 Merge branch 'b_lms' of http://121.40.234.130:8899/root/lanzhouhailiang_one into b_lms ZHOUZ\Noble'lift 2024-03-21 10:13:37 +08:00
• c1b6bee8f8 rev:表处优化 ZHOUZ\Noble'lift 2024-03-21 10:13:25 +08:00
• 0dee6fed5d rev：参数修改 liuxy 2024-03-21 09:40:37 +08:00
• 0fc22f8885 add:增加装箱对接位桁架任务尾卷信息 baoge 2024-03-20 17:19:36 +08:00
• 0b9b990262 opt: 烘箱行架监控大屏优化 yanps 2024-03-20 16:59:08 +08:00
• 7a50c3c230 Merge remote-tracking branch 'origin/master' LENOVO 2024-03-20 15:01:19 +08:00
• bb012a2c40 fix: 堆垛机 LENOVO 2024-03-20 15:00:59 +08:00
• 6da0f596bc add: 增加二楼NDC日志 yanps 2024-03-20 14:26:44 +08:00
• ea9cb45a3a fix: 现场联调行家 LENOVO 2024-03-20 13:42:36 +08:00
• 773a951f1f rev:修改确认子卷木箱规格页面能; add:增加数据库字段执行sql; baoge 2024-03-20 13:40:26 +08:00
• 72c9717169 fix: 解决日志信号变化为null的问题 yanps 2024-03-20 10:54:46 +08:00
• eba9ebf754 feat: 分切的部分注释、魔法值提取 liyongde 2024-03-20 09:06:02 +08:00
• e228808ebd rev：代码合并 liuxy 2024-03-20 09:05:42 +08:00
• 79bc126d39 Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one liuxy 2024-03-20 09:05:13 +08:00
• 2f4e488f2c rev：出库分配页面 优化 liuxy 2024-03-20 09:04:49 +08:00
• d99c0d8437 Merge remote-tracking branch 'origin/master' LENOVO 2024-03-20 09:04:32 +08:00
• 2eac4ea4e3 fix: 现场联调 LENOVO 2024-03-20 09:01:40 +08:00
• c9fb151de5 fix: 解决连续创建多个指令 yanps 2024-03-19 18:23:10 +08:00
• 3e808280ad rev：成品报废审核新增字段 liuxy 2024-03-19 15:26:52 +08:00
• 7b7d4d542a rev：成品报废导入 liuxy 2024-03-19 15:00:05 +08:00
• d0b46cc42a Merge branch 'b_lms' of http://121.40.234.130:8899/root/lanzhouhailiang_one into b_lms ZHOUZ\Noble'lift 2024-03-19 14:49:14 +08:00
• 22d7a97b27 rev:样式修改 ZHOUZ\Noble'lift 2024-03-19 14:49:05 +08:00
• e42fdec93a rev：代码合并 liuxy 2024-03-19 14:30:43 +08:00
• 9f5eb3914f Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one liuxy 2024-03-19 14:30:09 +08:00
• 565878bde3 rev：1.发货出库不能强控优化2.出库实际重量显示真是发货重量3.B开头子卷保质期为180天优化4.发货信息回传sap优化5.库存报表字段优化6.一键新增仓位优化 liuxy 2024-03-19 14:29:56 +08:00
• 461781c5d8 Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one ZHOUZ\Noble'lift 2024-03-19 14:20:49 +08:00
• 080fd348e3 rev:页面优化 ZHOUZ\Noble'lift 2024-03-19 14:20:41 +08:00
• ecbf9077c7 opt: 自动门优化 yanps 2024-03-19 13:08:35 +08:00
• 6903bdfa6d add: 行架缓存为页面 LENOVO 2024-03-18 11:03:09 +08:00
• 2fa7a54247 add: 行架缓存为页面 LENOVO 2024-03-18 10:59:44 +08:00
• 5303bf4828 Merge remote-tracking branch 'origin/master' LENOVO 2024-03-18 08:46:07 +08:00
• 0783af09c2 fix: 堆垛机联调 LENOVO 2024-03-18 08:45:37 +08:00
• 3f44cb3043 rev：成品出库报表导出新增管件编码、管件描述 liuxy 2024-03-15 16:16:51 +08:00
• 00c520344a add：仓储手持功能 liuxy 2024-03-15 15:59:24 +08:00
• c83881410f opt: 流量限制优化 yanps 2024-03-15 09:11:49 +08:00
• 5ad7a02093 rev:解决联调问题 tuqiang 2024-03-14 18:02:00 +08:00
• cabcd9d233 rev：出入库异常任务 liuxy 2024-03-14 17:50:04 +08:00
• 7b9c7ea911 opt: 分切 liyongde 2024-03-14 17:39:06 +08:00
• e4caec2918 Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one ZHOUZ\Noble'lift 2024-03-14 14:14:27 +08:00
• f2817ff5b6 rev:时间BUG修改 ZHOUZ\Noble'lift 2024-03-14 14:14:20 +08:00
• e1a6524fa9 rev：向飞书推送图片：增加排序、占比 liuxy 2024-03-14 11:24:21 +08:00
• d949018c11 rev：出入库异常任务 liuxy 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 ZHOUZ\Noble'lift 2024-03-14 09:31:56 +08:00
• 83cf6a3928 rev:表处逻辑修改 ZHOUZ\Noble'lift 2024-03-14 09:31:47 +08:00
• 2968905d15 rev:提示修改 ZHOUZ\Noble'lift 2024-03-13 17:50:50 +08:00
• 2a9cd7b3d0 rev：调式更新 liuxy 2024-03-13 17:07:29 +08:00
• 83d45da5c3 add：新增需求 liuxy 2024-03-13 09:08:53 +08:00
• b5efde54cc add: 废箔称重 liyongde 2024-03-12 18:06:58 +08:00
• 036bc71e08 rev：向飞书推送图片：增加客户限制 liuxy 2024-03-12 16:18:24 +08:00
• 598b91733c opt: 分切任务代码 liyongde 2024-03-12 15:35:41 +08:00
• 25b5ed048c feat: 分切业务 liyongde 2024-03-12 11:28:33 +08:00
• 57d571d5fa rev：向飞书推送图片 加锁 liuxy 2024-03-12 11:15:06 +08:00
• e6241ada4d Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one ZHOUZ\Noble'lift 2024-03-12 09:24:42 +08:00
• 59b40b6174 dev:EXCEL定时器问题修改 ZHOUZ\Noble'lift 2024-03-12 09:24:34 +08:00
• ff1e3c8dcb add:增加子卷装箱页面功能。 baoge 2024-03-11 17:42:45 +08:00
• f90070f8e5 fix: 修复入烘箱不创建第二条指令问题 yanps 2024-03-11 17:15:37 +08:00
• 207dac2778 dev:表处新增字段 ZHOUZ\Noble'lift 2024-03-11 15:32:14 +08:00
• efb5a18066 rev：向飞书推送图片，添加领导对应区域 liuxy 2024-03-11 15:28:58 +08:00
• f4e14eb6ba rev:修复报错 tuqiang 2024-03-11 14:19:28 +08:00
• e19fa045a3 rev:设备监控优化 tuqiang 2024-03-11 14:08:36 +08:00
• 4d18c231b9 fix: 行架对接位添加 LENOVO 2024-03-11 13:55:10 +08:00
• c0b36da274 rev：区域人员 liuxy 2024-03-11 09:53:07 +08:00
• f19b938a33 dev:表处问题修改 ZHOUZ\Noble'lift 2024-03-08 17:41:03 +08:00
• c9d9e86848 Merge branch 'b_lms' of http://121.40.234.130:8899/root/lanzhouhailiang_one into b_lms ZHOUZ\Noble'lift 2024-03-08 17:08:20 +08:00
• 41ed722cee dev:BUG修改 ZHOUZ\Noble'lift 2024-03-08 17:08:11 +08:00
• e8f015bbcd opt: 分切业务、气胀轴缓存库分配规则 liyongde 2024-03-08 16:34:30 +08:00
• 5a79e9eaaf rev：向飞书推送图片 修改标题 liuxy 2024-03-08 14:04:47 +08:00
• f041a48558 rev：向飞书推送图片 liuxy 2024-03-08 13:27:34 +08:00
• 19615e8ca7 opt: 路由同步，设备监控优化 yanps 2024-03-08 09:52:05 +08:00
• 0b7945a149 rev:新增请求接口，驱动代码优化 tuqiang 2024-03-07 18:12:53 +08:00
• 0ad8c2e8b7 fix: 手持权限、任务校验 liyongde 2024-03-07 17:16:28 +08:00
• cc8b7597f8 rev：向飞书推送图片 liuxy 2024-03-07 14:00:57 +08:00
• d226688705 Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one ZHOUZ\Noble'lift 2024-03-07 09:14:21 +08:00
• 1c795ec3fb rev:飞书相关修改 ZHOUZ\Noble'lift 2024-03-07 09:14:11 +08:00
• f1c17b6599 fix: 任务 liyongde 2024-03-06 18:14:01 +08:00
• 238b406aa3 fix: 分切业务区域校验 liyongde 2024-03-06 18:11:40 +08:00
• f16b6a6795 fix:国际化导包报错 LENOVO 2024-03-06 13:19:19 +08:00
• 832366d6d6 测试 LENOVO 2024-03-06 09:59:53 +08:00
• 4103b9c21e opt:优化业务逻辑。 baoge 2024-03-05 19:27:23 +08:00
• 2cd9287fda add： 向飞书推送图片 liuxy 2024-03-05 18:43:21 +08:00
• 385fc2dac1 opt: 更改创建者显示，页面优化 yanps 2024-03-05 17:52:04 +08:00
• edfb48330a Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one ZHOUZ\Noble'lift 2024-03-05 09:49:59 +08:00
• fdb53b5d30 rev:内包间逻辑修改 ZHOUZ\Noble'lift 2024-03-05 09:49:49 +08:00
• 317f6a848f fix: 分切业务修改 liyongde 2024-03-04 18:08:34 +08:00
• 05402cbdf1 Merge remote-tracking branch 'origin/master' lishuai 2024-03-04 16:23:45 +08:00
• bf36bed276 fix :判断光电信号 lishuai 2024-03-04 16:23:02 +08:00
• 2586cb6405 fix: 任务类 liyongde 2024-03-04 09:40:53 +08:00
• 1faf1dd652 Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one ZHOUZ\Noble'lift 2024-03-01 16:50:44 +08:00
• 93035b716a fix: 分切业务 liyongde 2024-03-01 14:34:52 +08:00
• 3da9bfe761 rev:定时导出EXCEL并上传到服务器 ZHOUZ\Noble'lift 2024-03-01 14:11:34 +08:00
• 257864494e Merge remote-tracking branch 'origin/master' lishuai 2024-03-01 14:06:40 +08:00
• d4593bbf8f fix :国际化修改 lishuai 2024-03-01 14:05:31 +08:00
• 3af7a34c26 Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one ZHOUZ\Noble'lift 2024-03-01 10:04:20 +08:00