Commit Graph

Select branches

Hide Pull Requests

hella_chenfang

hella_online_20240803

hella_online_20240815

hella_online_20240816

hella_online_20240819

hella_online_20240821

hella_online_20240823

hella_online_20240828

hella_online_20240829

hella_online_20240904

hella_online_20240906

hella_online_20240911

hella_online_20240913

hella_online_20240919

hella_online_20240924

hella_online_20240927

hella_online_20241011

hella_online_20241017

hella_online_20241024

hella_online_20241030

hella_online_20241107

hella_online_20241114

hella_online_20241121

intex

intex_online20241111

linshi20240813

master

master_hella

master_hella_20240701

syhx

5.1版本

合并到了海拉

合并到海拉

Mono Color

• 2e620a2a75 HL-6428WMS 客户退货申请 状态为处理中时，不应该存在生成标签按钮 yufei_wang 2024-11-15 08:51:50 +0800
• 91c78d3d76 要货计划预览功能 yufei_wang 2024-11-14 17:11:29 +0800
• 03227ab86f Merge branch 'intex' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui into intex ljlong_2630 2024-11-14 16:48:25 +0800
• dd1390d6f6 YT-844: 可以提交不符合格式要求文件问题解决 ljlong_2630 2024-11-14 16:48:21 +0800
• d11a80ef2c 去掉索赔总额计算 zhang_li 2024-11-14 16:42:55 +0800
• f006072ea1 供应商发票申请 zhang_li 2024-11-14 16:25:12 +0800
• a3b4e07e48 配置更新开发 zhaoxuebing 2024-11-14 16:22:10 +0800
• a28b8c3ebc Merge branch 'intex' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui into intex ljlong_2630 2024-11-14 16:09:39 +0800
• 0b7ccd0f64 YT-743: 补料策略部分开发 ljlong_2630 2024-11-14 16:09:37 +0800
• b57044a014 去掉ordertypem yufei_wang 2024-11-14 15:46:50 +0800
• 4b88f4a8d0 Merge branch 'intex' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui into intex yufei_wang 2024-11-14 15:20:24 +0800
• 212e41ab19 采购收货申请页面去掉数据来源 yufei_wang 2024-11-14 15:20:17 +0800
• c2e3f611c1 隔离转报废申请，添加明细时物料是没有批次的，从批次也应该为空 YT-948 YEJIAXING-PC\lenovo 2024-11-14 15:15:00 +0800
• 45e5b17f7c YT-977修改采购收货任务及采购收货记录的的列表显示 yufei_wang 2024-11-14 15:04:19 +0800
• b08a5b0691 YT-977修改采购收货任务及采购收货记录的的列表显示 yufei_wang 2024-11-14 14:57:22 +0800
• e99cba67ac YT-972 zhaoyiran 2024-11-14 14:44:51 +0800
• 1b249bb307 HL-6425维修备件领用申请界面增加与计划外出入库项目代码必填相同校验，如果选择的领用原因强制填写项目则必填，否则不需要填写 yufei_wang 2024-11-14 14:00:51 +0800
• f3e476ebf1 YT-759:采购收货上架按钮 songguoqiang 2024-11-14 13:33:10 +0800
• 87acea240c 物料隔离任务、记录页面、导出，1.应去掉供应商代码、供应商名称、供应商批次2.任务的批次，应是从批次 YEJIAXING-PC\lenovo 2024-11-14 13:23:33 +0800
• d438dd5eb6 YT-507备料计划变更 zhaoyiran 2024-11-14 13:08:59 +0800
• 0334002a83 删debugger yufei_wang 2024-11-14 13:08:13 +0800
• 89de50185d 更换业务类型BusinessType yufei_wang 2024-11-14 11:57:27 +0800
• 2878518335 HL-6423QMS检验记录，点击设置拖动排序功能不好使 yufei_wang 2024-11-14 11:33:22 +0800
• 2f5b6dc2a5 Merge branch 'intex' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui into intex ljlong_2630 2024-11-14 10:00:08 +0800
• 57b0eb297a YT-301：顺引界面查询类型参数问题修复 ljlong_2630 2024-11-14 09:59:54 +0800
• 7abab17e76 SCP待开票 intex_online20241111 songguoqiang 2024-11-14 09:50:04 +0800
• 990340d774 订单数量等于收获数量 hella_online_20241114 yufei_wang 2024-11-14 09:33:55 +0800
• a3fd958382 YT-648创建申请添加明细时，如果选择库存余额，统一库存余额列表显示顺序 zhaoyiran 2024-11-14 09:20:21 +0800
• 9fa7f4e66f Merge branch 'intex' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui into intex ljlong_2630 2024-11-13 20:05:16 +0800
• 089e962593 YT-882: 客户订单号必填问题修复 ljlong_2630 2024-11-13 20:05:12 +0800
• ee2d9d742d 物料隔离申请权限修改 YEJIAXING-PC\lenovo 2024-11-13 20:01:26 +0800
• 96bfd5023c 发货策略发料策略 zhang_li 2024-11-13 19:28:37 +0800
• 09164b6949 Merge branch 'intex' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui into intex ljlong_2630 2024-11-13 18:48:12 +0800
• a1850e6f86 YT-683，YT-685：线边退料和紧急胶料需求开发 ljlong_2630 2024-11-13 18:48:08 +0800
• cfc8e67511 WMS01.采购收货功能变更 songguoqiang 2024-11-13 18:33:36 +0800
• a7ea6736c7 YT-759:采购收货按钮权限 songguoqiang 2024-11-13 18:33:09 +0800
• b9aa9b7c26 YT-927发料策略和发货策略 zhaoyiran 2024-11-13 18:28:33 +0800
• e2e1cd09a8 Merge branch 'intex' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui into intex songguoqiang 2024-11-13 16:52:59 +0800
• 2e277d0abf YT-759:采购收货去掉新增按钮 songguoqiang 2024-11-13 16:52:54 +0800
• a39cda0b0f 采购索赔上传 YEJIAXING-PC\lenovo 2024-11-13 14:50:02 +0800
• 3e0f5ed7a4 缺陷:HL-6415修复 zhaoxuebing 2024-11-13 14:31:37 +0800
• 358761b96b YT-887创建标签，批次应是可编辑，默认当天；标签生产线代码应是，可放大镜可筛选的 zhaoyiran 2024-11-13 14:04:06 +0800
• fac5200950 YT-759:采购收货六个模块添加上架按钮 songguoqiang 2024-11-13 14:00:33 +0800
• e942f50b3e 解决回车刷新页面问题 yufei_wang 2024-11-13 13:46:24 +0800
• 8af8f82c65 订单数量计算 yufei_wang 2024-11-13 13:39:33 +0800
• 1000609158 策略整体删除按钮和判断问题 zhang_li 2024-11-13 13:14:56 +0800
• 4486f056b4 功能变更的上架策略 yufei_wang 2024-11-13 11:20:34 +0800
• d5d6e8c682 缺陷:HL-6415修复 zhaoxuebing 2024-11-13 10:43:55 +0800
• 1811e0aae7 环境 yufei_wang 2024-11-13 09:45:11 +0800
• 8b88cf57c4 回车事件处理 yufei_wang 2024-11-13 08:54:29 +0800
• 21d6cd3ee7 YT-895在失效时间后，创建者前，应增加备注字段 zhaoyiran 2024-11-12 19:14:40 +0800
• cffe30a732 YT-720WMS11.物料补打标签 zhaoyiran 2024-11-12 19:09:41 +0800
• ff81d7c689 宽度 yufei_wang 2024-11-12 17:25:49 +0800
• 436b5ede57 物料类型 yufei_wang 2024-11-12 17:23:48 +0800
• efeb7ce9b7 HL-6411WMS库存事务查询打开页面的数据加载逻辑变更 yufei_wang 2024-11-12 17:08:01 +0800
• a1a7768210 物料类型多选 yufei_wang 2024-11-12 16:46:47 +0800
• b55e888220 WMS14.计划外入库 YT-707 YEJIAXING-PC\lenovo 2024-11-12 16:10:29 +0800
• f8efa073c8 本地运行 yufei_wang 2024-11-12 15:59:39 +0800
• 6e038b12ff 是否上架 yufei_wang 2024-11-12 15:50:18 +0800
• 25a6dae086 importJIS yufei_wang 2024-11-12 15:36:00 +0800
• 5b4a1bd42d 默认包装规格和数量 yufei_wang 2024-11-12 15:35:11 +0800
• 5bd37b7234 Merge branch 'intex' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui into intex ljlong_2630 2024-11-12 15:22:34 +0800
• 7f62424ff1 YT-860，YT-863：修复直纳品导入bug ljlong_2630 2024-11-12 15:22:31 +0800
• 8113509659 Merge branch 'intex' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui into intex YEJIAXING-PC\lenovo 2024-11-12 14:31:45 +0800
• c38900378b 隔离转报废 YT-701 YEJIAXING-PC\lenovo 2024-11-12 14:31:36 +0800
• 12ef9915ea Merge branch 'intex' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui into intex ljlong_2630 2024-11-12 14:27:51 +0800
• c2fe04440a YT-872，YT-873：纳入受领书导入问题修复 ljlong_2630 2024-11-12 14:27:49 +0800
• f33af2085b 28行 yufei_wang 2024-11-12 14:21:58 +0800
• 34c6a5a765 26行 yufei_wang 2024-11-12 14:11:04 +0800
• 1bef7d0e47 24 25 变更 yufei_wang 2024-11-12 14:08:13 +0800
• 876f6bf942 21、22行 yufei_wang 2024-11-12 13:56:43 +0800
• 3952964f84 WMS06.报废需求变更 YT-684 YEJIAXING-PC\lenovo 2024-11-12 13:42:09 +0800
• a4ce4124c5 YT-720WMS11.物料补打标签 zhaoyiran 2024-11-12 13:19:24 +0800
• e302621937 检验方案 yufei_wang 2024-11-12 11:51:22 +0800
• 81d24475b3 Merge branch 'intex' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui into intex ljlong_2630 2024-11-12 11:46:00 +0800
• 551a72b444 YT-868：纳入受领书成功后没有入库问题 ljlong_2630 2024-11-12 11:45:58 +0800
• f036cb63d5 检验模版-详情编码不展示 yufei_wang 2024-11-12 11:33:09 +0800
• 40564d4dc7 Merge branch 'intex_online20241111' into intex liuchen864 2024-11-12 10:21:21 +0800
• 1cd73a7aae 采购策略更改库区名字 liuchen864 2024-11-12 10:18:49 +0800
• fd8d82a461 采购策略Area改成AreaCode zhang_li 2024-11-12 09:56:24 +0800
• 7a8d36582d 环境 yufei_wang 2024-11-12 09:24:38 +0800
• c847d9d373 Merge branch 'intex' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui into intex ljlong_2630 2024-11-12 08:53:44 +0800
• 55199c2f17 YT-299：客户订单号代码 ljlong_2630 2024-11-12 08:53:42 +0800
• 581d0deb97 去掉无用命令 liuchen864 2024-11-12 07:31:30 +0800
• ff8cd3980a 去掉无用命令 liuchen864 2024-11-11 16:56:28 +0800
• c59ce2b3c6 更新任务设置 zhaoxuebing 2024-11-11 16:54:00 +0800
• 5817ee52e7 Merge remote-tracking branch 'remotes/origin/intex_online20241111' into intex liuchen864 2024-11-11 16:49:01 +0800
• d1167294f9 YT-870生产退料申请中，生产线变为必填项。 zhaoyiran 2024-11-11 16:15:24 +0800
• f25a401c24 YT-677SCP不可维护基础数据 zhang_li 2024-11-11 15:43:45 +0800
• 1da6b7d839 长宽高不能是负数 yufei_wang 2024-11-11 15:28:45 +0800
• 8f141a78b1 YT-702WMS02.换货单打印 zhaoyiran 2024-11-11 14:45:55 +0800
• 2ed69e9acd 只保留一个逗号 yufei_wang 2024-11-11 14:26:30 +0800
• 7243469ad4 AMV+JS+BS yufei_wang 2024-11-11 13:49:34 +0800
• 7092dd4326 YT-689WMS08.生产计划完工报产 zhaoyiran 2024-11-11 13:28:21 +0800
• 266d4f43ea 更新任务设置 zhaoxuebing 2024-11-11 13:23:30 +0800
• 70a059c17a 更新任务设置 zhaoxuebing 2024-11-11 13:05:03 +0800
• 9a09beffe6 Merge branch 'intex' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui into intex ljlong_2630 2024-11-11 09:02:21 +0800
• 5b56b38f80 YT-302： 纳入受领书并对比代码 ljlong_2630 2024-11-11 09:02:15 +0800
• 3c8e3b0a02 YT-794要货计划，离散订单接收状态，明细应不能任何操作，现能编辑 zhang_li 2024-11-08 20:50:55 +0800
• 56be968db9 YT-794要货计划，离散订单接收状态，明细应不能任何操作，现能编辑 zhang_li 2024-11-08 20:10:12 +0800