sfms3.0-ui

Commit Graph

Select branches

Hide Pull Requests

deli_huaxiang_jimu

deli_scp

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

hella_online_20241128

hella_online_20241205

hella_online_20241212

hella_online_20241212_pandian

hella_online_20241219

hella_online_20241226

hella_online_20250102

hella_online_20250109

hella_online_20250116

hella_online_20250123

hella_online_20250213

hella_online_20250220

hella_online_20250227

hella_online_20250306

hella_online_20250313

hella_online_20250328

hella_online_20250417

hella_online_20250508

hella_online_20250522

hella_online_20250529

hella_online_20250710

hella_online_20250724

hella_onlinesettlement

hella_zhaoxuebing

index_online20241231

intes_online20250115

intex

intex_20241211

intex_20250617_panDian

intex_label_print

intex_onlin20250418

intex_online20241111

intex_online20241205

intex_online20241216

intex_online20241224

intex_online20241228

intex_online20250117

intex_online20250120

intex_online20250124

intex_online20250220

intex_online20250224

intex_online20250311

intex_online20250327

intex_online20250408

intex_online20250409

intex_online20250410

intex_online20250427

intex_online20250506

intex_online20250509

intex_online20250522

intex_online20250523

intex_online20250528

intex_online20250609

intex_online20250629

intex_online20250704

intex_online20250710

intex_online20250724

intex_online20250725

intex_online20250725_YT-2905

intex_online_narushoulingshu

intex_online_yejiaxing

intex_onlinescplabel

intex_onlinewmslabel

intex_pandian

intex_zhaoxuebing

linshi20240813

master

master_hella

master_hella_20240701

syhx

zhangli-YT-2391

5.1版本

合并到了海拉

合并到海拉

816358b165 YT-1572销售开票金额，明细税额、含税金额，应保留2位小数张立 2024-12-06 16:43:10 +0800
469553a562 Merge branch 'intex' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui into intex 宋国强 2024-12-06 16:26:01 +0800
348a3e5982 要货计划不接受后不显示发布按钮宋国强 2024-12-06 16:25:59 +0800
4313ec6848 YT-1588创建开票申请，未税金额没有四舍五入；修改未税金额后，含税金额不对张立 2024-12-06 15:55:44 +0800
5d94261b1e YT-1435pc和pda端所有点击都需要增加loading 张立 2024-12-06 15:47:24 +0800
d65863b6bf Merge branch 'intex' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui into intex 宋国强 2024-12-06 15:17:48 +0800
484fead9ea YT-1388：顺引收货记录导出的内容与列表不一致，需保持一致宋国强 2024-12-06 15:17:46 +0800
56865a5a96 Merge branch 'intex' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui into intex 张立 2024-12-06 14:59:30 +0800
7b043ed163 YT-1593要货计划明细新增功能去掉（任何状态都不能新增）张立 2024-12-06 14:59:11 +0800
7b8c18061a Merge branch 'intex' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui into intex 陈薪名 2024-12-06 14:44:27 +0800
896f990e44 111 陈薪名 2024-12-06 14:44:15 +0800
3b8fddabc5 YT-1590计划外入库，到库位复制粘贴时系统提示重复，通过查询添加是不会提示的张立 2024-12-06 14:41:11 +0800
b86d758031 Merge branch 'intex' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui into intex 张立 2024-12-06 14:37:29 +0800
21b04cba92 YT-1581已发已结、已发未结，销售单价精确到小数点后5位张立 2024-12-06 14:35:22 +0800
34fb337e97 YT-1458发料增加备料计划单号 zhaoyiran 2024-12-06 14:32:36 +0800
38d4e9fdf0 YT-1582 张立 2024-12-06 14:32:03 +0800
31668a9f2c YT-1388:顺引收货记录、直纳品收货记录页面字段调整 intex_online20241205 宋国强 2024-12-06 14:28:59 +0800
d30d770c40 Merge branch 'intex' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui into intex 张立 2024-12-06 14:27:49 +0800
df2c8953ae YT-1572销售开票金额，明细税额、含税金额，应保留2位小数张立 2024-12-06 14:26:51 +0800
a378559d7f Merge branch 'intex' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui into intex zhaoyiran 2024-12-06 14:10:31 +0800
934756a4ba YT-1458备料计划 zhaoyiran 2024-12-06 14:10:24 +0800
41f850c38a YT-1572销售开票金额，明细税额、含税金额，应保留2位小数张立 2024-12-06 14:09:30 +0800
4494d1bc2d 维修备件默认库位王宇飞 2024-12-06 13:36:04 +0800
2ef6ea1a48 去掉debugger 张立 2024-12-06 13:33:42 +0800
eae7d9f4ab YT-1587客户对账单，模具分摊对账单，点击确认金额后，次页面应立即不能修改调整金额，现点击确认后能修改张立 2024-12-06 13:09:35 +0800
e8044e1e6d YT-1582客户模具分摊对账预测，明细金额应保留小数后5位，如图；客户模具分摊对账单，明细的模具分摊金额应保留后5位；客户对账单的模具分摊对账单，分摊金额、调整金额保留后5位张立 2024-12-06 11:54:48 +0800
cbbaa5a41d Merge branch 'master_hella' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui into master_hella 赵雪冰 2024-12-06 11:42:56 +0800
b3140f0610 FWHL-61修改赵雪冰 2024-12-06 11:42:49 +0800
13740c1cd2 库存初始化批量打印标签打印的都是制造件标签（采购件应打印采购件标签且如果同时选择了制造件和采购件要分别打印）YT-1448 叶佳兴 2024-12-06 10:48:14 +0800
0b4adfee95 YT-1573销售开票申请，编辑，价税金额应保留2为小数张立 2024-12-06 10:14:17 +0800
565e9aba31 YT-1570创建开票，税额应保留2为小数张立 2024-12-06 10:04:54 +0800
6429057d84 隐藏线边盘点 bjang03 2024-12-05 17:34:57 +0800
250560b990 盘点调整申请-明细里添加删除按钮王宇飞 2024-12-05 17:08:38 +0800
95e34c1f61 FWHL-75默认来源库位，默认保存BOM 王宇飞 2024-12-05 16:44:04 +0800
1a0eda1bce Merge branch 'intex' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui into intex 张立 2024-12-05 16:26:34 +0800
a08aa64e3e YT-1561制品回收申请，新增应控制生产线与物料关系，选择生产线代码应带出对应生产线的物料，并切换生产线时应清空明细张立 2024-12-05 16:26:18 +0800
edabc739e1 合计单价小数位数,价税合计金额张立 2024-12-05 16:04:56 +0800
54c3207fd8 Merge branch 'intex_online20241205' into intex 陈薪名 2024-12-05 16:00:41 +0800
a55555c47b YT-1533创建开票申请，含税金额不正确张立 2024-12-05 15:47:31 +0800
02dfdf937c 加loading 张立 2024-12-05 15:41:14 +0800
4305e4177e YT-1541发料申请新增、备料计划新增，切换车间代码、生产线代码、工位代码，应清空明细张立 2024-12-05 15:18:23 +0800
842631d596 YT-1540补给品生产计划、号口品生产计划，切换车间、生产线时，应清空明细张立 2024-12-05 15:12:33 +0800
19a7142849 YT-1506客户对账单-模具分摊对账单，分摊中应能修改金额，不是分摊状态不能修改，现分摊中不能修改张立 2024-12-05 15:09:05 +0800
ff16f39ff6 YT-1524：SPARC订单导入后生成的要货计划没有显示SPARC订单号宋国强 2024-12-05 14:55:40 +0800
eac700d923 Merge branch 'intex' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui into intex ljlong_2630 2024-12-05 14:29:22 +0800
b8fdcb3e1d YT-1554: 物料描述去掉 ljlong_2630 2024-12-05 14:29:20 +0800
f35b9fc52f 采购收货申请/号试品收货/协定品收货打印标签页面物料类型显示不正确 YT-1557 叶佳兴 2024-12-05 14:14:30 +0800
43432576d5 YT-1541发料申请新增、备料计划新增，切换车间代码、生产线代码、工位代码，应清空明细张立 2024-12-05 14:13:37 +0800
22af57a9e3 YT-1540补给品生产计划、号口品生产计划，切换车间、生产线时，应清空明细张立 2024-12-05 14:09:59 +0800
c8667c3681 YT-1560采购件标签、制造件标签，选择物料代码，应过滤可制造、可采购张立 2024-12-05 14:03:46 +0800
409c09f529 YT-1550销售开票申请，金税票号应控制字段长度张立 2024-12-05 13:56:27 +0800
d27c770940 YT-1559创建库存初始化申请，物料默认包装规格和包装数量没有带出，无法保存张立 2024-12-05 13:49:18 +0800
5aa6a87cda bug 王宇飞 2024-12-05 13:33:49 +0800
7c80b42aa7 FWHL-72制品子件报废申请中修改车间字段为其他值后，生产线和明细应该清空；目前未清空王宇飞 2024-12-05 13:29:39 +0800
681f30966a FWHL-81 王宇飞 2024-12-05 13:29:16 +0800
c96f46cf23 Merge branch 'master_hella' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui into master_hella 王宇飞 2024-12-05 13:23:00 +0800
4abc1a0f3d FWHL-81线边原料报废明细数量修改问题王宇飞 2024-12-05 13:22:54 +0800
4e4dab2afa YT-1553销售开票记录，明细页应加序号字段张立 2024-12-05 13:13:22 +0800
a0d61192c1 YT-1520销售开票申请，明细页面缺少序号字段张立 2024-12-05 13:12:05 +0800
012e517996 YT-1506客户对账单-模具分摊对账单，分摊中应能修改金额，不是分摊状态不能修改，现分摊中不能修改张立 2024-12-05 13:08:11 +0800
7999e0d813 Merge branch 'intex' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui into intex 宋国强 2024-12-05 13:03:26 +0800
03b06d9115 已发已结宋国强 2024-12-05 13:03:24 +0800
697a597872 YT-1458增加备料数量 zhaoyiran 2024-12-05 11:38:46 +0800
18289a50c5 YT-1551:销售开票记录，单击单据号提示没有权限；详情开票日期不正确宋国强 2024-12-05 11:32:11 +0800
86f1a41617 YT-1531创建开票申请，模具分摊单价不应保留2位小数张立 2024-12-05 10:55:08 +0800
4917d3560c YT-1530创建开票申请，主未税金额=所有明细行中未税金额的相加之和，四舍五入保留两位小数。张立 2024-12-05 10:49:11 +0800
30608a2882 YT-1505供应商模具费用，筛选中的年月查询条件控件应该只能选择年月张立 2024-12-05 10:02:07 +0800
8786af0b80 隐藏线边盘点 hella_online_20241205 bjang03 2024-12-05 09:42:21 +0800
da1866e773 YT-1537:销售开票记录，去掉导入按钮宋国强 2024-12-05 09:42:01 +0800
73aa21a33a YT-1518：客户模具分摊预测，明细账票号显示不正确宋国强 2024-12-05 09:40:10 +0800
fdb09fffc4 Merge branch 'intex' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui into intex 宋国强 2024-12-05 09:13:31 +0800
4b7644e287 YT-1517：客户模具分摊对账单预测，已经存在客户年月，导入提示不正确宋国强 2024-12-05 09:13:29 +0800
a861cdab8e YT-1522要货计划导入SPARC订单按钮名称不正确张立 2024-12-05 09:06:54 +0800
b31aa07fe7 YT-1529客户对账单，模具分摊对账单，模具分摊单价字段应不显示张立 2024-12-05 08:57:42 +0800
810f879840 YT-1514客户对账单、客户模具分摊对账单记录、客户模具分摊对账单预测，选择年月不正确张立 2024-12-05 08:55:18 +0800
4b74c87b30 YT-1440:SCP01.SPARC订单导入宋国强 2024-12-05 08:54:41 +0800
1ad0f785d0 YT-1458号口品的生产计划取消生成备料计划功能 zhaoyiran 2024-12-05 08:52:24 +0800
34acf42a83 Merge branch 'intex' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui into intex 宋国强 2024-12-05 08:49:42 +0800
1357c0f9e1 YT-1440：SCP01.SPARC订单导入宋国强 2024-12-05 08:21:49 +0800
70fe3f64c7 Merge remote-tracking branch 'origin/master_hella' into master_hella bjang03 2024-12-05 08:19:59 +0800
9197a9e6dd 密码策略设置注释分钟锁定设置 bjang03 2024-12-05 08:19:52 +0800
fd3b9c433a 要货计划加显示字段叶佳兴 2024-12-04 17:30:20 +0800
b77b451bf0 Merge branch 'intex' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui into intex ljlong_2630 2024-12-04 17:29:58 +0800
b4b798e6e9 YT-1471: bug修复 ljlong_2630 2024-12-04 17:29:54 +0800
bcc4aa12e0 计划外出库不可以同事提交两种类型张立 2024-12-04 16:56:38 +0800
f5c9e7f4c3 显示王宇飞 2024-12-04 16:55:51 +0800
5f1e8fbc7a YT-1494预计出库存、预计入库存直接点击批量删除，应有提示 zhaoyiran 2024-12-04 16:30:30 +0800
4980affd09 YT-1520销售开票申请，明细页面缺少序号字段张立 2024-12-04 15:38:52 +0800
cff837c29b 盘点去掉部门字段张立 2024-12-04 15:31:47 +0800
838abafb80 YT-1506客户对账单-模具分摊对账单，分摊中应能修改金额，不是分摊状态不能修改，现分摊中不能修改张立 2024-12-04 14:44:25 +0800
7696dd7a4e YT-1507修改供应商发货申请【更多】按钮的样式，改为与【生成标签】按钮样式一致张立 2024-12-04 14:00:14 +0800
b4abe273a9 YT-1501维修备件领用记录导出的内容不正确，与系统不一致张立 2024-12-04 13:40:47 +0800
86c2199265 YT-1496维修备件领用申请新增时选择的物料没有批次时，无法保存张立 2024-12-04 13:12:36 +0800
05781ed0eb 处理YT-1486缺陷。刘忱 2024-12-04 13:00:36 +0800
415ffd9d7c Merge branch 'intex' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui into intex ljlong_2630 2024-12-04 11:43:21 +0800
e6818ff4c2 YT-1400：要货计划权限控制问题修复 ljlong_2630 2024-12-04 11:43:19 +0800
4aef31bca1 Merge branch 'intex' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui into intex 刘忱 2024-12-04 11:27:20 +0800
ec723c3bbc 处理YT-1485缺陷。刘忱 2024-12-04 11:27:09 +0800
eda782b7df YT-1488物料隔离，去掉明细新增、编辑、删除操作张立 2024-12-04 11:20:59 +0800
6b84b04465 YT-1473 张立 2024-12-04 11:15:40 +0800