leo
/
LAPP_LF_MOM_BACKEND
2
1
Fork 0
Code Issues 0 Pull Requests 0 Projects 0 Releases 0 Wiki Activity

Commit Graph

  • 3a27f37 Merge pull request '修改工序依赖派工的逻辑，添加ruleId到opdetail里' (#80) from feature_om into develop by weichenglei 2021-08-17 11:42:04 +0800
  • 0ade838 (refs/pull/80/head) Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_LF_MOM_BACKEND into feature_om by zhangxin 2021-08-17 11:41:10 +0800
  • 501ba05 修改工序依赖派工的逻辑 by zhangxin 2021-08-17 11:13:54 +0800
  • 90cb2ac 添加ruleId到opdetail里 by zhangxin 2021-08-16 19:17:19 +0800
  • 9e7b597 修复拼接artId的bug by zhangxin 2021-08-16 19:16:44 +0800
  • 6913f5b Merge pull request '修改displayTime字段类型' (#79) from feature_om into develop by 徐腾飞 2021-08-16 16:31:44 +0800
  • 1733a81 (refs/pull/79/head) Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_LF_MOM_BACKEND into feature_om by zhangxin 2021-08-16 16:25:07 +0800
  • abd60b9 修改displayTime字段类型 by zhangxin 2021-08-16 16:24:08 +0800
  • 099c784 Merge pull request '修改生成工艺的逻辑' (#78) from feature_om into develop by 徐腾飞 2021-08-16 16:21:52 +0800
  • 990b231 (refs/pull/78/head) 修改生成工艺的逻辑 by zhangxin 2021-08-16 16:14:05 +0800
  • da45343 Merge pull request 'feature_xml 修复合并代码错误' (#77) from feature_xml into develop by zhangxin 2021-08-16 15:42:16 +0800
  • 5eda207 (refs/pull/77/head) Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_LF_MOM_BACKEND into feature_xml by DESKTOP-4672LME\Xu Tengfei 2021-08-16 15:40:06 +0800
  • 7deea1e Merge pull request '添加了新的自动生成代码' (#76) from feature_NewCode into develop by zhangxin 2021-08-16 15:38:17 +0800
  • 844e2e0 Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_LF_MOM_BACKEND into feature_xml by DESKTOP-4672LME\Xu Tengfei 2021-08-16 15:33:29 +0800
  • 419e49e 修复合并代码错误 by DESKTOP-4672LME\Xu Tengfei 2021-08-16 15:33:00 +0800
  • b1f11e3 (refs/pull/76/head, refs/pull/75/head) 添加了新的自动生成代码 by allanwei 2021-08-16 15:12:26 +0800
  • 2779c83 Merge pull request '修复更新opcBasicMap的bug' (#74) from feature_om into develop by weichenglei 2021-08-16 15:07:40 +0800
  • 2688012 (refs/pull/74/head) Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_LF_MOM_BACKEND into feature_om by zhangxin 2021-08-16 15:04:22 +0800
  • 3de0d5c 修复更新opcBasicMap的bug by zhangxin 2021-08-16 15:02:54 +0800
  • 4970a5d Merge pull request 'feature_xml PackTemplate修改' (#73) from feature_xml into develop by 娄文智 2021-08-16 13:13:22 +0800
  • 8a0a0b5 (refs/pull/73/head) Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_LF_MOM_BACKEND into feature_xml by DESKTOP-4672LME\Xu Tengfei 2021-08-16 13:11:10 +0800
  • 69d77bb (refs/pull/72/head, refs/pull/71/head, refs/pull/70/head, refs/pull/69/head, refs/pull/68/head, refs/pull/67/head) PackTemplate 新增字段 by DESKTOP-4672LME\Xu Tengfei 2021-08-16 10:51:18 +0800
  • 3e599b0 Merge pull request '根据表结构变动修改代码，添加数据校验逻辑' (#66) from feature_om into develop by 徐腾飞 2021-08-16 10:49:32 +0800
  • ba75ea1 (refs/pull/66/head) 添加workplacenr的映射 by zhangxin 2021-08-16 10:13:36 +0800
  • a351fb4 修改字段类型 by zhangxin 2021-08-16 10:09:54 +0800
  • 718ad79 根据数据库表变动修改代码，增加校验逻辑 by zhangxin 2021-08-16 09:49:53 +0800
  • b04006e Merge pull request '根据修改的表结构修改生成工艺数据的逻辑' (#65) from feature_om into develop by 徐腾飞 2021-08-16 09:18:50 +0800
  • 4399f81 (refs/pull/65/head) 根据协议添加的workplacenr 修改生成工艺数据的逻辑 by zhangxin 2021-08-16 09:14:29 +0800
  • a95919c 修改表结构对应 by zhangxin 2021-08-16 09:11:53 +0800
  • 2766360 Merge pull request '添加了新的自动生成代码' (#64) from feature_NewCode into develop by zhangxin 2021-08-13 17:53:28 +0800
  • 4207c62 (refs/pull/64/head) 添加了新的自动生成代码 by allanwei 2021-08-13 17:37:18 +0800
  • bd168b6 添加了新的自动生成代码 by allanwei 2021-08-13 17:13:11 +0800
  • 5d28311 Merge pull request '根据新的需求修改生成工艺的逻辑' (#63) from feature_om into develop by weichenglei 2021-08-13 16:40:53 +0800
  • 3c29946 (refs/pull/63/head) 根据新的需求修改生成工艺的逻辑 by zhangxin 2021-08-13 16:36:48 +0800
  • bcb6298 Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_LF_MOM_BACKEND into feature_om by zhangxin 2021-08-12 11:06:20 +0800
  • 7937ac6 启动使用的路由 by zhangxin 2021-08-12 10:58:22 +0800
  • f230ae1 Merge pull request '添加了新的自动生成代码' (#62) from feature_NewCode into develop by zhangxin 2021-08-12 10:52:05 +0800
  • 2ae6a43 (refs/pull/62/head) 添加了新的自动生成代码 by allanwei 2021-08-12 10:49:28 +0800
  • 3553be3 Merge pull request '添加了新的自动生成代码' (#61) from feature_NewCode into develop by zhangxin 2021-08-11 13:37:17 +0800
  • ebeed53 (refs/pull/61/head) 添加了新的自动生成代码 by allanwei 2021-08-11 13:35:15 +0800
  • df4109a Merge pull request '添加了新的自动生成代码' (#60) from feature_NewCode into develop by zhangxin 2021-08-11 10:49:31 +0800
  • 7004ea5 (refs/pull/60/head) 添加了新的自动生成代码 by allanwei 2021-08-11 10:39:43 +0800
  • 79e7901 (feature_wms) Merge pull request '添加了新的自动生成代码' (#59) from feature_NewCode into develop by zhangxin 2021-08-10 16:19:26 +0800
  • bc7c277 (refs/pull/59/head) 添加了新的自动生成代码 by allanwei 2021-08-10 15:54:32 +0800
  • 14945bb 添加了新的自动生成代码 by allanwei 2021-08-10 14:47:27 +0800
  • 62c5000 Merge pull request '修改读取配置文件的路径 修改生成工艺数据的逻辑' (#58) from feature_om into develop by weichenglei 2021-08-09 09:41:12 +0800
  • 7ea7444 (refs/pull/58/head) 修改读取配置文件的路径 修改生成工艺数据的逻辑 by zhangxin 2021-08-09 09:39:34 +0800
  • c274979 添加ControlId字段及响应的处理 by zhangxin 2021-08-06 17:54:11 +0800
  • d333d54 Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_LF_MOM_BACKEND into feature_om by zhangxin 2021-08-06 17:15:54 +0800
  • a62205b Merge pull request '修改路径' (#57) from fix_pm into develop by zhangxin 2021-08-06 13:58:32 +0800
  • 6203a71 (refs/pull/57/head) 修改路径 by louwenzhi 2021-08-06 13:57:44 +0800
  • b3332cc Merge pull request '生产排程和pm任务' (#56) from feature_schePm into develop by zhangxin 2021-08-06 13:55:04 +0800
  • b09c75d (refs/pull/56/head) 生产排程和pm任务 by louwenzhi 2021-08-06 13:52:38 +0800
  • ce8ff8e 开启定时任务 by zhangxin 2021-08-04 17:01:51 +0800
  • d6b94dd Merge pull request '完善工艺维护的功能，修复生成工艺时出现的错误' (#55) from feature_om into develop by weichenglei 2021-08-04 16:57:45 +0800
  • 937be3a (refs/pull/55/head) 修改字段翻译发送给前端的字段拼接逻辑 by zhangxin 2021-08-04 16:55:51 +0800
  • 5358ae2 派工时将工艺数据也修改状态同时生成状态变更记录 by zhangxin 2021-08-04 16:55:24 +0800
  • 14a358a 修复生成工艺数据的bug by zhangxin 2021-08-04 16:54:38 +0800
  • 97d3697 注释掉不使用的定时任务 by zhangxin 2021-08-04 16:54:21 +0800
  • e94d2f3 修改OPC通讯规则维护逻辑 by zhangxin 2021-08-04 16:53:27 +0800
  • 69d8f05 修改程序的项目 by zhangxin 2021-08-04 16:52:26 +0800
  • c85a52a 修改程序接口 by zhangxin 2021-08-04 16:52:09 +0800
  • baf8fc1 修改启动接口 by zhangxin 2021-08-04 16:51:57 +0800
  • 3f3d166 Merge pull request 'wms 盘点bug修改' (#54) from feature_wms into develop by zhangxin 2021-08-04 14:06:00 +0800
  • 5f6e175 (refs/pull/54/head) wms 盘点bug修改 by DESKTOP-4672LME\Xu Tengfei 2021-08-04 14:01:30 +0800
  • d7ca338 Merge pull request '合并广州代码' (#53) from feature_om into develop by weichenglei 2021-08-03 14:20:48 +0800
  • fd412fd (refs/pull/53/head) 合并广州代码 by zhangxin 2021-08-03 14:15:19 +0800
  • 9fcedf7 Merge pull request '完成创建工单和生成工单工艺路径的功能' (#52) from feature_om into develop by weichenglei 2021-08-03 10:47:40 +0800
  • dd507ef (refs/pull/52/head) 修改通用字段映射 by zhangxin 2021-08-03 10:45:16 +0800
  • 5844cab 添加创建锁定工单的接口功能 by zhangxin 2021-08-03 10:30:51 +0800
  • 8728df2 添加工艺数据部分的常量 by zhangxin 2021-08-03 10:30:10 +0800
  • f7041db 完成开放协议部分的主数据维护 by zhangxin 2021-08-03 10:29:39 +0800
  • 047d7ce 添加attributevalst和articleatcodlst连表查询 by zhangxin 2021-08-03 10:28:47 +0800
  • 4871dfb Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_LF_MOM_BACKEND into feature_om by zhangxin 2021-08-02 11:03:02 +0800
  • aa58081 Merge pull request 'wms 库存接口修改' (#51) from feature_wms into develop by zhangxin 2021-08-02 11:02:46 +0800
  • aa96c76 Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_LF_MOM_BACKEND into feature_om by zhangxin 2021-08-02 09:09:57 +0800
  • 635d20e 修复生成工艺数据的bug by zhangxin 2021-07-30 16:04:47 +0800
  • 315e6d0 去掉多余的连表查询 by zhangxin 2021-07-30 16:04:09 +0800
  • 31a469b (refs/pull/51/head) wms 库存接口修改 by DESKTOP-4672LME\Xu Tengfei 2021-07-30 14:15:52 +0800
  • 4195deb Merge pull request '注释掉调试代码' (#50) from feature_om into develop by 徐腾飞 2021-07-30 13:37:52 +0800
  • 4ca949c (refs/pull/50/head) Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_LF_MOM_BACKEND into feature_om by zhangxin 2021-07-30 13:29:17 +0800
  • ca09905 注释掉调试代码 by zhangxin 2021-07-30 13:29:01 +0800
  • f9bc2e7 Merge pull request '根据表字段减少调整代码 并添加operation和opc数据得联动' (#49) from feature_om into develop by zhangxin 2021-07-30 13:28:29 +0800
  • 14c4be9 (refs/pull/49/head) Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_LF_MOM_BACKEND into feature_om by zhangxin 2021-07-30 13:28:03 +0800
  • 9f23515 根据表字段减少调整代码 并添加operation和opc数据得联动 by zhangxin 2021-07-30 13:26:06 +0800
  • 2deeb47 Merge pull request '添加了新的自动生成代码' (#48) from feature_NewCode into develop by zhangxin 2021-07-30 11:24:03 +0800
  • d7589ca (refs/pull/48/head) 添加了新的自动生成代码 by allanwei 2021-07-30 09:54:18 +0800
  • 75b3686 添加了新的自动生成代码 by allanwei 2021-07-30 09:42:57 +0800
  • 25b12fb Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_LF_MOM_BACKEND into feature_om by zhangxin 2021-07-29 17:58:21 +0800
  • 9840b85 Merge pull request '添加了新的自动生成代码' (#47) from feature_NewCode into develop by zhangxin 2021-07-29 17:58:00 +0800
  • 7455b41 (refs/pull/47/head) 添加了新的自动生成代码 by allanwei 2021-07-29 17:56:12 +0800
  • bd3bd52 添加了新的自动生成代码 by allanwei 2021-07-29 17:52:59 +0800
  • 59199b2 添加了新的自动生成代码 by allanwei 2021-07-29 17:32:19 +0800
  • c132102 修复数据维护校验逻辑的bug by zhangxin 2021-07-29 14:06:16 +0800
  • b2215de wms 入库 出库 查询一条变动 by DESKTOP-4672LME\Xu Tengfei 2021-07-29 09:45:39 +0800
  • c2ec045 Merge pull request '1. 添加基础数据维护功能 2.添加工单工艺路径生成的功能' (#46) from feature_om into develop by 徐腾飞 2021-07-28 17:29:37 +0800
  • a30a61a (refs/pull/46/head, fix_wms) 完善生成序列工单的业务逻辑 by zhangxin 2021-07-28 15:53:44 +0800
  • f3b3170 添加数据维护功能 by zhangxin 2021-07-28 15:47:43 +0800
  • 10b146c 添加opc部分的数据维护功能开发 by zhangxin 2021-07-28 15:47:13 +0800
  • fea9c74 修改process和workplacelst绑定关系的功能 by zhangxin 2021-07-28 15:46:42 +0800