 曾贞一
|
18b9a8c6c9
|
【14212 20162--库存调整盘点需要增加卡控逻辑--20210310】
|
4 years ago |
puxiao.liao
|
aec66afa83
|
修复泰国翻包
|
4 years ago |
wynne1005
|
8b1e28c893
|
删除mongo依赖 merge test
|
4 years ago |
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 |
许心洁
|
2127e3d260
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
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 |
|
许心洁
|
38e6870f04
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
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 |
 王杰
|
ec3d2f8557
|
pom
|
4 years ago |
|
王杰
|
4644639c2e
|
pom
|
4 years ago |
|
王杰
|
f0c09ca0e6
|
Merge branch 'test' into dev
|
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 |
|
王杰
|
84d9ec15f2
|
pom
|
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 |
|
曾贞一
|
bbd5dccbf8
|
【合并分支】
|
4 years ago |
|
puxiao.liao
|
db8c01b64c
|
修复天津BUG
|
4 years ago |
|
许心洁
|
a9fc8ae132
|
喜德WMS：BUG#13293，13295，13294
|
4 years ago |
|
钮海涛
|
b843db89d9
|
静态盘点查询单据查询不到数据问题修复
|
4 years ago |
|
puxiao.liao
|
129002573c
|
Fix bug#13399
|
4 years ago |
duan.yang
|
0db629a2a1
|
BUG #13415 19058-坤泰环境，生成装车单时需要把原出库单号作为关联号显示在界面上
Signed-off-by: duan.yang <994300880@qq.com>
|
4 years ago |
|
puxiao.liao
|
8657926eee
|
Fix bug#13411
ASN收货后未点击提交按钮，再次进入后无法提交
|
4 years ago |
|
puxiao.liao
|
4937b49281
|
Fix bug#13411
ASN收货后未点击提交按钮，再次进入后无法提交
|
4 years ago |
|
puxiao.liao
|
36d4f0ac10
|
修复天津麦格纳问题
|
4 years ago |
|
钮海涛
|
d301332162
|
合并dev代码
|
4 years ago |
|
钮海涛
|
70b80068c2
|
Merge remote-tracking branch 'origin/test' into test
|
4 years ago |
|
钮海涛
|
56630ccb0d
|
静态盘点查询单据查询不到数据问题修复
|
4 years ago |
|
puxiao.liao
|
7880fc96c9
|
修复天津BUG
|
4 years ago |
|
许心洁
|
8c26a27218
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
4 years ago |
|
许心洁
|
819a4312ae
|
喜德WMS：BUG#13293，13295，13294
|
4 years ago |
|
puxiao.liao
|
7e400a1a68
|
Fix bug#13399
|
4 years ago |
|
duan.yang
|
f210767332
|
BUG #13415 19058-坤泰环境，生成装车单时需要把原出库单号作为关联号显示在界面上
Signed-off-by: duan.yang <994300880@qq.com>
|
4 years ago |
|
puxiao.liao
|
87dcbd64f8
|
Fix bug#13411
ASN收货后未点击提交按钮，再次进入后无法提交
|
4 years ago |
|
puxiao.liao
|
4e0cab2f6a
|
Fix bug#13411
ASN收货后未点击提交按钮，再次进入后无法提交
|
4 years ago |
|
puxiao.liao
|
7fcdae795c
|
修复天津麦格纳问题
|
4 years ago |
|
钮海涛
|
baed7db4ed
|
合并dev代码
|
4 years ago |
|
钮海涛
|
48b4e45850
|
Merge remote-tracking branch 'remotes/origin/test' into dev
|
4 years ago |
|
钮海涛
|
6e5ea4462f
|
合并master代码
|
4 years ago |
|
钮海涛
|
977b8ac23c
|
Merge remote-tracking branch 'remotes/origin/test'
|
4 years ago |
|
puxiao.liao
|
6c2569ee92
|
盘点优化
|
4 years ago |
|
钮海涛
|
ded63e25db
|
坤泰问题修复
|
4 years ago |
|
shun
|
c067c671a9
|
无锡喜德
|
4 years ago |
|
shun
|
6f9d4b4342
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
4 years ago |
|
王杰
|
d089d0fba8
|
Merge branch 'test' into dev
|
4 years ago |
|
许心洁
|
1595f68723
|
任务#3036
|
4 years ago |
|
shun
|
2fd1b89425
|
无锡喜德WMS看板
|
4 years ago |
|
王杰
|
cd5b882e1f
|
dev merge test pom 冲突解决
|
4 years ago |
|
许心洁
|
3f72f2ac66
|
合并TEST分支代码
|
4 years ago |
|
许心洁
|
3cf59e9edc
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev
|
4 years ago |
|
许心洁
|
88d2eefcc8
|
供应商信息中的供应商地址因为之前漏加自定义搜索注解，导致界面上无法维护，现修复
|
4 years ago |
liangyao
|
9f1312e906
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
4 years ago |
|
liangyao
|
ae2469e463
|
北京领料任务提交
|
4 years ago |
|
许心洁
|
3d1d05ef1c
|
1.天津委外发运库存移动单打印
|
4 years ago |
|
许心洁
|
1474be7486
|
Merge branch 'ext-dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
4 years ago |
|
许心洁
|
30a6ef7ba5
|
Merge branch 'ext-dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev
|
4 years ago |
|
许心洁
|
3467893051
|
1.解决天津麦格纳库存不准问题，将所有stockquan更新的地方改为set qty+=newQty形式，避免并发执行导致脏读
2.更正生产计划对象属性woekorderNo->workOrderNo
3.将脚本异常往外抛
4.优化通用脚本接口
|
4 years ago |