3237 Commits (8a4111a43058e19012d89b73f483f3a1bb0246f9)

Author SHA1 Message Date
聂帅 8a4111a430 Merge pull request 'BUG #19874 松下页面优化' (#336) from qi.yuan/i3plus-pojo-ban:test into test
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/336
3 years ago
castle.zang f24fe9eae3 BSP pojo 3 years ago
castle.zang 60d2501505 wms作业流程导入导出功能,不校验脚本描述 3 years ago
castle.zang 4831d506cd Merge remote-tracking branch 'upstream/test' into test 3 years ago
ban.yuan 13a3f30876 BUG #19874 松下页面优化 3 years ago
聂帅 c72c4fddb7 Merge pull request 'BUG #19874 松下页面优化' (#334) from qi.yuan/i3plus-pojo-ban:test into test
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/334
3 years ago
ban.yuan e79b0da311 BUG #19874 松下页面优化 3 years ago
castle.zang 87ecad5b52 Merge remote-tracking branch 'upstream/test' into test 3 years ago
castle.zang 7b2d2e816c wms作业流程导入导出功能 3 years ago
jun 0ba685d226 供应商物料新增等级 3 years ago
聂帅 7361dfca50 Merge pull request 'BUG #19800 松下页面优化' (#330) from qi.yuan/i3plus-pojo-ban:test into test
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/330
3 years ago
ban.yuan 8b80c4f16f BUG #19800 松下页面优化 3 years ago
link 9d065ffac2 健康指标SQL取值计算BUG修复 3 years ago
link 741193be82 健康度指标DP修改 3 years ago
link 99c6752b63 add healthindex module Entity and DP 3 years ago
castle.zang b81b9c569d 冷热数据分离--重构--测试完成 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
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 d5f6d501b5 WmsStockSn新增构造函数 3 years ago
nies 6a07e7ff30 供应商新增字段是否首次登录 3 years ago
link ba5ddc09e1 delete table index 3 years ago
puxiao.liao 403fef80f4 实盘表增加托盘字段 3 years ago
link 73191c1961 三方指标查询POJO 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
nies 585e2aefe1 (update)WmsInterfaceDataMapper增加busiIdList字段 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
臧学普 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
曾贞一 7b9a91fd0f 【18541 21062+盘点 盘点单冻结页面缺一个托条码的字段,需添加+1110】 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
jun 93f50a56be WMS_产品报工明细信息 新增@ApiParam("是否已经生成领料单")字段 4 years ago
jun 49442ab5aa 成都麦格纳,wmsCqMaster新增构造方法 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
puxiao.liao 48c3448ff0 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev 4 years ago
jun 3201990076 原材料扣减和其他功能并发,添加lock_version字段 4 years ago
曾贞一 31321a4cf7 【合并冲突】 4 years ago
曾贞一 3761eebb08 【华域-标准盘点开发】 4 years ago
puxiao.liao e3ebdfeb2c Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev 4 years ago
曾贞一 94274b0af9 【领料单页面查询优化】 4 years ago
puxiao.liao d7b34facf0 Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev
 Conflicts:
	modules/i3plus-pojo-andon/pom.xml
	modules/i3plus-pojo-aps/pom.xml
	modules/i3plus-pojo-base/pom.xml
	modules/i3plus-pojo-bsp/pom.xml
	modules/i3plus-pojo-form/pom.xml
	modules/i3plus-pojo-hardswitch/pom.xml
	modules/i3plus-pojo-ics/pom.xml
	modules/i3plus-pojo-jobflow/pom.xml
	modules/i3plus-pojo-lac/pom.xml
	modules/i3plus-pojo-mdm/pom.xml
	modules/i3plus-pojo-mes-pcn/pom.xml
	modules/i3plus-pojo-mes/pom.xml
	modules/i3plus-pojo-model/pom.xml
	modules/i3plus-pojo-platform/pom.xml
	modules/i3plus-pojo-ptl/pom.xml
	modules/i3plus-pojo-report/pom.xml
	modules/i3plus-pojo-screen/pom.xml
	modules/i3plus-pojo-softswitch/pom.xml
	modules/i3plus-pojo-sweb/pom.xml
	modules/i3plus-pojo-wms/pom.xml
	modules/i3plus-pojo-workflow/pom.xml
	pom.xml
	sonar-project.properties
4 years ago
Dominic_Xiao 30eb4e2194 回滚POM版本 4 years ago