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

2877 Commits (ceebe541f26844f2a16694e80734602452450751)

Author SHA1 Message Date
钮海涛 72c1363517 Merge remote-tracking branch 'origin/test' into test 5 years ago
钮海涛 f2cf6af1fe Finish Task #2523 Cost:16h 
Fix Bug #10065 已增加数据权限控制
 5 years ago
许心洁 46904c43d1 任务#2528，#2545 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 2e3f5bb2af Fix bug#9994 
库存明细--显示重复
 5 years ago
puxiao.liao 5f90efe691 Fix bug#9982 
19125+条码打印页面，erpSrcNo字段数据错误，导致打印出的条码数据有误+0727
 5 years ago
钮海涛 7ca3b43bfe 合并DEV分支代码 5 years ago
钮海涛 b04ef3caa4 合并TEST分支代码 5 years ago
钮海涛 ef40f20e1d 解决合并冲突 5 years ago
钮海涛 3c22c8e3f4 test版本合并到master 5 years ago
钮海涛 0eb571d717 Fix bug #9804 5 years ago
钮海涛 9bde10f13c 修复收货回执界面打不开问题 5 years ago
puxiao.liao 5006e0a938 Finish Task #2520 Cost:8h 
2520 07 1.2.3.3.4北京麦格纳WMS-JIS生产报工与内部移库
 5 years ago
puxiao.liao 31c3fcd868 泰国需求 5 years ago
钮海涛 3e95dd4029 修复北京麦格纳生产报工问题 5 years ago
puxiao.liao 88b85b03d2 Finish Task #2436 Cost:8h 
拣货、客户发运流程简化配置
 5 years ago
qianhs c9e4c72901 Finish Task #2080 Cost:8h 5 years ago
qianhs e17318dbcb Finish Task #2080 Cost:8h 5 years ago
王杰 b3999ad481 dev merge test 5 years ago
王杰 767c1bffbc test merge dev 5 years ago
钮海涛 81266fbfb6 解决合并冲突 5 years ago
qianhs 9461057a07 Finish Task #2080 Cost:8h 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
曾贞一 791acf7ae8 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
曾贞一 dffdf88471 【9556 欧洲-RFID条码操作记录-操作类型显示问题】 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
曾贞一 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
曾贞一 c0cf08fa19 【9556 欧洲-RFID条码操作记录-操作类型显示问题】 5 years ago
王杰 4260316f62 test merge dev 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
王杰 a2f047553f pom 5 years ago
王杰 dc91809bb7 test merge dev 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
曾贞一 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
qianhs f0b8cee974 Merge remote-tracking branch 'origin/test' into test 5 years ago
qianhs ba6be25390 Finish Task #2080 Cost:8h 5 years ago
puxiao.liao 595266f536 Fix bug#9343 
19125+条码打印页面后端传值新增一个字段值，传表wms_part 字段color +0709
 5 years ago
曾贞一 0108649a73 【代码优化-优化】 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
曾贞一 50e2f18c0d 【9280 wms-202007-BH录值完成点击完成按钮系统响应时间过长-0705】 5 years ago
wynne1005 15f0a37508 还原pom 5 years ago
汪云昊 39d6609a5f Merge remote-tracking branch 'remotes/origin/dev' into test 5 years ago
钮海涛 24474b4704 Merge remote-tracking branch 'origin/test' into test 5 years ago
钮海涛 c3398a6cc9 修改中航BH问题 5 years ago
wynne1005 bcb4e5ad13 merge test 5 years ago
wynne1005 31b5f3e234 merge dev 还原pom 5 years ago
wynne1005 b18408b3bb merge 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 559fc003c8 Finish Task #2184 Cost:8h 
2184 06 1.2.3.7.1物流路线检查
 5 years ago
钮海涛 32eb9dc797 修复合并版本问题 5 years ago
钮海涛 9dca27259e Merge branch 'test' into dev 5 years ago
puxiao.liao 37fb285aa9 海纳川智能化 5 years ago
曾贞一 7dddac5113 【智能化开发-锁定库位】 5 years ago
曾贞一 aa09a31957 【智能化开发-锁定库存】 5 years ago
许心洁 9d79ed5376 3D仓库规则引擎优化 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
钮海涛 0f2f56163e Merge branch 'master' into test 5 years ago
puxiao.liao 5269cfb732 BH 需求修改 5 years ago
钮海涛 62c9d8d27d 修复欧洲FIFO跳过未进行交易处理Bug 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
曾贞一 624e8d6461 【2193 06 1.2.3.7.4任务自动生成任务JOB】 5 years ago
曾贞一 b68f55b062 【2193 06 1.2.3.7.4任务自动生成任务JOB】 5 years ago
王杰 15e7f2a0b5 pom 5 years ago
王杰 ea5a069eeb pom 5 years ago
王杰 f3ffdc7d4c dev merge test 5 years ago
王杰 2c16efcb72 Merge branch 'test' into dev 5 years ago
王杰 7d5d36d084 test merge master 5 years ago
王杰 70d58be136 pom 5 years ago
王杰 91d0ec1671 Merge branch 'master' into test 5 years ago
曾贞一 913991d30d 【2193 06 1.2.3.7.4任务自动生成任务JOB】 5 years ago
钮海涛 6c6fbf7e2c 新增收货回执显示收货时间功能 5 years ago
钮海涛 d08465dd38 修复版本问题 5 years ago
钮海涛 800a954b7f Merge branch 'test' into dev 5 years ago
qianhs 98b0110ff3 Finish Task #2080 Cost:8h 5 years ago
曾贞一 9567d62195 【自动化策略】 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
汪云昊 6d71c01178 Merge remote-tracking branch 'origin/dev' into test 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 0818778346 自动化策略主表 5 years ago
曾贞一 68c3f087dc 【2180 06 1.2.3.8泰国WMS－生产报工接口】 5 years ago
puxiao.liao 0c0d43cd96 北京海纳川：采购入库组件 5 years ago
曾贞一 a59fa1bf9b 【2078 06 1.2.3.9拣货策略-新增拣货推荐组价】 5 years ago
wei.peng ec3febfaa9 Merge remote-tracking branch 'remotes/origin/dev' into test 5 years ago
曾贞一 99f1ba98b6 【2077 06 1.2.3.8上架策略-4.5 新增上架推荐组件】 5 years ago
puxiao.liao 3fe454da39 Fix bug#8909 5 years ago
钮海涛 e457b50145 中航需求变更 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
曾贞一 27cb1dddfe 【1603 委外扣减查询-需求变更】 5 years ago
wynne1005 47ae0b46ef 还原pom 5 years ago
袁津哲 adb974d874 合并test分支代码到dev分支 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
puxiao.liao 2b791901d2 Fix bug#8876 5 years ago
钮海涛 16574b6920 Merge remote-tracking branch 'origin/test' into test 5 years ago
钮海涛 da454b3921 领料单界面显示erp单号问题 5 years ago
袁津哲 0067e31420 合并test分支代码到dev分支 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
钮海涛 97fb0bfd29 Fix Bug #8823 5 years ago
puxiao.liao 5c40073169 喜德BUG 修改 5 years ago
puxiao.liao 47a318f238 喜德BUG 修改 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
钮海涛 fd45d66968 解决合并冲突 5 years ago
曾贞一 a2ef35082e 【1794 天津麦格纳WMS-报表-库位利用率看板】 5 years ago
puxiao.liao e57acfacee BH BUG 修改 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
qianhs 6d4a1b6975 BH-CODE 出库，绑定 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
曾贞一 36f9068e4c 【冲突】 5 years ago
曾贞一 4c3571182c 【冲突】 5 years ago
曾贞一 523e4b7b3b 【2016 BH-回传检测结果至MES系统】 5 years ago
钮海涛 7414b76d85 修复合并版本问题 5 years ago
钮海涛 32a566be93 Merge branch 'test' into dev 5 years ago
钮海涛 6061f89d43 修复合并版本问题 5 years ago
puxiao.liao d3f2434aa0 Fix bug#8752,8753 5 years ago
曾贞一 6e70e3257b 【2009 天津麦格纳WMS-报表-库位利用率】 5 years ago
钮海涛 5643f1aab4 Merge remote-tracking branch 'origin/test' into test 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
钮海涛 5610e5a455 完成SWEB任务 5 years ago
puxiao.liao 47a7a0a9a3 BH 需求报表的修改 5 years ago
puxiao.liao 7f76cf0ad3 BH 需求修改 5 years ago
qianhs 86f6fefd5b BH-CODE 出库，绑定 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
puxiao.liao 1b84b3aeee Fix bug#8637,8697 5 years ago
wynne1005 8ef3997038 还原pom 5 years ago
puxiao.liao b5aa990ea7 Fix bug#8633 5 years ago
钮海涛 4d26c95639 Merge branch 'test' into dev 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
qianhs b474ef1266 Finish Task #1813 Cost:32h 
Finish Task #1814 Cost:32h
Finish Task #1815 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 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
钮海涛 f4cccf5c9b 修改微服务model接口 5 years ago
钮海涛 81b5262a24 修改微服务model接口 5 years ago
曾贞一 cf507fdb48 【BATCH录入检测值-需要变更】 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
曾贞一 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
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
曾贞一 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 1a018d4af5 1,产品条码事务实体类提交 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
钮海涛 27c62aa7d1 合并冲突 5 years ago
袁津哲 cad6b7ad89 Merge remote-tracking branch 'origin/dev' into dev 5 years ago
袁津哲 e578cb882a 优化通用模板代码模糊查询功能 5 years ago
wynne1005 608aa6be90 还原pom 5 years ago
wynne1005 99d3c9d721 提测合并 还原pom 5 years ago
wynne1005 5ef88c80c0 提测合并 还原pom 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
钮海涛 281a2dccb5 新增零件自动采购单 5 years ago
钮海涛 4ba0e6b264 自动生成采购订单功能 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
钮海涛 6c7a88b962 bug:【8520】 5 years ago
袁津哲 6e3da00fda Task1812:仓库健康度指标视图及相关指标自定义(#476) 5 years ago
袁津哲 3e65986585 Merge remote-tracking branch 'origin/dev' into dev 5 years ago
袁津哲 0e2f50e562 Task1812:仓库健康度指标视图及相关指标自定义(#476) 5 years ago
王杰 786c442d55 解决冲突 5 years ago
钮海涛 c1241bd6c5 修复版本问题 5 years ago
钮海涛 53a421b3b9 修复版本问题 5 years ago
钮海涛 94e9b2ffec Merge remote-tracking branch 'remotes/origin/master' into test 5 years ago
曾贞一 60dee04206 【8512 中航-BH检测结果管理-查询条件无效】 5 years ago
曾贞一 ecd888db6f Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
曾贞一 ec77182944 【BATCH录入检测值-查询优化】 5 years ago
王杰 029763feb1 pom 5 years ago
王杰 30fcf4f23f pom冲突 5 years ago
汪云昊 717f268c28 POJO版本号还原 5 years ago
钮海涛 281ef662b1 merge test 5 years ago
puxiao.liao e74f3d6d99 BUG#8438【20011-- 六合一改数按钮逻辑错误，打开改数按钮时，输入数量后数量会累加在下方明细中并且让用户再次输入数量--0515】 5 years ago
qianhs 7778ce1afd 类序列号 5 years ago
袁津哲 44eef89b40 Merge remote-tracking branch 'origin/dev' into dev 5 years ago
袁津哲 4b09d9fa8d 修改报错 5 years ago
qianhs 3462e33aac Merge remote-tracking branch 'origin/dev' into dev 5 years ago
qianhs 0e5bf3488b 盘点 5 years ago
袁津哲 486e655394 Merge remote-tracking branch 'origin/dev' into dev 5 years ago
袁津哲 7b5736d717 Task1812:仓库健康度指标视图及相关指标自定义(#476) 5 years ago
qianhs c38757de19 盘点 5 years ago
钮海涛 f1d14c9e3a bug:【8385】-报工事务查询联调报表查询功能。 5 years ago
puxiao.liao 8d386caa71 1776 工装初始化-新增箱条码与库位匹配检查组件 5 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
 5 years ago
puxiao.liao e8dd3ab12f 8481 基础数据-库位-导入。导出报错,提示cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil$LOCATE_TYPE.descriptionOfValue(java.lang.String) 5 years ago
曾贞一 c85fd2eff0 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
曾贞一 24ea607718 【8441 收货回执打印功能完善】 5 years ago
袁津哲 0ddd92e4f8 Merge remote-tracking branch 'origin/dev' into dev 5 years ago
袁津哲 0bafa0de52 开发调试回显组件模板功能 5 years ago
王杰 a6e9b90026 pom 5 years ago
许心洁 7e4fe5f945 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
许心洁 5d9f37ee33 根据作业类型分组查询流程组件SQL ：兼容SQLserver数据库优化 5 years ago
钮海涛 34a3598508 bug:8385 5 years ago
王杰 de9017ca5c 冲突 5 years ago
王杰 eaecf4b4b7 pom 5 years ago
王杰 c68d49880c Merge branch 'dev' into test 5 years ago
王杰 7d192b36a6 pom冲突 5 years ago
袁津哲 80e572f07d 开发回显组件模板管理功能和优化实体生成数据库脚本逻辑 5 years ago
puxiao.liao a748fbd2f7 8426 中航-报表中心-采购计划更改查询-查询条件无效 5 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
 5 years ago
puxiao.liao 70aeae21d3 8426 中航-报表中心-采购计划更改查询-查询条件无效 5 years ago
曾贞一 d43935f88a Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
曾贞一 7ac98ffbc6 【1797 天津麦格纳WMS-定制业务-VDA标签防错验证】 5 years ago
钮海涛 da8b4db890 修复pom版本问题 5 years ago
许心洁 75be7d5078 任务#1744：全局替换自定义搜索功能 5 years ago
许心洁 ef6330675c 任务#1744：全局替换自定义搜索功能 5 years ago
钮海涛 f87eeeb491 修复合并版本问题 5 years ago
钮海涛 ac268c1cbc Merge branch 'test' into dev 5 years ago
钮海涛 917a101f20 Merge remote-tracking branch 'origin/dev' into dev 5 years ago
钮海涛 df2e8601c4 task:1719 5 years ago
puxiao.liao ba81a26700 1778 产品工装关系维护 5 years ago
曾贞一 1901cf6eb0 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
曾贞一 2dac15c248 【1709 BH-录入检测值】 5 years ago
puxiao.liao 1983602b3a 8060 AP-MGN-BJ-19081 --扫描查询输入零件号查询，查询出来的零件数量全部为0 5 years ago
钮海涛 bbe03cc6fd 解决合并冲突问题 5 years ago
钮海涛 40a87d83b3 修复合并问题 5 years ago
钮海涛 05276bcf46 Merge remote-tracking branch 'origin/dev' into dev 5 years ago
钮海涛 005d0f7f86 修复合并问题 5 years ago
钮海涛 bc269e1f71 Merge branch 'master' into test 5 years ago
钮海涛 2b85a05645 新增脚本WebSocket 5 years ago
钮海涛 dd70688754 新增脚本WebSocket 5 years ago
qianhs f03e119561 bug:8268;8267;8266;8265 5 years ago
钮海涛 6e2344b303 bug:8330 5 years ago
wynne1005 4ed1770189 Merge branch 'dev' into test 5 years ago
曾贞一 97d7fdbf24 【8181 20011-- 条码打印界面增加一个打印组号按钮，用于现场母条码丢失或者损坏的场景来补打母条码】 5 years ago
曾贞一 fb15536a34 【8254 中航-出库单-客户发运-新增销售订单字段】 5 years ago
钮海涛 7aaed8fb79 task:1735 5 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
 5 years ago
钮海涛 81f380aec4 产品入库表新增 5 years ago
钮海涛 b7dceccd71 Merge remote-tracking branch 'origin/test' into test 5 years ago
钮海涛 f414274aeb 供货追踪 5 years ago
汪云昊 2ab9045d17 Merge remote-tracking branch 'remotes/origin/dev' into test 5 years ago
许心洁 1a7d9edd40 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
许心洁 3cd2fb02f4 宁德BUG-JIS发运汇总JOB:BUG#8246 5 years ago
曾贞一 8e529f46d7 【1722 BH-Bacth条码查询】 5 years ago
wei.peng 37922cab29 POM 文件修改 
Merge remote-tracking branch 'remotes/origin/test'

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