3813 Commits (3faa679cf91552fb95f7efad4a326372c9fb2b99)

Author SHA1 Message Date
crish ad6baaa1e6 安灯通知方式调试, 日志调试 6 years ago
钮海涛 58b0f4a531 新增BOM树信息获取接口 6 years ago
puxiao.liao 21375ed6f4 【超级移库】bug6295 6 years ago
WYnneaoapc 37e288ff77 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
 Conflicts:
	modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackage.java
	modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java
6 years ago
WYnneaoapc 360f908ae4 获取生产数据 6283 6 years ago
于学杰 c3441184c0 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
# Conflicts:
#	modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
6 years ago
汪云昊 8ff5d888c2 Merge remote-tracking branch 'origin/dev' into dev 6 years ago
汪云昊 aab18be0e6 Lac细节优化
OPC调整
6 years ago
qianhs 137e473543 【 EU编组管理】【 334- EU编组管理-组件和函数复用】【1172EU编组管理-组件和函数复用】 6 years ago
王杰 ebb59cbb64 【需求:1167,批量打包】 6 years ago
于学杰 b80a5b21ba Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
于学杰 bcc7c282ca 1. 增加质检单生成类型 6 years ago
jokelone 616d39fa38 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
jokelone 246726a67d 【任务:1193 接口基础数据】 6 years ago
王杰 49637cb23f 【需求:1167,批量打包】 6 years ago
汪云昊 d23303f07b Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
puxiao.liao 1f85c75f6c Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
puxiao.liao 9b8d4c900b 【事物查询】bug6294 6 years ago
1111 60ec41e149 【采购收货】 6 years ago
1111 4063929c34 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
 Conflicts:
	modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
6 years ago
1111 2077c651e7 【采购收货】 6 years ago
crish 4bd4ca8745 通知方式, 通知内容 6 years ago
WYnneaoapc c1c00213e1 工位监控修改 6283 6 years ago
汪云昊 423d8d2c03 日志开关
lac优化
OPC UA工具类
6 years ago
crish 835ea47ba2 Merge remote-tracking branch 'origin/dev' into dev 6 years ago
crish a30f4aae83 andon广播音量可配置, 安灯通知记录 6 years ago
jokelone 3eeaff50b3 【bug:5957工厂初始化】 6 years ago
puxiao.liao 75701682d2 【EU-生产报工撤销】【353生产报工撤销-4.1 处理报工撤销条码组件】【1191生产报工撤销-4.1 处理报工撤销条码组件】 6 years ago
许心洁 cce413945d Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
许心洁 c1476f83c0 关闭任务 6 years ago
crish ee51d54030 Merge remote-tracking branch 'origin/dev' into dev 6 years ago
crish aa22d18645 添加注解 6 years ago
crish 577b2c462a 按照安灯类型统计当天发生的安灯总次数和安灯超时次数 6 years ago
WYnneaoapc b595d76056 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
WYnneaoapc 45d14fe3e2 枚举增加 生产模式参数 6823 6 years ago
crish 7678b95aaa Merge remote-tracking branch 'origin/dev' into dev 6 years ago
crish a294c1ccb0 安灯看板超时统计功能 6 years ago
qianhs 6536109b66 【 EU编组管理】【 334- EU编组管理-组件和函数复用】【1172EU编组管理-组件和函数复用】 6 years ago
陈思洁 508618baf6 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
陈思洁 9b491b742e 业务类型枚举维护 6 years ago
王杰 e2249ea8dd 【需求:1189,产品条码工步】 6 years ago
WYnneaoapc 3425b443c8 工位监控优化 6283 6 years ago
1111 f3cb409ca6 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
1111 2f2c843006 【坤泰-采购收货】包装关系 6 years ago
王杰 f5c8e36ac9 【需求:1189,产品条码工步】 6 years ago
王杰 e30ba280e0 解决冲突 6 years ago
王杰 5142191f55 解决冲突 6 years ago
qianhs 1453a3d49b 【EU盘点】【 317-EU盘点-盘点差异查询】【1148EU盘点-盘点差异查询】 6 years ago
陈思洁 3b235acda0 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
陈思洁 31e24390dd 合并冲突 6 years ago
WYnneaoapc c93dd66cd9 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
WYnneaoapc 7b88c605ba 枚举修改 1060 6 years ago
陈思洁 99947f284e 枚举修改--移动业务类型 6 years ago
qianhs 62bb71f4b0 【EU盘点】【 317-EU盘点-盘点差异查询】【1148EU盘点-盘点差异查询】 6 years ago
lpx 94dc90172d 【扫描查询】bug6246 6 years ago
wei.peng 43e400d354 数据映射类型 更改BigDecimal 6 years ago
1111 db952282e0 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
1111 7378df1b9e 【宁德问题清单】 6 years ago
jokelone a04b8f7c57 【bug:5791 生产工单明细1】 6 years ago
jokelone 5fd619ac79 【bug:5791生产工单明细】 6 years ago
王杰 84bf5ba64a 【需求:1162,pcn登陆】 6 years ago
陈思洁 04e876250b Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
陈思洁 58c9795b7c 移动类型、业务类型维护数据 6 years ago
WYnneaoapc b4cea27a5b 代码审核 修改2 6 years ago
WYnneaoapc 56e6cf7918 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
 Conflicts:
	modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java
6 years ago
1111 88a69ac7f8 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
1111 71c867dd8c 【包装规格】 6 years ago
许心洁 ac43296df3 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
许心洁 5dc8ffb394 日志处理队列V1.0 6 years ago
钮海涛 8e614bcb72 1:增加多选枚举的功能。 6 years ago
钮海涛 6be9a55983 1:增加多选枚举的功能。 6 years ago
钮海涛 f85dd4cbe5 Merge remote-tracking branch 'origin/dev' into dev 6 years ago
汪云昊 eeebbfd1fe Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
alwaysfrin 759f9ee819 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
王杰 e26dadca01 【需求:1162,pcn登陆】 6 years ago
汪云昊 dcbb6a7a1c Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
汪云昊 053b3ae0e4 LAC 前端联调调整 6 years ago
alwaysfrin da582b871d 日志处理优化 6 years ago
jokelone 755e920513 【bug:6250 返工返修拆解优化】 6 years ago
lpx fc49ddeea5 【事务查询】【326EU事务查询-新增按条码查询事务交易记录组件】【1157 新增按条码查询事务交易记录组件】 6 years ago
lpx fc79b1b0f3 【扫描查询】【308扫描查询-4.2增加处理查询结果组件】【1132扫描查询-4.2增加处理查询结果组件】 6 years ago
WYnneaoapc 029c9b6bc8 代码审核 修改1 6 years ago
王杰 980ae89cdf 【需求id:1162,pcn登陆】 6 years ago
jokelone b6d7156b0b Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
jokelone 9a6c5cfda3 【任务:1163客户订单】 6 years ago
王杰 b2886012a5 【需求id:1162,pcn登陆】 6 years ago
qianhs c68cb7889e 【VDA物料拆分-输入数量-数量检验】【6233】 6 years ago
钮海涛 bd834a24cb 1:增加资源甘特图获取数据接口 6 years ago
曾贞一 c2d3e044fb Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
曾贞一 be75c4ec42 【VDA质检--物料信息维护】任务号1135
【VDA质检--检查数量组件--修改】任务号1134
【VDA质检--检查质检箱数组件】任务号1133
6 years ago
WYnneaoapc 4b47ceb42d Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
WYnneaoapc 3b447fa77a 数据抽取修改 1130 6 years ago
jokelone bdce8a7103 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
jokelone 9418a0838b 【任务:1129 产品编码配置基础数据】 6 years ago
钮海涛 64cda23c12 1:增加资源甘特图获取数据接口 6 years ago
曾贞一 d428aa302d Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
曾贞一 b7071bd0db 供应商字段 添加 6 years ago
crish 87d9b5c6ec Merge remote-tracking branch 'origin/dev' into dev 6 years ago
crish 1a7fda268b andon 系统配置 6 years ago
钮海涛 809e23aad7 1:修复启动时从数据库加载数据时的Bug。 6 years ago
钮海涛 7aa078e7ce 1:修复未设置基准时间的Bug 6 years ago
wei.peng da7ba77dab LAC 跨服务调用软适配接口完成 6 years ago
WYnneaoapc a6e8265e29 Merge remote-tracking branch 'origin/dev' into dev 6 years ago
jokelone 90ec0f107e Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
jokelone 32dbaed8fe 【任务:1129数据对象、对象结构、产品包装关系基础数据】 6 years ago
WYnneaoapc 4308084ca3 数据抽取修改 1130 6 years ago
陈思洁 d69e863959 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
陈思洁 3ef115bbe2 新增冗余字段 6 years ago
汪云昊 23f0503454 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
WYnneaoapc 1215a5c658 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
WYnneaoapc 855cc46448 数据抽取修改 1116 6 years ago
wei.peng 0ba20f0094 LAC 日志查询接口功能完成 6 years ago
WYnneaoapc 46e0488d5a Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
WYnneaoapc 1de5b8b196 数据抽取修改 1116 6 years ago
wei.peng 0d777d1894 LAC 日志处理功能完成 6 years ago
crish 851ba63e7c Merge remote-tracking branch 'origin/dev' into dev 6 years ago
crish f111febd8d 修改“其他”安灯类型的名字为“自处理”, 统一修改获取组织代码的方法 6 years ago
wei.peng 3645368544 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
wei.peng b963bcb502 LAC 日志处理功能完成 6 years ago
汪云昊 dd0de76d4d Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
qianhs 457e10bc75 1,【拆包管理】【305-4.3物料信息维护】【1122物料信息维护】 6 years ago
gaochangjiang d0165fd342 Merge remote-tracking branch 'origin/dev' into dev 6 years ago
陈思洁 2414993cf9 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
陈思洁 777060450e 新增字段--目标库位 6 years ago
gaochangjiang 047b9d5e35 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
gaochangjiang 02e3ac4960 【库存预警】bug 修复库存预警 6 years ago
汪云昊 25425822a8 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
汪云昊 154bba4b3b LAC 调度模式优化 6 years ago
WYnneaoapc 7f9f9cb242 返工返修pojo字段更改 1092 6 years ago
WYnneaoapc 9ad66157a8 数据同步优化 1078-4 6 years ago
钮海涛 2c47556abf 1:新增工作计划资源位置插入逻辑 6 years ago
jokelone 93438e1bdb Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
jokelone 21087d5d4d 【需求:1092 工序BOM和物料绑定记录模板增加构造方法】 6 years ago
钮海涛 921be6b0f2 1:新增工作计划资源位置插入逻辑 6 years ago
汪云昊 ba7c713b6f Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
汪云昊 cfd7f5276e 实体调整 6 years ago
crish 6996dc2273 6204: MesConfig配置添加业务主键 6 years ago
WYnneaoapc 4ceef3c6d1 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
于学杰 6087fe0c2c Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
于学杰 80c340308a 1. 修改通用接口POJO中的字段长度 6 years ago
WYnneaoapc 35f625ac21 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
WYnneaoapc 563955570d 数据同步优化 1078 6 years ago
汪云昊 e0ec7bb377 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
汪云昊 50bf9300ba LAC 调度模式完成 6 years ago
jokelone 828cf66784 【需求:1090 工序BOM,物料绑定记录删除多余字段】 6 years ago
王杰 cb319e4304 【需求:1126,设备周期计划】 6 years ago
lpx 00954f2917 Merge remote-tracking branch 'origin/dev' into dev 6 years ago
lpx 69be002972 【装箱防错】【301-4.2条码装箱防错】【1118条码装箱防错建任务】 6 years ago
jokelone 4dcbcf068a 【需求:1090 产品类型图片增加字段】 6 years ago
汪云昊 86a18d730a Merge remote-tracking branch 'origin/dev' into dev 6 years ago
汪云昊 4b66ec0e87 任务实例id 6 years ago
汪云昊 9907813aed Lac调度实体 6 years ago
jokelone 7ee96d1444 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
jokelone 6fd7e6be5f 【需求:1092 维修类型】 6 years ago
许心洁 bbec6a1002 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
许心洁 7799937093 成功处理移动单写入MOVE_TO_ERP表:根据移动单号+行号+零件号查询是否已存在数据,是则将此数据标记为不同步且无效软删除 6 years ago
许心洁 b112bdb5e8 成功处理移动单写入MOVE_TO_ERP表:根据移动单号+行号+零件号查询是否已存在数据,是则将此数据标记为不同步且无效软删除 6 years ago
王杰 75ce77f6f1 【需求:1126,设备周期计划】 6 years ago
钮海涛 6a1990a215 1:新增弹出框选择多个对象信息接口 6 years ago
钮海涛 2e02d77966 Merge remote-tracking branch 'origin/dev' into dev 6 years ago
王杰 347c47c82f 【需求:1125,设备报表】 6 years ago
jokelone 438517be44 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
# Conflicts:
#	modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java
6 years ago
jokelone 6c847cf305 【需求:1091 返厂返修添加字段和枚举】 6 years ago
王杰 2069d6a3ae 【需求:1125,设备报表】 6 years ago
wei.peng f67a61ec92 网关 添加 APS 路由
BASE URL 路径优化
6 years ago
wei.peng aeff042046 添加 组织代码查询 6 years ago
曾贞一 ed9e388c8b Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
曾贞一 1357dfad30 【VDA收货-- 前端PC端POsn页】任务号1102
【VDA收货-- 问题清单中加密库位】任务号1104
【VDA收货-- 系统无法查看保质期物料的具体信息】任务号1112
【VDA收货-- 对于分组数据如何查看分组信息】任务号1111
6 years ago
WYnneaoapc b668879f9d Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
王杰 2f382d37cc 【需求:1124,首检件配置】 6 years ago
jokelone 0011a4bc56 【需求:1089 过程检测数据 增加字段】 6 years ago
王杰 dcaf007f4d 【需求:1107,生产工单首检件】 6 years ago
WYnneaoapc 29ac92566d Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
钮海涛 b05711dc6c 1:新增弹出框选择多个对象信息接口 6 years ago
jiajack 3c8b920a4c Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
jiajack 95789b1bd8 增加生产质量情况BI业务 6 years ago
钮海涛 794bbc4fba 1:新增弹出框选择多个对象信息接口 6 years ago
jokelone bc13a8a3ac 【需求:1090 返厂返修增加分页查询】 6 years ago
钮海涛 5b712ce774 1:新增弹出框选择多个对象信息接口 6 years ago
许心洁 dd86ce354a Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
许心洁 b8842edbb1 无条码打印:新功能开发完成 6 years ago
WYnneaoapc dbd4a7578b Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
crish 88af19f8e9 修改开发环境pom文件test为dev 6 years ago
changjiang.gao 376ca4bbd4 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
王杰 3f6f6428f6 【需求:1106,设备通知,优化】 6 years ago
changjiang.gao 13066bd4d1 【库存预警】bug 243 6 years ago
WYnneaoapc 04c99167c8 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
WYnneaoapc 6de6d36e80 数据库抽取反写 1105-1 6 years ago
jokelone a5609d97fb 【1092 返厂返修增加枚举】 6 years ago
钮海涛 d99ad6c44a 1:新增弹出框选择对象信息接口。 6 years ago
王杰 03a4c98234 Merge branch 'dev' into test 6 years ago
王杰 803d5c57f2 【需求1101,设备维修作业,第3次提交】 6 years ago
wei.peng 699276777a Merge remote-tracking branch 'origin/dev' into dev 6 years ago
wei.peng 7496eb4a1b LAC 全部 CRUD 接口完成 6 years ago
钮海涛 5183163abd 1:新增弹出框选择对象信息接口。 6 years ago
WYnneaoapc e6e2e9fb22 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
crish 67461457fc Merge branch 'dev' into test 6 years ago
crish 1e0f0c706c 安灯问题修复 6 years ago
crish f093a97cf0 Merge remote-tracking branch 'origin/dev' into dev 6 years ago
crish 4eaa8b5b17 导入导出 6 years ago