7921 Commits (f31071afc67213a4b2856ec28d893370092be6d6)

Author SHA1 Message Date
钮海涛 f31071afc6 add export function 4 years ago
钮海涛 52644c1deb Merge remote-tracking branch 'origin/ext-dev' into ext-dev 4 years ago
钮海涛 f10f13a8de add import field 4 years ago
puxiao.liao a98066dbe8 接口增加字段信息 4 years ago
王杰 f4e9bf4603 Merge branch 'test' into ext-dev 4 years ago
王杰 fe6940b0dc 编码规则扩展 4 years ago
joke.wang b505fe8456 13858 20027--接口表同步情况报表 4 years ago
joke.wang e2a9222b47 pcn登陆限制 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 485fe13202 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 4 years ago
puxiao.liao c880d51c9d 修复泰国翻包 4 years ago
钮海涛 90169cd8b0 Merge remote-tracking branch 'origin/ext-dev' into ext-dev 4 years ago
钮海涛 2ba2314968 add import field 4 years ago
曾贞一 c63df1ed7f Merge remote-tracking branch 'remotes/origin/test' into ext-dev 4 years ago
Dominic_Xiao 0c9dff6dd8 不良品处理根据物料类型查询位置 4 years ago
Dominic_Xiao c1eb51dec5 缺陷位置新增产品类型字段 4 years ago
王杰 dbc417269b test merge ext-dev 4 years ago
王杰 03d95e2591 Merge branch 'dev' into test 4 years ago
王杰 e66a560661 冲突 4 years ago
王杰 4644639c2e pom 4 years ago
王杰 c06902f8de 冲突 4 years ago
曾贞一 462ed4f1de 【13795 20027--现中航BH数据检验完成后无法将数据通过接口传输到老WMS系统--2021-01-21】 4 years ago
曾贞一 7b3ef8f268 【13795 20027--现中航BH数据检验完成后无法将数据通过接口传输到老WMS系统--2021-01-21】 4 years ago
曾贞一 5af6f3ae7f 【13795 20027--现中航BH数据检验完成后无法将数据通过接口传输到老WMS系统--2021-01-21】 4 years ago
钮海涛 7cda94ab0c Merge remote-tracking branch 'origin/ext-dev' into ext-dev 4 years ago
钮海涛 0b354ef001 add import template 4 years ago
王杰 096e2fc8bf test merge ext-dev 4 years ago
王杰 f0c09ca0e6 Merge branch 'test' into dev 4 years ago
王杰 2b89e35c69 pom 4 years ago
王杰 78b5bb0c08 Merge branch 'test' 4 years ago
王杰 7111a3b60f pojo 4 years ago
simon.song ca8ca18f34 数据同步接口修改查询条件 4 years ago
许心洁 1367584df0 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev 4 years ago
许心洁 cf83ab060d Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo 4 years ago
simon.song 24bd5ab668 Merge remote-tracking branch 'origin/test' into test
# Conflicts:
#	modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java
4 years ago
simon.song ff5348bf99 中航看板取值修改 4 years ago
simon.song 9c51146117 数据迁移接口修改 4 years ago
王杰 5a0927299b 新建表报错 bug 4 years ago
simon.song 78a96c6583 mes管理端增加数据迁移功能相关接口 4 years ago
许心洁 5fae039262 合并测服代码 4 years ago
许心洁 55ba26ad22 Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev 4 years ago
许心洁 22c55fc8c6 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo 4 years ago
joke.wang e967dde7a3 总屏幕看板优化 4 years ago
Dominic_Xiao 553fb09bc0 修改hql去除多余工厂代码条件 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
simon.song db0d184aa3 数据迁移功能完成。 4 years ago
肖奕扬 9f0dfdb1fd Merge branch 'test' of frank.yu/i3plus-pojo into test 4 years ago
Dominic_Xiao cf908f2d04 卡斯马基础界面--客户条码规则、产品容器容量配置 4 years ago
puxiao.liao 696a0a8c3f 修复单据条码展开日期 4 years ago