8734 Commits (55c88ec1d4c9fbe05f9acadf0920e774ed8690f5)

Author SHA1 Message Date
曾贞一 5c9e6ad4cf 【19625 21062+质检报表导出失败,需修复】 3 years ago
曾贞一 cb5db7101a 【19625 21062+质检报表导出失败,需修复】 3 years ago
聂帅 1ee62d1689 Merge pull request '仓库健康统计变量,周期和计算频次换成corn表达式' (#324) from junsheng.li/i3plus-pojo-junsheng:test into test
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/324
3 years ago
jun d21cc02739 仓库健康统计变量,周期和计算频次换成corn表达式 3 years ago
castle.zang 94c61f77f4 冷热数据分离--重构 3 years ago
castle.zang c2437fd00f 接口映射bean 3 years ago
聂帅 edc4a74001 Merge pull request '中航物料对象导入修改' (#323) from baoyu.wang/i3plus-pojo:test into test
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/323
3 years ago
王宝玉 2e2487ebc0 中航物料对象导入修改 3 years ago
link 8c65aa1294 fix miss field 3 years ago
link ac152cf3f2 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 3 years ago
link b04cedf70b 添加dao的数据接口 3 years ago
nies f44a69a46c UserDeatilModel增加登录次数字段 3 years ago
聂帅 b7ba3b1f6e Merge pull request '中航条码补偿字段' (#322) from baoyu.wang/i3plus-pojo:test into test
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/322
3 years ago
王宝玉 74f9e00f56 中航条码补偿字段 3 years ago
nies d5f6d501b5 WmsStockSn新增构造函数 3 years ago
nies 6a07e7ff30 供应商新增字段是否首次登录 3 years ago
nies f0ddb6ca60 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 3 years ago
聂帅 2f79cf7d2b Merge pull request '条码表新增补偿字段' (#321) from baoyu.wang/i3plus-pojo:test into test
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/321
3 years ago
王宝玉 da44d62f8f 条码表新增补偿字段 3 years ago
nies db04d60fbc Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 3 years ago
link ba5ddc09e1 delete table index 3 years ago
nies 1086f11875 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 3 years ago
nies a43b17841f 软适配新增SuitRetryModel 3 years ago
puxiao.liao 403fef80f4 实盘表增加托盘字段 3 years ago
link 73191c1961 三方指标查询POJO 3 years ago
nies 976369fa10 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 3 years ago
nies 2255d1dfcf (update)软适配新增适配类型表 3 years ago
聂帅 a70c9cf5ec Merge pull request 'MesProdCfgType 新增 项目代码与报文vehicleCode关系字段' (#319) from honghui.jiang/i3plus-pojo:test into test
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/319
3 years ago
蒋鸿辉 b7bf7edfa5 MesProdCfgType 新增 项目代码与报文vehicleCode关系字段 3 years ago
castle.zang 35abd70bae Merge remote-tracking branch 'upstream/test' into test 3 years ago
castle.zang 8a369c31fa 通用数据冷热分离代码,并规范化test分支开发时的依赖,全部依赖1.0-TEST-SNAPSHOT 3 years ago
聂帅 e51e82994a Merge pull request 'MesKpsnRule(关键件条码校验规则),MesBypassMapping(MES_BYPASS项映射关系)增加项目代(prodCfgTypeCode)' (#318) from honghui.jiang/i3plus-pojo:test into test
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/318
3 years ago
蒋鸿辉 4d61109541 MesKpsnRule(关键件条码校验规则),MesBypassMapping(MES_BYPASS项映射关系)增加项目代(prodCfgTypeCode) 3 years ago
聂帅 39e0235ad9 Merge pull request '物料项目关系表新增客户零件号(custPartNo)字段' (#317) from honghui.jiang/i3plus-pojo:test into test
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/317
3 years ago
蒋鸿辉 f1811b42de 物料项目关系表新增客户零件号(custPartNo)字段 3 years ago
nies 585e2aefe1 (update)WmsInterfaceDataMapper增加busiIdList字段 3 years ago
nies 058a761500 (update)增加适配重复记录 3 years ago
nies ccab3f0c04 (update)BsSuitCase增加requestId 3 years ago
nies a3d2749161 (update)SuitModel 增加requestId 3 years ago
聂帅 65c22dec22 Merge pull request '18934 原材料扣减job替换' (#316) from junsheng.li/i3plus-pojo-junsheng:test into test
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/316
3 years ago
jun 0ef89f2a6d 18934 原材料扣减job替换 3 years ago
聂帅 f1e158737b Merge pull request '【18835 19081-盘点策略-循环规则-选项可配置】' (#314) from jimmy.zeng/i3plus-pojo:test into test
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/314
4 years ago
曾贞一 7f7baa1ea4 【18835 19081-盘点策略-循环规则-选项可配置】 4 years ago
nies 38b1ce6643 (update)更新aps-4的端口为8400 4 years ago
nies d06fe76744 增加aps_3和aps_4的枚举配置 4 years ago
jun 93d84b66f5 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into Mytest 4 years ago
jun 67ed074d35 18681 交易类型需要导出功能 4 years ago
臧学普 0e5cafae91 Merge pull request 'WmsBH物料子检测项新增录入方式字段' (#312) from baoyu.wang/i3plus-pojo:test into test
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/312
4 years ago
王宝玉 cdd7f7bed2 WmsBH物料子检测项新增录入方式字段 4 years ago
聂帅 443a8a200d Merge pull request 'test' (#311) from baoyu.wang/i3plus-pojo:test into test
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/311
4 years ago
王宝玉 4625987eef Mes散件BOM增加项目代码字段 4 years ago
王宝玉 5056f30f45 核心包mes散件产品配置BOM新增项目代码 4 years ago
nies fc9ef265f9 修改aps-2的menurootid 4 years ago
nies 0400305d91 增加aps-2的枚举配置 4 years ago
曾贞一 7b9a91fd0f 【18541 21062+盘点 盘点单冻结页面缺一个托条码的字段,需添加+1110】 4 years ago
nies 5b5e00eee7 model core 增加SysRoleModel 4 years ago
nies 72673bfa12 平台新增用户角色关联model 4 years ago
王杰 3270395d94 安灯 4 years ago
臧学普 9d8371bdac Merge pull request '工单表增加系统同步标志字段' (#306) from honghui.jiang/i3plus-pojo:test into test
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/306
4 years ago
nies 5666b5d120 软适配增加华域相关的配置 4 years ago
nies 0f92e2bbf9 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 4 years ago
聂帅 74dab6e6d0 Merge pull request '成都麦格纳,wmsCqMaster新增构造方法' (#304) from junsheng.li/i3plus-pojo-junsheng:test into test
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/304
4 years ago
castle.zang d771304733 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 4 years ago
王杰 77795be8df StationRequestBean 增加 缓存数据来源class 4 years ago
蒋鸿辉 0cfac0aaaf 工单表增加系统同步标志字段 4 years ago
nies b8662be266 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 4 years ago
nies 211d20e840 修改打印模板复杂查询 4 years ago
jun a7b6cd22d3 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into Mytest 4 years ago
jun 93f50a56be WMS_产品报工明细信息 新增@ApiParam("是否已经生成领料单")字段 4 years ago
jun e390e7fc33 成都:PULL_WAY_STATUS枚举新增 OVER_PULL(80, "过点拉动") 4 years ago
castle.zang 1072745cda Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 4 years ago
臧学普 f7d8ee1026 Merge pull request '索引' (#302) from jhforever.wang/wangjie-i3plus-pojo:test into test
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/302
4 years ago
castle.zang 34cb9d311f Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 4 years ago
nies 5acd3270f9 修改pom中版本为1.0.0.1 4 years ago
nies 968708d1b8 删除多余的taskNo 4 years ago
castle.zang 124cc7d729 Merge remote-tracking branch 'upstream/test' into test 4 years ago
castle.zang ace269e8aa Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 4 years ago
nies 5f4b8efe56 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 4 years ago
聂帅 a995805f74 Merge pull request '二开项目目前pojo类无法同步,在核心包新增pojo' (#303) from dominic.xiao/i3plus-pojo:test into test
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/303
4 years ago
Dominic_Xiao cbba75032a 二开项目目前pojo类无法同步,在核心包新增pojo 4 years ago
王杰 cedc61b6a8 索引 4 years ago
nies f8d1d85c86 platform 增加job执行记录相关的bean 4 years ago
jun 49442ab5aa 成都麦格纳,wmsCqMaster新增构造方法 4 years ago
王杰 a6ed27b901 索引 4 years ago
聂帅 1314ee7c20 Merge pull request '华域枚举OUT_MOVEMENT_BUSI_TYPE 新增 安全库存补货' (#301) from junsheng.li/i3plus-pojo-junsheng:test into test
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/301
4 years ago
jun 685166caf7 华域枚举OUT_MOVEMENT_BUSI_TYPE 新增 安全库存补货 4 years ago
admin e4ee9c5ce5 无锡喜德添加新增批次超期预警报表 需要的值三十天,六十天,九十天 4 years ago
admin 46c57ffa81 Merge remote-tracking branch 'ban/test' into testban
# Conflicts:
#	modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java
4 years ago
admin 1493cf59e1 无锡喜德添加新增批次超期预警报表 需要的值三十天,六十天,九十天 4 years ago
admin 1f307b709a 无锡喜德添加新增批次超期预警报表 需要的值三十天,六十天,九十天 4 years ago
聂帅 98706bcc20 Merge pull request 'test' (#299) from dominic.xiao/i3plus-pojo:test into test
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/299
4 years ago
Dominic_Xiao e7044a6dfe 修复数据迁移校验数据源BUG 4 years ago
castle.zang f3190e6bbe 数据冷热分离pojo 4 years ago
Dominic_Xiao c787981c14 因长度过长,去除content字段的索引 4 years ago
聂帅 a89c8d3998 Merge pull request '生产数据表 增加系统同步标志' (#296) from jhforever.wang/wangjie-i3plus-pojo:test into test
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/296
4 years ago
聂帅 1aafce7f47 Merge pull request '17619 19081-盘点策略-增加循环规则' (#294) from junsheng.li/i3plus-pojo-junsheng:test into test
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/294
4 years ago
王杰 682a086f23 生产数据表 增加系统同步标志 4 years ago
王杰 0113ac8038 核心包 条码 包装 表增加系统同步标志 4 years ago
jun 62ddd292c9 17619 19081-盘点策略-增加循环规则 4 years ago
castle.zang 038aef18dd Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 4 years ago