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

2487 Commits (3b5142a1f8aff85de77df33123b617aeed82ae09)

Author SHA1 Message Date
曾贞一 9e236a06a1 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 6 years ago
曾贞一 6fc4641033 【BATCH录入检测值-需要变更】 6 years ago
puxiao.liao c2942b8a0d BH 需求变更 6 years ago
puxiao.liao 583c750055 BH 需求变更 6 years ago
puxiao.liao 4f56baadef Merge remote-tracking branch 'origin/test' into test 6 years ago
钮海涛 71d936cc56 Merge remote-tracking branch 'origin/test' into test 6 years ago
钮海涛 b060ba97aa 修改BH同步JOB逻辑 6 years ago
puxiao.liao 75308c8989 BH 需求变更 6 years ago
puxiao.liao 1dc9276e9a BH 需求变更 6 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
 6 years ago
钮海涛 efc30f713f 修改BH同步JOB逻辑 6 years ago
曾贞一 627b417256 【BATCH录入检测值-需要变更】 6 years ago
曾贞一 765e0619ca 【BATCH录入检测值-需要变更】 6 years ago
puxiao.liao 8c3f81292c BH 需求变更 6 years ago
puxiao.liao c06fee639d BH 需求变更 6 years ago
qianhs 17b27da539 BH-CODE 出库，绑定 6 years ago
曾贞一 33c0ab4015 【BATCH录入检测值-需要变更】 6 years ago
曾贞一 a4fdf07b4b 【BATCH录入检测值-需要变更】 6 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
 6 years ago
曾贞一 72817fca4a 【BATCH录入检测值-需要变更】 6 years ago
钮海涛 6d1c0bb46d 修改BH基础数据 6 years ago
钮海涛 ad79c9fd7b 修改BH基础数据 6 years ago
puxiao.liao 99955a70ff bug7940【7940 推荐入库-未按最近距离推荐】 6 years ago
puxiao.liao 443486a8cf BH 需求变更-增加产品条码信息 6 years ago
qianhs 1a018d4af5 1,产品条码事务实体类提交 6 years ago
钮海涛 999a415d27 修复版本问题 6 years ago
钮海涛 b9cbf9684b Merge branch 'test' into dev 6 years ago
钮海涛 4921d55bda 修复版本问题 6 years ago
钮海涛 b303cf9a14 修复合并问题 6 years ago
钮海涛 a5a032debe 解决model生成数据库表问题 6 years ago
钮海涛 96fdbe0e07 Merge branch 'master' into test 6 years ago
puxiao.liao 491bc32325 Fix Bug#8345 6 years ago
钮海涛 27c62aa7d1 合并冲突 6 years ago
袁津哲 cad6b7ad89 Merge remote-tracking branch 'origin/dev' into dev 6 years ago
袁津哲 e578cb882a 优化通用模板代码模糊查询功能 6 years ago
wynne1005 608aa6be90 还原pom 6 years ago
wynne1005 99d3c9d721 提测合并 还原pom 6 years ago
wynne1005 5ef88c80c0 提测合并 还原pom 6 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
 6 years ago
钮海涛 281a2dccb5 新增零件自动采购单 6 years ago
钮海涛 4ba0e6b264 自动生成采购订单功能 6 years ago
钮海涛 8a2d54ce61 临时保存 6 years ago
曾贞一 e3accbf24e 【8441 收货回执打印功能完善】 6 years ago
曾贞一 d0e4af979e Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 6 years ago
曾贞一 6a28329d75 【8441 收货回执打印功能完善】 6 years ago
puxiao.liao f8ccd0166e BUG【8554】 中航-工装初始化导入后，一个excel应该产生一笔事物，明细按物料分 6 years ago
钮海涛 6c7a88b962 bug:【8520】 6 years ago
袁津哲 6e3da00fda Task1812:仓库健康度指标视图及相关指标自定义(#476) 6 years ago
袁津哲 3e65986585 Merge remote-tracking branch 'origin/dev' into dev 6 years ago
袁津哲 0e2f50e562 Task1812:仓库健康度指标视图及相关指标自定义(#476) 6 years ago
王杰 786c442d55 解决冲突 6 years ago
钮海涛 c1241bd6c5 修复版本问题 6 years ago
钮海涛 53a421b3b9 修复版本问题 6 years ago
钮海涛 94e9b2ffec Merge remote-tracking branch 'remotes/origin/master' into test 6 years ago
曾贞一 60dee04206 【8512 中航-BH检测结果管理-查询条件无效】 6 years ago
曾贞一 ecd888db6f Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 6 years ago
曾贞一 ec77182944 【BATCH录入检测值-查询优化】 6 years ago
王杰 029763feb1 pom 6 years ago
王杰 30fcf4f23f pom冲突 6 years ago
汪云昊 717f268c28 POJO版本号还原 6 years ago
钮海涛 281ef662b1 merge test 6 years ago
puxiao.liao e74f3d6d99 BUG#8438【20011-- 六合一改数按钮逻辑错误，打开改数按钮时，输入数量后数量会累加在下方明细中并且让用户再次输入数量--0515】 6 years ago
qianhs 7778ce1afd 类序列号 6 years ago
袁津哲 44eef89b40 Merge remote-tracking branch 'origin/dev' into dev 6 years ago
袁津哲 4b09d9fa8d 修改报错 6 years ago
qianhs 3462e33aac Merge remote-tracking branch 'origin/dev' into dev 6 years ago
qianhs 0e5bf3488b 盘点 6 years ago
袁津哲 486e655394 Merge remote-tracking branch 'origin/dev' into dev 6 years ago
袁津哲 7b5736d717 Task1812:仓库健康度指标视图及相关指标自定义(#476) 6 years ago
qianhs c38757de19 盘点 6 years ago
钮海涛 f1d14c9e3a bug:【8385】-报工事务查询联调报表查询功能。 6 years ago
puxiao.liao 8d386caa71 1776 工装初始化-新增箱条码与库位匹配检查组件 6 years ago
puxiao.liao 8e8744d3db 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
 6 years ago
puxiao.liao e8dd3ab12f 8481 基础数据-库位-导入。导出报错,提示cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil$LOCATE_TYPE.descriptionOfValue(java.lang.String) 6 years ago
曾贞一 c85fd2eff0 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
曾贞一 24ea607718 【8441 收货回执打印功能完善】 6 years ago
袁津哲 0ddd92e4f8 Merge remote-tracking branch 'origin/dev' into dev 6 years ago
袁津哲 0bafa0de52 开发调试回显组件模板功能 6 years ago
王杰 a6e9b90026 pom 6 years ago
许心洁 7e4fe5f945 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 6 years ago
许心洁 5d9f37ee33 根据作业类型分组查询流程组件SQL ：兼容SQLserver数据库优化 6 years ago
钮海涛 34a3598508 bug:8385 6 years ago
王杰 de9017ca5c 冲突 6 years ago
王杰 eaecf4b4b7 pom 6 years ago
王杰 c68d49880c Merge branch 'dev' into test 6 years ago
王杰 7d192b36a6 pom冲突 6 years ago
袁津哲 80e572f07d 开发回显组件模板管理功能和优化实体生成数据库脚本逻辑 6 years ago
puxiao.liao a748fbd2f7 8426 中航-报表中心-采购计划更改查询-查询条件无效 6 years ago
puxiao.liao f765493696 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/CommonEnumUtil.java
 6 years ago
puxiao.liao 70aeae21d3 8426 中航-报表中心-采购计划更改查询-查询条件无效 6 years ago
曾贞一 d43935f88a Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
曾贞一 7ac98ffbc6 【1797 天津麦格纳WMS-定制业务-VDA标签防错验证】 6 years ago
钮海涛 da8b4db890 修复pom版本问题 6 years ago
许心洁 75be7d5078 任务#1744：全局替换自定义搜索功能 6 years ago
许心洁 ef6330675c 任务#1744：全局替换自定义搜索功能 6 years ago
钮海涛 f87eeeb491 修复合并版本问题 6 years ago
钮海涛 ac268c1cbc Merge branch 'test' into dev 6 years ago
钮海涛 917a101f20 Merge remote-tracking branch 'origin/dev' into dev 6 years ago
钮海涛 df2e8601c4 task:1719 6 years ago
puxiao.liao ba81a26700 1778 产品工装关系维护 6 years ago
曾贞一 1901cf6eb0 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
曾贞一 2dac15c248 【1709 BH-录入检测值】 6 years ago
puxiao.liao 1983602b3a 8060 AP-MGN-BJ-19081 --扫描查询输入零件号查询，查询出来的零件数量全部为0 6 years ago
钮海涛 bbe03cc6fd 解决合并冲突问题 6 years ago
钮海涛 40a87d83b3 修复合并问题 6 years ago
钮海涛 05276bcf46 Merge remote-tracking branch 'origin/dev' into dev 6 years ago
钮海涛 005d0f7f86 修复合并问题 6 years ago
钮海涛 bc269e1f71 Merge branch 'master' into test 6 years ago
钮海涛 2b85a05645 新增脚本WebSocket 6 years ago
钮海涛 dd70688754 新增脚本WebSocket 6 years ago
qianhs f03e119561 bug:8268;8267;8266;8265 6 years ago
钮海涛 6e2344b303 bug:8330 6 years ago
wynne1005 4ed1770189 Merge branch 'dev' into test 6 years ago
曾贞一 97d7fdbf24 【8181 20011-- 条码打印界面增加一个打印组号按钮，用于现场母条码丢失或者损坏的场景来补打母条码】 6 years ago
曾贞一 fb15536a34 【8254 中航-出库单-客户发运-新增销售订单字段】 6 years ago
钮海涛 7aaed8fb79 task:1735 6 years ago
钮海涛 bf2cc9843f Merge remote-tracking branch 'origin/dev' into dev 
# Conflicts:
#	modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
 6 years ago
钮海涛 81f380aec4 产品入库表新增 6 years ago
钮海涛 b7dceccd71 Merge remote-tracking branch 'origin/test' into test 6 years ago
钮海涛 f414274aeb 供货追踪 6 years ago
汪云昊 2ab9045d17 Merge remote-tracking branch 'remotes/origin/dev' into test 6 years ago
许心洁 1a7d9edd40 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
许心洁 3cd2fb02f4 宁德BUG-JIS发运汇总JOB:BUG#8246 6 years ago
曾贞一 8e529f46d7 【1722 BH-Bacth条码查询】 6 years ago
wei.peng 37922cab29 POM 文件修改 
Merge remote-tracking branch 'remotes/origin/test'

# Conflicts:
#	modules/i3plus-icloud-report/pom.xml
 6 years ago
wei.peng 8aab106aa9 合并代码 pom 冲突 
Merge remote-tracking branch 'remotes/origin/dev' into test

# Conflicts:
#	modules/i3plus-ics-gateway/src/main/resources/application-docker.properties
 6 years ago
钮海涛 724ba402bf 前端联调 6 years ago
曾贞一 bc82c85790 【1721 BH-BH检测结果管理】 6 years ago
钮海涛 cb8688105c task:1727;1728;1729 6 years ago
钮海涛 3fbf532c84 修复pom版本问题 6 years ago
钮海涛 a1eb3c3bc2 修复pom版本问题 6 years ago
钮海涛 2e2ee2cc6c Merge branch 'test' into dev 6 years ago
钮海涛 c6d36af4c9 Merge branch 'master' into test 6 years ago
曾贞一 c3b6376934 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
曾贞一 f3e53ff1eb 【8150 20011-- 出库单明细界面，打印客户标签按钮，增加打印字段】 
【8151 20011-- 出库单明细界面，打印客户标签按钮，重打按钮，补打客户标签按钮，三个按钮牛均无法打出客户零件号。关联bug7501---0429】
 6 years ago
钮海涛 7b2a4fdea7 合并dev代码 6 years ago
钮海涛 475bb9370f Merge remote-tracking branch 'origin/dev' into dev 6 years ago
qianhs 2303186fc4 【657】【中航WMS看板－成品发运率看板】 
【658】【中航WMS看板－发运窗口时间看板】
【656】【 中航WMS看板－收货完成率看板】
【655】【 中航WMS看板－仓库预警看板】
【654】【中航WMS看板－３０天供应商延期到货跟踪动态看板】
 6 years ago
钮海涛 398207b875 Merge remote-tracking branch 'origin/dev' into dev 6 years ago
曾贞一 6190a4f66d Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
曾贞一 156f0feedc 【1603 委外扣减查询】 6 years ago
puxiao.liao 7c7691f583 bug8190【8190 中航-成品条码维护-批量修改客户代码-】 6 years ago
钮海涛 4d383dda1b 新增事务报工查询 6 years ago
puxiao.liao f6988f36c8 1655 生产领料单增加替代料 6 years ago
袁津哲 7789883f9b 开发导入功能模块 6 years ago
曾贞一 509240126a 【1604 待入库数据查询】 6 years ago
曾贞一 312cf59f49 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
曾贞一 88ce1e59cf 【1604 待入库数据查询】 6 years ago
袁津哲 8a6c9aadef 开发导入功能模块 6 years ago
wynne1005 d6fe718e4c Merge branch 'dev' into test 6 years ago