puxiao.liao
|
8e8744d3db
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
Conflicts:
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
|
5 years ago |
|
puxiao.liao
|
e8dd3ab12f
|
8481 基础数据-库位-导入。导出报错,提示cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil$LOCATE_TYPE.descriptionOfValue(java.lang.String)
|
5 years ago |
许心洁
|
7e4fe5f945
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
许心洁
|
5d9f37ee33
|
根据作业类型分组查询流程组件SQL ：兼容SQLserver数据库优化
|
5 years ago |
 钮海涛
|
34a3598508
|
bug:8385
|
5 years ago |
 王杰
|
eaecf4b4b7
|
pom
|
5 years ago |
|
王杰
|
c68d49880c
|
Merge branch 'dev' into test
|
5 years ago |
袁津哲
|
80e572f07d
|
开发回显组件模板管理功能和优化实体生成数据库脚本逻辑
|
5 years ago |
|
puxiao.liao
|
a748fbd2f7
|
8426 中航-报表中心-采购计划更改查询-查询条件无效
|
5 years ago |
|
puxiao.liao
|
f765493696
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
Conflicts:
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java
|
5 years ago |
|
puxiao.liao
|
70aeae21d3
|
8426 中航-报表中心-采购计划更改查询-查询条件无效
|
5 years ago |
 曾贞一
|
d43935f88a
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
曾贞一
|
7ac98ffbc6
|
【1797 天津麦格纳WMS-定制业务-VDA标签防错验证】
|
5 years ago |
|
钮海涛
|
da8b4db890
|
修复pom版本问题
|
5 years ago |
|
许心洁
|
75be7d5078
|
任务#1744：全局替换自定义搜索功能
|
5 years ago |
|
许心洁
|
ef6330675c
|
任务#1744：全局替换自定义搜索功能
|
5 years ago |
|
钮海涛
|
f87eeeb491
|
修复合并版本问题
|
5 years ago |
|
钮海涛
|
ac268c1cbc
|
Merge branch 'test' into dev
|
5 years ago |
|
钮海涛
|
917a101f20
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
钮海涛
|
df2e8601c4
|
task:1719
|
5 years ago |
|
puxiao.liao
|
ba81a26700
|
1778 产品工装关系维护
|
5 years ago |
|
曾贞一
|
1901cf6eb0
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
曾贞一
|
2dac15c248
|
【1709 BH-录入检测值】
|
5 years ago |
|
puxiao.liao
|
1983602b3a
|
8060 AP-MGN-BJ-19081 --扫描查询输入零件号查询，查询出来的零件数量全部为0
|
5 years ago |
|
钮海涛
|
bbe03cc6fd
|
解决合并冲突问题
|
5 years ago |
|
钮海涛
|
40a87d83b3
|
修复合并问题
|
5 years ago |
|
钮海涛
|
05276bcf46
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
钮海涛
|
005d0f7f86
|
修复合并问题
|
5 years ago |
|
钮海涛
|
bc269e1f71
|
Merge branch 'master' into test
|
5 years ago |
|
钮海涛
|
2b85a05645
|
新增脚本WebSocket
|
5 years ago |
|
钮海涛
|
dd70688754
|
新增脚本WebSocket
|
5 years ago |
qianhs
|
f03e119561
|
bug:8268;8267;8266;8265
|
5 years ago |
|
钮海涛
|
6e2344b303
|
bug:8330
|
5 years ago |
wynne1005
|
4ed1770189
|
Merge branch 'dev' into test
|
5 years ago |
|
曾贞一
|
97d7fdbf24
|
【8181 20011-- 条码打印界面增加一个打印组号按钮，用于现场母条码丢失或者损坏的场景来补打母条码】
|
5 years ago |
|
曾贞一
|
fb15536a34
|
【8254 中航-出库单-客户发运-新增销售订单字段】
|
5 years ago |
|
钮海涛
|
7aaed8fb79
|
task:1735
|
5 years ago |
|
钮海涛
|
bf2cc9843f
|
Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
# modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
|
5 years ago |
|
钮海涛
|
81f380aec4
|
产品入库表新增
|
5 years ago |
|
钮海涛
|
b7dceccd71
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
钮海涛
|
f414274aeb
|
供货追踪
|
5 years ago |
汪云昊
|
2ab9045d17
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
5 years ago |
|
许心洁
|
1a7d9edd40
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
许心洁
|
3cd2fb02f4
|
宁德BUG-JIS发运汇总JOB:BUG#8246
|
5 years ago |
|
曾贞一
|
8e529f46d7
|
【1722 BH-Bacth条码查询】
|
5 years ago |
wei.peng
|
37922cab29
|
POM 文件修改
Merge remote-tracking branch 'remotes/origin/test'
# Conflicts:
# modules/i3plus-icloud-report/pom.xml
|
5 years ago |
|
wei.peng
|
8aab106aa9
|
合并代码 pom 冲突
Merge remote-tracking branch 'remotes/origin/dev' into test
# Conflicts:
# modules/i3plus-ics-gateway/src/main/resources/application-docker.properties
|
5 years ago |
|
钮海涛
|
724ba402bf
|
前端联调
|
5 years ago |
|
曾贞一
|
bc82c85790
|
【1721 BH-BH检测结果管理】
|
5 years ago |
|
钮海涛
|
cb8688105c
|
task:1727;1728;1729
|
5 years ago |