钮海涛
a71d7a31ce
Merge branch 'master' into test
5 years ago
钮海涛
5a0fea01ca
修复版本问题
5 years ago
钮海涛
6061f89d43
修复合并版本问题
5 years ago
b43317c11a
还原pom
5 years ago
钮海涛
3a40d278ac
修复平台登录问题
5 years ago
钮海涛
470bceac6a
Start Task #1973 Cost:2h
...
Start Task #1971 Cost:2h
Start Task #1970 Cost:2h
Effort Task #1968 Cost:4h
6 years ago
钮海涛
f1a6f66ccb
Merge remote-tracking branch 'origin/dev' into dev
6 years ago
钮海涛
15a3d95c61
Start Task #1968 Cost:3h
6 years ago
钮海涛
47131ff13f
修复版本问题
6 years ago
99d3c9d721
提测合并 还原pom
6 years ago
6169542dbb
合并代码 有代码丢失或者文件丢失请排查此处
...
Merge remote-tracking branch 'remotes/origin/dev' into test
# Conflicts:
# modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java
6 years ago
王杰
786c442d55
解决冲突
6 years ago
钮海涛
c1241bd6c5
修复版本问题
6 years ago
钮海涛
53a421b3b9
修复版本问题
6 years ago
钮海涛
94e9b2ffec
Merge remote-tracking branch 'remotes/origin/master' into test
6 years ago
王杰
029763feb1
pom
6 years ago
王杰
30fcf4f23f
pom冲突
6 years ago
王杰
716e1f7df1
Merge branch 'test' into dev
6 years ago
3ffa9d06fa
sweb pojo 序列化提交
6 years ago
717f268c28
POJO版本号还原
6 years ago
王杰
a6e9b90026
pom
6 years ago
王杰
de9017ca5c
冲突
6 years ago
王杰
eaecf4b4b7
pom
6 years ago
王杰
7d192b36a6
pom冲突
6 years ago
钮海涛
005d0f7f86
修复合并问题
6 years ago
37922cab29
POM 文件修改
...
Merge remote-tracking branch 'remotes/origin/test'
# Conflicts:
# modules/i3plus-icloud-report/pom.xml
6 years ago
钮海涛
a1eb3c3bc2
修复pom版本问题
6 years ago
钮海涛
c6d36af4c9
Merge branch 'master' into test
6 years ago
钮海涛
efe083a9da
修复版本号
6 years ago
钮海涛
288fb4a16b
修改POM版本号
6 years ago
2772ea6a2f
Merge remote-tracking branch 'remotes/origin/dev' into test
...
# Conflicts:
# modules/i3plus-pojo-andon/pom.xml
# modules/i3plus-pojo-aps/pom.xml
# modules/i3plus-pojo-base/pom.xml
# modules/i3plus-pojo-form/pom.xml
# modules/i3plus-pojo-hardswitch/pom.xml
# modules/i3plus-pojo-jobflow/pom.xml
# modules/i3plus-pojo-lac/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-softswitch/pom.xml
# modules/i3plus-pojo-sweb/pom.xml
# modules/i3plus-pojo-wms/pom.xml
# modules/i3plus-pojo-workflow/pom.xml
# pom.xml
6 years ago
8a8c3ee34d
pom版本调整
6 years ago
钮海涛
1d16e2d938
解决合并冲突
6 years ago
贾文涛
492dfbff82
pom通过变量方式存在只能引用jar不能引用到项目文件的问题，暂时先还原为最初方式
6 years ago
钮海涛
82d5332861
修复POM文件问题
6 years ago
ec1d52e7dd
MAVEN 版本控制调整
6 years ago
贾文涛
7106c06221
统一修改pom文件的项目版本问题0331
6 years ago
44696061ee
修改pom文件为最新
6 years ago
d80b341620
还原test pom
6 years ago
贾文涛
048419d823
修改打包时版本号的定义，后续可以通过mvn clean install Pdev 命令进行打包,最后dev还可以更换为test、prod、docker。
6 years ago
曾贞一
779b9d209c
【修改 DEV-pom.xml】
6 years ago
12579c7a14
还原pom
6 years ago
王杰
cfa54aa2b6
修改pom
6 years ago
王杰
ac5432bebb
解决冲突
6 years ago
bec3a7098d
Merge remote-tracking branch 'remotes/origin/test'
6 years ago
9170083b17
Merge branch 'dev' into test
7 years ago
曾贞一
33ef135392
采购订单表-条码明细表 字段修改 炉批号 改为 特殊批号
7 years ago
5ba134126a
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
7 years ago
曾贞一
6845ef957b
bug #4330 工厂订单管理-订单管理 所有订单的已发布的历史记录都没有显示出来
7 years ago
9eb207145c
Merge branch 'dev' into test
7 years ago
曾贞一
c164972238
已发布状态的订单，不支持打印 修改
7 years ago
a152d8d565
Merge branch 'dev' into test
7 years ago
曾贞一
8a9e347f13
bug 修改
7 years ago
d714733a27
Merge branch 'dev' into test
7 years ago
曾贞一
4e45f813dc
CS_ORDER_STATUS 枚举修改
...
DdlPreparedPack getNotInPack getNotInPackString 方法修改
7 years ago
68c8c62542
Merge remote-tracking branch 'remotes/origin/dev' into test
7 years ago
245596ee0b
sweb 导入非标准包装修改
7 years ago
a7833ea9dd
Merge remote-tracking branch 'origin/dev' into test
7 years ago
c5a4a5c023
sweb 订单按天发布
7 years ago
7db7dee50c
sweb 订单发布状态取子表
7 years ago
458cf3610f
sweb 订单发布修改子表状态
7 years ago
7c20f070e4
Merge remote-tracking branch 'origin/dev' into test
7 years ago
b4f07905e5
sweb 发布列表修改，按天发布
7 years ago
5f5b3b84bd
Merge branch 'dev' into test
7 years ago
fe23d7003f
sweb po详情级联查询重写，发布订单接口重写
7 years ago
20afd08ba7
Merge remote-tracking branch 'remotes/origin/dev' into test
7 years ago
6ebc22e6cc
master分支配置调整
7 years ago
58bc54f3c6
sweb 订单发布代码修改bug
7 years ago
e93605135c
sweb 发布列表重写
7 years ago
ef4acdbb00
sweb测试环境版本配置修改pojo
7 years ago
cdd0e5fc05
消息接口修改
7 years ago
6ea6b3d54b
请求路径修改，系统配置表增删改查
7 years ago
461aa2fc1b
供应商条码打印，非标导入，excelutil空行判断
7 years ago
9ec20ed314
标准包装导入，发布列表修改 重写
7 years ago
50f0a7d52a
新增逻辑修改
7 years ago
ce55dda367
确认订单目录调整
7 years ago
7535d82bed
发布列表修改、发布 修改存在 bug
7 years ago
6f3fefe3b4
发布列表修改、发布
7 years ago
a464028a3b
新增初始化
7 years ago
93f4d1cfd7
发布列表接口
7 years ago
bb2d5f905a
ids改为idsStr
7 years ago
556072dbaa
登录授权、发货通知
7 years ago
3a5f43f97b
删除iml文件
7 years ago
2fdf91f164
导入excel联调
7 years ago
cddb582ab4
发布列表
7 years ago
9ca521f64a
hqlpack =》 ddlpack
7 years ago
709c018fb4
Sweb更新到订单明细修改历史记录查询
7 years ago
fb095c6bfb
Sweb基础数据维护bean+hql
7 years ago
c5331008dc
wsebhqlpack update
7 years ago
da3490acbf
sweb repository init 9 files
7 years ago
acc8e97825
sweb bean init 9 files
7 years ago
ea2eb6103d
优化调整
7 years ago
1dcdf36537
添加mes、mes-pcn、sweb三个微服
7 years ago
钮海涛
wynne1005
wei.peng
王杰
qianhs
汪云昊
贾文涛
曾贞一
luweihao
Silliter
wei.peng
allen.zhang
yihang.lv
jenkins
jiajack
alwaysfrin