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

3167 Commits (e59d55de7d61a478540ec2d215aeb673717e5ad9)

Author SHA1 Message Date
王杰 f1db936f42 pom 5 years ago
王杰 d2f03a966e Merge branch 'dev' into test 5 years ago
puxiao.liao c8d97daa58 Fix bug#13248 5 years ago
puxiao.liao 983565aca1 Fix bug#13752 5 years ago
许心洁 896a88de44 合并测服代码 5 years ago
王杰 c8b21c0b69 pom 5 years ago
许心洁 8246a28c05 Merge branches 'master' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo 5 years ago
许心洁 8cd32346d3 BUG#13694,喜德BUG：单据条码展开没有查询seqNo导致无法生成条码 5 years ago
许心洁 c45cd70ea9 喜德BUG：单据展开查询没有返回seqNo导致不能生成条码 5 years ago
puxiao.liao 8eb1831861 Fix bug#12607 5 years ago
许心洁 d107c7a3fe Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo 5 years ago
许心洁 02137638e4 喜德BUG:单据条码展开没有查询出单据明细的SEQNO，导致工单条码无法生成 5 years ago
肖奕扬 0ee06f6e03 Merge branch 'test' of i3-IMPP/i3plus-pojo into ext-dev 5 years ago
许心洁 ca5cc4937e 需求#1391 5 years ago
rock.yu 8be0df57ea Merge remote-tracking branch 'origin/test' into test 5 years ago
rock.yu ad2c771996 ERP快照相关的表切换为从BaseBean继承，解决SnapID重复的问题 5 years ago
puxiao.liao 1f3f891264 二维码优化 5 years ago
许心洁 6fab12fc50 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
许心洁 e72c2dd09a 任务#2586 5 years ago
shun 9cdf5827a3 JIS发运报表增加导出枚举 5 years ago
钮海涛 2740830e8f 合并test代码 5 years ago
shun dfaa9c810b JIS发运报表增加导出model 5 years ago
Dominic_Xiao c72a294a6f 回滚POM 5 years ago
肖奕扬 9f25d80eac Merge branch 'dev' of i3-IMPP/i3plus-pojo into test 5 years ago
andly.pan ddb6fa33d3 条码增加道口泊位 
Signed-off-by: andly.pan <andly.pan@estsh.com>
 5 years ago
shun 987fa02e32 自动打印增加重量 5 years ago
shun 33b05c090c Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
shun 36f37a4444 无锡喜德看板优化 5 years ago
许心洁 abc5a9b812 BUG#新增需求：13580 5 years ago
shun ad0ddbf65e Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev 5 years ago
曾贞一 aae3fb2539 【未完成单据提交-优化】 5 years ago
王杰 58c7b6854b pom 5 years ago
曾贞一 2e13f7e3f9 Merge remote-tracking branch 'origin/ext-dev' into ext-dev 5 years ago
曾贞一 bbd5dccbf8 【合并分支】 5 years ago
puxiao.liao db8c01b64c 修复天津BUG 5 years ago
许心洁 a9fc8ae132 喜德WMS：BUG#13293，13295，13294 5 years ago
钮海涛 b843db89d9 静态盘点查询单据查询不到数据问题修复 5 years ago
puxiao.liao 129002573c Fix bug#13399 5 years ago
duan.yang 0db629a2a1 BUG #13415 19058-坤泰环境，生成装车单时需要把原出库单号作为关联号显示在界面上 
Signed-off-by: duan.yang <994300880@qq.com>
 5 years ago
puxiao.liao 8657926eee Fix bug#13411 
ASN收货后未点击提交按钮，再次进入后无法提交
 5 years ago
puxiao.liao 4937b49281 Fix bug#13411 
ASN收货后未点击提交按钮，再次进入后无法提交
 5 years ago
puxiao.liao 36d4f0ac10 修复天津麦格纳问题 5 years ago
钮海涛 d301332162 合并dev代码 5 years ago
钮海涛 70b80068c2 Merge remote-tracking branch 'origin/test' into test 5 years ago
钮海涛 56630ccb0d 静态盘点查询单据查询不到数据问题修复 5 years ago
puxiao.liao 7880fc96c9 修复天津BUG 5 years ago
许心洁 8c26a27218 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
许心洁 819a4312ae 喜德WMS：BUG#13293，13295，13294 5 years ago
puxiao.liao 7e400a1a68 Fix bug#13399 5 years ago
duan.yang f210767332 BUG #13415 19058-坤泰环境，生成装车单时需要把原出库单号作为关联号显示在界面上 
Signed-off-by: duan.yang <994300880@qq.com>
 5 years ago
puxiao.liao 87dcbd64f8 Fix bug#13411 
ASN收货后未点击提交按钮，再次进入后无法提交
 5 years ago
puxiao.liao 4e0cab2f6a Fix bug#13411 
ASN收货后未点击提交按钮，再次进入后无法提交
 5 years ago
puxiao.liao 7fcdae795c 修复天津麦格纳问题 5 years ago
钮海涛 baed7db4ed 合并dev代码 5 years ago
钮海涛 48b4e45850 Merge remote-tracking branch 'remotes/origin/test' into dev 5 years ago
钮海涛 6e5ea4462f 合并master代码 5 years ago
钮海涛 977b8ac23c Merge remote-tracking branch 'remotes/origin/test' 5 years ago
puxiao.liao 6c2569ee92 盘点优化 5 years ago
钮海涛 ded63e25db 坤泰问题修复 5 years ago
shun c067c671a9 无锡喜德 5 years ago
shun 6f9d4b4342 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
王杰 d089d0fba8 Merge branch 'test' into dev 5 years ago
许心洁 1595f68723 任务#3036 5 years ago
shun 2fd1b89425 无锡喜德WMS看板 5 years ago
王杰 cd5b882e1f dev merge test pom 冲突解决 5 years ago
许心洁 3f72f2ac66 合并TEST分支代码 5 years ago
许心洁 3cf59e9edc Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev 5 years ago
许心洁 88d2eefcc8 供应商信息中的供应商地址因为之前漏加自定义搜索注解，导致界面上无法维护，现修复 5 years ago
liangyao 9f1312e906 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
liangyao ae2469e463 北京领料任务提交 5 years ago
许心洁 3d1d05ef1c 1.天津委外发运库存移动单打印 5 years ago
许心洁 1474be7486 Merge branch 'ext-dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
许心洁 30a6ef7ba5 Merge branch 'ext-dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev 5 years ago
许心洁 3467893051 1.解决天津麦格纳库存不准问题，将所有stockquan更新的地方改为set qty+=newQty形式，避免并发执行导致脏读 
2.更正生产计划对象属性woekorderNo->workOrderNo
3.将脚本异常往外抛
4.优化通用脚本接口
 5 years ago
曾贞一 15452dfa0e Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
曾贞一 b695ab2fc3 【10202 20011--发运一步法配料时】 5 years ago
wynne1005 b7c4e76163 增加joined注解 5 years ago
puxiao.liao eb56d52e17 盘点优化 5 years ago
钮海涛 7a7169386a Merge remote-tracking branch 'origin/test' into test 5 years ago
钮海涛 c4023d4bac 坤泰问题修复 5 years ago
puxiao.liao 0bb69b6505 优化盘点 5 years ago
钮海涛 3b700e722c Merge remote-tracking branch 'origin/test' into test 5 years ago
wynne1005 b438735172 Merge branch 'test' into ext-dev 5 years ago
rock.yu 2f912b2334 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
rock.yu fe23cab34b 增加实体扩展注解 5 years ago
钮海涛 231c4b015a 修复坤泰采购收货卡控包装物料，二次判定库存条码库位，存储区，仓库信息未更新问题 5 years ago
puxiao.liao 9cd011c6ca 修复盘点BUG 5 years ago
liangyao 88aea83c1a 北京领料任务提交 5 years ago
simon.song effc34f74d Merge remote-tracking branch 'remotes/origin/test' into ext-dev 
# Conflicts:
#	modules/i3plus-pojo-mes-pcn/pom.xml
 5 years ago
许心洁 d4696b54a3 墨西哥WMS报工业务新增功能：通用脚本定制业务+生产计划主表添加单据类型和产线名称+添加生产工单类型枚举 5 years ago
liangyao 4b79ab806e Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
钮海涛 3b3f0c98db 修复坤泰问题~ 5 years ago
liangyao d176895a5d 北京领料任务提交 5 years ago
liangyao e5c7432093 北京领料任务提交 5 years ago
廖普小 4b0c9b927f Merge branch 'test' of channing.zhang/i3plus-pojo into test 5 years ago
许心洁 de9578d439 墨西哥WMS报工业务新增功能：通用脚本导入接口+生产版本DAO层+生产计划主表计划状态FINISH(25, "FINISH", "已完成") 5 years ago
许心洁 02decfe9c4 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
许心洁 5c1164a938 墨西哥WMS报工业务新增功能：通用脚本导入接口+生产版本DAO层+生产计划主表计划状态FINISH(25, "FINISH", "已完成") 5 years ago
小梁不胖 9508bd41ac 北京领料任务提交 5 years ago
小梁不胖 f744b94e87 北京领料报表提交 5 years ago
puxiao.liao a62b10dc9d 修复合并异常 5 years ago
钮海涛 dfc18cc9b2 Merge remote-tracking branch 'origin/test' into test 5 years ago
钮海涛 ffbc5d605e 喜德增加将PO及ASN订单的库存条码打印状态置为已打印的JOB 5 years ago
钮海涛 b5c994a18b sweb同一供应商编码命名为VendorNo 5 years ago
simon.song 9b57f47af6 修改pom文件 5 years ago
simon.song 3917408421 Merge remote-tracking branch 'remotes/origin/dev' into test 5 years ago
rock.yu 785152dbfa 接口同步状态赋予默认值 5 years ago
Dominic_Xiao 86f9faa01d Merge remote-tracking branch 'remotes/origin/test' into dev 5 years ago
puxiao.liao ca18bb40cd 修复天津单据明细查询对应条码：单据条码增加行号查询条件 5 years ago
许心洁 4a38aab5b6 任务#2989 5 years ago
wynne1005 d893e76ab4 merge 5 years ago
Dominic_Xiao 167b0dad0c Merge remote-tracking branch 'remotes/origin/test' into dev 5 years ago
puxiao.liao 46cc056a43 修复天津BUG 5 years ago
simon 55188db083 Merge remote-tracking branch 'remotes/origin/test' into dev 5 years ago
钮海涛 af732b7a4f 合并test代码 5 years ago
许心洁 6005e2ab66 Merge remote-tracking branch 'origin/test' into test 5 years ago
许心洁 7aa7738a59 BUG#12600 5 years ago
duan.yang a38be26538 采购订单表-主表添加同步标识、接口映射方向类型添加 
Signed-off-by: duan.yang <994300880@qq.com>
 5 years ago
duan.yang 787629581f 接口映射方向类型添加SWEB2SAP 
Signed-off-by: duan.yang <994300880@qq.com>
 5 years ago
许心洁 c1e3b01524 BUG#12504 5 years ago
许心洁 ee37d6f5eb 任务#12597 5 years ago
许心洁 c04895784a Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
许心洁 a604e70771 BUG#12711 5 years ago
许心洁 3ebcfd21e7 BUG#12711,12509 5 years ago
puxiao.liao 21cfe5c740 Fix bug#12004 
19058-KT其他出库用例
 5 years ago
rock.yu 70f659593b 通用接口增加 cron 表达式的支持 5 years ago
许心洁 be272fd12e Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
许心洁 2d47eeb84d BUG#12487 5 years ago
钮海涛 12edbb64d5 Merge remote-tracking branch 'origin/test' into test 5 years ago
钮海涛 6fe792f75b posn新增供应商生产批次字段 5 years ago
wynne1005 db87c0c32f pom版本 5 years ago
puxiao.liao a6ca2b35d3 修复北京特殊领料 5 years ago
puxiao.liao 4392b513f7 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
钮海涛 7381ac2ca0 Merge remote-tracking branch 'origin/test' into test 5 years ago
钮海涛 bf51e5bb7a 修改登录平台为固定密码 5 years ago
puxiao.liao 9d7ae4a90f 修复北京特殊领料 5 years ago
钮海涛 b9283ec075 合并dev代码 5 years ago
钮海涛 b57ae573ed 合并test代码 5 years ago
钮海涛 89a45d326b 合并test代码 5 years ago
钮海涛 f63813d66d 合并master代码 5 years ago
钮海涛 ceebe541f2 Merge remote-tracking branch 'remotes/origin/master' into test 5 years ago
puxiao.liao e250883f22 Fix bug#12004 
19058-KT其他出库用例
 5 years ago
许心洁 0f5ab7b144 BUG#12609 5 years ago
许心洁 359e085aac BUG#12430 5 years ago
许心洁 063ba20f74 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
许心洁 8e5c2f4b00 BUG#12170,12417,12166,12437,12452 5 years ago
汪云昊 f2180f18f3 revert(pojo):还原pom版本 5 years ago
汪云昊 cc947c08f5 revert(pojo):还原pom版本 5 years ago
钮海涛 e9ec997e05 Fix Bug #12413 查询库存条码错误 5 years ago
puxiao.liao dc3e344f11 Fix bug#12401 
19048-发运单支持关联多个470单据号
 5 years ago
许心洁 4300201f99 BUG#12430,12495 5 years ago
许心洁 cbd0b1f136 BUG#12496 5 years ago
许心洁 e59f67e84b Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
钮海涛 e3e4e1fc84 修复坤泰问题 5 years ago
许心洁 ecdc5888a4 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
许心洁 e5aefee838 BUG#12166 5 years ago
puxiao.liao 5f6a7c9a98 Fix bug#12380 
19048-支持批量下发BOM的功能
 5 years ago
许心洁 2d9521e412 BUG#12166 5 years ago
puxiao.liao 7b8597dde4 天津麦格纳看板BUG修复 5 years ago
puxiao.liao b124db3383 天津麦格纳看板BUG修复 5 years ago
rock.yu d226c27c2b 邮件推送增加获取附件的脚本功能 
增加发送附件功能
 5 years ago
puxiao.liao c6031c2f28 天津麦格纳看板BUG修复 5 years ago
rock.yu 65b26a0696 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
rock.yu a300e6e2f8 idoc 记录表增加 erp 状态字段 5 years ago
puxiao.liao 7ec1bc61b0 天津麦格纳看板BUG修复 5 years ago
puxiao.liao 71e70e9a94 天津麦格纳看板BUG修复 5 years ago
rock.yu 510845c185 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
rock.yu d41d14b112 增加 erp doc no 字段 5 years ago
许心洁 7dba4e7f32 BUG#12166 5 years ago
许心洁 4d5ffce7ac 任务#2933 5 years ago
puxiao.liao 679ef67457 天津麦格纳看板BUG修复 5 years ago
Aisiyu 79161c6703 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
Aisiyu 303fe5907d [1211 天津麦格纳货运看板和asn看板修改 ] 5 years ago
rock.yu 7162664b79 通用接口增加SID记录 5 years ago
puxiao.liao 274191aee2 天津麦格纳看板BUG修复 5 years ago
许心洁 82dc8eafbb Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
rock.yu 3a5e446e90 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
许心洁 b318abb4b8 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
rock.yu 77d8aa4bdd 修改天津工单拉动逻辑 5 years ago
Aisiyu 2ca398468f [1211 天津麦格纳货运看板和asn看板修改 ] 5 years ago
许心洁 29a5d01620 BUG#2938 5 years ago
puxiao.liao c0d52b93f7 天津麦格纳看板BUG修复 5 years ago
puxiao.liao cd2076d66a 天津麦格纳看板BUG修复 5 years ago
puxiao.liao 08011a5722 天津麦格纳看板BUG修复 5 years ago
Aisiyu 0ea3354b70 [1211 天津麦格纳货运看板和asn看板时间和count ] 5 years ago
许心洁 d1fb133839 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
许心洁 346a5088ff BUG#12231 5 years ago
Aisiyu d819821234 [1211 天津麦格纳货运看板和asn看板修改 ] 5 years ago
Aisiyu be7f6a4a92 [1211 天津麦格纳货运看板和asn看板修改 ] 5 years ago
puxiao.liao 67419496cb 修复天津麦格纳BUG 5 years ago
Aisiyu 6b9fcb2da9 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
Aisiyu ab0b8a2af1 [1211 天津麦格纳货运看板sql 修改 ] 5 years ago
汪云昊 1825cfbdf3 revert(pojo):还原pom版本 5 years ago
puxiao.liao a844a4d59b 天津麦格纳修复BUG 5 years ago
Aisiyu 219dd0ddd7 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
Aisiyu 47f464b01d [1211 天津麦格纳货运看板 ] 5 years ago
曾贞一 143e2f1947 【12057 #20011-----影响流程是二维码收货和po收货和po收货，收货流程走完但是还没有提交，需要能够删除历史记录，重新操作后提交，然后不允许收货待提交的条码入库。期望解决日期2020/10/31】 5 years ago
puxiao.liao e68735be83 MOVE_SN 增加 left_code 属性 5 years ago
许心洁 08125e3b0f Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
曾贞一 4ee1875097 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago