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

8448 Commits (ad1f48c28c9ef570c6eab32f1a541d2922fa2a2a)

Author SHA1 Message Date
simon.song 792d4263c5 接口表增加同步标识，kettle同步工具使用 4 years ago
simon.song 95029f6abd Merge remote-tracking branch 'origin/test' into test 4 years ago
simon.song 32e4bb4ba7 15872 20027--PCN端工位扫描增加数据复核工步，校验采集的数据完整性和数据质量是否合格--2021-05-22 4 years ago
王杰 4fdab21958 Merge branch 'test' into ext-dev 4 years ago
王杰 15dc951bf1 dev merge test 4 years ago
王杰 56ed9e73f2 ctno 增加 同步标志 松下wms接口映射需要此字段 4 years ago
王杰 5d33795cff test merge dev 4 years ago
王杰 ab1bc23eb7 Merge branch 'test' into dev 4 years ago
王杰 ae71f6a008 状态机 - 增加逻辑 4 years ago
Dominic_Xiao 40d7dbff22 15957 20027-PCN端-来料检验&发货检验-影藏过程条码列&判定结果要展示出来-20210521 4 years ago
Xiao-yin0517 6f1b047725 Merge remote-tracking branch 'origin/ext-dev' into ext-dev 4 years ago
Xiao-yin0517 1696ba05e3 更改实体类 4 years ago
andly.pan 95d72cf4af 库存交易条码新增字段（同步仪征） 
Signed-off-by: andly.pan <andly.pan@estsh.com>
 5 years ago
Dominic_Xiao 524a766dd5 中航SPC表新增零件号字段 5 years ago
wynne1005 95ac5f0ee3 feat(screen): jdbc拼接初步完成 待整理代码 
jdbc拼接初步完成 待整理代码
 5 years ago
puxiao.liao c05cb37dff Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev 5 years ago
castle.zang 8ef28595ab bug 动态表单工厂隔离:增加组织隔离属性ID 5 years ago
puxiao.liao a001dae575 代码回滚 5 years ago
puxiao.liao eb8f03cf19 Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev 
 Conflicts:
	modules/i3plus-pojo-andon/pom.xml
	modules/i3plus-pojo-aps/pom.xml
	modules/i3plus-pojo-jobflow/pom.xml
 5 years ago
李俊生 5f52b1aa33 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
李俊生 206b522af5 pom冲突 5 years ago
李俊生 adb48ef07f 南非收货提交后，需送检的零件后需要有送检的提示 5 years ago
曾贞一 54329c67ec 【同步BH成品条码JOB-优化】 5 years ago
castle.zang 4fa41f2f90 还原pom version 5 years ago
castle.zang 9a4d2060b6 修复version版本号 5 years ago
曾贞一 93c64328db 【修改-pom.xml】 5 years ago
臧学普 7aa68616bc Merge branch 'master' into test 5 years ago
肖奕扬 62505fa7b7 Merge pull request '一次性通过率BUG修改' (#268) from xiangming.liao/i3plus-pojo:test into test 
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/268
 5 years ago
钮海涛 7c60ce4cdc Merge remote-tracking branch 'origin/ext-dev' into ext-dev 5 years ago
钮海涛 b5bbf7aefb 增加等待时间评估规则 5 years ago
puxiao.liao 48d2f6680a Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev 
 Conflicts:
	modules/i3plus-pojo-screen/pom.xml
 5 years ago
李俊生 85dd71b1ca Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 
 Conflicts:
	modules/i3plus-pojo-screen/pom.xml
 5 years ago
wynne1005 83b4cb64df merge dev 5 years ago
钮海涛 f50d358cdd Merge remote-tracking branch 'origin/ext-dev' into ext-dev 5 years ago
钮海涛 7bd17131b5 牵纱拆到手工设备，包布也需要拆到手工设备。 5 years ago
wynne1005 b46bd3b354 feat(core): 平台添加用户名登录方式 支持钉钉授权 
平台添加用户名登录方式 支持钉钉授权
 5 years ago
廖湘明 e001bbecfe Merge remote-tracking branch 'origin/test' into test 5 years ago
廖湘明 c19d2aebd5 一次性通过率BUG修改 5 years ago
puxiao.liao 41d09fd259 Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev 5 years ago
puxiao.liao 177cdd0b6e 库存条码表增加容器字段 5 years ago
andly.pan 43d7195a37 Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into pext-dev 5 years ago
Xiao-yin0517 7a4ab20483 增加了是否禁用和启用 5 years ago
陈思洁 23e5b87ceb 【15607 20027-PCN端 - 巡检检验- 生成巡检任务时增加一个计数 -20210429】 5 years ago
钮海涛 4088a85a5c 更改左边界计算逻辑：后道工序满模即可开始。 5 years ago
Dominic_Xiao a0f6fa5a7e 15609 20135--产品工序过程查询报表--》缺陷信息--》缺陷位置--2021-04-29 5 years ago
wynne1005 ac791d518a fix(impp-framework): 更换redisson注入方式 
更换redisson注入方式
 5 years ago
joke.wang 49f709959d 15711 19081-邮件提醒内容每一条之间增加换行和序号 5 years ago
曾贞一 697f93a384 Merge remote-tracking branch 'origin/test' into test 5 years ago
曾贞一 3e0df20273 【15693 19108+单据管理-出库单-出库单明细-双击-出库单子表详情，新增wms_stock_sn.package_no字段显示+0506】 5 years ago
钮海涛 3dd67766b2 测试时间 5 years ago
joke.wang eef6f8e18b 节假日 泰国 5 years ago
puxiao.liao 294d34b6d3 Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev 5 years ago
puxiao.liao 5cf9c232b5 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
puxiao.liao dbd14c9d6e 导出模板字段排序维护 5 years ago
钮海涛 c09a078ce4 获取生产计划开始时间和结束时间去除service调用。 5 years ago
joke.wang 0ec0bc2592 15690 19108+PCN 监听工步 记录plc值 5 years ago
joke.wang db23233a8f 增加容器条码记录表 5 years ago
钮海涛 9ace046d1d 修改动态拆分字段为对象关联 5 years ago
Fightgoo 82b4c948f6 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
Fightgoo 021e05ebaf 15635 20027-调角器BH- BH检测结果管理-管理明细增加检测类型代码查询条件 - 20210430 5 years ago
钮海涛 99b43a6677 修改枚举 5 years ago
李俊生 efaafcdcc9 仓库物料统计预警 5 years ago
joke.wang b06b49866f 容器清空接口逻辑优化 5 years ago
钮海涛 b396d9cfd9 修改枚举 5 years ago
钮海涛 e918d85702 Merge remote-tracking branch 'origin/ext-dev' into ext-dev 5 years ago
钮海涛 30048f4ce1 修改枚举 5 years ago
曾贞一 60408db7b0 【15642 19108+wms_printing_queue 新增 part_no 字段+0429】 5 years ago
puxiao.liao 3cf1fd642e Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev 5 years ago
Dominic_Xiao cd351e443f 15627 19048-喷涂条码在不同工位重复报工-20210430 ->报工表增加唯一索引:工厂代码+包装编号+原材料物料号 5 years ago
曾贞一 c6e80ad9a7 【3391 添加报废记录报表和修改质检不良清单表-后端】 5 years ago
joke.wang f20e000957 15608 19081-返工返修-报废单据需要增加字段和数据 5 years ago
陈思洁 2c65486bc6 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
陈思洁 dd000b33a3 【15573 20027-PCN端 - 来料检验- WMS已经将数据传输到了中间接口表，但MES还未生成来料检验任务 -20210429】 
【15546 20027-管理端-报表中心-首检检验结果报表-班组和班长显示错误-20210421】
 5 years ago
andly.pan 6989180c2a Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into pext-dev 5 years ago
曾贞一 ac08dc110c Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
曾贞一 a92b87f6a0 【3391 添加报废记录报表-后端】 5 years ago
wynne1005 1323569c56 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
wynne1005 0c860de567 feat(SCREEN): 数据对象操作 1 
数据对象操作 1
 5 years ago
duan.yang a30e97336c 供应商关系添加物料字段，工厂代码查询条件Bug 
Signed-off-by: duan.yang <994300880@qq.com>
 5 years ago
王杰 844349d583 冲突 5 years ago
王杰 21a3d716f4 pom 5 years ago
王杰 5bf5504992 pom 5 years ago
李俊生 91d7b0157d 零件转换界面增加按钮功能 
15241 19081 ——北京麦格纳采购订货进度报表看板需排序，2021-04-17 按照计划时间倒序
15474 19081-报表中心，供应商到货异常到货次数查询主表添加显示字段，到货时间，单号--20210422
15471 19081-领料任务报表及明细没有拣货完成时间-20210425
 5 years ago
joke.wang 5193012b69 15527 19081-追溯汇总报表-Operator Data区域数据需要按照Time Built正序排序 5 years ago
钮海涛 f1159f8afb Merge remote-tracking branch 'origin/ext-dev' into ext-dev 5 years ago
钮海涛 ae88dda60d 新增MDM对象转换工具。 5 years ago
puxiao.liao a9881bc01f 修复泰国产品条码统计 5 years ago
joke.wang 92e0acee58 包装明细接口增加索引 5 years ago
Dominic_Xiao e18b726369 MesPackageTravelRepository 增加 Repository注解 5 years ago
Dominic_Xiao 28d512021e 增加数据源类型字段 5 years ago
simon.song 64d9eef5fc Merge remote-tracking branch 'origin/test' into test 5 years ago
simon.song 05f805f227 数据迁移功能优化，支持多数据源 5 years ago
joke.wang ebd3f85255 泰国扭矩展示优化 5 years ago
puxiao.liao 54529730e7 Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev 5 years ago
puxiao.liao 3c4c271c64 增加产品条码字段信息 5 years ago
肖奕扬 4025c81a8d Merge pull request '产品工序报表' (#266) from frank.yu/i3plus-pojo:test into test 
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/266
 5 years ago
yumingxing c5cd0d8a1d 产品工序报表 5 years ago
许心洁 ab8686ae2c 去掉mongo依赖 5 years ago
许心洁 b08ff69d37 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev 5 years ago
陈思洁 a735bfc40c Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
陈思洁 e7e0580c9a 【15381 20027--MES看板需要查询BH订单的首、中、末件的数据实时状态，故需要跨数据库实现其查询数据效果-2021-04-23】 
【15197 20027-管理端-报表中心-首检检验结果报表-需要按照工单汇总展示首检-20210421
】
 5 years ago
许心洁 c4b833a259 合并test分支代码 5 years ago
Dominic_Xiao 10bc144c85 Merge remote-tracking branch 'origin/test' into test 5 years ago
Dominic_Xiao 62ae1d9a13 包装履历新增qrCode字段，实现卡斯马报表根据工序查询历史CMS标签的功能 5 years ago
钮海涛 508fd77881 Merge remote-tracking branch 'origin/ext-dev' into ext-dev 5 years ago
钮海涛 4f697d51ec 演示问题修复 5 years ago
李俊生 4e87b3000d Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
李俊生 9ed1a5d36a 15241 19081 ——北京麦格纳采购订货进度报表看板需排序，2021-04-17 
15108 19048-- 库存移动统计可以查看到历史记录 --20210417
 5 years ago
puxiao.liao 505f80032c 导入模板下载增加是否必填字段下载 5 years ago
陈思洁 91ab318854 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
陈思洁 a691cded53 【15381 20027--MES看板需要查询BH订单的首、中、末件的数据实时状态，故需要跨数据库实现其查询数据效果-2021-04-23】 
【15197 20027-管理端-报表中心-首检检验结果报表-需要按照工单汇总展示首检-20210421
】
 5 years ago
曾贞一 ab0e8d559b Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
曾贞一 57a9a8b4fd 【15334 19108+wms_doc_fg_detail到库存执行按产线处理+0419】 5 years ago
陈思洁 4a3f379a28 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
陈思洁 10ad3e54bb 【15332 20027-PCN端 - 来料检验- 选择检验单报错 -20210421】 5 years ago
joke.wang 8a4698bfe7 15284 19108+ MES无下线汇总报表 5 years ago
钮海涛 63a8aef96d 演示问题修复 5 years ago
汪云昊 ec605315bb Merge remote-tracking branch 'remotes/origin/test' into ext-dev 5 years ago
汪云昊 862256e751 Merge remote-tracking branch 'remotes/origin/dev' into test 5 years ago
汪云昊 9241c60f07 feat(mdm):通用导入导出及外部应用扩展 5 years ago
joke.wang fd18ec063f 产品关键数据 5 years ago
puxiao.liao 87f3031a3d 修复软适配枚举 5 years ago
joke.wang c0ff7ce986 订单池增加索引 5 years ago
许心洁 e1f366f654 喜德任务#3349 5 years ago
许心洁 091a5b3678 流程管家重置提示+喜德任务3349 5 years ago
许心洁 2684b52775 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
许心洁 a24b40d8ec 喜德任务#3349 5 years ago
puxiao.liao 39b716d2a1 修复打印异常 5 years ago
钮海涛 95dffb65e0 新增成品检验报工 5 years ago
钮海涛 736087852e 新增成品检验报工 5 years ago
陈思洁 77f66de188 【14930 20027-管理端生产包装报表中增加产品二维码查询条件，可以根据产品二维查询出包装条码-20210409】 
【14884 20027--控制计划--编辑中选择一行数据点击删除后，不做版本更新。-2021-04-06】
【14848 20027--控制计划--编辑中输入版本号，条件没有生效，点击查询，数据没有按照筛选条件显示查询结果-2021-04-02】
 5 years ago
钮海涛 33be7da477 新增成品检验报工 5 years ago
钮海涛 4590133c27 新增成品检验报工 5 years ago
github33 4854673754 14850 20027-mes查询 wms的熔深batch的接口-20210409 5 years ago
wynne1005 9c4b233975 refactor(core): 支持用户密码过期 
Finish 21.4.8
 5 years ago
wynne1005 afc0138e83 refactor(core): 支持用户密码过期 
commit1 21.4.7
 5 years ago
github33 be26c0920f 14850 20027-mes查询 wms的熔深batch的接口-20210409 5 years ago
puxiao.liao 6030c67021 打印数据查询修改 5 years ago
github33 63dc4a2f9f 14850 20027-mes查询 wms的熔深batch的接口-20210409 5 years ago
钮海涛 984f772788 Merge remote-tracking branch 'origin/ext-dev' into ext-dev 5 years ago
钮海涛 8b75ed1cfc 新增报工功能 5 years ago
曾贞一 f15f85b56d Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
陈思洁 6ffd586274 【14903 19108+ PCN【上装工位】逻辑优化 +2021-04-03】 5 years ago
曾贞一 b688f4aff5 【14905 20027-调角器BH-录入检测值- 熔深结果刷新有误 -20210404】 5 years ago
wynne1005 5b003a613b screen修改关系表名 增加历史表 5 years ago
puxiao.liao 93226dd915 Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev 5 years ago
Dominic_Xiao eacbdbaa7d 20027--MES看板-班组数来源班组信息，需要班组信息中增加一个字段来维护班组人数-2021-04-02 5 years ago
钮海涛 543433bfff Merge remote-tracking branch 'origin/ext-dev' into ext-dev 5 years ago
钮海涛 9ee464f67e 新增报工功能 5 years ago
joke.wang bddd4b37a2 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
joke.wang 52b2ea43da 14859 19081-JISA收序时间超时和队列时间预警信息-邮件提示内容加上预警值 5 years ago
陈思洁 2b2761ade2 【14827 19108+ MES->【生成工单】模块,释放功能应根据零件号进行流水号累加+2021-04-01】 5 years ago
joke.wang ca8bfd3f53 泰国扭矩采集 5 years ago
wynne1005 64c2ed920f 修改通用界面端口 还原第三方数据库连接字符串中的时区 5 years ago
wynne1005 0ba5c62931 Merge branch 'screen' into dev 5 years ago
wynne1005 714a32a994 first commit 5 years ago
Dominic_Xiao f12c568119 天津:物料校验客户标签关系和物料绑定客户标签明细同步标识赋默认值 5 years ago
Dominic_Xiao cc86a60ba7 Merge remote-tracking branch 'origin/test' into test 5 years ago
Dominic_Xiao 9eba8f1683 天津-PCN:物料校验客户标签关系与物料绑定客户标签明细新增同步标识字段 5 years ago
joke.wang 072bc431fb 扭矩采集 5 years ago
shun 1fbccdcf40 查询移库单增加供应商名称 5 years ago
simon.song 3c6a7b410d Merge remote-tracking branch 'origin/test' into test 5 years ago
simon.song 5554bfd14c 14520 20027--管理端--控制计划--增加审核状态、是否生效筛选条件-2021-03-17 5 years ago
puxiao.liao 2adc935bb0 Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev 
 Conflicts:
	modules/i3plus-pojo-mes-pcn/pom.xml
	sonar-project.properties
 5 years ago
钮海涛 23f6f9285b 增加4车间补满模逻辑 5 years ago
许心洁 4f919011dc Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
github33 9a4aae9f68 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
github33 a61f2c1778 CYCLE_RULE--新增枚举 5 years ago
王杰 38d03b1060 状态机优化 5 years ago
wynne1005 7767630fbb tmp 5 years ago
wynne1005 15633bc28e tmp 5 years ago
陈思洁 9e0d03629c Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
陈思洁 281957a6f5 【3324 泰国-扭矩采集 --PC端后端】 5 years ago
joke.wang 3d0d39ac1d Tha扭矩采集 5 years ago
陈思洁 ccf221f80b 【pojo改名字】 5 years ago
陈思洁 39ced0a83d 【14681 19108+ PCN->容器绑定单件条码工位,当前容器号无显示+2021-03-25】 5 years ago
汪云昊 1ef29d1fce revert(pojo):还原pom版本 5 years ago
汪云昊 1eae64bafe Merge remote-tracking branch 'origin/dev' into test 5 years ago
汪云昊 95052a4e78 Merge remote-tracking branch 'origin/dev' into dev 5 years ago
汪云昊 46e068ccdb feat(softswitch):REST按状态码重试 5 years ago
joke.wang 7f8dd50412 物料关系表 5 years ago
wynne1005 a44a4a8be3 Merge branch 'dev' into test 5 years ago
wynne1005 d97a855e83 移除screen 5 years ago
Dominic_Xiao 9fc68bc443 14382 19081-安灯广播速度调整未生效-20210312:修改播放速度类型为浮点型 5 years ago
汪云昊 4272aad4ac Merge remote-tracking branch 'origin/dev' into dev 5 years ago
汪云昊 d45d5175dc feat(softswitch):REST按状态码重试 5 years ago
wynne1005 44f61e1525 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
wynne1005 385156cd18 refactor(core): SSO 支持方式变更 5 years ago
Dominic_Xiao e58ffc9d69 天津-PCN新增功能:物料校验客户标签明细表新增客户标签字段 5 years ago
汪云昊 fc28ea2346 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
钮海涛 ffa0aa94f8 Merge remote-tracking branch 'origin/ext-dev' into ext-dev 5 years ago
钮海涛 caafb9c317 修改排程计划逻辑 5 years ago
汪云昊 2443d1d8e6 feat(softswitch):REST按状态码重试 5 years ago
Dominic_Xiao ce91ea879f 天津-PCN新增功能:物料校验客户标签 5 years ago
许心洁 f363979f24 任务#3328 5 years ago
wynne1005 f21c618f70 feat(Screen): pojo建立 
pojo建立
 5 years ago
puxiao.liao cc8d2a5441 Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev 5 years ago
simon.song f73570b28e 漏提交代码 5 years ago
puxiao.liao f9c3fc705b Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev 5 years ago
Dominic_Xiao 4ceb2b70c7 Merge remote-tracking branch 'origin/test' into test 5 years ago
Dominic_Xiao d129a3863b 天津-新注塑区域集中下件 5 years ago
simon.song 2dc6a886fe 14492 19048-产品追溯报表OP10-OP70工位，日期字段显示的信息不对-20210316（时区问题） 5 years ago
joke.wang cd5773fb2e 绑定关键件增加显示列 5 years ago
王杰 e40744e65a Merge branch 'test' into ext-dev 5 years ago
王杰 f8e0146b19 pom 5 years ago
王杰 af11605d46 工步 5 years ago
钮海涛 257647de0a Merge remote-tracking branch 'origin/ext-dev' into ext-dev 5 years ago
钮海涛 0af24e4704 新增生产计划下发，生产计划打印功能。 5 years ago
曾贞一 f05c9bfaa4 Merge remote-tracking branch 'remotes/origin/test' into ext-dev 5 years ago
曾贞一 05ce6976e4 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
曾贞一 18b9a8c6c9 【14212 20162--库存调整盘点需要增加卡控逻辑--20210310】 5 years ago
joke.wang 6a00f4f7f9 14539 19081-工艺管理-BYPASS映射关系需按照BYPASS项需要升序排序 5 years ago
汪云昊 46d94c051a Merge remote-tracking branch 'remotes/origin/dev' into test 5 years ago
汪云昊 af4ce0fa32 feat(impp):组织结构添加事业部节点 5 years ago
钮海涛 1072a62f79 PDA首页增加目标存储区显示 5 years ago
钮海涛 ec35afa34e Merge remote-tracking branch 'origin/ext-dev' into ext-dev 5 years ago
钮海涛 9f12a44fb6 完成插单功能 5 years ago
puxiao.liao aec66afa83 修复泰国翻包 5 years ago
andly.pan 5859716998 Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into pext-dev 5 years ago
andly.pan 5e98df411e 更改重置参数 
Signed-off-by: andly.pan <andly.pan@estsh.com>
 5 years ago
wynne1005 8b1e28c893 删除mongo依赖 merge test 5 years ago
wynne1005 bbb4d57abc 删除mongo依赖 5 years ago
wynne1005 d627d024a7 移除mongo依赖 5 years ago
wynne1005 62d9679308 删除mongo依赖 5 years ago
wynne1005 b48f30fd47 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
汪云昊 960ec37cbc Merge remote-tracking branch 'remotes/origin/test' into ext-dev 5 years ago
汪云昊 a067683998 Merge remote-tracking branch 'remotes/origin/dev' into test 5 years ago
puxiao.liao 2da5b569a6 Merge remote-tracking branch 'origin/ext-dev' into ext-dev 5 years ago
puxiao.liao 29ee22da5d 软适配定时任务的修改 5 years ago
andly.pan 4261e9d34e Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into pext-dev 5 years ago
andly.pan faeef7b511 swebplanOrder增加过期字段 
Signed-off-by: andly.pan <andly.pan@estsh.com>
 5 years ago
汪云昊 2fd80792ba Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
汪云昊 c60daac399 feat(mdm):mdmhql工具调整 5 years ago
钮海涛 be664bf464 Merge remote-tracking branch 'origin/ext-dev' into ext-dev 5 years ago
钮海涛 a63334c5a1 去除事务sop 5 years ago
wynne1005 31f26f5b4f Merge branch 'dev' into test 5 years ago
wynne1005 b8d254e55e 增加平台配置类型 5 years ago
joke.wang 19872ba443 隔离报废 5 years ago
陈思洁 c2dbff5d5a Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
陈思洁 6b4ae7eb71 【3254 泰国-上装总成套膜标签打印】 5 years ago
joke.wang 0c4e6359fc JISA导入优化 5 years ago
joke.wang fbab36aad2 报废隔离 5 years ago
andly.pan 754124ff25 Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into pext-dev 5 years ago
汪云昊 c6031a0fc4 feat(softswitch):添加sap-rfc适配器 5 years ago
wynne1005 6adc396aef 删除动态表单的元素样式类型 5 years ago
wynne1005 dce748fdd8 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
wynne1005 2a63c05597 删除动态表单的元素样式类型 5 years ago
wynne1005 4d40686be8 删除动态表单的元素样式类型 5 years ago
曾贞一 54e691bc30 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
曾贞一 2e49522aec 【14115 20063-BH基础数据增加导出及导入功能-20210305】 5 years ago
joke.wang 24aa100dfe 追溯总览报表 5 years ago
wynne1005 1f94eee641 Merge branch 'dev' into test 5 years ago
许心洁 ab05112dc4 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev 5 years ago
陈思洁 efebc6f605 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
陈思洁 154307b2f0 【泰国工位传参修改】 5 years ago
许心洁 2127e3d260 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo 5 years ago
joke.wang 339cbf0634 bug:14146 一张报表中查询产品所有追溯信息 5 years ago
许心洁 4ae7700104 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev 5 years ago
Dominic_Xiao 44af0f4e80 删除重复实体类 5 years ago
puxiao.liao 5b3046f482 天津麦格纳BUG修复 5 years ago
joke.wang d7da6437b3 获取状态机dao bug修复 5 years ago
钮海涛 919db8451e 导入问题修复 5 years ago
王杰 4d81424794 numberrule 5 years ago
王杰 5e290e81b8 number rule 5 years ago
wynne1005 8c3a652ada Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
wynne1005 6318ca6afc feat(form): 动态表单新增跳转详情页枚举 5 years ago
simon.song dbeb6baac7 14185 20027--管理端-数据对象，根据数据源代码查询无效- 2021-02-28 5 years ago
joke.wang f01ae5106b 14165 返修队列增加校验 5 years ago
钮海涛 7d47979fe1 Merge remote-tracking branch 'origin/ext-dev' into ext-dev 5 years ago
钮海涛 f31071afc6 add export function 5 years ago
王杰 6b7cfa6659 Merge branch 'test' into ext-dev 5 years ago
王杰 3cd06f5be3 pom 5 years ago
许心洁 d223ff242d BUG14132 #流程管家在重置之后开启了一个新的流程但是没有重新返回配置项信息，导致前端重置后按钮组件等消失 5 years ago
王杰 04756b1a6d Merge branch 'test' into dev 5 years ago
钮海涛 52644c1deb Merge remote-tracking branch 'origin/ext-dev' into ext-dev 5 years ago
钮海涛 f10f13a8de add import field 5 years ago
许心洁 38e6870f04 Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo 5 years ago
puxiao.liao a98066dbe8 接口增加字段信息 5 years ago
王杰 431ee97d64 同步工单表 5 years ago
王杰 f4e9bf4603 Merge branch 'test' into ext-dev 5 years ago
王杰 94d38bb175 test merge dev 5 years ago
王杰 fe6940b0dc 编码规则扩展 5 years ago
joke.wang b505fe8456 13858 20027--接口表同步情况报表 5 years ago
joke.wang e2a9222b47 pcn登陆限制 5 years ago
曾贞一 76079c9bee Merge branch 'test' into ext-dev 
# Conflicts:
#	modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java
 5 years ago
puxiao.liao 485fe13202 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
puxiao.liao c880d51c9d 修复泰国翻包 5 years ago
钮海涛 90169cd8b0 Merge remote-tracking branch 'origin/ext-dev' into ext-dev 5 years ago
钮海涛 2ba2314968 add import field 5 years ago
曾贞一 c63df1ed7f Merge remote-tracking branch 'remotes/origin/test' into ext-dev 5 years ago
Dominic_Xiao 0c9dff6dd8 不良品处理根据物料类型查询位置 5 years ago
Dominic_Xiao c1eb51dec5 缺陷位置新增产品类型字段 5 years ago
王杰 dbc417269b test merge ext-dev 5 years ago
王杰 03d95e2591 Merge branch 'dev' into test 5 years ago
王杰 e66a560661 冲突 5 years ago
王杰 ec3d2f8557 pom 5 years ago
王杰 4644639c2e pom 5 years ago
王杰 c06902f8de 冲突 5 years ago
曾贞一 462ed4f1de 【13795 20027--现中航BH数据检验完成后无法将数据通过接口传输到老WMS系统--2021-01-21】 5 years ago
曾贞一 7b3ef8f268 【13795 20027--现中航BH数据检验完成后无法将数据通过接口传输到老WMS系统--2021-01-21】 5 years ago