I3_YF_SEAT
/
i3plus-pojo
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
8,483 Commits
1 Branch
0 Tags
20 MiB
yun-zuoyi
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from '5b003a613b'
${ noResults }
Commit Graph

7920 Commits (5b003a613b0b18780040d3ed33b0e6fefde62617)

Author SHA1 Message Date
曾贞一 3267a9b54f 【如东AGV接口】 5 years ago
puxiao.liao 92c2a49b90 麦格纳ASN新增异常 5 years ago
liquor ddf9936d74 在看板中增加了一列“来源库位”。 5 years ago
wynne1005 d00dcd80eb 冲突解决 5 years ago
wynne1005 7412eb3f16 质量检测 5 years ago
陈思洁 f19ee854be Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
陈思洁 802c801013 【11310 19081-下达至下线时间预警-20200913】 5 years ago
puxiao.liao 039fc9106b Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
puxiao.liao 6765c58de2 Fix bug#11212 
生产报废的条码在条码状态中查询是入库状态 --20200914
 5 years ago
王杰 cf26f7eadd mespcn异步任务 5 years ago
wynne1005 1e9f1a5c47 质量检测 1 5 years ago
陈思洁 d3f754c8a6 【客户JIT生产队列增加字段】 5 years ago
钮海涛 31791ea8cc Merge remote-tracking branch 'origin/test' into test 5 years ago
钮海涛 17c64fbf46 修改麦格纳最早批次问题 5 years ago
puxiao.liao 8ac53abe9e 麦格纳ASN新增异常 5 years ago
宋军超 0d5ade92a9 天津麦格纳添加工位缺陷导入功能 5 years ago
puxiao.liao 08f76c099e Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
陈思洁 65b18c6b91 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
陈思洁 d127413055 【11225 19081-客户JIT生产队列需要能够选择L7级零件，进行对应订单的筛选-20200910】 5 years ago
puxiao.liao 9954b1e83a 麦格纳ASN新增异常 5 years ago
rock.yu 36dd266065 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
rock.yu 9a2a596094 增加条码操作类型-发运校验 5 years ago
宋军超 0c855ba2af 天津麦格纳问题修复 5 years ago
钮海涛 cb39559a3d Merge remote-tracking branch 'origin/test' into test 5 years ago
曾贞一 6cc11a637d Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
曾贞一 c947df6c66 【坤泰接口优化】 5 years ago
puxiao.liao 15a259c8b2 修复MGN系列BUG 5 years ago
钮海涛 cfd507438e 天津麦格纳问题修复 5 years ago
宋军超 bd20bc1552 天津麦格纳修改涂装条码打印 5 years ago
joke.wang b389da7c2f Fix Bug #11260 5 years ago
puxiao.liao c91511185a Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
puxiao.liao 3cf5c70774 修复MGN系列BUG 5 years ago
陈思洁 40cef1961c Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
陈思洁 8a1f0c608e 【基础页面增加替代料功能】 5 years ago
宋军超 baafe4cd49 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
宋军超 b978fa390c 修改天津麦格纳涂装计划查询报表和涂装工单导入 5 years ago
puxiao.liao f1715db664 Finish Task #2184 Cost:8h 
2184 06 1.2.3.7.1物流路线检查
 5 years ago
陈思洁 644454294c Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
陈思洁 676e43fc33 【增加查询参数条件】 5 years ago
王杰 5e229b7176 message pool 5 years ago
汪云昊 1ce2793faa Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
宋军超 799967bde5 修改天津麦格纳问题 5 years ago
汪云昊 7a4be36111 Merge remote-tracking branch 'remotes/origin/dev' into test 5 years ago
汪云昊 156dd53402 Merge remote-tracking branch 'origin/dev' into dev 5 years ago
汪云昊 130d3a9792 feat:字典规则调整允许值为空 5 years ago
汪云昊 ab608c0919 feat:用户导出 5 years ago
宋军超 91aa6f61a0 删除预装区查询接口 5 years ago
陈思洁 2af946a4bf Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
陈思洁 9fde75101e 【11181 19048-组织模型新增数据和保存的数据不一致！-2020-09-09】 5 years ago
wynne1005 9bfd9ef279 Merge branch 'master' into test 5 years ago
wynne1005 beaeccf1ed 冲突合并 5 years ago
wynne1005 48b6634032 新增枚举 样本类型 5 years ago
宋军超 c5ebcaf2b5 天津麦格纳添加出入库事务表枚举 5 years ago
puxiao.liao 97a8a5a6ec 修复MGN系列BUG 5 years ago
puxiao.liao 698128aff5 MGN修复BUG 5 years ago
宋军超 7a6bda2994 天津麦格纳问题修复 5 years ago
陈思洁 2c91dfba60 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
陈思洁 e4dc2e1a46 【2637 08 ext 20042 PCN界面优化，log调整 0804】 5 years ago
joke.wang d33dae14dc jsp计算bug优化 5 years ago
曾贞一 99e63fea8c 【2741 北京麦格纳WMS-质检跳批】 5 years ago
宋军超 f73e826cd8 天津麦格纳问题修复 5 years ago
钮海涛 729a7b6990 合并冲突 5 years ago
钮海涛 5c9da87650 合并冲突 5 years ago
钮海涛 d47607880e 合并冲突 5 years ago
钮海涛 56b1ae99a9 Merge remote-tracking branch 'origin/test' into test 5 years ago
钮海涛 1b6bbed47c Fix Bug #10974 5 years ago
曾贞一 193cff013f 【2737 09 1.2.1.9.1库位新增库位别名】 5 years ago
joke.wang b8c743896d 拆解接口表优化 5 years ago
puxiao.liao 61b87d2d00 MGN修复BUG 5 years ago
puxiao.liao 15d915370e MGN修复BUG 5 years ago
曾贞一 fe9a19c534 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
曾贞一 6ca0948a5d 【11026 20011--有关北美收货产生的需求变更--0910】 5 years ago
宋军超 b0aba21859 中航导入问题修复 5 years ago
曾贞一 5dc142ba34 【2719 06 1.1.10 数据库文档管理-导入模板生成功能新增】 5 years ago
songss bdf708b73a 增加上传图片job 5 years ago
joke.wang 045babeee1 已生产队列查询修改 5 years ago
joke.wang ba940f9a39 BYPASS项映射关系表 5 years ago
汪云昊 0a0727e2fa fix:代码错误 5 years ago
汪云昊 f878e6b283 Merge remote-tracking branch 'remotes/origin/dev' into test 5 years ago
汪云昊 2e102f4189 Merge remote-tracking branch 'origin/dev' into dev 5 years ago
汪云昊 1ccd4f3b65 feat:添加区间查询 5 years ago
puxiao.liao 48a6dec057 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
puxiao.liao 9a7bef44ac MGN修复BUG 5 years ago
陈思洁 01fc8bb062 【条码履历增加字段】 5 years ago
陈思洁 75fe475b53 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
陈思洁 01eda59dd5 【11069 19048- 抛光质量待定扫描条码后，提示信息不明确！-2020-09-05】 5 years ago
王杰 396dcdf56c 涂装 一箱 优化 5 years ago
曾贞一 332e37ea94 【2719 06 1.1.10 数据库文档管理-导入模板生成功能新增】 5 years ago
宋军超 b7542f8db0 修改中航问题 5 years ago
wynne1005 38096fb04e mes表名过长不兼容oracle 5 years ago
汪云昊 6457cac828 feat:去除非空校验 5 years ago
曾贞一 54dc09ff76 【冲突解决】 5 years ago
曾贞一 9ebe3c17b7 【枚举状态】 5 years ago
joke.wang bd8cc364c1 jsp计算优化 5 years ago
汪云昊 1243607e0e Merge remote-tracking branch 'remotes/origin/dev' into test 5 years ago
汪云昊 5fbd0fdd80 fix:单号生成记录 5 years ago
puxiao.liao 26367ea28d Finish Task #2184 Cost:8h 
2184 06 1.2.3.7.1物流路线检查
 5 years ago
汪云昊 cf2bf8d291 企业微信适配 5 years ago
rock.yu 6e37cd934b Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
rock.yu d7133b24f5 增加缺失的字段 5 years ago
陈思洁 decd0ae558 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
陈思洁 6c351c09b5 【11016 19048- 总装生产计划显示多条！-2020-09-03】 5 years ago
曾贞一 8ca16d7c68 【枚举状态】 5 years ago
许心洁 7f11e5b1d7 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
许心洁 1fe5b807c6 BUG#10826,11025,11024 5 years ago
曾贞一 92e8364b58 【1140 09 1.2.1.1.1客户发运车辆推荐】 5 years ago
曾贞一 62733aa799 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
曾贞一 a53e7c5724 【2712 子 09 1.2.1.1.1客户发运车辆推荐 / 09 1.2.1.1.1客户发运车辆推荐 -后端】 5 years ago
puxiao.liao acbad1a637 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 
 Conflicts:
	modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java
 5 years ago
puxiao.liao df4e794a48 修复MGN系列BUG 5 years ago
rock.yu 1e5fe42702 完成了麦格纳质检录入不良数量的功能 5 years ago
曾贞一 a0b50da83e Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
曾贞一 c06c504805 【2712 子 09 1.2.1.1.1客户发运车辆推荐 / 09 1.2.1.1.1客户发运车辆推荐 -后端】 5 years ago
joke.wang 746a17bd75 bj-mgn辅助展示组件 5 years ago
songss 7243e20cc8 Merge remote-tracking branch 'origin/test' into test 5 years ago
songss d5d6f2cfee 修改枚举值 5 years ago
陈思洁 5dd7cc44b2 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
陈思洁 fad811c2bc 【增加索引】 5 years ago
joke.wang 18ca368f3c 照片采集 5 years ago
puxiao.liao 679ad59b86 Fix bug#10977 
19128+MES工单生成WMS领料任务无法生成+20200901
 5 years ago
wynne1005 4bdfebede1 中航打包PCR完成 5 years ago
puxiao.liao 0e89f89327 修复MGN系列BUG 5 years ago
puxiao.liao 137c45b5cc 修复MGN系列BUG 5 years ago
汪云昊 b2517a11b8 feat(用户登录日志):用户登录日志查询及导出功能 5 years ago
陈思洁 564fdb261b Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
陈思洁 03730fe13c 【[#2702::07 ext 虚拟工单关闭按钮（注塑、涂装、组装） ] 】 5 years ago
wynne1005 fa8beadc4f Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
wynne1005 191220442f websocket错误提示音 5 years ago
rock.yu 3935bde8f6 同步 SAP 数据同步 JOB（从仪征同步） 5 years ago
wynne1005 89ec0cbd71 解决冲突 5 years ago
wynne1005 d86c84a39e 添加工步返回表格背景色 5 years ago
许心洁 73c0ae5d42 优化合并仪征代码 5 years ago
陈思洁 df2342e097 【2703 07 ext 虚拟工单关闭按钮（注塑、涂装、组装）】 5 years ago
puxiao.liao 1eb3622d19 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
alwaysfrin 8b6271cebc 1，数据源参数配置优化 
2，读写分离数据源切换优化
3，日志切面优化调整
4，登陆线程优化
5，对象新增、修改监听优化
 5 years ago
songss 19f1cf85c4 Merge remote-tracking branch 'origin/test' into test 5 years ago
songss fad439a5a0 增加MES状态机Repository类 5 years ago
puxiao.liao b8a938df2e Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
陈思洁 23d8afd0ae Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
陈思洁 09c95d3542 【库存排程配置增加禁用启用接口】 5 years ago
joke.wang 3815c1c730 扭矩采集plc优化 5 years ago
puxiao.liao 2527fe0163 修复MGN系列BUG 5 years ago
陈思洁 381ff0c974 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
陈思洁 de248a944f 【2701 08 1.2.3.3.8 涂装检测工位，显示合格数、不良数】 5 years ago
钮海涛 51746154ba 合并dev到test 5 years ago
钮海涛 e6b472bcfd 合并test代码到dev 5 years ago
钮海涛 98b992408c Merge remote-tracking branch 'remotes/origin/test' into dev 5 years ago
钮海涛 4144e12b5d 合并test代码到master 5 years ago
钮海涛 92f0158dab 合并master代码 5 years ago
曾贞一 57aae56345 【2690 ext新增委外库存查询报表 -后端】 5 years ago
wynne1005 f06f51cc7e master merge test 5 years ago
rock.yu f6b812aaf8 PDA组件原生支持脚本组件 5 years ago
joke.wang b09aa27e0f 排程job 5 years ago
rock.yu 9be1dd70d5 盘点明细表 lotno 字段增加默认值 5 years ago
汪云昊 feace77fc3 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
puxiao.liao 7f91f1269c 修复MGN系列BUG 5 years ago
汪云昊 731a92fa2c Merge remote-tracking branch 'remotes/origin/dev' into test 5 years ago
汪云昊 6dc0d94085 feat:适配器添加空报文保存开关 5 years ago
汪云昊 4dc40c79dd fix:pager.startRow重复计算 5 years ago
钮海涛 3bca09c091 Merge remote-tracking branch 'origin/test' into test 5 years ago
钮海涛 8d38a297d2 三力士演示demo 5 years ago
汪云昊 7e678e747d feat:移除mongo日志持久化方法 5 years ago
puxiao.liao 36e9000710 麦格纳BUG 5 years ago
joke.wang a2eab983d9 缓存池订单池增加jit_seq字段 5 years ago
钮海涛 2133d0d7e4 Merge remote-tracking branch 'origin/test' into test 5 years ago
钮海涛 f0023a2232 三力士演示demo 5 years ago
曾贞一 c1cb461f36 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
曾贞一 a9e97d4e28 【2688 08 extPDA-查询查看零件对应库位】 
【2683 08 ext单据打印新增字段查询和显示】
【2682 08 ext单据打印新增模板选择】
 5 years ago
钮海涛 0b6764e8fe Merge remote-tracking branch 'origin/test' into test 5 years ago
钮海涛 6dd429d328 三力士演示demo 5 years ago
songss a2f257e414 Merge remote-tracking branch 'origin/test' into test 5 years ago
songss df6f0bb4f2 删除没用代码 5 years ago
songss f4d7e55f05 喷涂过程条码批量打印报错bug修复 5 years ago
陈思洁 0325e3dc95 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
陈思洁 98afecf57b 【10877 19048-预组装看板及操作工位变更调整-20200828】 5 years ago
wynne1005 a580c70c04 添加正态分布数据总数 5 years ago
wynne1005 762b73dddf 添加StepResult的返回cmd CLEAR_CACHE 5 years ago
wynne1005 9563ebeb66 normalDistribution 5 years ago
wynne1005 b4b1c2f3f8 erge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
wynne1005 0fd5989864 新增帮助类型的busiType 5 years ago
rock.yu 42187ebadc 完善流程管家日志信息 5 years ago
钮海涛 85395e84fd 合并dev代码 5 years ago
钮海涛 2013d47353 合并dev代码 5 years ago
宋军超 940510ea5b 北京海纳川、北京麦格纳问题修复 5 years ago
陈思洁 d7f8796d36 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
陈思洁 ee1b0b5b67 【2674 预装区基础页面开发】 5 years ago
puxiao.liao d63d07ad7e 麦格纳收货BUG 5 years ago
joke.wang ac55ae1df1 库存排程配置增加物料名称 5 years ago
王杰 7a502c45c9 注塑上料 展示组件增加字段 5 years ago
陈思洁 baa7d144b7 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
陈思洁 daf0b94314 【10828 19048-10827-预装作业界面优化！-2020-08-25】 5 years ago
曾贞一 3f2232d741 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
曾贞一 ec7aee68a7 【10744 20011--二维码收货时，如果该零件号设置了特殊批次，则扫描系统自己生成的二维码时永远报错“条码未维护供应商批次 执行成功请扫描二维码”，实际批次已经存在与条码最后一个字段中--0830】 5 years ago
宋军超 53d392ebe1 海纳川问题修复枪头更换添加弹框校验 5 years ago
wynne1005 ebd12f7c65 去除ProductBiModel重复字段 5 years ago
wynne1005 f9fa5814f6 冲突解决 5 years ago
wynne1005 40ec96a390 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
wynne1005 bbcd0c8f69 去除多余枚举 5 years ago
许心洁 2cc6abb902 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
许心洁 291c0b2a40 BUG#10584,BUG#10784,BUG#10785 5 years ago
钮海涛 9a41c2e2e0 合并test到dev 5 years ago
钮海涛 025cc19f68 合并dev到test 5 years ago
钮海涛 347f6671f2 合并dev到test 5 years ago
钮海涛 99b8cb146c Merge remote-tracking branch 'remotes/origin/master' into test 5 years ago
钮海涛 310da99743 合并master代码 5 years ago
wynne1005 3769a630fe Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
wynne1005 42a340d0c0 timeModuleInit 5 years ago
宋军超 f3cb06ba5a Merge remote-tracking branch 'origin/test' into test 5 years ago
宋军超 030343f2ce 海纳川问题修复 5 years ago
王杰 43ad04818c pom 5 years ago
王杰 0d256b3afd Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
钮海涛 b4a4c42fe0 合并master代码 5 years ago
wynne1005 b3aa6eef70 中航 均值极差 5 years ago
钮海涛 35d3a85b60 合并master代码 5 years ago
钮海涛 c7adb56b9c Merge remote-tracking branch 'origin/test' into test 5 years ago
汪云昊 8d6b01c06e Merge remote-tracking branch 'remotes/origin/dev' into test 5 years ago
钮海涛 3df3c89db9 Merge remote-tracking branch 'origin/test' into test 5 years ago
汪云昊 a52646a65d Merge remote-tracking branch 'remotes/origin/dev' into test 
# Conflicts:
#	modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java
 5 years ago
钮海涛 ea43d63d7e Merge remote-tracking branch 'remotes/origin/master' into test 5 years ago
汪云昊 dd75e3729b feat:添加条码解析校验模式 5 years ago
汪云昊 d02c73f431 Merge remote-tracking branch 'origin/dev' into dev 5 years ago
汪云昊 26cf4c5e92 feat:mongo模块化 5 years ago
汪云昊 103137e2fc feat:添加条码解析校验模式 5 years ago
汪云昊 a5d7ff1ef4 feat:添加条码解析校验模式 5 years ago
王杰 3b31f9fcc8 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
王杰 d0bfa965f7 类型信息 seq 5 years ago
陈思洁 b0c3b85378 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
陈思洁 68fef2b051 【2634 19048--涂装Unpack流程！-2020-08-05】 5 years ago
wynne1005 c3f30530a8 erge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
wynne1005 086c78f828 新增pcn页面的辅助展示组件 5 years ago
puxiao.liao 6d59e00fc5 Fix bug#10545 
10545 19081 -- 出入库界面更改 20200814
 5 years ago
joke.wang e3146c9fb4 Fix Bug #0776 5 years ago
王杰 4c9b5d087c 涂装 二箱 客户 查询工作逻辑变更 5 years ago
王杰 a2084204f0 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
王杰 41422d895e 涂装 客户 二箱 查询工单逻辑变更 5 years ago
puxiao.liao ba5befe291 Finish Task #2645 Cost:8h 
【PCR-20200525-003_委外出库条码变更】中的零件号转化
 5 years ago
joke.wang fd771bccf8 报功接口增加工单类型字段 5 years ago
joke.wang 6f2905de1a Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
joke.wang f6460749db jsp解析优化 5 years ago
曾贞一 d81a7bf22e 【接口映射优化】 5 years ago
joke.wang 84dcf36c86 Fix Bug #10708 5 years ago
陈思洁 d17161d359 【2658 LPS导入后端开发】 5 years ago
曾贞一 867ecc6d71 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
曾贞一 15314209ae 【2636 07 1.2.3.4.3坤泰ERP&WMS接口】 5 years ago
joke.wang f275d70136 Fix Bug #10674 5 years ago
puxiao.liao 9299f17c3b Fix bug#10671 
二维码收货扫描条码报错系统异常 --20200821
 5 years ago
陈思洁 358d582209 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
陈思洁 b56cf991be 【2607 08 ext PCR-200623001需求变更-预组装】 5 years ago
王杰 5f495a1b98 产品工作中心配置 5 years ago
曾贞一 d3ae797ba0 【坤泰接口开发】 
【质保周期检查组件--优化代码】
 5 years ago
joke.wang 9207f20b37 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
joke.wang 09b8ccd1e3 Fix Bug #10520 5 years ago
王杰 1d86ce6429 总装打包 展示组件 列表显示封箱状态名称 5 years ago
陈思洁 406c625974 【2634 19048--涂装Unpack流程！】 5 years ago
陈思洁 c937e2aa64 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
陈思洁 ee927b7056 【2607 08 ext PCR-200623001需求变更-预组装】 5 years ago
宋军超 6db85d596b 修改海纳川问题 5 years ago
王杰 72afe6891b 料箱显示工作中心名称 5 years ago
rock.yu f1bbe0344b Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
rock.yu 5bfd542402 增加工单拉动 5 years ago
宋军超 5e81b1f448 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
宋军超 4d816de5da 修改海纳川问题,添加PTL新逻辑关联bug:10538 5 years ago
王杰 a7c3167eef 注塑上料 5 years ago
joke.wang 562ba3e339 增加按灯停机时长接口 5 years ago
曾贞一 0b09e410f5 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
曾贞一 fe2017fbe4 【622 08 1.2.2.2.6 BOM增加虚阶零件】 5 years ago
钮海涛 228d3dd2ab Merge remote-tracking branch 'origin/test' into test 5 years ago
钮海涛 841742e474 托标签收货合并到二维码收货 5 years ago
宋军超 163c385842 修改海纳川问题 5 years ago
puxiao.liao fde40074ce BUG修复 5 years ago
joke.wang 85b6067133 BI优化1 5 years ago
wynne1005 a400bf5aa7 还原orderBy 5 years ago
wynne1005 8ee28db80b Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
wynne1005 887e1d04f7 baseBean sortParamMap 先注释 5 years ago
宋军超 ba7cdc84e5 修改海纳川问题 5 years ago
wynne1005 953e243fe8 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
wynne1005 ef83a7aa08 是否重选更换名称 大小枪与绑定支持并发 5 years ago
钮海涛 9878547daa 合并dev分支代码 5 years ago
钮海涛 272c92dcb6 Merge remote-tracking branch 'origin/test' into test 5 years ago
钮海涛 f42ece4f6c 优化流程管家执行性能 5 years ago
wynne1005 032a7e8126 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
wynne1005 d699e88984 StationRequestBean 5 years ago
joke.wang 1cf11c4500 Fix Bug #10477 5 years ago
joke.wang 3f03b5fab5 产线表增加序号字段 5 years ago
wynne1005 a751d5a8a7 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
wynne1005 8d7b0fae6a 添加小枪日志 与不需要打枪绑定 自动跳过 5 years ago
宋军超 44b90bf639 修改海纳川问题 5 years ago
钮海涛 2fb46609c3 sweb功能开发 5 years ago
钮海涛 ad4b59a700 Merge remote-tracking branch 'origin/test' into test 5 years ago
钮海涛 dd7347d352 Sweb功能开发 5 years ago
钮海涛 b437a78e31 Merge remote-tracking branch 'origin/test' into test 5 years ago
王杰 f45137db94 注塑上料 5 years ago
钮海涛 438dcacdce Merge remote-tracking branch 'origin/test' into test 5 years ago
曾贞一 8f7a7fcc32 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
曾贞一 6ba2d2826a 【麦格纳问题】 5 years ago
汪云昊 2013ca569a Merge remote-tracking branch 'origin/dev' into dev 5 years ago
汪云昊 15aa885cf8 fix:定时任务空指针的问题 5 years ago
汪云昊 a45d1ed104 fix:分页结束行计算错误的问题 5 years ago
钮海涛 53151424b9 Merge remote-tracking branch 'remotes/origin/master' into test 5 years ago
陈思洁 a5ea72f593 【新增库位实体】 5 years ago
陈思洁 a093f06edc Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
陈思洁 38f9adc2dd 【10554 19048--喷涂条码打印功能不应该查询出其他车间的生产计划！-2020-08-13】 5 years ago
wynne1005 59aadc94ce Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
wynne1005 763b88b420 工位扫描添加工步触发条件 5 years ago
许心洁 9bbc387818 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
许心洁 4ec9858182 任务#2625 5 years ago
宋军超 19b1bfb9b6 修改海纳川打印 5 years ago
joke.wang 2d52fe0a40 Fix Bug #10535 5 years ago
wynne1005 3030a109b2 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
wynne1005 0d3a8a3af7 添加放行记录 5 years ago
joke.wang 89bd4f189a 项目表增加字段 5 years ago
joke.wang 74cc0c757d 成品标签打印 5 years ago
曾贞一 3c4239c66a Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
曾贞一 2bef33960c 【2617 08 1.2.2.2.4新增保质期检查组件】 5 years ago
许心洁 c0629d52d1 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
许心洁 1c02cd6562 任务#2612，2613 5 years ago
wynne1005 ba558d640e tmp 5 years ago
joke.wang bf902b8366 Fix Bug #10294 5 years ago
王杰 175052ebcc 报工表加质量状态 默认合格 5 years ago
王杰 1707f6b228 MesProdWorkCenter 5 years ago
陈思洁 3baf748329 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
陈思洁 9b9871534a 【10493 19048-产品颜色无导入功能】 5 years ago
汪云昊 bda160ccec Merge remote-tracking branch 'remotes/origin/dev' into test 5 years ago
joke.wang a522db04a9 过程条码增加字段vinCode 5 years ago
宋军超 84f61e65fc 修改海纳川问题 5 years ago
王杰 18dd2cbcb2 zs 5 years ago
汪云昊 b4c90b01fa Merge remote-tracking branch 'origin/dev' into dev 5 years ago
汪云昊 8d17cfcec0 feat:用户定制化配置功能 5 years ago
王杰 772229b983 andon 5 years ago
王杰 9e8cb0b844 注塑 5 years ago
陈思洁 056d4390ca Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
陈思洁 4a99857248 【10414 19048 - 注塑产品消耗BOM报表！-2020-08-05】 5 years ago
joke.wang 8c2fd8a587 Fix Bug #10476 5 years ago
joke.wang f495ffed54 Fix Bug #10477 5 years ago
joke.wang 4bdd2b770b Fix Bug #10486 5 years ago
joke.wang 51f9d92d36 北京麦格纳esop展示组件修改 5 years ago
ypf 97a2bdd60e Merge remote-tracking branch 'origin/dev' into dev 5 years ago
ypf 523d2ffc80 关于欧洲领料看板逻辑实体的添加 5 years ago
joke.wang 7c3594a870 Fix Bug #9589 5 years ago
陈思洁 e4c8431a22 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
陈思洁 653b413623 【10334 19048-MES、WMS接口JIT02中增加内部工单号！-2020-08-03】 5 years ago
宋军超 e70192d3c2 添加日志查询问题 5 years ago
钮海涛 54b0af00cc Sweb功能开发 5 years ago
宋军超 625b780aaf 添加海纳川数据复核工步和产线状态看板变更 5 years ago
wynne1005 5d9e055fe1 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
wynne1005 3af4d32a97 mes工位运行状态 5 years ago
汪云昊 a3e8caf085 fix:detachObject为空时报错 5 years ago
宋军超 6aaa26b192 修改海纳川问题 5 years ago
joke.wang edb85b5ea6 桌面BI 5 years ago
汪云昊 55b047448b fix:会话模式为默认时出现不能正常覆盖的问题 5 years ago
宋军超 6e60bee0dd 修改海纳川问题 5 years ago
宋军超 731b1c60ee 修改海纳川问题 5 years ago
wynne1005 3c004324b1 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
wynne1005 6e455f5d72 reqBean 添加productSn 5 years ago
王杰 5413fc259c pcn 缺陷 5 years ago
许心洁 4a9e5cbb59 Merge remote-tracking branch 'origin/test' into test 5 years ago
钮海涛 3a4c143563 Merge remote-tracking branch 'origin/test' into test 5 years ago
钮海涛 14e68803df 增加根据物料号取库存地信息的微服务接口 5 years ago
许心洁 afeb22c8ec Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
许心洁 7dcd8a1627 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
许心洁 7482a6dd74 BUG#9928 和任务#2590 5 years ago
汪云昊 410f469450 Merge remote-tracking branch 'remotes/origin/dev' into test 5 years ago
汪云昊 7f291a26cd 会话模式配置-调整默认模式 5 years ago
puxiao.liao f9061f5d27 BUG修复 5 years ago
宋军超 162e2d33d7 修改海纳川问题 5 years ago
宋军超 99787412cd Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
宋军超 8eade912c7 添加返工返修数据复核逻辑 5 years ago
陈思洁 ed343a8064 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
陈思洁 ba3f5fde4d 【总装、涂装、注塑计划报表】 5 years ago
qianhs 86c9bce2aa Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
宋军超 c4f40d215b Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
宋军超 fa4b1e09aa 修改海纳川问题 5 years ago
曾贞一 067a859e83 【10229 19081-- 在已有的二维码生产报工逻辑上加上原材料扣减逻辑 --20200802】 5 years ago
钮海涛 933f2014ad Merge remote-tracking branch 'origin/test' into test 5 years ago
钮海涛 39f6819e9b 修复合并版本问题 5 years ago
钮海涛 59a1acdafc 修复合并版本问题 5 years ago
puxiao.liao d5d16569bb Fix bug#10283 
20089+库存移动统计报表查询增加项目代码查询项
 5 years ago
钮海涛 f760b72094 Merge remote-tracking branch 'remotes/origin/test' 5 years ago
宋军超 fe79944778 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
王杰 5739ac27bb 缺陷 5 years ago
陈思洁 39ea32e37e Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
陈思洁 a01cd4d34b 【注塑计划导入功能数据优化】 5 years ago
宋军超 8bc0da924c 修改海纳川问题 5 years ago
rock.yu f368ec88cc 修改流程管家组件调用日志表 5 years ago
joke.wang 33cace48ab 半成品打印增加字段 5 years ago
qianhs c872663847 Finish Task #2080 Cost:8h 5 years ago
宋军超 0b3c53b4ca 修改海纳川问题 5 years ago
wynne1005 e35fdcbc2a Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
wynne1005 4c9cdcb6a0 tmp 5 years ago
rock.yu 71a2b68991 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
rock.yu b928acae47 1. 流程管家增加记录组件执行耗时的功能 5 years ago
陈思洁 b662a6ebe5 Merge remote-tracking branch 'origin/test' into test 5 years ago
陈思洁 26fe63eb8a 【10278 19048-总装标记不良功能通过外部输入条码标记不良-2020-08-03】 5 years ago
汪云昊 e6ecd4f86f Merge remote-tracking branch 'remotes/origin/dev' into test 5 years ago
汪云昊 0d40470059 Merge remote-tracking branch 'origin/dev' into dev 5 years ago
汪云昊 18a09cc4b6 FTP多文件读取问题 
脚本解析功能初版
 5 years ago
汪云昊 101a71970c 虚拟属性数据校验及参数赋值问题 5 years ago
汪云昊 5a6a7a77fc 平台功能优化，移除通用缓存服务 5 years ago
钮海涛 51bae8d1e6 Fix Bug #10312 修复动态搜索取不到列信息问题 5 years ago
王杰 9a959a5184 pcn enum 5 years ago
陈思洁 41cbe4f380 【10284 19048-注塑生产计划导入变更-20200803】 5 years ago
陈思洁 ce7ca48c4b Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
宋军超 394a332de2 修改展示组件逻辑 5 years ago
陈思洁 72c8e22433 【接口映射代码调试】 5 years ago
wynne1005 88233f080a Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
wynne1005 3ec8109e82 枪优化 5 years ago
王杰 e8611616db IPC 5 years ago
王杰 6c5e646d49 test merge master 5 years ago
joke.wang c060377822 中航BI 5 years ago
wynne1005 5fad38392e 添加索引 脚本表更新 5 years ago
joke.wang 05fa7dba04 Fix Bug #10227 5 years ago
joke.wang af539c85a7 mgn bug 5 years ago
宋军超 31f289e1be 修改展示组件和电检逻辑 5 years ago
曾贞一 f25a186d77 【2511 07 1.2.3.4.3坤泰ERP&WMS接口】 5 years ago
曾贞一 4ff84de904 【2557 sap指令锁定回传信息增加业务类型，交易类型，erp单号内容】 5 years ago
puxiao.liao 5990e56dfd Finish Task #2540 Cost:8h 
喜德WMS-新增“回传源材料扣减结果”的接口映射
 5 years ago
王杰 bc9adf8ac0 ptl 5 years ago
王杰 784cd87c71 ptl 5 years ago
钮海涛 e239c89e63 Merge remote-tracking branch 'origin/test' into test 
# Conflicts:
#	modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
 5 years ago
钮海涛 7f55af4477 Finish Task #2560 Cost:8h 5 years ago
贾文涛 5d19c8876b Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
陈思洁 bc2d29c006 【2547 07 1.2.4.6.1.10 PCR-200617001需求变更-生产过程不良紧急拉料】 5 years ago
贾文涛 fd42a3292a Fix Bug #10090,修复涂装二次箱条码作业完成后，一次箱条码工位数据会乱掉问题。 5 years ago
许心洁 f791b3f82f Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
许心洁 ffc70e158a BUG#8696 5 years ago
钮海涛 5a64ce6021 Merge remote-tracking branch 'remotes/origin/dev' into test 5 years ago
joke.wang 13f7121610 海纳川看板 5 years ago
贾文涛 70693d5b63 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
joke.wang 01ac2e85da Fix Bug #10087 5 years ago
宋军超 e007a52732 修改海纳川问题 5 years ago
王杰 4a59b5c913 bug: 10003 19073-安灯作业安灯类型自处理名称修改工装-20200728 5 years ago
贾文涛 8180795cd7 功能优化-打包时将工位代码存入包装表 5 years ago
王杰 7f5c1735ea 数据复核 5 years ago
joke.wang ea922affba Start Task #2522 Cost:8h Left:8h 5 years ago
qianhs 163d610265 Finish Task #2080 Cost:8h 5 years ago
puxiao.liao 937eac5e87 Finish Task #2549 Cost:4h 
自动生成领料单增加默认来源存储区、自动获取默认目标库位
 5 years ago
钮海涛 72c1363517 Merge remote-tracking branch 'origin/test' into test 5 years ago
钮海涛 f2cf6af1fe Finish Task #2523 Cost:16h 
Fix Bug #10065 已增加数据权限控制
 5 years ago
王杰 306b05b4d7 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
许心洁 46904c43d1 任务#2528，#2545 5 years ago
puxiao.liao 9b622a27fc Merge remote-tracking branch 'origin/test' into test 5 years ago
puxiao.liao 3c3a5f6068 Fix bug#9902 
20089+物料拆分条码异常+0724
 5 years ago
joke.wang 3223158529 Fix Bug #10108 5 years ago
王杰 47a155e1d1 git push 5 years ago
joke.wang 2a93bb2ca4 Finish Task #2521 5 years ago
rock.yu 0f8326d5f8 1. 修改扭矩枪采集部分因主数据变动引起的逻辑变动 5 years ago
wynne1005 7593b63cfc 重做枚举 5 years ago
joke.wang 47f7e24f57 Fix Bug #10060 5 years ago
puxiao.liao 47f466d1d6 Merge remote-tracking branch 'origin/test' into test 5 years ago
puxiao.liao e85acdcfff Fix bug#9994 
库存明细--显示重复
 5 years ago
qianhs 958a45d3dd Finish Task #2080 Cost:8h 5 years ago
钮海涛 fd0f079a6a Merge remote-tracking branch 'origin/test' into test 5 years ago
钮海涛 34be0bde26 增加物料组功能 5 years ago
puxiao.liao 6cd46e07bc Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
宋军超 23f33a79d1 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
宋军超 c18c22a799 修改海纳川电检测问题 5 years ago
贾文涛 c7bba92741 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
rock.yu 35cdb1f257 完善脚本管理功能 5 years ago
贾文涛 aafb3d36fc Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
puxiao.liao 2e3f5bb2af Fix bug#9994 
库存明细--显示重复
 5 years ago
rock.yu eef7ed9c32 调整 pojo 引用关系， mes-pcn-pojo 已废弃 5 years ago
rock.yu 1d02d45e61 增加脚本引擎缺失的DAO 5 years ago
rock.yu 9104f42d42 增加脚本引擎缺失的DAO 5 years ago
rock.yu 6fbb76b395 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
rock.yu 7d76a3ecc7 增加脚本持久化类 5 years ago
宋军超 3590ef4b68 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
宋军超 f0fd8da49c 修改海纳川问题 5 years ago
钮海涛 7a93a935cc Merge remote-tracking branch 'origin/test' into test 5 years ago
puxiao.liao 5f90efe691 Fix bug#9982 
19125+条码打印页面，erpSrcNo字段数据错误，导致打印出的条码数据有误+0727
 5 years ago
joke.wang e5d54d8c0a 工位BOM增加预警字段 5 years ago
joke.wang 768e31e636 Fix Bug #9995 5 years ago
钮海涛 7ca3b43bfe 合并DEV分支代码 5 years ago
钮海涛 9b3bb48231 Merge remote-tracking branch 'remotes/origin/test' into dev 5 years ago
贾文涛 3e260a9b86 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
wynne1005 4d608dd4c3 扩展dispatcher model 5 years ago
宋军超 5fa18e05f1 修改中航问题 5 years ago
钮海涛 b04ef3caa4 合并TEST分支代码 5 years ago
钮海涛 ef40f20e1d 解决合并冲突 5 years ago
钮海涛 3c22c8e3f4 test版本合并到master 5 years ago
贾文涛 c10a7bae7e 增加方法代码字段 5 years ago
钮海涛 0eb571d717 Fix bug #9804 5 years ago
钮海涛 9bde10f13c 修复收货回执界面打不开问题 5 years ago
宋军超 457cb894db 添加工位队列信息功能 5 years ago
puxiao.liao 5006e0a938 Finish Task #2520 Cost:8h 
2520 07 1.2.3.3.4北京麦格纳WMS-JIS生产报工与内部移库
 5 years ago
陈思洁 2636e43b9b 【9914 天津】 5 years ago
joke.wang c90a009e66 Fix Bug #9874 5 years ago
wynne1005 d0e1900a84 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
wynne1005 c1fd1f6eee bypass redo release 5 years ago
王杰 03dbb18bb8 8832 PO-HJMGN-19073--TJX5没有设备信息，但是显示了新松线的设备信息。--20200609 5 years ago
王杰 41ff729f99 workorderlog 5 years ago
宋军超 13142b4ce1 修改电检逻辑 5 years ago
曾贞一 374e73128d 【坤泰流程测试】 5 years ago
汪云昊 1aa63db4d3 Merge remote-tracking branch 'remotes/origin/dev' into test 5 years ago
汪云昊 4b3470b1fd 定时任务日志优化 
邮件发送失败记录
 5 years ago
宋军超 933e9efb3d Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
宋军超 3a31ccae70 队列明细添加临时字段 5 years ago
贾文涛 a577eac60a 修复缓存redis时，忽略ModuleServer对象。 5 years ago
wynne1005 f3a13522a1 解决冲突 5 years ago
wynne1005 3ba1c8ee62 新增组件类型枚举 5 years ago
joke.wang a1af94fe70 Fix Bug #9760 5 years ago
宋军超 ae285a6dc6 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
王杰 4df8a743a7 9735 19048-物料信息导入模板增加喷涂必需信息的维护-2020-07-21 5 years ago
宋军超 076c6c1b4f 扭矩二合一查询关键件清单逻辑优化--目前根据 队列主表，队列明细表，车型散件配置清单，物料信息表。加上条件【一百位条码】,年度型相同，车型相同 内联查出所有的关键件零件——>查询车型散件配置清单中的零件信息 
工位监控逻辑修改:产线添加工位监控模式字段，为空或10执行之前逻辑，为20时不需要查询工单信息，后面逻辑不变
 5 years ago
puxiao.liao 31c3fcd868 泰国需求 5 years ago
wynne1005 194f49ca11 agv停车信号 工位重做 倒计时 1 5 years ago
wynne1005 d5ee3d3b29 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
wynne1005 2116fdafc7 agv枚举 5 years ago
宋军超 63163e1140 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
宋军超 1ac8fae269 修改枪头更换逻辑 5 years ago
曾贞一 b6a0d43bd0 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
曾贞一 a379c97461 【2444 坤泰流程配置测试】 5 years ago
钮海涛 3e95dd4029 修复北京麦格纳生产报工问题 5 years ago
宋军超 a77bf1a98a Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
宋军超 a25df616e3 修改展示组件，添加查询队列刷新时间；修改PLC标签地址查询条件 5 years ago
puxiao.liao 88b85b03d2 Finish Task #2436 Cost:8h 
拣货、客户发运流程简化配置
 5 years ago
qianhs c9e4c72901 Finish Task #2080 Cost:8h 5 years ago
钮海涛 e140910db7 Merge remote-tracking branch 'origin/test' into test 5 years ago
qianhs e17318dbcb Finish Task #2080 Cost:8h 5 years ago
汪云昊 94c21581dc Merge remote-tracking branch 'origin/dev' into dev 5 years ago
汪云昊 50999e49f2 软适配添加原始报文查询 5 years ago
汪云昊 c230c57c97 定时任务 导入导出 
定时任务 重载功能
 5 years ago
王杰 b3999ad481 dev merge test 5 years ago
王杰 767c1bffbc test merge dev 5 years ago
钮海涛 81266fbfb6 解决合并冲突 5 years ago
王杰 9a74188e55 master merge test 5 years ago
qianhs 9461057a07 Finish Task #2080 Cost:8h 5 years ago
陈思洁 1d799ed294 2447 中航 扣减错误信息保存 5 years ago
王杰 204da853c3 [任务：2442] 5 years ago
joke.wang 8f7d6d46af Fix Bug #9457 5 years ago
joke.wang 54a51a4c69 Fix Bug #916 5 years ago
王杰 9b6be3167d dev merge test 5 years ago
王杰 d2ff83e22b test merge dev 5 years ago
王杰 411fdbaa7d Merge branch 'test' into dev 5 years ago
王杰 7533a3ef44 [任务2408] 5 years ago
陈思洁 ffbf18944c Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
陈思洁 f5b4c666bf 【天津bug修改 9627,9615,9614,9610,9585,9445,9439,9428,9421,9401】 5 years ago
曾贞一 fd958c1c5f Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
曾贞一 6dd0614533 【欧洲-定时悬挂链汇总更新库存数据JOB-优化】 5 years ago
wynne1005 bd3e32d39e 小枪调试完毕 5 years ago
宋军超 34a9cbe0ac 修改PTL数据同步逻辑 5 years ago
宋军超 e4384bd569 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
宋军超 2e5ab2cdcd 条码外上线添加赋值字段 5 years ago
钮海涛 9a516f893f 合并dev代码到test 5 years ago
钮海涛 37a12c0cdf Merge remote-tracking branch 'remotes/origin/test' into dev 5 years ago
puxiao.liao 5d62ebf26f Finish Task #2424 Cost:8h 
2424 07 1.2.3.7.1新增检查容器包装关系
 5 years ago
wynne1005 3f8789332f Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
wynne1005 1252027685 dl小枪 5 years ago
曾贞一 9bf2d5206c Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
曾贞一 6750f11459 【2388 07 1.2.3.6.2欧洲WMS-PCR-悬挂链库存同步】 5 years ago
曾贞一 791acf7ae8 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
曾贞一 dffdf88471 【9556 欧洲-RFID条码操作记录-操作类型显示问题】 5 years ago
joke.wang b69fcdc0c6 Finish Task #2399 Cost:6h 5 years ago
宋军超 885d2c16a1 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
宋军超 300e308394 新增盲检规则导入功能 5 years ago
王杰 e1b3b14a36 test merge dev 5 years ago
王杰 6de2bc5472 Merge branch 'test' into dev 5 years ago
puxiao.liao df125e71b9 泰国翻包 5 years ago
qianhs 860f6d11f0 Finish Task #2080 Cost:8h 5 years ago
王杰 ec87065eb5 if pick data 5 years ago
宋军超 448bd77b81 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
宋军超 538b224f67 新增计划外条码识别上线-PCR功能 5 years ago
wynne1005 cc4d17a81f 大枪ok bug 9492 5 years ago
曾贞一 354d1290f7 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
曾贞一 f99c5232be 【2388 07 1.2.3.6.2欧洲WMS-PCR-悬挂链库存同步】 5 years ago
宋军超 1c93d21815 修改字段BIN_NO 5 years ago
曾贞一 da9c698ea4 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
曾贞一 c0cf08fa19 【9556 欧洲-RFID条码操作记录-操作类型显示问题】 5 years ago
钮海涛 8ae3c65cb3 三力士演示demo 5 years ago
王杰 7e48674d9e dev merge test 5 years ago
王杰 4260316f62 test merge dev 5 years ago
joke.wang e5cd6692d4 Finish Task #2359 5 years ago
wynne1005 25382f0265 Fix Bug #2357,2358 5 years ago
钮海涛 8d29e72322 Merge remote-tracking branch 'origin/test' into test 5 years ago
钮海涛 dcc23e56cd 三力士演示demo 5 years ago
曾贞一 ef58d72067 【9514 欧洲-定制业务-RFID管理-查询条件无效】 5 years ago
puxiao.liao 9445989545 Finish Task #2338 Cost:4h 
2338 07 1.2.3.5.1客户发往地新增维护目标存储区
 5 years ago
曾贞一 000097a4c6 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
曾贞一 82e2366fa6 【2181 06 1.2.3.8 泰国WMS-容器包装关系接口-需求变更】 5 years ago
钮海涛 20a5443fa7 Merge remote-tracking branch 'origin/test' into test 5 years ago
钮海涛 c05e18db5b 合并源分支代码 5 years ago
joke.wang 52ad38fa9d Finish Task #2238 5 years ago
王杰 a2f047553f pom 5 years ago
王杰 c20f630402 Merge branch 'test' into dev 5 years ago
王杰 dc91809bb7 test merge dev 5 years ago
王杰 cff90316a5 ptl 5 years ago
钮海涛 2bbc0bea66 三力士演示demo 5 years ago
钮海涛 1581e8b86c 三力士演示demo 5 years ago
曾贞一 3620d2abd2 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
曾贞一 e9492a86b0 【2315 07 1.2.3.6.3欧洲WMS-RFID查询】 5 years ago
rock.yu c4f8497dda 通用接口的字段映射关系 JSON 中增加 seq 属性，发出的接口报文会按照此属性生序 
如果未配置此属性，则默认为 0，即无序
增加此段代码的单元测试用例
 5 years ago
钮海涛 f061ff7b73 Merge remote-tracking branch 'origin/test' into test 5 years ago
钮海涛 c980c6c87c 三力士演示demo 5 years ago
王杰 a452a71924 9461 北京海纳川-线边库拉动接口调整-0711 5 years ago
宋军超 3d7b43a7de 修改测试天津问题bug 5 years ago
陈思洁 4137fe1a80 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
陈思洁 ba35d0a24b 【新增客户标签模板字段】 5 years ago
曾贞一 5dfad71e39 【2292 子 07 1.2.3.6.3欧洲WMS-PCR-RFID入库 】 
【2310 07 1.2.3.6.3欧洲WMS-RFID发运】
【2312 07 1.2.3.6.3欧洲WMS-RFID空车回库】
 5 years ago
许心洁 9a62fe0e06 BUG#9302 5 years ago
qianhs e321ca3790 Merge remote-tracking branch 'origin/test' into test 5 years ago
宋军超 8e99ae38e6 修改测试天津bug 5 years ago
王杰 82158d8283 [bug 9238 9096] 5 years ago
qianhs f0b8cee974 Merge remote-tracking branch 'origin/test' into test 5 years ago
qianhs ba6be25390 Finish Task #2080 Cost:8h 5 years ago
joke.wang cdf8c79cce Fix Bug #9408 5 years ago
wynne1005 79fb42e149 MES_PROD_BIND_RECORD添加mdt索引 5 years ago
宋军超 a49b57229c Merge remote-tracking branch 'origin/test' into test 5 years ago
puxiao.liao 595266f536 Fix bug#9343 
19125+条码打印页面后端传值新增一个字段值，传表wms_part 字段color +0709
 5 years ago
陈思洁 ce4593c381 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
陈思洁 47ef0fa503 【2286 07 1.1.2.2 强制放行ByPass】 5 years ago
宋军超 bd251113a7 涂装展示组件添加显示实际包装数量 5 years ago
汪云昊 c35cd9c169 Merge remote-tracking branch 'origin/dev' into dev 5 years ago
曾贞一 8891c38e66 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
曾贞一 0108649a73 【代码优化-优化】 5 years ago
宋军超 6440fd2dfe 首检、巡检报表新增工单号、产线和产品条码查询条件 5 years ago
wynne1005 a84186e023 中航审核发布 5 years ago
宋军超 716f0ac1f9 对象结构添加是否显示和显示顺序字段 5 years ago
宋军超 93d7b4dac8 首检、巡检查询添加产品条码、工单号、物料号、产线 搜索条件 5 years ago
宋军超 f032b6ddcd 首检、巡检查询添加产品条码、工单号、物料号、产线 搜索条件 5 years ago
汪云昊 0fa8981440 定时任务日志bug修改及优化 
资源内存清理方法
 5 years ago
曾贞一 c20159da6a 【上架策略-功能优化】 5 years ago
钮海涛 6033695b99 修复合并版本问题 5 years ago
puxiao.liao f385be1d7c 无锡喜德BUG 5 years ago
wynne1005 085f15427d 还原pom 5 years ago
wynne1005 cb4bf9f453 merge andon pom 5 years ago
wynne1005 dfa993b9e9 还原pom 5 years ago
宋军超 b2587f2288 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
宋军超 e5f3c553ec bug 9122, 展示组件，配置产品位置参数，如果需要显示多个位置，使用逗号间隔。Fix Bug #9122 
bug 9268, 工位BOM查询报错。Fix Bug #9268
bug 9270, 工位BOM查询报错。Fix Bug #9270
bug 9271, 工位BOM查询报错。Fix Bug #9271
所有展示组件添加工步区域缩进功能
 5 years ago
王杰 08cce22dbb dev merge test 5 years ago
王杰 02cb107672 Merge branch 'test' into dev 5 years ago
曾贞一 639ac8f223 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
曾贞一 50e2f18c0d 【9280 wms-202007-BH录值完成点击完成按钮系统响应时间过长-0705】 5 years ago
王杰 0e3614eb68 test merge dev 5 years ago
wynne1005 15f0a37508 还原pom 5 years ago
陈思洁 6bc9aa1f70 2092 MES202006-首检、巡检检验单据生成逻辑变更-20200615 5 years ago
汪云昊 39d6609a5f Merge remote-tracking branch 'remotes/origin/dev' into test 5 years ago
汪云昊 a2f7642d53 Merge remote-tracking branch 'origin/dev' into dev 5 years ago
汪云昊 cbf1c97c06 彭伟代码恢复 
定时任务日志过滤器
 5 years ago
王杰 9b56c6d9bf 【任务2223】 5 years ago
陈思洁 556f112ef8 Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo 5 years ago
陈思洁 49f0c0c33a 2092 MES202006-首检、巡检检验单据生成逻辑变更-20200615 5 years ago
王杰 46261119d9 mes 5 years ago
钮海涛 24474b4704 Merge remote-tracking branch 'origin/test' into test 5 years ago
钮海涛 c3398a6cc9 修改中航BH问题 5 years ago
joke.wang 4bb5dbfac5 Finish Task #2236 Cost:8h 5 years ago
joke.wang f8c6247137 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
joke.wang 44e3d667b3 订单池枚举 5 years ago
袁津哲 257fb6c515 Merge remote-tracking branch 'origin/dev' into dev 5 years ago
袁津哲 315e3a266f 优化涂装上线功能 5 years ago
joke.wang 7457e27180 解决冲突 5 years ago
joke.wang 12478a6251 解决冲突 5 years ago
joke.wang 76e3fb0811 Finish Task #Finish Task #2236 5 years ago
wynne1005 445668a9b2 调整jitseq字段类型 5 years ago
wynne1005 1bc846454e Merge branch 'test' into dev 5 years ago
wynne1005 98849d3131 调整jitseq类型 5 years ago
wynne1005 bcb4e5ad13 merge test 5 years ago
wynne1005 31b5f3e234 merge dev 还原pom 5 years ago
wynne1005 7b795c12fb merge master 5 years ago
qianhs b48d38ee62 Finish Task #2080 Cost:8h 5 years ago
宋军超 2d39282521 修改涂装逻辑 5 years ago
陈思洁 27ef6dc7f3 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
陈思洁 7f4c173105 【2250 总装条码打印,2228 06 1.2.4.6.1.7 总装上线工位】 5 years ago
joke.wang ad6249f412 Finish Task #2235 Cost:8h 5 years ago
wynne1005 b18408b3bb merge test 5 years ago
王杰 7517a11a90 [任务：2223] 5 years ago
puxiao.liao 1f6c613488 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
曾贞一 f4edb471c3 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
曾贞一 3d826c5edc 【智能化开发-日志记录优化】 5 years ago
puxiao.liao 1d2c2b7be2 海纳川智能化 5 years ago
汪云昊 517eef8e66 Merge remote-tracking branch 'origin/dev' into dev 5 years ago
汪云昊 0c0eea561d 功能优化 5 years ago
joke.wang ab0ae20d40 Finish Task #2234 客户JIT预装队列 5 years ago
puxiao.liao 559fc003c8 Finish Task #2184 Cost:8h 
2184 06 1.2.3.7.1物流路线检查
 5 years ago
宋军超 59c79b5134 TASK 2205, 开发对接涂装二次箱条码打印。Finish Task #2205 Cost:24h 5 years ago
袁津哲 bdde5bbb9a Merge remote-tracking branch 'origin/dev' into dev 5 years ago
袁津哲 c73ef2b93b 开发涂装检查工位和一次、二次箱条码Un-Pack-后端开发业务逻辑 5 years ago
wynne1005 b8239f6455 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
wynne1005 6956259496 EDI Finish Task #2215 Cost:48h Left:0h 5 years ago
钮海涛 32eb9dc797 修复合并版本问题 5 years ago
钮海涛 9dca27259e Merge branch 'test' into dev 5 years ago
钮海涛 629817ddef 三力士数据排程 5 years ago
joke.wang 57a7ddad35 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
joke.wang fff94902f7 Fix Bug #9203 5 years ago
puxiao.liao 37fb285aa9 海纳川智能化 5 years ago
王杰 5ccf659c94 [bug:9149] 5 years ago
wynne1005 614582ce36 条码表增加乐观锁 5 years ago
曾贞一 7dddac5113 【智能化开发-锁定库位】 5 years ago
wynne1005 aaf9f8a21b 添加乐观锁 日志 5 years ago
wynne1005 1fb2f07ca3 edi 添加队列字段 5 years ago
钮海涛 84698f3042 Merge remote-tracking branch 'origin/dev' into dev 5 years ago
钮海涛 9475667e74 Finish Task #2134 Cost: 8h 5 years ago
袁津哲 9361512fb8 Merge remote-tracking branch 'origin/dev' into dev 5 years ago
袁津哲 b1dddb62d3 开发涂装检查工位和一次、二次箱条码Un-Pack-后端开发业务逻辑 5 years ago
王杰 473ebd5ec8 [任务：2219] 5 years ago
王杰 31d7b71872 mes enum order type 5 years ago
曾贞一 0d7eb7ac67 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
曾贞一 aa09a31957 【智能化开发-锁定库存】 5 years ago
wynne1005 d2869dc31a tmp 5 years ago
joke.wang aabd7b5d1d Fix Bug #9112 5 years ago
joke.wang d44312c470 Fix Bug #9151 5 years ago
许心洁 54241ebf11 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
许心洁 9d79ed5376 3D仓库规则引擎优化 5 years ago
袁津哲 56a4edc4c0 Merge remote-tracking branch 'origin/dev' into dev 5 years ago
袁津哲 295860683a 开发涂装检查工位和一次、二次箱条码Un-Pack-后端开发业务逻辑 5 years ago
王杰 472b2f1ee6 bug 9149 5 years ago
许心洁 38b154b0cb Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
许心洁 6cd70eb695 3D仓库规则引擎优化 5 years ago
钮海涛 0626d6f969 修复版本问题 5 years ago
钮海涛 e42ea19f37 修复版本问题 5 years ago
钮海涛 8d4c5f3cd4 Merge branch 'test' into dev 5 years ago
王杰 272d647073 【任务2219】 5 years ago
钮海涛 2478fc3b14 修复版本问题 5 years ago
钮海涛 0f2f56163e Merge branch 'master' into test 5 years ago
puxiao.liao 5269cfb732 BH 需求修改 5 years ago
wynne1005 d9f619e1a0 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
puxiao.liao e599a833f1 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
wynne1005 3b5142a1f8 edi 5 years ago
宋军超 6f454c95a4 Start Task #2212,2205 Cost:8h Left:16h 5 years ago
宋军超 c44e6ac965 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
袁津哲 e3a86fdbab 涂装条码打印、涂装上线功能联调 5 years ago
钮海涛 2b5f76caee Merge remote-tracking branch 'origin/master' 5 years ago
钮海涛 62c9d8d27d 修复欧洲FIFO跳过未进行交易处理Bug 5 years ago
joke.wang cf1020d82f 删除@Lob 5 years ago
王杰 08fe2de018 mes 5 years ago
joke.wang 2829bb5afb pcn同步对象映射 5 years ago
wynne1005 8ae7ce53b7 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
宋军超 a757d2c339 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
puxiao.liao 84253d7562 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
puxiao.liao b9ac27df19 无锡喜德BUG 5 years ago
joke.wang 2ce2e20c0b 包装扫描数量计算有误修复 5 years ago
袁津哲 f607860c57 Fix Bug #8845 
修改关键零部件绑定的数据列中增加带绑定条码的长度、特征码内容bug
 5 years ago
袁津哲 aaaa591be4 优化关键条码绑定逻辑 5 years ago
曾贞一 3d79d73ff4 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
曾贞一 624e8d6461 【2193 06 1.2.3.7.4任务自动生成任务JOB】 5 years ago
曾贞一 b68f55b062 【2193 06 1.2.3.7.4任务自动生成任务JOB】 5 years ago
wynne1005 cf1edee02e edi 5 years ago
王杰 15e7f2a0b5 pom 5 years ago
王杰 ea5a069eeb pom 5 years ago
王杰 ed64d12875 pojo 5 years ago
宋军超 712f1e8d3d Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
宋军超 5be9081fc3 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
钮海涛 f464fd09c5 Merge branch 'test' into dev 5 years ago
宋军超 9218ca44a7 产品条码表添加生产批次lotNo 5 years ago
joke.wang b32136f75d Fix Bug #9078 5 years ago
puxiao.liao fa383f6417 自动化策略主表 5 years ago
王杰 f3ffdc7d4c dev merge test 5 years ago
puxiao.liao 84dbbcd9a8 自动化策略主表 5 years ago
puxiao.liao 2673b9164a Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
王杰 2c16efcb72 Merge branch 'test' into dev 5 years ago
王杰 7d5d36d084 test merge master 5 years ago
puxiao.liao aea28cf6bb Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
puxiao.liao e3513bddaa 自动化策略主表 5 years ago
王杰 70d58be136 pom 5 years ago
王杰 1e1f7cc1fb pom 5 years ago
王杰 91d0ec1671 Merge branch 'master' into test 5 years ago
曾贞一 710c6aee3a Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
曾贞一 913991d30d 【2193 06 1.2.3.7.4任务自动生成任务JOB】 5 years ago
袁津哲 3247ef5ed7 优化涂装上线工位展示组件逻辑 5 years ago
宋军超 fe05a76f6f 添加涂装功能实体字段与model 5 years ago
qianhs 20cefbfec6 Finish Task #2080 Cost:8h 5 years ago
袁津哲 66b98dd6d5 1.开发涂装上线功能逻辑 
2.开发涂装工单条码打印逻辑
 5 years ago
钮海涛 6c6fbf7e2c 新增收货回执显示收货时间功能 5 years ago
陈思洁 3f88a390e4 【8983 需求调整-泰国MES，工单下达逻辑调整】 5 years ago
宋军超 68fa329701 添加涂装打印实体 5 years ago
陈思洁 5431d09073 【8983 需求调整-泰国MES，工单下达逻辑调整】 5 years ago
wynne1005 c8178975af StationRequestBean添加状态机代码 5 years ago
钮海涛 44ba68bb04 Merge remote-tracking branch 'origin/dev' into dev 5 years ago
钮海涛 d08465dd38 修复版本问题 5 years ago
陈思洁 80e0ec63bb Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
陈思洁 498d6821a1 【2145 06 1.2.4.6.1.1 注塑计划排产】 5 years ago
钮海涛 800a954b7f Merge branch 'test' into dev 5 years ago
qianhs 98b0110ff3 Finish Task #2080 Cost:8h 5 years ago
王杰 c2a6fb1684 [任务2186 涂装导入] 5 years ago
陈思洁 1f6af14316 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
陈思洁 0d81228ce7 【2145 06 1.2.4.6.1.1 注塑计划排产】 5 years ago
joke.wang 1f05cfca4c Finish Task #2152 Cost:16h 5 years ago
puxiao.liao 9cd0823c34 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
 5 years ago
曾贞一 9567d62195 【自动化策略】 5 years ago
puxiao.liao 17d3642fff 自动化策略主表 5 years ago
曾贞一 a8b2a0a618 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
曾贞一 e94e4ad189 【2180 06 1.2.3.8泰国WMS－生产报工接口】 
【2181 06 1.2.3.8 泰国WMS-容器包装关系接口】
【2180 06 1.2.3.8泰国WMS－生产报工接口】
 5 years ago
袁津哲 a4820f236e Merge remote-tracking branch 'origin/dev' into dev 5 years ago
袁津哲 3d88913343 物料表中新增标准包规数量字段 5 years ago
汪云昊 6d71c01178 Merge remote-tracking branch 'origin/dev' into test 5 years ago
汪云昊 26b564f0be FTP 文件编码类型 5 years ago
汪云昊 517f89ad58 Merge remote-tracking branch 'origin/dev' into dev 5 years ago
汪云昊 6c5c726187 REST 服务端适配器支持JSON与XML 
FTP 支持增量写入
国际化资源内存缓存
 5 years ago
陈思洁 9e9bb2fd03 【合并冲突】 5 years ago
陈思洁 f90371f632 【2144 06 1.2.4.6.1.3 装配计划排产】 5 years ago
puxiao.liao ffc2d4d56c Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 
 Conflicts:
	modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java
 5 years ago
puxiao.liao 49f9d06d5f Fix bug#9062 
无锡喜德-生产汇报（原材料/成品）用 函数取出来的父位置和子位置号可能会有多个-0620
 5 years ago
钮海涛 ac7e69e51e 修复版本问题 5 years ago
钮海涛 34e63db56c Merge remote-tracking branch 'origin/dev' into dev 5 years ago
钮海涛 e340749f87 Finish Task #2196 Cost:4h 5 years ago
puxiao.liao eeaaa74d1e Merge remote-tracking branch 'origin/dev' into dev 5 years ago
puxiao.liao 0818778346 自动化策略主表 5 years ago
宋军超 819bd7aba8 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
王杰 8cf6e99cf6 mes 5 years ago
宋军超 87dc9ab966 与前端联调修改 5 years ago
曾贞一 16271ea338 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
曾贞一 68c3f087dc 【2180 06 1.2.3.8泰国WMS－生产报工接口】 5 years ago
曾贞一 77e6ee3b98 【2180 06 1.2.3.8泰国WMS－生产报工接口】 5 years ago
宋军超 2ef42fdadd Finish Task:2160,2175.北京麦格纳基础数据开发。 Finish Task #2160,2175 Cost:10h 5 years ago
钮海涛 9d64793a5f Merge branch 'master' into test 5 years ago
joke.wang 3dda15e00a Finish Task #2153 Cost:24h 5 years ago
袁津哲 edae2b00f6 Fix Bug #8996,#9033 
1.PCN同步配置界面同步方式及同步类型显示为空-0617
2.原材料上线扫描显示数量不正确
 5 years ago
puxiao.liao 0c0d43cd96 北京海纳川：采购入库组件 5 years ago
wynne1005 64b00d6717 接口表添加产品条码 5 years ago
汪云昊 3c2462c1af Merge remote-tracking branch 'origin/dev' into dev 5 years ago
汪云昊 fdd5516a0f FTP适配器优化 
表单功能优化
UA 适配 LONG类型
 5 years ago
陈思洁 b65d9e0f3d 2171 首检生成逻辑调整 5 years ago
wynne1005 b0df686091 Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo 5 years ago
wynne1005 878acb869f 提交zh修改问题 5 years ago
袁津哲 c066820b18 Fix Bug #9001 
关键件绑定异常问题
 5 years ago
曾贞一 a4fd88f237 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
曾贞一 a59fa1bf9b 【2078 06 1.2.3.9拣货策略-新增拣货推荐组价】 5 years ago
袁津哲 cb69f62c63 Fix Bug #8886 
原材料上线扫描，无法看到原材料已扣减数量和剩余数量
 5 years ago
wei.peng b0e752c65e Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
wei.peng 91f4edc83f 数据库读写分离 功能完善 5 years ago
wei.peng d5051cabdb 数据库读写分离 功能完善 5 years ago
wei.peng 25b2109144 getByProperty 查询优化 5 years ago
王杰 0388c36c41 mes 5 years ago
wei.peng fb65b042f0 getByProperty 查询优化 5 years ago
袁津哲 212dccad6c 同前端联调倒计时组件逻辑 5 years ago
wei.peng ec3febfaa9 Merge remote-tracking branch 'remotes/origin/dev' into test 5 years ago
陈思洁 67a7904024 【泰国演示问题修复】 5 years ago
曾贞一 26e3053ecc Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
曾贞一 99f1ba98b6 【2077 06 1.2.3.8上架策略-4.5 新增上架推荐组件】 5 years ago
汪云昊 676ab32cd6 Merge remote-tracking branch 'origin/dev' into dev 5 years ago
汪云昊 0ea80a0f63 删除无用代码 
测试环境开关回滚
 5 years ago
袁津哲 2546395b8d 优化定时倒计时组件逻辑和前后端调用逻辑 5 years ago
wei.peng 4208d39e3f feat(密码规则验证完成): 用户登录,密码修改 5 years ago
wei.peng bdb5e6e27c 密码策略完成 5 years ago
袁津哲 089f655cfe 优化工位定时组件调用逻辑 5 years ago
袁津哲 638c032d95 优化工位定时组件调用逻辑 5 years ago
wynne1005 8ff96a0c3f merge master 防止冲突更多 5 years ago
puxiao.liao 3fe454da39 Fix bug#8909 5 years ago
joke.wang ab8ee21c66 Finish Task #2139 Cost:8h 5 years ago
钮海涛 e457b50145 中航需求变更 5 years ago
袁津哲 b114daed3f 优化代码 5 years ago
汪云昊 2888e5b510 错误注解 5 years ago
汪云昊 4ec71681de Merge remote-tracking branch 'origin/dev' into dev 5 years ago
汪云昊 4de301bf79 MDM 系统结构优化 
单元测试开关
 5 years ago
王杰 6c47817bfe mes enuk 5 years ago
joke.wang 6f375edf9a 类型信息枚举增加样本类型 5 years ago
joke.wang 26d7701a49 包装扫描需求变更 5 years ago
陈思洁 3924be2504 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
陈思洁 e7e13e53f4 【工艺流程设计-更新前端组件】 5 years ago
qianhs 53298f6b88 Finish Task #2080 Cost:8h 5 years ago
曾贞一 5c2dcf8e10 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
曾贞一 f3857116d1 【2074 06 1.2.3.8上架策略-计算COI值】 5 years ago
joke.wang f5452667f6 Start Task #2139 Cost:16h Left:8h 5 years ago
joke.wang 672483245c Fix #Bug 8904 5 years ago
袁津哲 764060bf20 Start Task #2118 Cost:8h Left:0h 
Finish Task #2118 Cost:8h
 5 years ago
qianhs 7a60d37ddc Finish Task #2080 Cost:8h 5 years ago
曾贞一 27cb1dddfe 【1603 委外扣减查询-需求变更】 5 years ago
袁津哲 5ee4fd6441 开发MES产线AGV停机记录报表功能 5 years ago
钮海涛 aeb347b1fb Merge remote-tracking branch 'origin/dev' into dev 5 years ago
钮海涛 ce020cc1ab Start Task #2134 Cost: 8h 5 years ago
wynne1005 de08f2005e 还原hqlpack 5 years ago
joke.wang cb4fd979e1 包装字段修改 5 years ago
wynne1005 60c1f6ecab 还原pom 5 years ago
wynne1005 47ae0b46ef 还原pom 5 years ago
wynne1005 ba1ba8bc0f Merge branch 'dev' into test 5 years ago
wynne1005 8623a5a13d 还原pom 5 years ago
wynne1005 b75347ffc1 还原pom 5 years ago
wynne1005 d969c07317 解决冲突 5 years ago
wynne1005 4eef0f8c45 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
宋军超 c9114c9dae Fix Bug #8688 5 years ago
王杰 a495d0b4ce 物料校验项] 5 years ago
钮海涛 9f349cd42c Merge remote-tracking branch 'origin/test' into test 5 years ago
钮海涛 9dd7c54678 修复启动问题 5 years ago
宋军超 247589fc0d Fix Bug #8884 5 years ago
袁津哲 adb974d874 合并test分支代码到dev分支 5 years ago
wynne1005 40d921ddd6 优化 新增状态点类型，发运自测1 5 years ago
袁津哲 142033f1ac Merge remote-tracking branch 'origin/test' into test 5 years ago
袁津哲 0504e58f95 Fix Bug #8778 5 years ago
puxiao.liao 328967ff06 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
puxiao.liao 2194715705 Fix bug#8736 5 years ago
qianhs f4ca720ce4 Finish Task #2080 Cost:8h 5 years ago
王杰 1d775acd69 ptl IF_拣货数据 5 years ago
joke.wang 28fe4a03f8 Finish Task#2108 Cost:12h 5 years ago
puxiao.liao 2b791901d2 Fix bug#8876 5 years ago
王杰 e063608cb1 ptl IF_拣货数据 5 years ago
王杰 be9f9e843d Merge remote-tracking branch 'i3plus-pojo/dev' into dev 5 years ago
王杰 9675274a0d ptl 5 years ago
钮海涛 93dd90363e Merge remote-tracking branch 'origin/test' into test 5 years ago
钮海涛 ae805a6596 修复Bug 5 years ago
钮海涛 16574b6920 Merge remote-tracking branch 'origin/test' into test 5 years ago
钮海涛 da454b3921 领料单界面显示erp单号问题 5 years ago
袁津哲 42f43c58f5 Fix Bug #8778 5 years ago
袁津哲 32ddc567a0 Start Task #2021 Cost:24h Left:0h 
Finish Task #2021 Cost:24h
 5 years ago
袁津哲 0067e31420 合并test分支代码到dev分支 5 years ago
袁津哲 a871d65e1f Merge remote-tracking branch 'origin/test' into test 
# Conflicts:
#	modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java
 5 years ago
袁津哲 0a5f45840a Fix Bug #8778 5 years ago
宋军超 d18beff50c Finish Task #2094 Cost:16h 5 years ago
钮海涛 7982cefc1e Merge branch 'test' into dev 5 years ago
钮海涛 2f8b0ba5db 修复版本问题 5 years ago
qianhs 057439d050 Finish Task #2080 Cost:8h 
Finish Task #2081 Cost:12h
Finish Task #2083 Cost:8h
 5 years ago
puxiao.liao 3173e43245 Fix bug#8742 5 years ago
钮海涛 a71d7a31ce Merge branch 'master' into test 5 years ago
钮海涛 8ec9f1b137 Merge remote-tracking branch 'origin/test' into test 5 years ago
钮海涛 471208d051 SWEB添加条码状态枚举 5 years ago
王杰 c39c9b6f70 ptl 5 years ago
袁津哲 12457efe93 Merge remote-tracking branch 'origin/test' into test 5 years ago
袁津哲 fb4bf4cbe2 Fix Bug #8778 5 years ago
钮海涛 97fb0bfd29 Fix Bug #8823 5 years ago
joke.wang 1afa60623c Finish Task #2090 Cost:16h 5 years ago
陈思洁 1cedf2b75b Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo 5 years ago
陈思洁 47904278c5 2092 MES202006-首检、巡检检验单据生成逻辑变更-20200615 5 years ago
汪云昊 2f71b79ed8 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
汪云昊 b9a619f4fe REST调整添加requestBody支持 5 years ago
汪云昊 fb603db58e 表单拾取功能 5 years ago
汪云昊 2f01b41c1e 定时任务控制台日志 5 years ago
汪云昊 79429024cf MDM基础功能 5 years ago
汪云昊 08c52dc09f 文件服务器优化扩展 
添加go-fastdfs支持
 5 years ago
puxiao.liao 5c40073169 喜德BUG 修改 5 years ago
wynne1005 86363b2012 Finish Task #2098 Cost:8h 5 years ago
puxiao.liao 47a318f238 喜德BUG 修改 5 years ago
宋军超 1ce748eecb Fix Bug #8771 5 years ago
puxiao.liao bcb70400eb Finish Task #2027 Cost:10h 5 years ago
puxiao.liao 2133908ff5 Finish Task #2024 Cost:8h 5 years ago
袁津哲 de48c90800 Merge remote-tracking branch 'origin/dev' into dev 5 years ago
袁津哲 7f0b99297f Start Task #2019 Cost:16h Left:0h 
Finish Task #2019 Cost:16h
 5 years ago
宋军超 3c53d8a2f2 Finish Task #2064 Cost:24h 5 years ago
钮海涛 f301abbd04 Merge remote-tracking branch 'origin/test' into test 5 years ago
钮海涛 fd45d66968 解决合并冲突 5 years ago
陈思洁 01363fde23 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
陈思洁 9f6ecf72a0 【2002 泰国内饰生产作业-按生产工单，单件生产】 5 years ago
joke.wang f357293ca5 plc数据类型修改 5 years ago
钮海涛 52e0d840af Merge remote-tracking branch 'origin/test' into test 5 years ago
钮海涛 5a0fea01ca 修复版本问题 5 years ago
汪云昊 e416b032c2 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
汪云昊 4fc8c2a80d 软适配添加适配发送报文 5 years ago
曾贞一 8476ae75c9 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
曾贞一 a2ef35082e 【1794 天津麦格纳WMS-报表-库位利用率看板】 5 years ago
王杰 b946ca7fa1 [任务：2066，状态机异常处理] 5 years ago
puxiao.liao e57acfacee BH BUG 修改 5 years ago
钮海涛 414b811871 修复启动问题 5 years ago
puxiao.liao 454de274c7 Fix bug#8780 5 years ago
puxiao.liao 71d729b7f5 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
puxiao.liao 16f1ed34a5 Fix bug#8780 5 years ago
王杰 6232d14e61 [任务：2066，状态机异常处理] 5 years ago
qianhs 5c31f6c54e Merge remote-tracking branch 'origin/test' into test 5 years ago
qianhs 6d4a1b6975 BH-CODE 出库，绑定 5 years ago
袁津哲 7aaa8bca6d 合并dev分支代码到test分支 5 years ago
puxiao.liao 9a65fc95fa Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
puxiao.liao 9975335acb Finish Task #2033 Cost:8h 5 years ago
宋军超 3c1f8cf6b1 Finish Task #1889 Cost:24h 5 years ago
袁津哲 b0f3873aea Merge remote-tracking branch 'origin/dev' into dev 5 years ago
袁津哲 a8dd9831e0 Start Task #2021,2022 Cost:8h Left:8h 5 years ago
曾贞一 36f9068e4c 【冲突】 5 years ago
曾贞一 4c3571182c 【冲突】 5 years ago
曾贞一 523e4b7b3b 【2016 BH-回传检测结果至MES系统】 5 years ago
陈思洁 35fdc95250 Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo 5 years ago
陈思洁 0727370002 8660 MES-202005-PCN首检、巡检需要支持扫描产品条码录入检测值-20200527 5 years ago
wei.peng d753bdc5b6 fix(数据层): 数据库操作根据AOP对DAO的方法进行分切数据源 5 years ago
wei.peng adb95f100f Ics 日志收集功能完成 5 years ago
wei.peng 1a079a1b89 feat(自定义报表): 自定义样式功能开发 
1. Pojo 实体创建
2. Service 实现唯一校验
3. 使用CRUD Controller 实现API 接口
 5 years ago
陈思洁 2efab3b0cc Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
陈思洁 01e7224d1e 【合并冲突】 5 years ago
钮海涛 7414b76d85 修复合并版本问题 5 years ago
钮海涛 32a566be93 Merge branch 'test' into dev 5 years ago
钮海涛 6061f89d43 修复合并版本问题 5 years ago
宋军超 433a6cf744 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
宋军超 570be85b8d Fix Bug #8744 5 years ago
puxiao.liao d3f2434aa0 Fix bug#8752,8753 5 years ago
袁津哲 1e29445697 Merge remote-tracking branch 'origin/dev' into dev 5 years ago
袁津哲 868e82d83a Start Task #2019 Cost:16h Left:0h 
Finish Task #2019 Cost:16h
 5 years ago
陈思洁 4950cc1067 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
陈思洁 1102513fb7 【1926 盲检工步】 5 years ago
曾贞一 7134bad17f Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
曾贞一 b2d9741453 【2009 天津麦格纳WMS-报表-库位利用率】 5 years ago
钮海涛 75e744e07e Merge remote-tracking branch 'origin/dev' into dev 5 years ago
钮海涛 7b83f8fa50 新增aps序列化id 5 years ago
汪云昊 a4ba058ee3 表单查询条件 
Rest是适配器 requestBody
 5 years ago
曾贞一 6e70e3257b 【2009 天津麦格纳WMS-报表-库位利用率】 5 years ago
曾贞一 faf8cced03 Merge remote-tracking branch 'origin/dev' into dev 5 years ago
曾贞一 4346eb647b Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
曾贞一 31c26017c1 【2009 天津麦格纳WMS-报表-库位利用率】 5 years ago
王杰 215ffc080b ptl 5 years ago
钮海涛 5643f1aab4 Merge remote-tracking branch 'origin/test' into test 5 years ago
陈思洁 76b96540ca 【1926 盲检工步】 5 years ago
陈思洁 dda5a4c7e9 【合并冲突】 5 years ago
陈思洁 55de940f7c 【1926 盲检工步】 5 years ago
陈思洁 bbef19ed71 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
陈思洁 f6cd0b6b0b 【8685 05 2.3.3.6 队列条码打印-管理端-查、打印】 5 years ago
wynne1005 85f99fcdfa 提测 还原pom 5 years ago
wynne1005 b43317c11a 还原pom 5 years ago
wynne1005 5f80cc4322 Merge branch 'dev' into test 5 years ago
wynne1005 ca080002a1 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
钮海涛 dea25ce166 Merge remote-tracking branch 'origin/dev' into dev 5 years ago
钮海涛 3a40d278ac 修复平台登录问题 5 years ago
陈思洁 759cb39827 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
陈思洁 260899368d 【8685 05 2.3.3.6 队列条码打印-管理端-查、打印】 5 years ago
wynne1005 aa5c13dde1 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
钮海涛 2e434bc859 Merge remote-tracking branch 'origin/dev' into dev 5 years ago
钮海涛 5610e5a455 完成SWEB任务 5 years ago
王杰 5ccc6c4408 andon 5 years ago
puxiao.liao 47a7a0a9a3 BH 需求报表的修改 5 years ago
袁津哲 00f07acd45 Fix Bug #1916,1917 5 years ago
wynne1005 2d69c3ab18 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
wynne1005 6b9d56f9e0 自测修改 5 years ago
joke.wang 00ca9bef40 Finish Task #1960 Cost:16h 5 years ago
宋军超 56dec41ad0 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
宋军超 f5074fba08 Finish Task #1898 Cost:16h 5 years ago
陈思洁 94c7526d65 【盲检工步】 5 years ago
puxiao.liao 7f76cf0ad3 BH 需求修改 5 years ago
陈思洁 4d4469ebc9 【合并冲突】 5 years ago
陈思洁 3848c6da14 【盲检工步】 5 years ago
宋军超 febbb549fc Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
宋军超 612d768999 Start Task #1932 Cost:5h Left:3h 5 years ago
qianhs 86f6fefd5b BH-CODE 出库，绑定 5 years ago
钮海涛 d0eea0eb9a Merge remote-tracking branch 'origin/dev' into dev 5 years ago
钮海涛 470bceac6a Start Task #1973 Cost:2h 
Start Task #1971 Cost:2h
Start Task #1970 Cost:2h
Effort Task #1968 Cost:4h
 5 years ago
钮海涛 7286ce7ebb Merge remote-tracking branch 'origin/dev' into dev 5 years ago
钮海涛 f7c42ee90d Start Task #1973 Cost:2h 
Start Task #1971 Cost:2h
Start Task #1970 Cost:2h
 5 years ago
joke.wang ca0b92aa6a Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
joke.wang a8241a1694 Start Task #1960 Cost:8h Left:8h 5 years ago
puxiao.liao 1b84b3aeee Fix bug#8637,8697 5 years ago
宋军超 4d2f200677 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
宋军超 a47eb08a8e Start Task #1934 Cost:8h Left:8h 5 years ago
袁津哲 399c9c828e Fix Bug #1916,1917 5 years ago
袁津哲 271e7264a4 Merge remote-tracking branch 'origin/dev' into dev 
# Conflicts:
#	modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java
 5 years ago
袁津哲 31bd8754df Fix Bug #1916,1917 5 years ago
宋军超 6f1bba9997 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
宋军超 c2a5a17379 工步参数添加工步弹框参数字段 5 years ago
王杰 b0b276ba66 [任务：1938] 5 years ago
joke.wang 342e5f7ab2 Effort Task #1915 Cost:2h Left:0h 5 years ago
wynne1005 8ef3997038 还原pom 5 years ago
wynne1005 4150543cb4 Effort Task #1940 Cost:16h Left:8h 5 years ago
袁津哲 f4ff8205f6 Merge remote-tracking branch 'origin/dev' into dev 5 years ago
袁津哲 a4bedf2354 Fix Bug #1916,1917 5 years ago
钮海涛 f1a6f66ccb Merge remote-tracking branch 'origin/dev' into dev 5 years ago
钮海涛 15a3d95c61 Start Task #1968 Cost:3h 5 years ago
puxiao.liao b5aa990ea7 Fix bug#8633 5 years ago
钮海涛 bbde1ebc9c Merge branch 'dev' into test 5 years ago
钮海涛 4d26c95639 Merge branch 'test' into dev 5 years ago
陈思洁 3d0524ec1f Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
陈思洁 a6ba3b6a5c 【8671 客户JIT队列，自动定时JOB-生成数据错误】 5 years ago
puxiao.liao 7353b79b9c Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
puxiao.liao 944b400f1e Fix bug#8679 5 years ago
joke.wang d4f0ef157a Finish Task #1915 Cost:8h 5 years ago
qianhs fcbaffa2b7 Merge remote-tracking branch 'origin/dev' into dev 5 years ago
qianhs b474ef1266 Finish Task #1813 Cost:32h 
Finish Task #1814 Cost:32h
Finish Task #1815 Cost:16h
 5 years ago
宋军超 659b893903 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
宋军超 b05113f63c Finish Task #1887 Cost:16h 5 years ago
钮海涛 47131ff13f 修复版本问题 5 years ago
钮海涛 043e71649a bh子检测项新增检测大类 5 years ago
钮海涛 da21795f7f Merge branch 'test' into dev 5 years ago
钮海涛 f392a13832 Merge remote-tracking branch 'remotes/origin/master' into test 5 years ago
钮海涛 d65d9a5a1d Merge remote-tracking branch 'origin/test' into test 5 years ago
puxiao.liao 91688ddab5 BH 需求变更 5 years ago
puxiao.liao 8bca38a17d Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 
 Conflicts:
	modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
 5 years ago
puxiao.liao e793667812 BH 需求变更 5 years ago
钮海涛 e2e48f31bd bh子检测项新增检测大类 5 years ago
qianhs 5d32b43e51 BH-CODE 出库，绑定 5 years ago
钮海涛 f4cccf5c9b 修改微服务model接口 5 years ago
钮海涛 898f9a061d Merge remote-tracking branch 'origin/dev' into dev 5 years ago
钮海涛 81b5262a24 修改微服务model接口 5 years ago
袁津哲 37092cf2c5 Task1917、1916:开发关键件绑定、扭矩二合一(PF)、关键件绑定、扭矩二合一(DL)功能 5 years ago
袁津哲 d65a5a3784 Merge remote-tracking branch 'origin/dev' into dev 
# Conflicts:
#	modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java
 5 years ago
袁津哲 44f313abc4 Task1917、1916:开发关键件绑定、扭矩二合一(PF)、关键件绑定、扭矩二合一(DL)功能 5 years ago
曾贞一 45b5812cb1 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
曾贞一 cf507fdb48 【BATCH录入检测值-需要变更】 5 years ago
宋军超 9eda1f67b7 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
宋军超 40672559e4 修改sonar--BUG类型问题 5 years ago
钮海涛 c344f017a9 修复sonar上的问题 5 years ago
钮海涛 52f3758cee Merge remote-tracking branch 'origin/dev' into dev 5 years ago
wynne1005 8955fd2f4d mes提测 还原pom 5 years ago
wynne1005 23754d3f18 mes提测 还原pom 5 years ago
wynne1005 81753d3260 Merge branch 'dev' into test 5 years ago
wynne1005 81b554fc8b Merge branch 'test' 5 years ago
wynne1005 0636daed51 Finish Task:1896 Cost:8h 5 years ago
陈思洁 677cc85360 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
陈思洁 b2384619d4 【1891 队列条码打印-管理端】 5 years ago
曾贞一 9e236a06a1 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
曾贞一 6fc4641033 【BATCH录入检测值-需要变更】 5 years ago
puxiao.liao c2942b8a0d BH 需求变更 5 years ago
puxiao.liao 583c750055 BH 需求变更 5 years ago
宋军超 fd9a2e6d15 Start Task #1887 Cost:8h Left:8h 5 years ago
puxiao.liao 4f56baadef Merge remote-tracking branch 'origin/test' into test 5 years ago
钮海涛 71d936cc56 Merge remote-tracking branch 'origin/test' into test 5 years ago
钮海涛 b060ba97aa 修改BH同步JOB逻辑 5 years ago
puxiao.liao 75308c8989 BH 需求变更 5 years ago
puxiao.liao 1dc9276e9a BH 需求变更 5 years ago
钮海涛 e91a6821bc Merge remote-tracking branch 'origin/test' into test 
# Conflicts:
#	modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartCheckType.java
 5 years ago
钮海涛 efc30f713f 修改BH同步JOB逻辑 5 years ago
曾贞一 627b417256 【BATCH录入检测值-需要变更】 5 years ago
曾贞一 765e0619ca 【BATCH录入检测值-需要变更】 5 years ago
puxiao.liao 8c3f81292c BH 需求变更 5 years ago
puxiao.liao c06fee639d BH 需求变更 5 years ago
qianhs 17b27da539 BH-CODE 出库，绑定 5 years ago
王杰 074093a46d [任务：1850 ，安灯流程设计] 5 years ago
曾贞一 33c0ab4015 【BATCH录入检测值-需要变更】 5 years ago
曾贞一 a4fdf07b4b 【BATCH录入检测值-需要变更】 5 years ago
曾贞一 470e4986a9 Merge remote-tracking branch 'origin/test' into test 
# Conflicts:
#	modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/QmsCheckType.java
#	modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSerialSn.java
#	modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/QmsCheckTypeRepository.java
#	modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsSerialSnRepository.java
 5 years ago
曾贞一 72817fca4a 【BATCH录入检测值-需要变更】 5 years ago
钮海涛 6d1c0bb46d 修改BH基础数据 5 years ago
钮海涛 ad79c9fd7b 修改BH基础数据 5 years ago
puxiao.liao 99955a70ff bug7940【7940 推荐入库-未按最近距离推荐】 5 years ago
puxiao.liao 443486a8cf BH 需求变更-增加产品条码信息 5 years ago
qianhs f4c4b4a1f6 1,产品条码事务实体类提交 5 years ago
qianhs 1a018d4af5 1,产品条码事务实体类提交 5 years ago
joke.wang dd179a6d89 Fix Bug #8636 5 years ago
joke.wang 1a72c16f14 Finish Task #1890 Cost:8h 5 years ago
wynne1005 b48ba8c481 Finish Task #1876 Cost:32h 5 years ago
wynne1005 8aef23e4ad Finish Task #1876 edi webservice解析 Cost:32h 5 years ago
陈思洁 4d63f9817e Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
陈思洁 9b8342b7f5 【1865 客户JIT生产队列，自动下达定时JOB】 5 years ago
王杰 648d8662b5 [任务：1851 安灯升级配置变更] 5 years ago
钮海涛 999a415d27 修复版本问题 5 years ago
钮海涛 b9cbf9684b Merge branch 'test' into dev 5 years ago
钮海涛 4921d55bda 修复版本问题 5 years ago
钮海涛 b303cf9a14 修复合并问题 5 years ago
钮海涛 a5a032debe 解决model生成数据库表问题 5 years ago
钮海涛 96fdbe0e07 Merge branch 'master' into test 5 years ago
puxiao.liao 491bc32325 Fix Bug#8345 5 years ago
贾文涛 a68475d3d0 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
贾文涛 a8efa90089 bug 7461,count时去掉distinct。Fix Bug #7461 5 years ago
钮海涛 27c62aa7d1 合并冲突 5 years ago
袁津哲 cad6b7ad89 Merge remote-tracking branch 'origin/dev' into dev 5 years ago
袁津哲 e578cb882a 优化通用模板代码模糊查询功能 5 years ago
袁津哲 f50b76cd1f Task1858:电枪枪头更换计数 5 years ago
陈思洁 5b167546e4 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
陈思洁 e42641855d 【8528 收货检验-图片上传】 5 years ago
wynne1005 608aa6be90 还原pom 5 years ago
wynne1005 99d3c9d721 提测合并 还原pom 5 years ago
wynne1005 6dd2f12a2a Merge branch 'dev' into test 5 years ago
wynne1005 5ef88c80c0 提测合并 还原pom 5 years ago
王杰 56ae714283 【任务：1845，安灯】 5 years ago
wei.peng 6169542dbb 合并代码  有代码丢失或者文件丢失请排查此处 
Merge remote-tracking branch 'remotes/origin/dev' into test

# Conflicts:
#	modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java
 5 years ago
wei.peng 9ee8acae91 合并代码 有代码丢失或者文件丢失请排查此处 5 years ago
wei.peng f161270af8 版本发布 5 years ago
钮海涛 c0303cc247 Merge remote-tracking branch 'origin/dev' into dev 5 years ago
钮海涛 281a2dccb5 新增零件自动采购单 5 years ago
王杰 8e94cbb8fa pojo 序列号 5 years ago
袁津哲 8b63dea809 Merge remote-tracking branch 'origin/dev' into dev 5 years ago
袁津哲 08b03c9eb8 Task1858:电枪枪头更换计数 5 years ago
钮海涛 8059342b8f Merge remote-tracking branch 'origin/dev' into dev 5 years ago
钮海涛 4ba0e6b264 自动生成采购订单功能 5 years ago
宋军超 8d2f6fb8d1 任务：【1842】-海纳川基础数据修改字段类型 5 years ago
钮海涛 8a2d54ce61 临时保存 5 years ago
曾贞一 e3accbf24e 【8441 收货回执打印功能完善】 5 years ago
曾贞一 d0e4af979e Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
曾贞一 6a28329d75 【8441 收货回执打印功能完善】 5 years ago
puxiao.liao f8ccd0166e BUG【8554】 中航-工装初始化导入后，一个excel应该产生一笔事物，明细按物料分 5 years ago
袁津哲 e47f050ff3 优化通用导入工具类和导入逻辑 5 years ago
joke.wang e2ce63a9cd bug: [8533] plc数据类型改为枚举 5 years ago
钮海涛 6c7a88b962 bug:【8520】 5 years ago
joke.wang 88a0d6d02f 任务:[1828] 半成品绑定工步增加逻辑 5 years ago