Commit Graph

Select branches

Hide Pull Requests

develop

feature/10月迭代优化

feature/20250604_chenye

feature/6679

feature/6684

feature/6686

feature/6694

feature/6711

feature/6763

feature/6973

feature/7119_lxbTest

feature/7134

feature/7141

feature/7151

feature/7154

feature/7229

feature/7230

feature/7231

feature/7248

feature/7249

feature/7253

feature/7254

feature/7254_new

feature/7277

feature/7277_7280

feature/7280

feature/auxiliary_files_upload

feature/backup-develop

feature/commercially_launched

feature/customer_material_optimization

feature/customer_supply

feature/delivery_status

feature/machining_accuracy_sync

feature/manufactur_order

feature/merge-6694

feature/message_update

feature/model_type_update

feature/mrp_bug_fixed

feature/new

feature/new1

feature/new111

feature/org_info_synchronous

feature/part_number

feature/plan_slow

feature/pre-three-elment

feature/process_outsourcing_code_stripping

feature/sale_order_route_pick

feature/sf-master1.0

feature/sf看板样式统一

feature/sync-develop-with-master

feature/tax_sync

feature/tool_standard_library_process

feature/update_process_start_time

feature/update_production_line

feature/wechat_message

feature/weid_sync_update

feature/workorder_exceptions

feature/临时分支

feature/主题logo添加中文

feature/产品的权限优化

feature/仓库发货下发bfm

feature/优化工件配送及AGV

feature/优化报废和返工

feature/优化设备维保标准

feature/优化调拨列表

feature/修改产品名称

feature/修改制造订单列表显示

feature/修改机床参数bug

feature/修改网站标题

feature/制造功能优化

feature/前端样式修改

feature/加工能力显示重叠

feature/取消加工订单

feature/合同审批

feature/坯料尺寸显示修改

feature/增加模块完整性验证

feature/增加质检模块

feature/增加适配开发环境

feature/工单返工优化

feature/打印配置优化

feature/报废优化

feature/搜索优化

feature/新增plm模块

feature/新增坯料类型

feature/新增消息提醒

feature/根据项目组区分sf代码

feature/消息提醒优化

feature/物料需求计划管理

feature/禁止负库存

feature/程序用刀异常提醒

feature/请购明细

feature/调拨单质检

feature/还原产品页面代码

feature/逾期工单批量重新安排

feature/采购申请优化

feature/销售和排程添加消息推送

feature/零件图号名称优化需求

feature/零件图号筛选

feature/需求计划

feature/页面显示优化

feature/验证合并的逻辑

feature/齐套检查与下达生产

hotfix/修复刀具预警没有预警记录和通知

hotfix/修复多面加工产线状态

hotfix/修复工件上下产线接口

hotfix/修复报废-外协入库验证

hotfix/修改agv回调接口授权

hotfix/备注为空

hotfix/解决采购申请bug

master

release/release1.0

release/release1.6

release/release1.7

release/release_1.2

release/release_1.4

release/release_1.5

release/release_1.8

release/release_1.9

release/release_2.0

release/release_2.1

release/release_2.10

release/release_2.11

release/release_2.12

release/release_2.13

release/release_2.14

release/release_2.15

release/release_2.2

release/release_2.3

release/release_2.4

release/release_2.5

release/release_2.6

release/release_2.7

release/release_2.8

release/release_2.9

master_sf_20240518_1.0

master_sf_20240529_1.1

master_sf_20240530_1.2

master_sf_20240604_1.3

master_sf_20240605_1.4

master_sf_20240613_1.5

master_sf_20240617_1.6

master_sf_20240619_1.7

master_sf_20240624_1.8

master_sf_20240701_1.9

master_sf_20240703_2.0

master_sf_20240724_2.1

master_sf_20240724_2.2

master_sf_20240724_2.3

master_sf_20240830_2.4

master_sf_20241011_2.5

master_sf_20241104_2.6

master_sf_20241208_2.7

master_sf_20250107_2.8

master_sf_20250121_2.9

master_sf_20250304_2.10

master_sf_20250401_2.11

master_sf_20250415_2.12

master_sf_20250428_2.13

master_sf_20250509_2.14

master_sf_20250610_2.15

master_sf_20250701_2.16

release_1.3

release_1_1

修复工件上下产线

修复编程单下发接口

Mono Color

• b619c15231 修复采购单没有接收产品的问题 胡尧 2025-01-17 11:27:04 +08:00
• bccdd93884 Accept Merge Request #1779: (feature/制造订单状态优化_1 -> develop) 禹翔辉 2025-01-17 11:07:54 +08:00
• 41cdeb7fd9 制造订单状态优化 yuxianghui 2025-01-17 11:06:17 +08:00
• 57ab276c37 Accept Merge Request #1778: (feature/制造功能优化 -> develop) 马广威 2025-01-17 10:01:16 +08:00
• f3e64b007e 调整扫码字段位置 mgw 2025-01-17 09:59:46 +08:00
• eed89836e1 调整扫码字段位置 mgw 2025-01-17 09:36:37 +08:00
• 19e1b16122 屏蔽将制造订单的补货组修改为不同的代码 胡尧 2025-01-17 09:27:38 +08:00
• 9efa4636d9 Accept Merge Request #1777: (feature/制造功能优化 -> develop) 马广威 2025-01-16 17:40:09 +08:00
• 0b2b9c2bf5 恢复屏蔽 mgw 2025-01-16 17:39:34 +08:00
• cc5036ce64 Accept Merge Request #1776: (feature/制造功能优化 -> develop) 马广威 2025-01-16 17:11:59 +08:00
• 2dc54792f4 调整扫码字段的位置 mgw 2025-01-16 17:10:55 +08:00
• 5db877a54c Accept Merge Request #1775: (feature/质检单优化_1 -> develop) 禹翔辉 2025-01-16 15:58:53 +08:00
• 6bff1f2f64 优化工单的质量检查跳转按钮 yuxianghui 2025-01-16 15:56:11 +08:00
• 0aaa3bd5ba Accept Merge Request #1774: (feature/质检单优化_1 -> develop) 禹翔辉 2025-01-16 15:42:18 +08:00
• 39d6c8ae24 处理制造订单再次返工时，点击返工按钮报错 yuxianghui 2025-01-16 15:41:07 +08:00
• 2c56011502 Accept Merge Request #1773: (feature/质检单优化_1 -> develop) 禹翔辉 2025-01-16 14:53:50 +08:00
• 1e71fc1b08 Merge branch 'feature/制造订单状态优化' into feature/质检单优化_1 yuxianghui 2025-01-16 14:51:51 +08:00
• add528f0f3 1、质检单有关后置三元检测的字段和页签添加工单没有后置三元检测时隐藏的条件；2、工单添加质检单跳转按钮 yuxianghui 2025-01-16 14:51:04 +08:00
• b8cff4445d Accept Merge Request #1772: (feature/制造功能优化 -> develop) 马广威 2025-01-16 14:33:39 +08:00
• a2d51ce04e Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 mgw 2025-01-16 14:32:47 +08:00
• 109a093f86 调整审批状态 mgw 2025-01-16 14:32:21 +08:00
• c7265bdb46 Accept Merge Request #1771: (feature/加工能力显示重叠 -> develop) 管欢 2025-01-16 12:50:47 +08:00
• f93edef2d3 Accept Merge Request #1770: (feature/customer_supply -> develop) 廖丹龙 2025-01-16 12:42:28 +08:00
• 5c780c7b82 客供料合并 liaodanlong 2025-01-16 11:35:37 +08:00
• 303fcd0430 修改采购单非询价状态只读 liaodanlong 2025-01-16 11:24:21 +08:00
• e57574783f 修复设备档案页面数据显示 feature/加工能力显示重叠 guanhuan 2025-01-16 10:28:30 +08:00
• ff35374eee Accept Merge Request #1769: (feature/制造订单状态优化 -> develop) 禹翔辉 2025-01-16 09:03:17 +08:00
• 5b550952a2 Merge branch 'feature/返工功能优化' into feature/制造订单状态优化 yuxianghui 2025-01-16 09:02:04 +08:00
• e3562e7ae3 1、制造订单状态优化 yuxianghui 2025-01-16 09:01:11 +08:00
• 229df40db4 Accept Merge Request #1768: (feature/返工功能优化 -> develop) 禹翔辉 2025-01-15 15:52:44 +08:00
• 5ff6fe73d4 点击制造订单触发返工的过滤条件优化 yuxianghui 2025-01-15 15:40:19 +08:00
• 1dd8eac32c Accept Merge Request #1767: (feature/返工功能优化 -> develop) 禹翔辉 2025-01-15 14:47:16 +08:00
• 93eb588f91 Merge branch 'feature/工单-制造订单优化' into feature/返工功能优化 yuxianghui 2025-01-15 14:37:46 +08:00
• 5297bf05d1 1、制造订单返工按钮添加新的显示条件；2、优化返工流程 yuxianghui 2025-01-15 14:36:49 +08:00
• 9adfca6010 Accept Merge Request #1766: (feature/制造功能优化 -> develop) 马广威 2025-01-15 13:37:14 +08:00
• 03c317542a Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 mgw 2025-01-15 13:36:34 +08:00
• ece136e71e 解除屏蔽 mgw 2025-01-15 13:36:05 +08:00
• e0452283f6 Accept Merge Request #1765: (feature/制造功能优化 -> develop) 马广威 2025-01-15 11:35:00 +08:00
• 8ee98c52e4 Accept Merge Request #1764: (feature/工单-制造订单优化 -> develop) 禹翔辉 2025-01-15 11:27:55 +08:00
• 1b9dbffcce Merge branch 'feature/质检单优化' into feature/工单-制造订单优化 yuxianghui 2025-01-15 11:26:01 +08:00
• 8d5d19ec69 1、质检单通过、失败按钮添加工单为返工时隐藏条件；2、处理夹具入库到夹具房时，夹具查询中夹具可用状态没有变更为可用问题；3、处理后置三元检测选择返工后制造订单状态没有变更为返工的问题 yuxianghui 2025-01-15 11:25:00 +08:00
• 8bda70be71 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 mgw 2025-01-15 10:19:42 +08:00
• ca3015600a 调整扫码widget mgw 2025-01-15 10:18:25 +08:00
• 09bd06774d Accept Merge Request #1763: (feature/制造功能优化 -> develop) 马广威 2025-01-15 09:38:05 +08:00
• eabe2aa9e9 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 mgw 2025-01-15 09:37:20 +08:00
• 4b6fd72237 调整下发更新进行中状态的制造订单 mgw 2025-01-15 09:34:09 +08:00
• f79fa75a68 Accept Merge Request #1762: (feature/customer_supply -> develop) 胡尧 2025-01-15 08:43:31 +08:00
• f4f87555a8 排除坯料制造订单 liaodanlong 2025-01-15 01:44:48 +08:00
• adbf5a6a0d 隐藏欠单 liaodanlong 2025-01-14 21:03:27 +08:00
• 19ff7b5eb4 Accept Merge Request #1761: (feature/质检单优化 -> develop) 禹翔辉 2025-01-14 16:24:35 +08:00
• bf3256c4bc Merge branch 'feature/工单-质检优化_3' into feature/质检单优化 yuxianghui 2025-01-14 16:22:59 +08:00
• 847b7da8f7 处理 质检单确认合格或者不合格时报错 bug yuxianghui 2025-01-14 16:22:17 +08:00
• 61e08f20c7 Accept Merge Request #1760: (feature/制造功能优化 -> develop) 马广威 2025-01-14 16:22:08 +08:00
• fc29791f1b Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 mgw 2025-01-14 16:21:35 +08:00
• 2a9d19436a Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 mgw 2025-01-14 16:21:07 +08:00
• e5762f7058 Accept Merge Request #1759: (feature/前端样式修改 -> develop) 黄焱 2025-01-14 16:20:52 +08:00
• 357bb15e72 修复-会计-供应商-发票账单新增明细行标题显示错位了 hyyy 2025-01-14 16:18:34 +08:00
• 7de2e98464 Accept Merge Request #1758: (feature/制造功能优化 -> develop) 马广威 2025-01-14 16:04:22 +08:00
• 78a9c59cde 直接使用recordset mgw 2025-01-14 16:03:28 +08:00
• 18365de57e Accept Merge Request #1757: (feature/制造功能优化 -> develop) 马广威 2025-01-14 15:54:26 +08:00
• 90644a705b Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 mgw 2025-01-14 15:53:35 +08:00
• 5106067882 调整取值对象 mgw 2025-01-14 15:52:09 +08:00
• 79bd5344ad Accept Merge Request #1756: (feature/增加质检模块 -> develop) 胡尧 2025-01-14 15:50:21 +08:00
• 833b7ff78b Accept Merge Request #1755: (feature/customer_supply -> develop) 胡尧 2025-01-14 15:49:59 +08:00
• b9d95c0751 解决收藏报错的问题 胡尧 2025-01-14 15:48:49 +08:00
• e5f15661ce 采购单重复产品限制去除 liaodanlong 2025-01-14 15:10:22 +08:00
• 33ee5cb172 Accept Merge Request #1754: (feature/工单-质检优化_3 -> develop) 禹翔辉 2025-01-14 15:09:58 +08:00
• b433c6423b Merge branch 'feature/工单-质检优化_2' into feature/工单-质检优化_3 yuxianghui 2025-01-14 15:08:42 +08:00
• eae310ddad 1、工单、质检单优化 yuxianghui 2025-01-14 15:07:53 +08:00
• deff14b4d3 Accept Merge Request #1753: (feature/customer_supply -> develop) 廖丹龙 2025-01-14 14:17:26 +08:00
• 9d6baee082 客供料与非客供料分开合并 liaodanlong 2025-01-14 14:12:08 +08:00
• 47c54107f1 Accept Merge Request #1752: (feature/零件图号名称优化需求 -> develop) 管欢 2025-01-14 13:53:17 +08:00
• 551e6e0a02 Accept Merge Request #1751: (feature/制造功能优化 -> develop) 马广威 2025-01-14 13:29:08 +08:00
• f992d625bb Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 mgw 2025-01-14 13:28:33 +08:00
• 883d6938e5 调整提示词 mgw 2025-01-14 13:28:08 +08:00
• 37a5e37ed4 Accept Merge Request #1750: (feature/增加质检模块 -> develop) 胡尧 2025-01-14 13:26:48 +08:00
• 4aa6b59204 修改模块翻译 胡尧 2025-01-14 13:25:52 +08:00
• 437b081f15 加工面筛选修改 feature/零件图号名称优化需求 guanhuan 2025-01-14 13:13:50 +08:00
• 489ecc8028 Accept Merge Request #1749: (feature/制造功能优化 -> develop) 马广威 2025-01-14 11:13:10 +08:00
• bb5126d4f5 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 mgw 2025-01-14 11:12:41 +08:00
• 40603fea6a 调整编程记录生成 mgw 2025-01-14 11:12:07 +08:00
• 0a718b9836 Accept Merge Request #1748: (feature/工单-质检优化_2 -> develop) 禹翔辉 2025-01-14 10:42:36 +08:00
• f44dff2106 Merge branch 'feature/工单-质检优化_1' into feature/工单-质检优化_2 yuxianghui 2025-01-14 10:40:56 +08:00
• 07d854a740 处理质检结果为返工时，制造订单状态没有更改为返工的问题 yuxianghui 2025-01-14 09:25:06 +08:00
• fa80d42fc0 Accept Merge Request #1747: (feature/制造功能优化 -> develop) 马广威 2025-01-14 08:48:14 +08:00
• 86747b77a6 调整判断条件 mgw 2025-01-14 08:47:30 +08:00
• cc6fc450d9 Accept Merge Request #1746: (feature/制造功能优化 -> develop) 马广威 2025-01-14 08:42:06 +08:00
• 5865aab25c 解除屏蔽 mgw 2025-01-14 08:41:41 +08:00
• 9292fa29e6 Accept Merge Request #1745: (feature/制造功能优化 -> develop) 马广威 2025-01-14 08:34:34 +08:00
• 8b5740ece2 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 mgw 2025-01-14 08:33:57 +08:00
• 63ca6f5856 解除状态限制屏蔽 mgw 2025-01-14 08:33:34 +08:00
• dfd2082871 Accept Merge Request #1744: (feature/制造功能优化 -> develop) 马广威 2025-01-13 17:32:25 +08:00
• 587370fe54 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 mgw 2025-01-13 17:31:23 +08:00
• f29582ef07 调整首次下发理由 mgw 2025-01-13 17:30:23 +08:00
• 0d3a1f063c Accept Merge Request #1743: (feature/customer_supply -> develop) 秦圣 2025-01-13 17:16:56 +08:00
• 6cf4bf1005 代码合并 liaodanlong 2025-01-13 17:16:22 +08:00
• 119e4b9590 Accept Merge Request #1742: (feature/前端样式修改 -> develop) 黄焱 2025-01-13 17:09:07 +08:00
• 4467865b86 取消 -> 放弃保存 hyyy 2025-01-13 17:04:00 +08:00
• 2756edd6bc Accept Merge Request #1741: (feature/customer_supply -> develop) 秦圣 2025-01-13 17:03:17 +08:00
• b87343f017 采购单取消错误提示修改 liaodanlong 2025-01-13 17:02:41 +08:00