Commit Graph

Select branches

Hide Pull Requests

highway

master

orign

Mono Color

• ef441a5676 wms成品库存明细页面，加成品销售手持提交改动添加出库字段 master mengjiao 2025-01-14 10:48:32 +0800
• 02b96ef6c7 wms成品出库页面接口1 mengjiao 2025-01-13 14:25:37 +0800
• e548314080 烘房统计报表+产品追溯 zhaoxiaolin 2025-01-10 10:22:08 +0800
• 2cf6bef0ef 烘房统计报表+产品追溯 zhaoxiaolin 2025-01-09 17:51:38 +0800
• 0aafe49643 2025-1-9 DEVICE - 设备审核问题 -提醒不存在设备 元气满满(jgy) 2025-01-09 17:15:45 +0800
• 9811f49946 wms手持接口bug3和前端页面的线体框问题 mengjiao 2025-01-09 11:52:55 +0800
• 11688cc09c wms手持接口bug2 mengjiao 2025-01-09 11:25:40 +0800
• 7993dc9582 Merge remote-tracking branch 'origin/master' mengjiao 2025-01-09 10:17:40 +0800
• 53359c9556 wms手持接口bug mengjiao 2025-01-09 10:17:05 +0800
• 0b142e0711 Merge remote-tracking branch 'origin/master' zhaoxiaolin 2025-01-08 18:08:13 +0800
• 1062ae3f8e 烘房统计报表+产品追溯 zhaoxiaolin 2025-01-08 18:08:06 +0800
• bb68edc6bb 2025-1-8 MES-完产清线点检 元气满满(jgy) 2025-01-08 17:55:28 +0800
• 501ca0b094 烘房统计报表+产品追溯 zhaoxiaolin 2025-01-07 17:33:10 +0800
• db16cdcfb7 Merge remote-tracking branch 'origin/master' Yangwl 2025-01-07 16:38:52 +0800
• 1ab7051672 月度报表权限修改 Yangwl 2025-01-07 16:38:29 +0800
• 2cdae7a0fa 2025-1-7 MES-产品首检记录表、自检互检记录表 元气满满(jgy) 2025-01-07 15:17:26 +0800
• a2ff4b3ecd wms手持批条件筛选 mengjiao 2025-01-07 10:24:57 +0800
• 8e093d7a30 wms手持批条件筛选 mengjiao 2025-01-06 17:01:06 +0800
• fc48d69276 Merge remote-tracking branch 'origin/master' mengjiao 2024-12-30 20:41:41 +0800
• a1caec6ae3 wms白胚原材料库存查询，如果amount_real为null就查询为0 mengjiao 2024-12-30 20:41:18 +0800
• 704fc3a920 Merge remote-tracking branch 'origin/master' Yangwl 2024-12-30 20:40:52 +0800
• 5ae3401253 看板接口更改 Yangwl 2024-12-30 20:39:42 +0800
• b195472f0d wms冲销bug2 mengjiao 2024-12-30 15:59:26 +0800
• 2ea82a3b29 Merge remote-tracking branch 'origin/master' mengjiao 2024-12-30 13:29:21 +0800
• 255677abf4 wms冲销bug mengjiao 2024-12-30 13:28:48 +0800
• e486f8b0c1 增加白坯成型、收坯数据接口 Yangwl 2024-12-28 19:05:02 +0800
• 91bf322f6b wms成品装运单相同的是要生成相同的备货单 mengjiao 2024-12-27 16:10:54 +0800
• dfe5847d6f wms成品入库，加上返回的年凭证 mengjiao 2024-12-27 10:17:36 +0800
• 0f577038e4 Merge remote-tracking branch 'origin/master' mengjiao 2024-12-26 18:05:30 +0800
• 945f73a84e wms补打关联库区 mengjiao 2024-12-26 18:05:07 +0800
• 10919af34a Merge remote-tracking branch 'origin/master' zhaoxiaolin 2024-12-26 17:47:47 +0800
• 94e7b7bf2c 权限问题修正 zhaoxiaolin 2024-12-26 17:47:39 +0800
• a5fbdb51ef Merge remote-tracking branch 'origin/master' mengjiao 2024-12-25 14:57:37 +0800
• dbeac951fc wms生成备货单其中一个分支修改插入的对象 mengjiao 2024-12-25 14:57:08 +0800
• 29b045759f Merge remote-tracking branch 'origin/master' zhaoxiaolin 2024-12-25 11:39:55 +0800
• 1578c1a8b3 权限问题修正 zhaoxiaolin 2024-12-25 11:39:48 +0800
• 18788fd557 wms排序 mengjiao 2024-12-24 09:22:49 +0800
• f753248d11 Merge remote-tracking branch 'origin/master' mengjiao 2024-12-23 09:58:52 +0800
• 7dec1b6c8f wms成品报错问题 mengjiao 2024-12-23 09:56:40 +0800
• f80f4634d8 领料单数量*2问题修正 zhaoxiaolin 2024-12-20 20:36:58 +0800
• b0e278f6d0 2024-12-20 设备模块-维修审核问题 元气满满(jgy) 2024-12-20 11:26:46 +0800
• 386dbbb273 Merge remote-tracking branch 'origin/master' mengjiao 2024-12-17 16:28:00 +0800
• 7f0f20a47f wms冲销BUG2 mengjiao 2024-12-17 16:26:22 +0800
• 9ae60f7b4e 产品主键跟踪 zhaoxiaolin 2024-12-17 16:18:18 +0800
• 7355106bd5 Merge remote-tracking branch 'origin/master' zhaoxiaolin 2024-12-16 17:20:58 +0800
• 80974120a8 产品主键跟踪 zhaoxiaolin 2024-12-16 17:20:47 +0800
• 73bc19174f wms冲销查询rawOrderInId改为ID mengjiao 2024-12-16 14:58:37 +0800
• 8cd2b82f04 wms冲销bug mengjiao 2024-12-16 09:28:26 +0800
• 8d7c9c10ee Merge remote-tracking branch 'origin/master' zhaoxiaolin 2024-12-13 16:58:25 +0800
• 4e71868a76 产品主键跟踪 zhaoxiaolin 2024-12-13 16:58:17 +0800
• 4d06ca0e40 Merge remote-tracking branch 'origin/master' mengjiao 2024-12-13 11:47:20 +0800
• 758f9505f9 wms补打功能的查询物料改为模糊查询 mengjiao 2024-12-13 11:46:51 +0800
• a79b8b7c63 问题修复24 zhaoxiaolin 2024-12-13 09:19:38 +0800
• 2006f9145a 问题修复24 zhaoxiaolin 2024-12-12 16:02:00 +0800
• 4f6a3514d4 问题修复24 zhaoxiaolin 2024-12-12 15:31:28 +0800
• 1eaaf46109 问题修复24 zhaoxiaolin 2024-12-12 14:49:07 +0800
• 8a531dd2fd 问题修复24 zhaoxiaolin 2024-12-12 14:38:53 +0800
• 972ab962cc 2024-12-11 质量上传照片 元气满满(jgy) 2024-12-11 18:07:21 +0800
• ab9dd8eb5d Merge remote-tracking branch 'origin/master' zhaoxiaolin 2024-12-11 15:05:51 +0800
• 6770999e8a 问题修复24 zhaoxiaolin 2024-12-11 15:05:42 +0800
• 4152a51a9d Merge remote-tracking branch 'origin/master' mengjiao 2024-12-11 14:15:47 +0800
• 9529c14ba7 wms质检修改3 mengjiao 2024-12-11 14:14:59 +0800
• 16fbc0eeff 修复2 zhaoxiaolin 2024-12-11 14:04:16 +0800
• cb3a8810ae Merge remote-tracking branch 'origin/master' zhaoxiaolin 2024-12-11 10:38:53 +0800
• d376da1957 问题修复24 zhaoxiaolin 2024-12-11 10:38:46 +0800
• 1e95415fa8 wms质检修改2 mengjiao 2024-12-11 10:23:57 +0800
• 6c53998b20 Merge remote-tracking branch 'origin/master' mengjiao 2024-12-11 10:21:30 +0800
• e1806718ae wms质检修改 mengjiao 2024-12-11 10:20:58 +0800
• 024a293bee Merge remote-tracking branch 'origin/master' Yangwl 2024-12-10 16:54:04 +0800
• 190116c425 单耗数据增加工时统计 Yangwl 2024-12-10 16:52:57 +0800
• b250e7146f Merge remote-tracking branch 'origin/master' mengjiao 2024-12-09 13:19:30 +0800
• d6a3865f2a wms工序汇总报表 mengjiao 2024-12-09 13:18:37 +0800
• 6ac3800606 问题修复23 zhaoxiaolin 2024-12-09 11:53:30 +0800
• a68f69ad9a 问题修复23 zhaoxiaolin 2024-12-06 18:21:55 +0800
• ccfbf80a28 问题修复22 zhaoxiaolin 2024-12-06 09:05:20 +0800
• 54e8525ebc Merge remote-tracking branch 'origin/master' mengjiao 2024-12-05 11:03:44 +0800
• a480e5c566 wms修改补打不插入到库存里面。和补打不需要选择仓库和库区，根据配置的物料附属信息获取仓库和库区 mengjiao 2024-12-05 10:48:25 +0800
• 4b3f067c89 问题修复21 zhaoxiaolin 2024-12-03 21:38:55 +0800
• 27be79c807 问题修复20 zhaoxiaolin 2024-12-03 19:37:26 +0800
• 70142e8e62 wms白胚原材料查询bug mengjiao 2024-12-03 17:34:28 +0800
• c0f35d9c33 白坯原材料入库优化 陈恒杰 2024-12-03 17:01:45 +0800
• a5db9cd88b Merge remote-tracking branch 'origin/master' zhaoxiaolin 2024-12-02 14:40:11 +0800
• d79301f588 问题修复19 zhaoxiaolin 2024-12-02 14:40:05 +0800
• fbb0bf5e12 wms成品入库的批次bug--批次字符串上可能会多个空格，导致判断有误--所以去除空格 mengjiao 2024-12-02 10:24:36 +0800
• 1c683f8dfd wms标识卡扫描小bug mengjiao 2024-11-29 17:55:57 +0800
• b76b9bddd4 wms冲销bug修改 mengjiao 2024-11-29 16:43:04 +0800
• 78c4cba12b wms测试后又提的需求要收货时对应标识卡可以进行修改 mengjiao 2024-11-29 15:44:28 +0800
• ed9146112d wms标识卡查询添加字段 mengjiao 2024-11-29 11:06:21 +0800
• 0fe5bd2afc wms105过账bug2 mengjiao 2024-11-29 10:25:44 +0800
• 84ab36e7c7 wms105过账bug mengjiao 2024-11-29 10:10:16 +0800
• af915c1845 wms新的收货优化2和生产领料bug mengjiao 2024-11-29 09:15:04 +0800
• 2107dd5da5 wms新的收货优化 mengjiao 2024-11-27 11:15:21 +0800
• 61d3b1beb3 Merge remote-tracking branch 'origin/master' Yangwl 2024-11-25 11:43:03 +0800
• 86fd98b6db 箱型改单表，生产日报表导出修改。 Yangwl 2024-11-25 11:41:25 +0800
• c27f446a8f Merge remote-tracking branch 'origin/master' mengjiao 2024-11-25 11:32:28 +0800
• 1ab20ef427 wms问题1 mengjiao 2024-11-25 11:31:49 +0800
• 59b032d6b5 Merge remote-tracking branch 'origin/master' Yangwl 2024-11-20 16:36:00 +0800
• 8bd1b45747 生产日报表导出，查询修改 Yangwl 2024-11-20 16:35:19 +0800
• 18d5844879 Merge remote-tracking branch 'origin/master' mengjiao 2024-11-20 15:51:47 +0800
• 72d547a265 wms补打和冲销的问题完善和一些比如过账批次的小问题修改 mengjiao 2024-11-20 15:51:20 +0800