andly.pan
|
4261e9d34e
|
Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into pext-dev
|
4 years ago |
|
andly.pan
|
faeef7b511
|
swebplanOrder增加过期字段
Signed-off-by: andly.pan <andly.pan@estsh.com>
|
4 years ago |
|
andly.pan
|
754124ff25
|
Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into pext-dev
|
4 years ago |
 曾贞一
|
54e691bc30
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
4 years ago |
|
曾贞一
|
2e49522aec
|
【14115 20063-BH基础数据增加导出及导入功能-20210305】
|
4 years ago |
许心洁
|
4ae7700104
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev
|
4 years ago |
puxiao.liao
|
5b3046f482
|
天津麦格纳BUG修复
|
4 years ago |
|
许心洁
|
d223ff242d
|
BUG14132 #流程管家在重置之后开启了一个新的流程但是没有重新返回配置项信息，导致前端重置后按钮组件等消失
|
4 years ago |
|
puxiao.liao
|
a98066dbe8
|
接口增加字段信息
|
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
|
c880d51c9d
|
修复泰国翻包
|
4 years ago |
 王杰
|
2b89e35c69
|
pom
|
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 |
|
puxiao.liao
|
696a0a8c3f
|
修复单据条码展开日期
|
4 years ago |
|
王杰
|
5a5874b137
|
test
|
4 years ago |
|
王杰
|
45a1b63a23
|
Merge branch 'test'
|
4 years ago |
|
王杰
|
f1db936f42
|
pom
|
4 years ago |
|
王杰
|
d2f03a966e
|
Merge branch 'dev' into test
|
4 years ago |
|
puxiao.liao
|
c8d97daa58
|
Fix bug#13248
|
4 years ago |
|
puxiao.liao
|
983565aca1
|
Fix bug#13752
|
4 years ago |
|
许心洁
|
896a88de44
|
合并测服代码
|
4 years ago |
|
王杰
|
c8b21c0b69
|
pom
|
4 years ago |
|
许心洁
|
8246a28c05
|
Merge branches 'master' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
4 years ago |
|
许心洁
|
8cd32346d3
|
BUG#13694,喜德BUG：单据条码展开没有查询seqNo导致无法生成条码
|
4 years ago |
|
许心洁
|
c45cd70ea9
|
喜德BUG：单据展开查询没有返回seqNo导致不能生成条码
|
4 years ago |
|
puxiao.liao
|
8eb1831861
|
Fix bug#12607
|
4 years ago |
|
许心洁
|
d107c7a3fe
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
4 years ago |
|
许心洁
|
02137638e4
|
喜德BUG:单据条码展开没有查询出单据明细的SEQNO，导致工单条码无法生成
|
4 years ago |
肖奕扬
|
0ee06f6e03
|
Merge branch 'test' of i3-IMPP/i3plus-pojo into ext-dev
|
4 years ago |
|
许心洁
|
ca5cc4937e
|
需求#1391
|
4 years ago |
rock.yu
|
8be0df57ea
|
Merge remote-tracking branch 'origin/test' into test
|
4 years ago |
|
rock.yu
|
ad2c771996
|
ERP快照相关的表切换为从BaseBean继承，解决SnapID重复的问题
|
4 years ago |
|
puxiao.liao
|
1f3f891264
|
二维码优化
|
4 years ago |
|
许心洁
|
6fab12fc50
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
4 years ago |
|
许心洁
|
e72c2dd09a
|
任务#2586
|
4 years ago |
shun
|
9cdf5827a3
|
JIS发运报表增加导出枚举
|
4 years ago |
 钮海涛
|
2740830e8f
|
合并test代码
|
4 years ago |
|
shun
|
dfaa9c810b
|
JIS发运报表增加导出model
|
4 years ago |
Dominic_Xiao
|
c72a294a6f
|
回滚POM
|
4 years ago |
|
肖奕扬
|
9f25d80eac
|
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
|
4 years ago |
|
andly.pan
|
ddb6fa33d3
|
条码增加道口泊位
Signed-off-by: andly.pan <andly.pan@estsh.com>
|
4 years ago |
|
shun
|
987fa02e32
|
自动打印增加重量
|
4 years ago |
|
shun
|
33b05c090c
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
4 years ago |
|
shun
|
36f37a4444
|
无锡喜德看板优化
|
4 years ago |
|
许心洁
|
abc5a9b812
|
BUG#新增需求：13580
|
4 years ago |
|
shun
|
ad0ddbf65e
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev
|
4 years ago |
|
曾贞一
|
aae3fb2539
|
【未完成单据提交-优化】
|
4 years ago |
|
王杰
|
58c7b6854b
|
pom
|
4 years ago |
|
曾贞一
|
2e13f7e3f9
|
Merge remote-tracking branch 'origin/ext-dev' into ext-dev
|
4 years ago |