jenkins
|
54d6d1f340
|
Jenkins自动合并
|
6 years ago |
WYnneaoapc
|
b1d030e0dd
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
jenkins
|
189bece3f7
|
Jenkins自动合并
|
6 years ago |
e-jiawentao1
|
b2edab4ef4
|
2020-01-07创建动态查询与表单dao
|
6 years ago |
|
e-jiawentao1
|
1dba90f768
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
e-jiawentao1
|
b939ce6625
|
2020-01-07创建动态查询实体
|
6 years ago |
 王杰
|
685d7949bf
|
Merge branch 'dev' into test
|
6 years ago |
zcg
|
d8f6a5273c
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
许心洁
|
a2041a4900
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
许心洁
|
7d63a933c0
|
生产报工JOB出错没有更新状态+流程修改初始化组件没有重新加载组件+流程管家：加上可设置是否提交逻辑
|
6 years ago |
|
zcg
|
b84a305b26
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
jenkins
|
497b963f60
|
Jenkins自动合并
|
6 years ago |
|
王杰
|
bf62494236
|
JIS
|
6 years ago |
|
jenkins
|
fa4cc8610f
|
Jenkins自动合并
|
6 years ago |
puxiao.liao
|
8584946ce5
|
【 条码状态报表，导出时下列三个字段为中文
】bug7196
|
6 years ago |
|
WYnneaoapc
|
a9f2cf2501
|
task 1309 大数据检索
|
6 years ago |
|
zcg
|
c86f3e280e
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
王杰
|
0a0124cd2b
|
Merge branch 'dev' into test
|
6 years ago |
jokelone
|
c3a7e0057b
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
jokelone
|
fea1811191
|
【bug：7153 JIT排序】
|
6 years ago |
|
王杰
|
4f8898d57a
|
Merge branch 'dev' into test
|
6 years ago |
|
王杰
|
bcec1d7e62
|
JIS
|
6 years ago |
|
王杰
|
f88041df1e
|
Merge branch 'dev' into test
|
6 years ago |
|
王杰
|
3fe50125ae
|
JIS
|
6 years ago |
|
jokelone
|
c226e61acf
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
zcg
|
d9990f0cb8
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
jenkins
|
a685cd208d
|
Jenkins自动合并
|
6 years ago |
|
许心洁
|
267ec6c647
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
wei.peng
|
823f818abf
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
许心洁
|
fe809e2eff
|
定时处理遗漏的待处理移动单JOB：处理周期改为可配置的JOB参数+流程管家：在放入“IS_COMMIT_REF_MOVE”缓存时需要判断是否为空+交易类型添加属性“是否推送异常邮件”用于第一次处理移动单出错
|
6 years ago |
|
wei.peng
|
44af186f2f
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
zcg
|
f2d73a0687
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
 曾贞一
|
1995e55b40
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
曾贞一
|
989e05c64c
|
【7168 对于发运单标签补打功能，根据发运单中的ship-to获取标签模板进行打印】
|
6 years ago |
|
wei.peng
|
d8d47541df
|
自定义报表调整
|
6 years ago |
|
wei.peng
|
af6083ddff
|
日志存储优化
|
6 years ago |
|
WYnneaoapc
|
227354923e
|
Merge branch 'test'
|
6 years ago |
|
jenkins
|
c14ef88ea8
|
Jenkins自动合并
|
6 years ago |
|
jokelone
|
68eb60c6cb
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
 钮海涛
|
74be235a26
|
修复资源甘特图拖拽问题
|
6 years ago |
|
钮海涛
|
b0bbd132c6
|
修复资源甘特图拖拽问题
|
6 years ago |
|
zcg
|
f38e54e496
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
jenkins
|
422aa1835f
|
Jenkins自动合并
|
6 years ago |
|
钮海涛
|
4013ed776b
|
修复炉资源排程问题
|
6 years ago |
|
jenkins
|
dfb06def2b
|
Jenkins自动合并
|
6 years ago |
|
曾贞一
|
9e9d3e2afa
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
曾贞一
|
5a4510cedb
|
【7168 对于发运单标签补打功能，根据发运单中的ship-to获取标签模板进行打印】
|
6 years ago |
qianhs
|
81bab75132
|
【库存调整盘点需要修改为，扫描新的库位时就对上一个库位中的数据做调整（更新条码状态），每个库位的扫描数据还是存在同一张盘点单内，点击提交时该张盘点单关闭。去除页面上的未盘移库按钮，未盘条码直接做移库。】【bug7148 】
|
6 years ago |
陈思洁
|
bae2130d72
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
陈思洁
|
1f1f6ec825
|
【KT-1346 增加拉动任务的暂停和开启】
|
6 years ago |