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

3262 Commits (7aae60a846bdedcaed732c5c20e6635c988f5a2a)

Author SHA1 Message Date
曾贞一 561717b7a3 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 4 years ago
曾贞一 8b4bd8d8ab 【中航-优化委外发运业务】 4 years ago
puxiao.liao 4d5888ae36 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev 4 years ago
puxiao.liao 1835890e4c Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev 4 years ago
puxiao.liao d952e7a8e9 采购收货进度报表增加列查询，窗口开始时间，窗口结束时间 4 years ago
puxiao.liao 2f903e07fa Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev 4 years ago
puxiao.liao 224e3a9a51 字段和枚举的新增 4 years ago
puxiao.liao 2580841944 Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev 4 years ago
puxiao.liao 808f60a64a 代码优化 4 years ago
puxiao.liao 0d73e0797e Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev 4 years ago
puxiao.liao d71434851c 增加库位名称 4 years ago
puxiao.liao e0083530f0 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev 4 years ago
puxiao.liao 96ea96f0a2 模板明细增加是否导出模板excel 头 4 years ago
王杰 c7a62d52b5 Merge branch 'test' into ext-dev 4 years ago
李俊生 804f9240cc 零星出库单需要增加出库原因、部门、领用人（前3个调用枚举）、项目号（调用项目信息） 
零星入库单  增加入库原因
 4 years ago
王杰 4fdab21958 Merge branch 'test' into ext-dev 4 years ago
王杰 15dc951bf1 dev merge test 4 years ago
王杰 5d33795cff test merge dev 4 years ago
andly.pan 95d72cf4af 库存交易条码新增字段（同步仪征） 
Signed-off-by: andly.pan <andly.pan@estsh.com>
 4 years ago
puxiao.liao a001dae575 代码回滚 4 years ago
李俊生 5f52b1aa33 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 4 years ago
李俊生 206b522af5 pom冲突 4 years ago
李俊生 adb48ef07f 南非收货提交后，需送检的零件后需要有送检的提示 4 years ago
曾贞一 54329c67ec 【同步BH成品条码JOB-优化】 4 years ago
castle.zang 4fa41f2f90 还原pom version 4 years ago
castle.zang 9a4d2060b6 修复version版本号 4 years ago
曾贞一 93c64328db 【修改-pom.xml】 4 years ago
臧学普 7aa68616bc Merge branch 'master' into test 4 years ago
李俊生 85dd71b1ca Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 
 Conflicts:
	modules/i3plus-pojo-screen/pom.xml
 4 years ago
puxiao.liao 177cdd0b6e 库存条码表增加容器字段 4 years ago
andly.pan 43d7195a37 Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into pext-dev 4 years ago
曾贞一 3e0df20273 【15693 19108+单据管理-出库单-出库单明细-双击-出库单子表详情，新增wms_stock_sn.package_no字段显示+0506】 4 years ago
puxiao.liao 5cf9c232b5 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 4 years ago
puxiao.liao dbd14c9d6e 导出模板字段排序维护 4 years ago
Fightgoo 82b4c948f6 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 4 years ago
Fightgoo 021e05ebaf 15635 20027-调角器BH- BH检测结果管理-管理明细增加检测类型代码查询条件 - 20210430 4 years ago
李俊生 efaafcdcc9 仓库物料统计预警 4 years ago
曾贞一 60408db7b0 【15642 19108+wms_printing_queue 新增 part_no 字段+0429】 4 years ago
puxiao.liao 3cf1fd642e Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev 4 years ago
曾贞一 c6e80ad9a7 【3391 添加报废记录报表和修改质检不良清单表-后端】 4 years ago
andly.pan 6989180c2a Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into pext-dev 4 years ago
曾贞一 ac08dc110c Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 4 years ago
曾贞一 a92b87f6a0 【3391 添加报废记录报表-后端】 4 years ago
王杰 844349d583 冲突 4 years ago
王杰 21a3d716f4 pom 4 years ago
王杰 5bf5504992 pom 4 years ago
李俊生 91d7b0157d 零件转换界面增加按钮功能 
15241 19081 ——北京麦格纳采购订货进度报表看板需排序，2021-04-17 按照计划时间倒序
15474 19081-报表中心，供应商到货异常到货次数查询主表添加显示字段，到货时间，单号--20210422
15471 19081-领料任务报表及明细没有拣货完成时间-20210425
 4 years ago
puxiao.liao 54529730e7 Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev 4 years ago
puxiao.liao 3c4c271c64 增加产品条码字段信息 4 years ago
许心洁 c4b833a259 合并test分支代码 4 years ago
李俊生 4e87b3000d Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 4 years ago
李俊生 9ed1a5d36a 15241 19081 ——北京麦格纳采购订货进度报表看板需排序，2021-04-17 
15108 19048-- 库存移动统计可以查看到历史记录 --20210417
 4 years ago
puxiao.liao 505f80032c 导入模板下载增加是否必填字段下载 4 years ago
汪云昊 ec605315bb Merge remote-tracking branch 'remotes/origin/test' into ext-dev 4 years ago
puxiao.liao 87f3031a3d 修复软适配枚举 4 years ago
许心洁 e1f366f654 喜德任务#3349 4 years ago
许心洁 091a5b3678 流程管家重置提示+喜德任务3349 4 years ago
许心洁 2684b52775 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 4 years ago
许心洁 a24b40d8ec 喜德任务#3349 4 years ago
puxiao.liao 39b716d2a1 修复打印异常 4 years ago
github33 4854673754 14850 20027-mes查询 wms的熔深batch的接口-20210409 4 years ago
github33 be26c0920f 14850 20027-mes查询 wms的熔深batch的接口-20210409 4 years ago
puxiao.liao 6030c67021 打印数据查询修改 4 years ago
github33 63dc4a2f9f 14850 20027-mes查询 wms的熔深batch的接口-20210409 4 years ago
曾贞一 b688f4aff5 【14905 20027-调角器BH-录入检测值- 熔深结果刷新有误 -20210404】 4 years ago
shun 1fbccdcf40 查询移库单增加供应商名称 4 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
 4 years ago
许心洁 f363979f24 任务#3328 4 years ago
曾贞一 f05c9bfaa4 Merge remote-tracking branch 'remotes/origin/test' into ext-dev 4 years ago
曾贞一 18b9a8c6c9 【14212 20162--库存调整盘点需要增加卡控逻辑--20210310】 4 years ago
puxiao.liao aec66afa83 修复泰国翻包 4 years ago
wynne1005 8b1e28c893 删除mongo依赖 merge test 4 years ago
andly.pan 4261e9d34e Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into pext-dev 4 years ago
andly.pan faeef7b511 swebplanOrder增加过期字段 
Signed-off-by: andly.pan <andly.pan@estsh.com>
 4 years ago
andly.pan 754124ff25 Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into pext-dev 4 years ago
曾贞一 54e691bc30 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 4 years ago
曾贞一 2e49522aec 【14115 20063-BH基础数据增加导出及导入功能-20210305】 4 years ago
许心洁 2127e3d260 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo 4 years ago
许心洁 4ae7700104 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev 4 years ago
puxiao.liao 5b3046f482 天津麦格纳BUG修复 4 years ago
许心洁 d223ff242d BUG14132 #流程管家在重置之后开启了一个新的流程但是没有重新返回配置项信息，导致前端重置后按钮组件等消失 4 years ago
许心洁 38e6870f04 Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo 4 years ago
puxiao.liao a98066dbe8 接口增加字段信息 4 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
 4 years ago
puxiao.liao c880d51c9d 修复泰国翻包 4 years ago
王杰 ec3d2f8557 pom 4 years ago
王杰 4644639c2e pom 4 years ago
王杰 f0c09ca0e6 Merge branch 'test' into dev 4 years ago
王杰 2b89e35c69 pom 4 years ago
许心洁 071b0ea9ce Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev 
# Conflicts:
#	sonar-project.properties
 4 years ago
许心洁 410b95aefd Merge branches 'master' and 'test' of http://git.estsh.com/i3-WMS/i3plus-wms 
# Conflicts:
#	modules/i3plus-wms-apiservice/pom.xml
 4 years ago
puxiao.liao 696a0a8c3f 修复单据条码展开日期 4 years ago
王杰 5a5874b137 test 4 years ago
王杰 45a1b63a23 Merge branch 'test' 4 years ago
王杰 84d9ec15f2 pom 4 years ago
王杰 f1db936f42 pom 4 years ago
王杰 d2f03a966e Merge branch 'dev' into test 4 years ago
puxiao.liao c8d97daa58 Fix bug#13248 4 years ago
puxiao.liao 983565aca1 Fix bug#13752 4 years ago
许心洁 896a88de44 合并测服代码 4 years ago
王杰 c8b21c0b69 pom 4 years ago
许心洁 8246a28c05 Merge branches 'master' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo 4 years ago
许心洁 8cd32346d3 BUG#13694,喜德BUG：单据条码展开没有查询seqNo导致无法生成条码 4 years ago
许心洁 c45cd70ea9 喜德BUG：单据展开查询没有返回seqNo导致不能生成条码 4 years ago
puxiao.liao 8eb1831861 Fix bug#12607 4 years ago
许心洁 d107c7a3fe Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo 4 years ago
许心洁 02137638e4 喜德BUG:单据条码展开没有查询出单据明细的SEQNO，导致工单条码无法生成 4 years ago
肖奕扬 0ee06f6e03 Merge branch 'test' of i3-IMPP/i3plus-pojo into ext-dev 4 years ago
许心洁 ca5cc4937e 需求#1391 4 years ago
rock.yu 8be0df57ea Merge remote-tracking branch 'origin/test' into test 4 years ago
rock.yu ad2c771996 ERP快照相关的表切换为从BaseBean继承，解决SnapID重复的问题 4 years ago
puxiao.liao 1f3f891264 二维码优化 4 years ago
许心洁 6fab12fc50 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 4 years ago
许心洁 e72c2dd09a 任务#2586 4 years ago
shun 9cdf5827a3 JIS发运报表增加导出枚举 4 years ago
钮海涛 2740830e8f 合并test代码 4 years ago
shun dfaa9c810b JIS发运报表增加导出model 4 years ago
Dominic_Xiao c72a294a6f 回滚POM 4 years ago
肖奕扬 9f25d80eac Merge branch 'dev' of i3-IMPP/i3plus-pojo into test 4 years ago
andly.pan ddb6fa33d3 条码增加道口泊位 
Signed-off-by: andly.pan <andly.pan@estsh.com>
 4 years ago
shun 987fa02e32 自动打印增加重量 4 years ago
shun 33b05c090c Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 4 years ago
shun 36f37a4444 无锡喜德看板优化 4 years ago
许心洁 abc5a9b812 BUG#新增需求：13580 4 years ago
shun ad0ddbf65e Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev 4 years ago
曾贞一 aae3fb2539 【未完成单据提交-优化】 4 years ago
王杰 58c7b6854b pom 4 years ago
曾贞一 2e13f7e3f9 Merge remote-tracking branch 'origin/ext-dev' into ext-dev 4 years ago
曾贞一 bbd5dccbf8 【合并分支】 4 years ago
puxiao.liao db8c01b64c 修复天津BUG 4 years ago
许心洁 a9fc8ae132 喜德WMS：BUG#13293，13295，13294 4 years ago
钮海涛 b843db89d9 静态盘点查询单据查询不到数据问题修复 4 years ago
puxiao.liao 129002573c Fix bug#13399 4 years ago
duan.yang 0db629a2a1 BUG #13415 19058-坤泰环境，生成装车单时需要把原出库单号作为关联号显示在界面上 
Signed-off-by: duan.yang <994300880@qq.com>
 4 years ago
puxiao.liao 8657926eee Fix bug#13411 
ASN收货后未点击提交按钮，再次进入后无法提交
 4 years ago
puxiao.liao 4937b49281 Fix bug#13411 
ASN收货后未点击提交按钮，再次进入后无法提交
 4 years ago
puxiao.liao 36d4f0ac10 修复天津麦格纳问题 4 years ago
钮海涛 d301332162 合并dev代码 4 years ago
钮海涛 70b80068c2 Merge remote-tracking branch 'origin/test' into test 4 years ago
钮海涛 56630ccb0d 静态盘点查询单据查询不到数据问题修复 4 years ago
puxiao.liao 7880fc96c9 修复天津BUG 4 years ago
许心洁 8c26a27218 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 4 years ago
许心洁 819a4312ae 喜德WMS：BUG#13293，13295，13294 4 years ago
puxiao.liao 7e400a1a68 Fix bug#13399 4 years ago
duan.yang f210767332 BUG #13415 19058-坤泰环境，生成装车单时需要把原出库单号作为关联号显示在界面上 
Signed-off-by: duan.yang <994300880@qq.com>
 4 years ago
puxiao.liao 87dcbd64f8 Fix bug#13411 
ASN收货后未点击提交按钮，再次进入后无法提交
 4 years ago
puxiao.liao 4e0cab2f6a Fix bug#13411 
ASN收货后未点击提交按钮，再次进入后无法提交
 4 years ago
puxiao.liao 7fcdae795c 修复天津麦格纳问题 4 years ago
钮海涛 baed7db4ed 合并dev代码 4 years ago
钮海涛 48b4e45850 Merge remote-tracking branch 'remotes/origin/test' into dev 4 years ago
钮海涛 6e5ea4462f 合并master代码 4 years ago
钮海涛 977b8ac23c Merge remote-tracking branch 'remotes/origin/test' 4 years ago
puxiao.liao 6c2569ee92 盘点优化 4 years ago
钮海涛 ded63e25db 坤泰问题修复 4 years ago
shun c067c671a9 无锡喜德 4 years ago
shun 6f9d4b4342 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 4 years ago
王杰 d089d0fba8 Merge branch 'test' into dev 4 years ago
许心洁 1595f68723 任务#3036 4 years ago
shun 2fd1b89425 无锡喜德WMS看板 4 years ago
王杰 cd5b882e1f dev merge test pom 冲突解决 4 years ago
许心洁 3f72f2ac66 合并TEST分支代码 4 years ago
许心洁 3cf59e9edc Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev 4 years ago
许心洁 88d2eefcc8 供应商信息中的供应商地址因为之前漏加自定义搜索注解，导致界面上无法维护，现修复 4 years ago
liangyao 9f1312e906 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 4 years ago
liangyao ae2469e463 北京领料任务提交 4 years ago
许心洁 3d1d05ef1c 1.天津委外发运库存移动单打印 4 years ago
许心洁 1474be7486 Merge branch 'ext-dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 4 years ago
许心洁 30a6ef7ba5 Merge branch 'ext-dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev 4 years ago
许心洁 3467893051 1.解决天津麦格纳库存不准问题，将所有stockquan更新的地方改为set qty+=newQty形式，避免并发执行导致脏读 
2.更正生产计划对象属性woekorderNo->workOrderNo
3.将脚本异常往外抛
4.优化通用脚本接口
 4 years ago
曾贞一 15452dfa0e Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 4 years ago
曾贞一 b695ab2fc3 【10202 20011--发运一步法配料时】 4 years ago
wynne1005 b7c4e76163 增加joined注解 4 years ago
puxiao.liao eb56d52e17 盘点优化 4 years ago
钮海涛 7a7169386a Merge remote-tracking branch 'origin/test' into test 4 years ago
钮海涛 c4023d4bac 坤泰问题修复 4 years ago
puxiao.liao 0bb69b6505 优化盘点 4 years ago
钮海涛 3b700e722c Merge remote-tracking branch 'origin/test' into test 4 years ago
wynne1005 b438735172 Merge branch 'test' into ext-dev 4 years ago
rock.yu 2f912b2334 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 4 years ago
rock.yu fe23cab34b 增加实体扩展注解 4 years ago
钮海涛 231c4b015a 修复坤泰采购收货卡控包装物料，二次判定库存条码库位，存储区，仓库信息未更新问题 4 years ago
puxiao.liao 9cd011c6ca 修复盘点BUG 4 years ago
liangyao 88aea83c1a 北京领料任务提交 4 years ago
simon.song effc34f74d Merge remote-tracking branch 'remotes/origin/test' into ext-dev 
# Conflicts:
#	modules/i3plus-pojo-mes-pcn/pom.xml
 4 years ago
许心洁 d4696b54a3 墨西哥WMS报工业务新增功能：通用脚本定制业务+生产计划主表添加单据类型和产线名称+添加生产工单类型枚举 4 years ago
liangyao 4b79ab806e Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 4 years ago
钮海涛 3b3f0c98db 修复坤泰问题~ 4 years ago
liangyao d176895a5d 北京领料任务提交 4 years ago
liangyao e5c7432093 北京领料任务提交 4 years ago
廖普小 4b0c9b927f Merge branch 'test' of channing.zhang/i3plus-pojo into test 4 years ago
许心洁 de9578d439 墨西哥WMS报工业务新增功能：通用脚本导入接口+生产版本DAO层+生产计划主表计划状态FINISH(25, "FINISH", "已完成") 4 years ago
许心洁 02decfe9c4 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 4 years ago
许心洁 5c1164a938 墨西哥WMS报工业务新增功能：通用脚本导入接口+生产版本DAO层+生产计划主表计划状态FINISH(25, "FINISH", "已完成") 4 years ago
小梁不胖 9508bd41ac 北京领料任务提交 4 years ago
小梁不胖 f744b94e87 北京领料报表提交 4 years ago
puxiao.liao a62b10dc9d 修复合并异常 4 years ago
钮海涛 dfc18cc9b2 Merge remote-tracking branch 'origin/test' into test 4 years ago
钮海涛 ffbc5d605e 喜德增加将PO及ASN订单的库存条码打印状态置为已打印的JOB 4 years ago
钮海涛 b5c994a18b sweb同一供应商编码命名为VendorNo 4 years ago
simon.song 9b57f47af6 修改pom文件 4 years ago