3211 Commits (73191c19617b643bee82e28fb31dab0b17d1c61d)

Author SHA1 Message Date
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
Wynne 7de40e37f5 Merge branch 'dev' into test 4 years ago
Wynne bd3dcbac3a Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 4 years ago
jun 472504f4a8 移除华域代码 4 years ago
jun 84f686b54e 华域零星入库新增包装代码字段 4 years ago
puxiao.liao c4a691ecb9 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev 4 years ago
jun 20029216ea 16919 19081-生产报废单无法打印 4 years ago
puxiao.liao d1a9fe37cd 修复盘点调差BUG 4 years ago
gsz 6411160219 Merge branch 'ext-dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev 4 years ago
gsz 4b21ff8851 南非E看板提交 修改 4 years ago
nies 5da810fb20 Merge branch 'test' into dev 4 years ago
曾贞一 634dce48b9 Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev 4 years ago
曾贞一 90f0936b20 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 4 years ago
曾贞一 add0708fb2 【3617 收货入库-后端开发】 4 years ago
jun 7945213f6e 19048 -- 供应商退货选择ERP单号界面增加【已退数量】字段 --20210710 4 years ago
jun d5fd0ec33a Merge branch 'ext-dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev 4 years ago
jun 1de5989099 华域麦格纳组托 4 years ago
jun e5e79230db WmsStockSn新增箱重量和托重量 4 years ago
gsz c901b36663 Merge remote-tracking branch 'remotes/origin/test' into ext-dev 4 years ago
曾贞一 bb48086df9 Merge remote-tracking branch 'origin/test' into test 4 years ago
曾贞一 4cd0f48f52 【查询条件】 4 years ago
jun fdec525fa1 16788 19081-北京麦格纳,ERP明细报表优化,2021-07-16 4 years ago
jun c93d9bdd2a 北京麦格纳ASN看板明细新增字段后无数据 4 years ago
puxiao.liao 4250f215f2 Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev 4 years ago
puxiao.liao 09e380d1f2 属性添加枚举值注解 4 years ago
wynne1005 d8ad92fe24 merge test 还原pom 4 years ago
wynne1005 08a0ca7937 merge dev 还原pom 4 years ago