Commit Graph

  • e3373387d2 安灯事件界面配置 王杰 2022-05-09 11:37:38 +0800
  • 7487be0a8a 安灯 王杰 2022-05-09 11:03:03 +0800
  • faba9840ee Merge pull request 'andon 核心包 流程重构' (#345) from jhforever.wang/i3plus-pojo-U7:test into test 王杰 2022-05-08 19:39:20 +0800
  • f4c3656ad7 andon 核心包 流程重构 王杰 2022-05-08 19:36:03 +0800
  • f07421a2e9 Merge branch 'test' into ext-dev nies 2022-05-05 14:43:01 +0800
  • 1410b57168 Merge pull request 'wms物料子检查项增加动态表单字段' (#344) from baoyu.wang/i3plus-pojo:test into test 聂帅 2022-05-05 14:42:45 +0800
  • 05d789ea64 wms物料子检查项增加动态表单字段 王宝玉 2022-05-05 14:33:07 +0800
  • 5874e7e5b7 Merge branch 'test' into ext-dev nies 2022-04-28 17:39:49 +0800
  • dfe93ff37e 新增账号类型字段 nies 2022-04-28 17:34:38 +0800
  • 187c1382ca 新增用户账号类型 nies 2022-04-28 13:46:49 +0800
  • 8084d7d11a 添加soft_type,eam_pad castle.zang 2022-04-27 14:20:10 +0800
  • 37d7b461f6 添加soft_type,eam_pad castle.zang 2022-04-27 14:16:53 +0800
  • 8f1633e797 Merge remote-tracking branch 'upstream/test' into test castle.zang 2022-04-27 14:06:05 +0800
  • 52aafa0bf4 四车间下发拆分问题修复 backo880607 2022-04-26 18:05:09 +0800
  • b89ceeca0f Merge branch 'test' into ext-dev nies 2022-04-22 15:49:18 +0800
  • 0ca309e38b 新增报关管理系统 nies 2022-04-22 15:48:59 +0800
  • 022ec3243e Merge pull request 'ext-dev' (#343) from andly.pan/i3plus-pojo:ext-dev into ext-dev 钮海涛 2022-04-20 18:58:06 +0800
  • e2f8c1c0fd 汽车带修改逻辑 andly.pan 2022-04-20 17:08:08 +0800
  • 9a18ec0920 Merge branch 'ext-dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev andly.pan 2022-04-20 17:06:52 +0800
  • 38e4f49f56 Merge branch 'test' into ext-dev nies 2022-04-20 12:18:48 +0800
  • e09dc6fd94 Merge pull request 'MesPartFormula 物料配方表新增参照数量字段' (#342) from honghui.jiang/i3plus-pojo:test into test 聂帅 2022-04-20 12:17:30 +0800
  • fcff103a4d MesPartFormula 物料配方表新增参照数量字段 蒋鸿辉 2022-04-20 12:10:33 +0800
  • 3cbf42162a Merge branch 'ext-dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev andly.pan 2022-04-18 12:42:52 +0800
  • fbd74baacb 汽车带逻辑优化 andly.pan 2022-04-18 11:34:32 +0800
  • dff7c3494c 添加token类型 castle.zang 2022-04-17 03:54:53 +0800
  • 0a2b6bccd1 设备人员增加班次时间段。 backo880607 2022-04-16 11:09:51 +0800
  • b5eb55feaf Merge branch 'test' into ext-dev nies 2022-04-13 15:56:57 +0800
  • 8cd30d3bc8 修改eam端口 nies 2022-04-13 15:56:39 +0800
  • e8cc06babb Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test castle.zang 2022-04-13 14:29:57 +0800
  • 945db7f238 合并代码 nies 2022-04-12 16:04:40 +0800
  • 428ebcf614 Merge pull request 'MesPartStockSchedule(安全库存配置)新增已下达箱数字段' (#341) from honghui.jiang/i3plus-pojo:test into test 聂帅 2022-04-12 16:01:42 +0800
  • f7a8acb88b MesPartStockSchedule(安全库存配置)新增已下达箱数字段 蒋鸿辉 2022-04-12 15:57:29 +0800
  • 810a6c2cd7 新增联组带组炉功能 钮海涛 2022-04-08 22:53:47 +0800
  • 83efec6280 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test castle.zang 2022-04-02 19:18:45 +0800
  • 0c7f2ccccb 二车间模具选择资源逻辑优化 Dominic_Xiao 2022-04-02 10:10:23 +0800
  • 4c57d9e9b3 修改SysTableTemplate索引设置 nies 2022-04-01 19:08:31 +0800
  • f843878e7e 新增钉钉单聊机器人批量发送消息的model nies 2022-03-30 15:07:09 +0800
  • e01f9a5570 集中对账单 castle.zang 2022-03-29 15:55:56 +0800
  • 5bea74bf80 sweb供应商自助修改密码---供应商登出 castle.zang 2022-03-27 23:23:52 +0800
  • 42a4d10770 sweb供应商自助修改密码 castle.zang 2022-03-25 15:53:03 +0800
  • 317d1c6129 sweb供应商自助修改密码 castle.zang 2022-03-25 15:43:26 +0800
  • 0e5d45d477 sweb供应商自助修改密码 castle.zang 2022-03-25 15:34:51 +0800
  • 18400f3c7e sweb统一登录--添加platform枚举类 castle.zang 2022-03-23 16:44:58 +0800
  • 3088b05027 sweb统一登录 castle.zang 2022-03-23 16:22:55 +0800
  • e4b9d076f2 核心包代码优化。 钮海涛 2022-03-18 13:15:46 +0800
  • 34df681f37 新增前端列表模板类 nies 2022-03-18 09:35:34 +0800
  • e6562460ce Merge pull request 'ext-dev' (#340) from andly.pan/i3plus-pojo:ext-dev into ext-dev 钮海涛 2022-03-17 17:47:07 +0800
  • 8b4b6c4dfc 汽车带优化 andly.pan 2022-03-17 16:22:28 +0800
  • cdd2eda3ac 汽车带pojo添加字段 andly.pan 2022-03-17 14:23:48 +0800
  • 2c67f5e7e5 Merge branch 'ext-dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev andly.pan 2022-03-17 13:08:31 +0800
  • 8ebc96d1f7 sysMessage 查询增加organizeCode字段 nies 2022-03-15 17:35:39 +0800
  • c73bfc41d1 Merge remote-tracking branch 'origin/ext-dev' into ext-dev 钮海涛 2022-03-14 21:46:43 +0800
  • 8ff044cbd0 修复数据备份还原的问题。 钮海涛 2022-03-14 21:46:22 +0800
  • 0c1bb120ef 汽车带逻辑优化 andly.pan 2022-03-11 11:20:13 +0800
  • a8d36f6558 Merge branch 'ext-dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev nies 2022-03-08 16:43:28 +0800
  • b652d0377e Merge branch 'test' into ext-dev nies 2022-03-08 16:43:10 +0800
  • a1d17f45c2 修复备份的数据还原问题 钮海涛 2022-03-08 16:23:00 +0800
  • 6508ad8082 获取redis信息 castle.zang 2022-03-08 14:16:20 +0800
  • bad5dc8134 软适配webservice服务端新增调用对应服务的适配模式 nies 2022-03-07 17:39:07 +0800
  • ed3f4c3464 Merge remote-tracking branch 'origin/ext-dev' into ext-dev 钮海涛 2022-03-04 10:32:07 +0800
  • b4873a4740 修复备份的数据还原问题 钮海涛 2022-03-04 10:31:39 +0800
  • 957c43f659 Merge branch 'test' into ext-dev nies 2022-03-03 16:42:57 +0800
  • 085c272e1d Merge pull request '生产队列明细(MesQueueOrderDetail)增加产线字段' (#339) from honghui.jiang/i3plus-pojo:test into test 聂帅 2022-03-03 16:41:43 +0800
  • 8179cceb4d 生产队列明细(MesQueueOrderDetail)增加产线字段 蒋鸿辉 2022-03-03 16:37:55 +0800
  • ec6a1dd09a Merge remote-tracking branch 'origin/ext-dev' into ext-dev 钮海涛 2022-03-02 11:31:33 +0800
  • 1c26e8803c 修复备份的数据还原问题 钮海涛 2022-03-02 11:31:16 +0800
  • fa37bbc51c 解决WmsVendorPart的冲突 nies 2022-03-01 17:29:22 +0800
  • e84952994a Merge pull request '供应商物料界面显示是否加严字段' (#338) from junsheng.li/i3plus-pojo-junsheng:test into test 聂帅 2022-03-01 17:24:46 +0800
  • c27db13780 加字段【变更号】字段 jun 2022-03-01 17:03:31 +0800
  • ac6d420e99 供应商物料界面显示是否加严字段 jun 2022-02-28 09:50:59 +0800
  • 3a46712908 合并李俊生代码--#19995 19081-WMS服务挂掉-PDA无法使用 castle.zang 2022-02-25 16:39:23 +0800
  • bae79eeee7 Merge pull request '#19995 19081-WMS服务挂掉-PDA无法使用' (#337) from junsheng.li/i3plus-pojo-junsheng:test into test 臧学普 2022-02-25 16:34:49 +0800
  • a515c629d0 #19995 19081-WMS服务挂掉-PDA无法使用 jun 2022-02-25 15:53:40 +0800
  • 6763f73ed9 Merge branch 'test' into ext-dev nies 2022-02-24 15:51:36 +0800
  • 8a4111a430 Merge pull request 'BUG #19874 松下页面优化' (#336) from qi.yuan/i3plus-pojo-ban:test into test 聂帅 2022-02-24 15:50:53 +0800
  • f24fe9eae3 BSP pojo castle.zang 2022-02-24 09:46:22 +0800
  • 60d2501505 wms作业流程导入导出功能,不校验脚本描述 castle.zang 2022-02-24 09:45:38 +0800
  • 4831d506cd Merge remote-tracking branch 'upstream/test' into test castle.zang 2022-02-24 09:37:05 +0800
  • 13a3f30876 BUG #19874 松下页面优化 ban.yuan 2022-02-23 13:34:44 +0800
  • 96b4c622ce Merge branch 'test' into ext-dev nies 2022-02-22 15:43:56 +0800
  • c72c4fddb7 Merge pull request 'BUG #19874 松下页面优化' (#334) from qi.yuan/i3plus-pojo-ban:test into test 聂帅 2022-02-22 15:43:08 +0800
  • e79b0da311 BUG #19874 松下页面优化 ban.yuan 2022-02-22 15:30:00 +0800
  • 87ecad5b52 Merge remote-tracking branch 'upstream/test' into test castle.zang 2022-02-21 19:01:06 +0800
  • 7b2d2e816c wms作业流程导入导出功能 castle.zang 2022-02-21 19:00:51 +0800
  • 0b8c2c1d90 Merge branch 'ext-dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev nies 2022-02-18 10:45:59 +0800
  • 36a9e0a352 Merge branch 'test' into ext-dev nies 2022-02-18 10:45:40 +0800
  • b138a2e7ee Merge pull request '供应商物料新增等级' (#333) from junsheng.li/i3plus-pojo-junsheng:test into test 聂帅 2022-02-18 10:44:16 +0800
  • 0ba685d226 供应商物料新增等级 jun 2022-02-18 10:38:39 +0800
  • 368ae1c971 Merge pull request '导出逻辑修改' (#325) from andly.pan/i3plus-pojo:ext-dev into ext-dev 钮海涛 2022-02-17 18:37:14 +0800
  • ff2a588a7c 汽车带排程初版 andly.pan 2022-02-17 18:28:12 +0800
  • 688fefe4f1 Merge branch 'ext-dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev nies 2022-02-17 18:08:04 +0800
  • c229132499 Merge branch 'test' into ext-dev nies 2022-02-17 18:07:16 +0800
  • 8c457b3093 Merge pull request '离线登陆' (#332) from jhforever.wang/wangjie-i3plus-pojo:test into test 聂帅 2022-02-17 18:06:24 +0800
  • 0f3b4c66a9 离线登陆 王杰 2022-02-17 17:42:12 +0800
  • 91b45665a2 Merge branch 'ext-dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev andly.pan 2022-02-17 16:43:17 +0800
  • 145f94c7a3 四车间问题修复 钮海涛 2022-02-17 10:02:11 +0800
  • 6b7ecd19b4 suitClientModel增加字段 nies 2022-02-14 16:43:28 +0800
  • d919ef4243 BSP 调整pojo castle.zang 2022-02-14 16:10:23 +0800
  • d5afc6d195 RequestModel新增属性 nies 2022-02-13 11:34:00 +0800
  • f82b161f78 BSP 脚本调整-1 castle.zang 2022-02-13 10:33:30 +0800