Commit Graph

  • ce4e92c 添加jit模块的路由 by zhangxin 2021-11-09 11:20:53 +0800
  • 1dbb624 Merge pull request '修改流水号获取方式' (#32) from feature_honda into develop by zhangxin 2021-11-03 16:05:44 +0800
  • 50061e3 (refs/pull/32/head) 修改流水号获取方式 by yehongyang 2021-11-03 16:04:51 +0800
  • ad67286 Merge pull request '添加发运模块功能代码' (#31) from feature_pln into develop by yehongyang 2021-11-03 15:33:10 +0800
  • 6992380 (refs/pull/31/head) 添加发运相关的结构体定义 by zhangxin 2021-11-03 15:31:13 +0800
  • 6784035 添加状态定义 by zhangxin 2021-11-03 15:30:34 +0800
  • 50973fb 添加字段和修改字段名 by zhangxin 2021-11-03 15:30:02 +0800
  • 09ca2bb 修改mongodbport数据类型 by zhangxin 2021-11-03 15:29:14 +0800
  • 9bbc347 添加发运模板管理及发运功能代码 by zhangxin 2021-11-03 15:26:52 +0800
  • 0f920a0 Merge pull request '修改数据结构' (#30) from feature_honda into develop by zhangxin 2021-10-29 17:47:53 +0800
  • 96a10b1 (refs/pull/30/head) 修改数据结构 by yehongyang 2021-10-29 17:46:38 +0800
  • e7e5853 Merge pull request '新增product字段和工单的产线映射' (#29) from feature_pln into develop by yehongyang 2021-10-29 17:42:48 +0800
  • 5505247 (refs/pull/29/head) Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_Acura_MES_Backend into feature_pln by zhangxin 2021-10-29 17:42:20 +0800
  • 8049525 新增product字段和工单的产线映射 by zhangxin 2021-10-29 17:41:09 +0800
  • a887806 Merge pull request '添加客户订单从未计划到计划到锁定生成工单的代码' (#28) from feature_pln into develop by yehongyang 2021-10-29 16:23:46 +0800
  • d21b829 (refs/pull/28/head) Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_Acura_MES_Backend into feature_pln by zhangxin 2021-10-29 16:16:45 +0800
  • 83c6d54 Merge pull request 'feature_honda' (#27) from feature_honda into develop by zhangxin 2021-10-29 16:16:35 +0800
  • 86a60ec Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_Acura_MES_Backend into feature_pln by zhangxin 2021-10-29 16:16:02 +0800
  • 5e07cf6 (refs/pull/27/head, refs/pull/26/head) Merge branch 'develop' of 101.201.121.115:leo/LAPP_Acura_MES_Backend into feature_honda by yehongyang 2021-10-29 16:15:37 +0800
  • ba0ae70 修复文件导入时查询零件配置bug by yehongyang 2021-10-29 16:13:24 +0800
  • 7f18ae9 Merge pull request '增加对文件异常判断' (#25) from feature_honda into develop by 徐腾飞 2021-10-29 15:57:23 +0800
  • 0555ebf (refs/pull/25/head) 增加对文件异常判断 by yehongyang 2021-10-29 15:55:44 +0800
  • e914cee 添加客户订单从未计划到计划到锁定生成工单的代码 by zhangxin 2021-10-29 15:44:50 +0800
  • 662b5f3 Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_Acura_MES_Backend into feature_pln by zhangxin 2021-10-29 15:11:55 +0800
  • 873dd7f 修改查询一条聚合数据的bug by zhangxin 2021-10-29 15:11:48 +0800
  • 121ab67 Merge pull request 'feature_honda' (#24) from feature_honda into develop by zhangxin 2021-10-29 15:00:20 +0800
  • 6490ac2 (refs/pull/24/head, refs/pull/23/head) Merge branch 'develop' of 101.201.121.115:leo/LAPP_Acura_MES_Backend into feature_honda by yehongyang 2021-10-29 14:58:38 +0800
  • 4df409d 客户订单列表增加状态返回 by yehongyang 2021-10-29 14:56:42 +0800
  • 5222bf3 Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_Acura_MES_Backend into feature_pln by zhangxin 2021-10-28 15:30:54 +0800
  • 5641ee7 Merge pull request '车型配置 产品关联 客户订单修改取消' (#22) from feature_honda into develop by 徐腾飞 2021-10-28 15:22:30 +0800
  • 7278ddd (refs/pull/22/head) 车型配置 产品关联 客户订单修改取消 by yehongyang 2021-10-28 15:20:13 +0800
  • 5926312 添加产品产线关联关系的代码 by zhangxin 2021-10-28 14:58:02 +0800
  • 48a1abc Merge pull request '修改字段类型和自增' (#21) from feature_pln into develop by yehongyang 2021-10-28 13:19:55 +0800
  • 8bd6c36 (refs/pull/21/head) Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_Acura_MES_Backend into feature_pln by zhangxin 2021-10-28 13:19:02 +0800
  • cb3296e 添加客户订单设置为计划的代码 by zhangxin 2021-10-28 13:16:37 +0800
  • 575cc16 修改字段类型和自增 by zhangxin 2021-10-28 13:14:59 +0800
  • a0975ba Merge pull request '客户订单模块提交' (#20) from feature_honda into develop by 徐腾飞 2021-10-28 12:35:42 +0800
  • f117717 (refs/pull/20/head) 客户订单模块提交 by yehongyang 2021-10-28 12:34:27 +0800
  • 19c4c02 Merge pull request '需求导入 转化客户订单' (#19) from feature_honda into develop by 徐腾飞 2021-10-27 18:22:43 +0800
  • a2eff4d (refs/pull/19/head) 需求导入 转化客户订单 by yehongyang 2021-10-27 18:21:05 +0800
  • 08d6c72 Merge pull request '添加model结构体定义' (#18) from feature_pln into develop by yehongyang 2021-10-27 09:40:23 +0800
  • b0edaff (refs/pull/18/head) 添加model结构体定义 by zhangxin 2021-10-27 09:39:02 +0800
  • 3114774 Merge pull request '添加排序工单页功能代码和包装代码' (#17) from feature_pln into develop by 徐腾飞 2021-10-26 17:29:54 +0800
  • 07edd69 (refs/pull/17/head) format code by zhangxin 2021-10-26 17:25:55 +0800
  • ebe5332 添加接口路由代码 by zhangxin 2021-10-26 17:25:37 +0800
  • b58532e 添加通过产线ID搜索物料总成的代码 by zhangxin 2021-10-26 17:25:16 +0800
  • bf7216c 添加包装的功能代码 by zhangxin 2021-10-26 17:24:33 +0800
  • c043436 添加锁定客户订单的功能 by zhangxin 2021-10-26 17:23:58 +0800
  • df32b79 添加工工单数据维护、排序撤销的功能代码 by zhangxin 2021-10-26 17:22:56 +0800
  • dee119c 添加通过查询物料总成的接口 by zhangxin 2021-10-26 17:21:28 +0800
  • 46027ea Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_Acura_MES_Backend into feature_pln by zhangxin 2021-10-26 16:35:18 +0800
  • 39409a8 添加me模块产品和车型配置关联的业务代码 by zhangxin 2021-10-26 16:26:51 +0800
  • 01c39c7 添加产品和车型配置之间关联表的代码 by zhangxin 2021-10-26 16:25:25 +0800
  • 12a9507 删除无用文件 by zhangxin 2021-10-26 16:24:03 +0800
  • ecc3a9c Merge pull request '车型配置管理 增加配置产品关联表' (#16) from feature_project into develop by zhangxin 2021-10-26 16:14:01 +0800
  • 278a7dc (refs/pull/16/head) 车型配置管理 增加配置产品关联表 by yehongyang 2021-10-26 16:11:04 +0800
  • 6433ede Merge pull request '添加pln客户订单模块模板代码' (#15) from feature_pln into develop by 徐腾飞 2021-10-22 14:12:55 +0800
  • 7d962a6 (refs/pull/15/head) Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_Acura_MES_Backend into feature_pln by zhangxin 2021-10-22 14:00:04 +0800
  • 40828d0 添加pln客户订单模块模板代码 by zhangxin 2021-10-22 13:57:23 +0800
  • f4a0cdd Merge pull request '需求导入解析' (#14) from feature_hondaDemand into develop by 徐腾飞 2021-10-22 09:16:53 +0800
  • 332c862 (refs/pull/14/head) 需求导入解析 by yehongyang 2021-10-22 09:15:12 +0800
  • 30b2155 Merge pull request '修改task任务bug' (#13) from feature_pm into develop by yehongyang 2021-10-21 17:36:32 +0800
  • de23e6b (refs/pull/13/head) 修改task任务bug by DESKTOP-4672LME\Xu Tengfei 2021-10-21 17:33:26 +0800
  • 8e6abce Merge pull request '添加字段PackOrderItemSize' (#12) from feature_me into develop by 徐腾飞 2021-10-21 14:29:13 +0800
  • bda753a (refs/pull/12/head) 添加字段PackOrderItemSize by zhangxin 2021-10-21 14:28:00 +0800
  • 699a3ee Merge pull request '车型规则配置 需求录入部分代码' (#11) from feature_project into develop by zhangxin 2021-10-21 13:17:31 +0800
  • f6ec2e7 (refs/pull/11/head) 车型规则配置 需求录入部分代码 by yehongyang 2021-10-21 13:12:09 +0800
  • 5e0fbb9 Merge pull request '迁移广州qm模块' (#10) from feature_qm into develop by 徐腾飞 2021-10-20 14:30:07 +0800
  • 98296bd (refs/pull/10/head) 去掉无用代码 by zhangxin 2021-10-20 14:27:38 +0800
  • b6c6696 格式化代码 by zhangxin 2021-10-20 14:27:09 +0800
  • bd0e92d 迁移广州qm模块 by zhangxin 2021-10-20 14:24:54 +0800
  • 34d8c80 Merge pull request '提交jit模块代码 同时格式化所有代码' (#9) from feature_jit into develop by 徐腾飞 2021-10-19 10:46:15 +0800
  • 99880b1 (refs/pull/9/head) 格式化代码 by zhangxin 2021-10-19 10:41:05 +0800
  • ded32df 提交jit模块代码 by zhangxin 2021-10-19 10:35:08 +0800
  • b2c79b8 Merge pull request '添加工厂数据维护的接口' (#8) from feature_NewOperation into develop by 徐腾飞 2021-10-19 10:30:26 +0800
  • b60afeb (refs/pull/8/head) 添加工厂数据维护的接口 by zhangxin 2021-10-19 10:28:07 +0800
  • 7ba5cba Merge pull request '新工艺调整数据维护接口,修复老功能迁移报错' (#7) from feature_NewOperation into develop by 徐腾飞 2021-10-15 17:39:49 +0800
  • a8df344 (refs/pull/7/head) 根据新工艺调整开启的接口 by zhangxin 2021-10-15 17:37:18 +0800
  • 4dfd71b 去掉无用的定时任务 by zhangxin 2021-10-15 17:36:56 +0800
  • 678668a 根据新框架修改获取流水号及用户获取plantnr和userid的代码 by zhangxin 2021-10-15 17:36:40 +0800
  • 83880c2 添加主数据的维护代码 by zhangxin 2021-10-15 17:35:55 +0800
  • 007a27e 修改字段长度 by zhangxin 2021-10-15 17:35:31 +0800
  • 01fc951 添加原功能模块需要的代码 by zhangxin 2021-10-15 17:34:59 +0800
  • 7392de2 Merge pull request '设备维护计划任务修复报错' (#6) from feature_pm into develop by zhangxin 2021-10-15 13:54:08 +0800
  • ede1d47 (refs/pull/6/head) 设备维护计划任务修复报错 by DESKTOP-4672LME\Xu Tengfei 2021-10-15 13:50:22 +0800
  • fc87d6a Merge pull request '修复OPC查询bug,生成流水号使用新的SnrDao' (#5) from feature_NewOperation into develop by 徐腾飞 2021-10-15 10:15:58 +0800
  • bb8251d (refs/pull/5/head) 去掉限制代码 by zhangxin 2021-10-15 10:13:58 +0800
  • fe9445d 使用新的snrdao by zhangxin 2021-10-15 10:13:40 +0800
  • 219712b 根据新工艺逻辑调整代码 by zhangxin 2021-10-15 10:13:14 +0800
  • 3a5dcd5 格式话代码 by zhangxin 2021-10-15 10:12:39 +0800
  • 092b73c 修复查询一条条件不足得bug by zhangxin 2021-10-15 10:11:08 +0800
  • 805c9fc 添加获取所有工厂及工厂得所有产品数据 by zhangxin 2021-10-15 10:10:24 +0800
  • a1730c6 Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_Acura_MES_Backend into develop by zhangxin 2021-10-14 09:52:41 +0800
  • c5385b9 Merge pull request '设备管理模块上传' (#4) from feature_pm into develop by zhangxin 2021-10-12 09:48:27 +0800
  • 05246b6 (refs/pull/4/head) 设备管理模块上传 by DESKTOP-4672LME\Xu Tengfei 2021-10-12 09:41:54 +0800
  • 711329e 修改日模型得校验 by zhangxin 2021-10-08 17:35:08 +0800
  • 008dbe2 添加对时间零值的处理 by zhangxin 2021-09-26 09:55:38 +0800
  • e3020fd 新增新的结构体 by zhangxin 2021-09-24 10:41:20 +0800
  • e56b0b0 Merge pull request '更新了自动生成代码' (#3) from feature_NewCode into develop by zhangxin 2021-09-23 17:44:11 +0800
  • 40f7897 (refs/pull/3/head) 更新了自动生成代码 by allanwei 2021-09-23 17:40:41 +0800