Commit Graph

Select branches

Hide Pull Requests

master

Mono Color

• 523c3837e2 fix:取消任务时更新库存 zhangzq 2023-12-27 09:19:24 +08:00
• 01bafbf404 fix:入库订单查询sql报错 zhangzq 2023-12-26 18:24:02 +08:00
• a596caddfe opt:优化日志；add：包装机一体机页面新增空筐送回 zhangzq 2023-12-26 16:25:20 +08:00
• fbd5e1ca7e rev: 增加日志配置-CMD控制台高亮，链路追踪 ludj 2023-12-25 19:07:50 +08:00
• 05878afa90 add:刻字机不合格数量 gengby 2023-12-21 19:26:31 +08:00
• 2bdea65231 rev:日志文件打印慢 zhangzq 2023-12-21 19:21:08 +08:00
• 41040484b5 rev:增加规格统计分页，修改排产顺序，设备最后规格记录; baoge 2023-12-19 16:38:02 +08:00
• 1735f6e48c rev:工单强制完成 zhangzq 2023-12-16 17:55:02 +08:00
• e620dff9b2 add:手工排产功能上线；出库单设置 zhangzq 2023-12-14 18:31:36 +08:00
• 9f2b73a49f rev:分支合并修复 zhangzq 2023-12-13 17:31:22 +08:00
• 3610044642 rev:工单创建校验 zhangzq 2023-12-13 16:31:00 +08:00
• 1dbc4e0098 Merge remote-tracking branch 'origin/master' zhangzq 2023-12-13 14:44:59 +08:00
• 007bd043f3 rev:工单编号 zhangzq 2023-12-13 14:44:51 +08:00
• dc0b25d076 add:排产调整sql。 baoge 2023-12-08 16:00:32 +08:00
• 462728956e add:增加工单排产调整相关功能。 baoge 2023-12-08 15:56:59 +08:00
• 45a102eed0 rev:pom zhangzq 2023-12-04 16:42:12 +08:00
• 1d28c7cf9e rev:工单下发接口兼容暂停工单;opt:删除useragent zhangzq 2023-12-04 16:02:16 +08:00
• c4c7fc9c27 rev：工单查询sql zhangzq 2023-12-04 09:50:04 +08:00
• 925b2a998e add:飞书接口 zhangzq 2023-11-29 17:17:37 +08:00
• 1f82889211 Merge remote-tracking branch 'origin/master' zhangzq 2023-11-29 10:15:39 +08:00
• 2927e7e25f rev:新增报工时间字段，下料机优先级，缓存线写0（三层缓存线跑）下一道工序设备来料仓排序 zhangzq 2023-11-29 10:15:33 +08:00
• 11a007ea36 rev 修改逻辑 USER-20220102CG\noblelift 2023-11-22 13:46:16 +08:00
• ecb875e229 Merge branch 'master' of http://121.40.234.130:8899/root/hl_one USER-20220102CG\noblelift 2023-11-22 13:32:04 +08:00
• d34baf0cce rev 海柔输送线驱动 USER-20220102CG\noblelift 2023-11-22 13:31:45 +08:00
• d1bf663e0f add:工单优化 zhangzq 2023-11-20 16:13:38 +08:00
• f985b7ba9d add:新增pc工单暂停页面，添加物料筐数量 zhangzq 2023-11-20 16:04:53 +08:00
• 5e5feb5d4b add:工单操作人 zhangzq 2023-11-15 16:32:35 +08:00
• 5bef91add4 add:工单界面添加操作人 zhangzq 2023-11-15 16:29:58 +08:00
• eb958137a3 add:维修单挂起1 zhangzq 2023-11-15 14:56:35 +08:00
• bb88cf869e add:维修单挂起功能 zhangzq 2023-11-15 14:52:59 +08:00
• 9b81e28f67 rev:报修页面修改 zhangzq 2023-11-14 17:39:33 +08:00
• 6cf7fede4f rev:载具打印 zhangzq 2023-11-14 14:19:01 +08:00
• 4354e961f4 rev:载具打印添加配置 zhangzq 2023-11-13 20:05:51 +08:00
• 3f0cf6092a add:设备档案打印功能 zhangzhiqiang 2023-11-09 14:25:06 +08:00
• e218f447a1 rev:设备报修添加手持 zhangzhiqiang 2023-11-08 17:22:52 +08:00
• 4c0128e1e7 add:飞书接口 zhangzhiqiang 2023-11-06 09:23:04 +08:00
• ffb118be74 add:飞书接口 zhangzhiqiang 2023-11-06 09:22:37 +08:00
• 5f9b9e2540 add:飞书接口 zhangzhiqiang 2023-11-06 09:13:05 +08:00
• d56b7e2aa8 rev:设备单据 zhangzhiqiang 2023-11-06 09:08:40 +08:00
• 5e3a5586c6 add:working material zhangzhiqiang 2023-11-03 13:35:22 +08:00
• 02367d3c06 add:working material zhangzhiqiang 2023-11-02 09:03:42 +08:00
• d2cb0ed33e add：在制品物料统计 zhangzhiqiang 2023-11-02 09:00:35 +08:00
• f68701f4d5 add:sql zhangzhiqiang 2023-10-25 11:16:20 +08:00
• c0cb6541b4 rev:设备管理功能优化 zhangzhiqiang 2023-10-25 10:19:07 +08:00
• afdb19dc70 Merge remote-tracking branch 'origin/device_fix' zhangzhiqiang 2023-10-24 14:35:35 +08:00
• 4e8c1c6a88 rev：维修单备件出库新增个添加物料，从物料列表中选物料， liuxy 2023-10-23 16:06:00 +08:00
• 0fc2178dd9 rev：1. 保养/点检/润滑：添加保养/点检/润滑设备与人员对应关系2. 保养/点检/润滑/维修：新增单据页面，添加人员一行3.创建设备报修单时：添加故障分类标签选择4.设备报修允许点击报修单单号，查看详情信息5. 创建设备报修单时添加图片上传功能;查看跟修改时显示图片：只支持图片格式 liuxy 2023-10-23 15:10:51 +08:00
• c8734d0ac2 add：设备管理，人员单据 zhangzhiqiang 2023-10-23 14:08:29 +08:00
• 181c2ecaf8 rev:故障分类修改：新增故障分类字段维护 liuxy 2023-10-20 14:20:03 +08:00
• 05bf2e296b rev:修改深坑相关任务 zhangzhiqiang 2023-10-19 16:04:40 +08:00
• 75fc9bddc9 rev:工单页面修改 zhangzhiqiang 2023-10-19 14:56:30 +08:00
• 271fb59773 接口文档生成工具 zhangzhiqiang 2023-10-18 15:46:37 +08:00
• 694304b03f rev:设备管理页面维护 zhangzhiqiang 2023-10-17 14:43:04 +08:00
• cd30e4b748 add:工序任务统计/生产进度统计分析 zhangzhiqiang 2023-10-13 17:30:55 +08:00
• 6fe96e4cac rev:出库分配库存修改 zhangzhiqiang 2023-10-13 09:23:34 +08:00
• 45f53662f2 rev:修改组盘记录页面 zhangzhiqiang 2023-10-12 20:15:49 +08:00
• f07be22524 add：新增半成品虚拟入库 liuxy 2023-10-12 17:37:55 +08:00
• c67cd18b63 Merge remote-tracking branch 'origin/master' baoge 2023-10-12 13:01:19 +08:00
• b698c19413 fix:修正代码冲突 baoge 2023-10-12 13:00:52 +08:00
• 4f71b6f9c5 add:添加托盘状态查询 zhangzhiqiang 2023-10-12 11:04:12 +08:00
• 63582389bf Merge remote-tracking branch 'origin/master' baoge 2023-10-12 11:00:18 +08:00
• c9ddff1a01 fix:增加工单工作顺序字段，删除工序顺序号字段； baoge 2023-10-12 10:52:17 +08:00
• 023e47c8e6 add:组盘状态过滤 zhangzhiqiang 2023-10-12 10:29:10 +08:00
• f3cb3fa083 Merge remote-tracking branch 'origin/master' zhangzhiqiang 2023-10-11 19:50:59 +08:00
• 1f2da7be2f rev:修改配置 zhangzhiqiang 2023-10-11 19:50:21 +08:00
• 5252da91e8 add:统计分析质量检测分析;足盘模糊查询 zhangzhiqiang 2023-10-11 19:40:55 +08:00
• f58edac2ef fix:分页优化 liuxy 2023-10-11 16:53:46 +08:00
• 8787b6b151 add:收发存查询 liuxy 2023-10-11 08:48:13 +08:00
• 1954538af6 Merge remote-tracking branch 'origin/master' zhangzhiqiang 2023-10-10 16:41:59 +08:00
• 24ed153a81 add:车间质量统计分析 zhangzhiqiang 2023-10-10 16:41:52 +08:00
• 90b1e12f4f rev 读取线程 USER-20220102CG\noblelift 2023-10-09 16:11:54 +08:00
• e33ca3fae9 add:项目维护基础数据导入 zhangzhiqiang 2023-10-09 13:40:11 +08:00
• ad8df52dcf rev：日库存统计增加：入库数、出库数 liuxy 2023-10-09 11:21:59 +08:00
• dbb70827d8 Merge remote-tracking branch 'origin/master' zhangzhiqiang 2023-10-09 09:37:20 +08:00
• 8ab8ebf29f add:统计分析 zhangzhiqiang 2023-10-09 09:37:14 +08:00
• aa923a5a1a add：实时库存分析 liuxy 2023-10-08 16:37:17 +08:00
• 3a9ed53c21 Merge remote-tracking branch 'origin/master' baoge 2023-10-08 13:38:04 +08:00
• 2693baf28c fix:修改销售订单表单样式引起的错误。 baoge 2023-10-08 13:37:46 +08:00
• 9c27279dbc add：历史库存分析 liuxy 2023-10-08 13:28:40 +08:00
• ee24ae7c2a add:订单新增生产数量等字段； fix：修复相同订单号相同品目相同交期合并订单无订单号时的bug。 baoge 2023-10-08 13:25:08 +08:00
• 418b40f683 add:统计分析 zhangzhiqiang 2023-10-08 10:22:18 +08:00
• d20e5f8282 add:统计分析 zhangzhiqiang 2023-10-07 09:58:37 +08:00
• acd4fe5a48 Merge remote-tracking branch 'origin/master' zhangzhiqiang 2023-10-07 09:10:17 +08:00
• abe2990e51 add:半成品虚拟库 zhangzhiqiang 2023-10-07 09:10:11 +08:00
• 8ec3c4324a add：三线半成品移库 liuxy 2023-09-28 16:13:47 +08:00
• b6aaa978de Merge remote-tracking branch 'origin/master' zhangzhiqiang 2023-09-28 09:34:57 +08:00
• 34c93e833a add:新增设备导入功能 zhangzhiqiang 2023-09-28 09:34:50 +08:00
• 6af1fbb14c rev ：acs jiaoliming 2023-09-25 09:53:33 +08:00
• 9959ebd679 rev:配置 zhangzhiqiang 2023-09-22 15:34:58 +08:00
• 85fefa35c1 add:日库存 zhangzhiqiang 2023-09-22 14:09:32 +08:00
• d55e063092 rev:aps原料需求和采购订单功能修改 baoge 2023-09-22 13:55:06 +08:00
• e5f4aaff35 add:添加档案导入/故障分类;rev:分类分类显示异常 zhangzhiqiang 2023-09-21 21:48:16 +08:00
• d6e5677bb7 rev:设备台账功能修改 zhangzhiqiang 2023-09-21 15:17:36 +08:00
• 790191603a Merge remote-tracking branch 'origin/aps_0918' into aps_0918 zhangzhiqiang 2023-09-20 16:31:21 +08:00
• 6308d6ba37 opt:分支合并 zhangzhiqiang 2023-09-20 16:31:09 +08:00
• 8e42ff2302 rev:aps相关数据变更 baoge 2023-09-19 22:03:01 +08:00
• 223f437338 rev:aps导出到原料需求，原材料编号和到货时间相同且同一天的多个订单自动合并成一个原料需求。 baoge 2023-09-19 22:02:33 +08:00
• 532b900347 rev:aps相关数据改动 baoge 2023-09-19 17:55:12 +08:00
• 18452c8181 rev:修改半成品库存相关字段 baoge 2023-09-19 17:54:07 +08:00
• 56bcda4269 rev:维修单填报新增备件出库 liuxy 2023-09-19 17:39:12 +08:00