peter.pan
|
a551249165
|
Merge branch 'dev' into test
|
6 years ago |
于学杰
|
bc6d7f5c4d
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
于学杰
|
e7bd528736
|
1. 设置 is_sync 字段不允许为空，默认值为 2
|
6 years ago |
陈思洁
|
d9d776060f
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
陈思洁
|
557880ffd2
|
生产报工明细实体修改
|
6 years ago |
shiyanghuan
|
b29d5722bc
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
shiyanghuan
|
31b7e2d8dc
|
库存交易报表和未完成订单报表bug修复
|
6 years ago |
|
peter.pan
|
49d35f264e
|
Merge branch 'dev' into test
|
6 years ago |
|
于学杰
|
35f92b05e3
|
1. 修改ERP接口暂存表的字段，增加关联单据类型
|
6 years ago |
刘敏
|
787eaaf53d
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
wei.peng
|
1ee9cb24f2
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
于学杰
|
2b1414814c
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
于学杰
|
baeb202ca5
|
1. 增加查询系统配置参数的结构
|
6 years ago |
|
陈思洁
|
1b1f2aca51
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
陈思洁
|
2ce560b39f
|
生产报工明细实体修改和枚举新增
|
6 years ago |
|
刘敏
|
7ac3509f96
|
状态查询添加是否有效
|
6 years ago |
|
shiyanghuan
|
400b380b55
|
未完成订单查询报表代码提交
|
6 years ago |
jenkins
|
470d319504
|
Merge branch 'dev' into test
|
6 years ago |
|
陈思洁
|
4a4a50638c
|
生产报工明细实体提交
|
6 years ago |
|
刘敏
|
98229202b8
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
刘敏
|
d91c9138b3
|
字段新增
|
6 years ago |
sky.meng
|
2f1a3080ba
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
sky.meng
|
05c56e46b4
|
库存预警看板开发
|
6 years ago |
|
刘敏
|
d7f15cddef
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
许心洁
|
ae4e31e22c
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
许心洁
|
484c5942e8
|
所有业务单据Item属性都用String类型
|
6 years ago |
|
刘敏
|
eb7ff3fd40
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
peter.pan
|
4b924c64a3
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
peter.pan
|
af7e8d7a43
|
组织码
|
6 years ago |
|
刘敏
|
e42c238d16
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
许心洁
|
7c28110bd4
|
代码忘了发起合并请求
|
6 years ago |
|
刘敏
|
cd566574cb
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
于学杰
|
713503d7ff
|
Merge branch 'dev' into test
|
6 years ago |
|
于学杰
|
91f1a120a2
|
1. 修改编译不过的代码
|
6 years ago |
|
于学杰
|
5d1447c92a
|
1. 解决标准拣货多级存储区查找的问题
|
6 years ago |
|
peter.pan
|
ced56de9de
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
peter.pan
|
b1ca55e3a3
|
pojo
|
6 years ago |
|
许心洁
|
41324abdad
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
许心洁
|
b13a9cd79c
|
PDA获取任务列表+盘点冻结根据移动明细源库位更新库存
|
6 years ago |
|
sky.meng
|
854ee5b3cf
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
# Conflicts:
# modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
|
6 years ago |
|
sky.meng
|
0f3d67d110
|
供应商收货看板功能完成
|
6 years ago |
|
许心洁
|
8ba2173753
|
冲突
|
6 years ago |
|
许心洁
|
8347085f26
|
冲突
|
6 years ago |
|
刘敏
|
48589a10cb
|
默认字段修改
|
6 years ago |
|
许心洁
|
e3d5e5bb19
|
PDA获取任务列表+盘点冻结根据移动明细源库位更新库存
|
6 years ago |
|
刘敏
|
945ef82867
|
实体字段新增
|
6 years ago |
|
wei.peng
|
eb2f61c32f
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
陈思洁
|
d0d9a467a3
|
乐观锁修改数字类型
|
6 years ago |
|
wei.peng
|
edc0dda102
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
陈思洁
|
62ae657151
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
陈思洁
|
71f6d48d16
|
修改流程管家实体--架构
|
6 years ago |
|
wei.peng
|
f32f7e72a2
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
shiyanghuan
|
f3151cbbe3
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
shiyanghuan
|
e13d4163b7
|
库存交易报表代码提交
|
6 years ago |
|
wei.peng
|
f1c49c1cae
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
 曾贞一
|
4d37e2a095
|
合并
|
6 years ago |
|
wei.peng
|
9cc7c5d8b8
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
曾贞一
|
2f595807ea
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
曾贞一
|
14a8afca83
|
优化 盘点代码
|
6 years ago |
|
刘敏
|
cabb4c9357
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
刘敏
|
1a43546bd1
|
条码状态报表开发
|
6 years ago |
alwaysfrin
|
4ce22aaa3f
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
alwaysfrin
|
d4dce36280
|
流程管家优化
|
6 years ago |
|
jenkins
|
e4cf82841f
|
Merge branch 'dev' into test
|
6 years ago |
|
于学杰
|
663d8cdcf1
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
于学杰
|
aed953a03e
|
1. FIFO 推荐时要加上 sn_status = 40 的筛选条件
|
6 years ago |
|
刘敏
|
6aaf2f3f3e
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
刘敏
|
1f403ebe40
|
代码优化
|
6 years ago |
|
jenkins
|
c12cdea29f
|
Merge branch 'dev' into test
|
6 years ago |
|
peter.pan
|
96e031b2f2
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
peter.pan
|
062b20af23
|
物料清单dao层
|
6 years ago |
|
刘敏
|
8d8c91f352
|
盘点调差导入接口表开发
|
6 years ago |
|
wei.peng
|
a4016dc911
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
曾贞一
|
022d178833
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
曾贞一
|
e8c736ee67
|
开发 交叉盘点 库存容量更新
|
6 years ago |
|
曾贞一
|
316050dd24
|
开发 交叉盘点 库存容量更新
|
6 years ago |
|
刘敏
|
98cf305653
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
于学杰
|
6ee8d7d2a2
|
1. 修改潜在BUG
|
6 years ago |
|
刘敏
|
7488f0652e
|
移库单明细查询条件新增、盘点导入开发
|
6 years ago |
|
刘敏
|
34dcf6d526
|
枚举修改
|
6 years ago |
|
wei.peng
|
3605e5ef35
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
于学杰
|
9282edf93a
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
于学杰
|
c6f5111510
|
1. 解决标准拣货中的 FIFO 按照存储区推荐问题
|
6 years ago |
汪云昊
|
6c68b123f0
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
许心洁
|
a8a1c2fe8b
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
许心洁
|
659968da3c
|
流程管家启动加载流程不存在不报错+MOVE_NO存KEY的BUG
|
6 years ago |
|
汪云昊
|
f3ba4b33a2
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
陈思洁
|
5f74c26466
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
陈思洁
|
326992e6ce
|
通过库存地查询存储区的sql新增
|
6 years ago |
|
刘敏
|
60be1763b2
|
实体数字类型get方法重写
|
6 years ago |
|
汪云昊
|
5d6f9a42af
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
刘敏
|
b815564e6e
|
线边配料页面新增任务字段、主表状态字段
|
6 years ago |
|
汪云昊
|
90028caa6f
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
sky.meng
|
78c8d3b689
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
sky.meng
|
9d2146b23d
|
客户零件号功能完成
|
6 years ago |
jenkins
|
0b302482fd
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
|
于学杰
|
5b6068b2ae
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
于学杰
|
60d151eb35
|
1. 完成 WMS --> SAP 接口程序
|
6 years ago |
|
jenkins
|
8132c94cee
|
Merge branch 'dev' into test
|
6 years ago |
|
刘敏
|
c6b24ea3cc
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
刘敏
|
8c4646bc41
|
实体类型修改
|
6 years ago |
|
shiyanghuan
|
f6bc967e07
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
shiyanghuan
|
bcd3e43867
|
库存交易报表部分代码提交以及供应商物料bug修复
|
6 years ago |
|
陈思洁
|
add3f05985
|
数据权限hql修改
|
6 years ago |
|
wei.peng
|
734340fe63
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
陈思洁
|
5f5bd84089
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
陈思洁
|
8e8cafc6d8
|
数据权限增加角色名称
库存条码数量封装
|
6 years ago |
|
刘敏
|
9b2356231e
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
刘敏
|
4a5f799291
|
实体新增
|
6 years ago |
|
刘敏
|
8a420ff9c9
|
库存转储指令 供应商退货指令实体新增
|
6 years ago |
|
sky.meng
|
15c22e28fd
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
sky.meng
|
0182dd3cc3
|
生产线(工作中心) 存储区关系管理功能完成
|
6 years ago |
|
shiyanghuan
|
f7f0ebadaf
|
Merge branch 'dev' of http://git.estsh.com/i3-WMS/i3plus-wms into dev
# Conflicts:
# modules/i3plus-wms-apiservice/src/main/java/cn/estsh/i3plus/wms/apiservice/controller/base/WmsUnitController.java
|
6 years ago |
|
刘敏
|
81f0ea48ba
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
jenkins
|
5694d58256
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
|
于学杰
|
02734d33f9
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
于学杰
|
b6746b7e6f
|
1. 增加 WMS 到 SAP 接口的处理代码
|
6 years ago |
|
刘敏
|
0a7583a91b
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
刘敏
|
85681c4465
|
导入问题统一修改
|
6 years ago |
|
陈思洁
|
0210ab9d70
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
陈思洁
|
16ceb8ff7b
|
修复任务权限业务逻辑
|
6 years ago |
|
曾贞一
|
8f56fc5620
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
曾贞一
|
fa59716c17
|
需求变更 冻结盘点业务
|
6 years ago |
|
jenkins
|
4212c9b61e
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
|
shiyanghuan
|
6222923c80
|
修改
|
6 years ago |
|
刘敏
|
3310571d18
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
刘敏
|
856345e830
|
初始化问题修改
|
6 years ago |
|
许心洁
|
c4bdbc3c17
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
许心洁
|
7fa871508e
|
流程修改去掉工厂代码+库存交易实体新增scrapQty字段
|
6 years ago |
|
wei.peng
|
1be5aa02bf
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
刘敏
|
8dc939b849
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
刘敏
|
07e6e58e23
|
实体新增与修改
|
6 years ago |
|
陈思洁
|
e85c2ea992
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
陈思洁
|
91999948b6
|
sql优化
|
6 years ago |
|
刘敏
|
e726833580
|
非JIS发运实体新增
|
6 years ago |
|
许心洁
|
ada53de0fe
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
许心洁
|
f69795cc5f
|
任务数据来源基础数据维护唯一校验修改
|
6 years ago |
|
sky.meng
|
baee01a070
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
sky.meng
|
5f898661c7
|
添加产线(工作中心)-存储区信息 repository
|
6 years ago |
|
wei.peng
|
a02b32a20e
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
曾贞一
|
8d64152e58
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
# Conflicts:
# modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java
|
6 years ago |
|
曾贞一
|
8289de8259
|
优化 新建盘点范围数据
需求更新 盘点冻结业务
|
6 years ago |
|
shiyanghuan
|
619487aedb
|
修改库位物料和供应商物料bug
|
6 years ago |
|
shiyanghuan
|
f7d4f85d45
|
库位物料和供应商物料bug修复
|
6 years ago |
|
jenkins
|
320910e2ae
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
|
刘敏
|
721ddbee3c
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
刘敏
|
16400aa31c
|
实体字段修改
|
6 years ago |
|
sky.meng
|
e5e0da62e7
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
sky.meng
|
939d67e7f3
|
添加产线信息管理(工作中心)
|
6 years ago |
|
许心洁
|
dfef27151d
|
冲突
|
6 years ago |
|
许心洁
|
f834e91353
|
Task#764+枚举TRUE_OR_FALSE
|
6 years ago |
|
jenkins
|
32cc1db3bf
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
|
陈思洁
|
f89a98479c
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
陈思洁
|
30dd11cce7
|
sql拼接优化
|
6 years ago |
|
peter.pan
|
62b2ea298b
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
# Conflicts:
# modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
# modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsUnitRepository.java
|
6 years ago |
|
peter.pan
|
ea83820fbf
|
新增物料类型跟单位类型
|
6 years ago |
|
许心洁
|
fe13a43ccc
|
WmsEnumUtil冲突（几步法）
|
6 years ago |
|
jenkins
|
ea4cde868f
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
|
shiyanghuan
|
2be5f29a63
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
shiyanghuan
|
40f0860647
|
修改库位物料和供应商物料bug
|
6 years ago |
|
shiyanghuan
|
4fad1795b1
|
修改库位物料和供应商物料bug
|
6 years ago |
|
陈思洁
|
fb98db0bcc
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
陈思洁
|
c08a569ac5
|
sql优化
数据权限实体增加字段
枚举增加数据权限的交易对象
|
6 years ago |
|
刘敏
|
3bb095a8ab
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
刘敏
|
7d0cd674cf
|
零星退料指令导入开发
|
6 years ago |
|
peter.pan
|
67cd5e008b
|
主数据信息sql拼装
|
6 years ago |
|
jenkins
|
9232010d60
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
|
许心洁
|
79d1da3230
|
系统数据初始化
|
6 years ago |
|
sky.meng
|
8409025253
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into stock_report
# Conflicts:
# modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java
# modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java
|
6 years ago |
|
sky.meng
|
a67f88a4bb
|
库存报表开发
|
6 years ago |
|
jenkins
|
9848ca9c90
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
|
曾贞一
|
beb2285591
|
移库单业务逻辑修复 bug#4495
|
6 years ago |
|
曾贞一
|
ca625dbfcc
|
开发 交叉盘点业务，新建盘点范围表，盘点调差范围表
|
6 years ago |
|
于学杰
|
c3ff60a581
|
1. 解决 WMS 数据权限查询时多个值覆盖的问题
|
6 years ago |
|
jenkins
|
f75a861d05
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
|
shiyanghuan
|
b871b34dba
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
shiyanghuan
|
54d7190bf0
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
# Conflicts:
# modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java
|
6 years ago |
|
陈思洁
|
be8c20fc45
|
收货回执单据打印修改--ASN订单冗余标准包装字段
|
6 years ago |
|
shiyanghuan
|
1ad24c40f1
|
增加供应商物料信息
|
6 years ago |
|
陈思洁
|
821afdd75b
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
陈思洁
|
fbfba84ab0
|
冗余业务字段数据
修改任务明细查询方法
|
6 years ago |
|
jenkins
|
06892a9c99
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
|
刘敏
|
b6b6ca8c1e
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
刘敏
|
1eda68e151
|
sap接口实体新增
|
6 years ago |
|
jenkins
|
3969a8c7f2
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
|
许心洁
|
ec158d9bdf
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
许心洁
|
d3431028d7
|
StockQuan表新增ScrapQty字段：NC,盘点调差，出入移库交易处理组件+控制台逻辑变动
|
6 years ago |
|
于学杰
|
45cd34f067
|
1. SAP - WMS 接口 POJO 类中增加 groupName 属性
|
6 years ago |
|
于学杰
|
804fd91527
|
1. 完善 SAP - WMS 接口
|
6 years ago |
Chnx
|
a9f33764b2
|
po订单主表箱数默认0
|
6 years ago |
|
jenkins
|
e2556fa455
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
|
刘敏
|
6546ae1562
|
要货计划实体新增
|
6 years ago |
|
jenkins
|
884d4fd763
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
|
刘敏
|
77e2d1e3ec
|
物料表字段新增
|
6 years ago |
|
jenkins
|
fd7abde050
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
|
Chnx
|
f12e480ff7
|
po订单表添加箱数字段
|
6 years ago |
|
jenkins
|
ac8b9d3986
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
|
于学杰
|
c90d70e54f
|
1. 完善 SAP - WMS 接口程序
|
6 years ago |
|
许心洁
|
29605d0c37
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
许心洁
|
5ef906d88f
|
交易处理组件去掉生成收货入库单逻辑+新增公共初始化组件+任务生成去掉调试邮件+作业步骤参数类型查询条件去掉工厂+交易类型对象去掉作业类型编号属性
|
6 years ago |
|
于学杰
|
9b6e8bf921
|
1. 修改拼错的单词
|
6 years ago |
|
于学杰
|
65ddc6f57a
|
1. 完善SAP WMS 接口
|
6 years ago |
|
jenkins
|
201d5cffee
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
|
曾贞一
|
ba23663011
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
曾贞一
|
db7b849f3e
|
添加 移库单主表字段
|
6 years ago |
|
于学杰
|
65efb44dde
|
1. 把默认值的类型改为 Object
|
6 years ago |
|
shiyanghuan
|
3c5dea23fe
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
shiyanghuan
|
37eb33bcad
|
线边库实体以及WmsHqlpack中添加sql封装
|
6 years ago |
|
陈思洁
|
6fb0abcadd
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
陈思洁
|
cbb658e088
|
冗余字段新增
|
6 years ago |
|
jenkins
|
373bbfaa98
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
|
许心洁
|
052652dd36
|
交易处理组件（收货）：物料查询没有加工厂+流程设计：步骤调用参数值可以为空+作业处理组件：未修改不需要唯一校验
|
6 years ago |
|
许心洁
|
4261207e54
|
交易处理组件（收货）：物料查询没有加工厂+流程设计：步骤调用参数值可以为空+作业处理组件：未修改不需要唯一校验
|
6 years ago |
|
jenkins
|
5fc6ac8006
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
|
于学杰
|
b4e0effcb0
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
于学杰
|
46a361a291
|
1. 增加 SAP - WMS 接口转换实体类
|
6 years ago |
|
jenkins
|
25fc477991
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
|
刘敏
|
4cfe208bb7
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
# Conflicts:
# modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsProdCfgType.java
|
6 years ago |
|
刘敏
|
91442ec8ff
|
Wms V3新增实体创建
|
6 years ago |
wei.peng
|
9c201c70e8
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
陈思洁
|
767758f7a2
|
PO字段新增
|
6 years ago |
allen.zhang
|
919d633be0
|
Merge branch 'dev' into test
|
6 years ago |
|
陈思洁
|
854cb4e106
|
项目表新增，物料表中项目字段添加
|
6 years ago |
|
jenkins
|
a58888df85
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
|
于学杰
|
4a7081f90b
|
1. 添加 SAP 中间数据库转换接口的 POJO 类
|
6 years ago |
|
汪云昊
|
c07858d5ba
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
曾贞一
|
4fef723bdb
|
增加移库单主表字段
|
6 years ago |
|
jenkins
|
28ae6cf85d
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
|
曾贞一
|
25187ecf2c
|
存储区树型查询接口开发
|
6 years ago |
|
曾贞一
|
65beb8549f
|
wms存储区添加字段 是否子节点IS_SON_NODE
|
6 years ago |
Silliter
|
9170083b17
|
Merge branch 'dev' into test
|
6 years ago |
|
刘敏
|
93fa0d1aaa
|
实体字段与pdm比对添加
|
6 years ago |
|
allen.zhang
|
d70f85d592
|
Merge branch 'dev' into test
|
6 years ago |
|
陈思洁
|
e33c7c2465
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
陈思洁
|
9d9f5a2cc2
|
抽点记录查询条件增加
|
6 years ago |
|
刘敏
|
0b186e1317
|
物流路线查询修改
|
6 years ago |
|
wei.peng
|
5ba134126a
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
刘敏
|
ca0a671e92
|
#4337
|
6 years ago |
|
wei.peng
|
019505c4d2
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
陈思洁
|
37dc68b858
|
修改hql语句
|
6 years ago |
|
陈思洁
|
f6acf45ace
|
实体中增加乐观锁字段
|
6 years ago |
|
allen.zhang
|
e24e7ef421
|
Merge branch 'dev' into test
|
6 years ago |
|
许心洁
|
76e553234e
|
MES-JIT队列组件+WMS-GOJS位置字段添加@Lob注解
|
6 years ago |
|
汪云昊
|
68c8c62542
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
汪云昊
|
93ace83b5f
|
长文本数据类型
|
6 years ago |
|
allen.zhang
|
5f5b3b84bd
|
Merge branch 'dev' into test
|
6 years ago |
|
许心洁
|
cca408fcf0
|
监控台：防止出现负库存+流程配置：流程添加POSITION字段
|
6 years ago |
|
许心洁
|
c7e417e644
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
许心洁
|
a65b3d6fb2
|
交易处理组件基础方法维护+流程配置+任务生成代码结构层优化+交易处理主程序查询移动单条件修改调工厂代码（代码逻辑错误）
|
6 years ago |
|
jenkins
|
298a3c1ddf
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
|
曾贞一
|
81821c70a8
|
移库单 生成条码问题
|
6 years ago |
|
许心洁
|
37efbf718e
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
许心洁
|
4cf5fbc2b7
|
#4091+流程配置复制流程+作业步骤参数，作业组件，作业组件参数，作业流程基础数据接口代码调整
|
6 years ago |
|
Silliter
|
5ffc366dd0
|
Merge branch 'dev' into test
|
6 years ago |
|
Silliter
|
10844622a7
|
1.优化查询语句
2.流程管家查询条件加上工厂字段
|
6 years ago |
|
yunhao.wang
|
58247fe3f1
|
清除iml
|
6 years ago |
|
许心洁
|
58c29f5aee
|
作业流程接口+作业组件接口联调优化
|
6 years ago |
|
Silliter
|
4e9a8ab787
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
许心洁
|
24d115be6d
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
许心洁
|
35690ce138
|
作业流程界面+后端分页查询接口
|
6 years ago |
|
Silliter
|
0a36f9130f
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
jimmy
|
bc1b0b7e90
|
业务类型表 字段数据类型修改
|
6 years ago |
|
Silliter
|
7e58ced783
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
jimmy
|
fc15efe67c
|
开发业务类型增删改查接口
|
6 years ago |
|
Silliter
|
c99d7aec25
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
Silliter
|
733b65e8d5
|
流程管家优化：1.缓存重新规划
2.重入保存上一步的回显
|
6 years ago |
|
jenkins
|
12e2f1d1b8
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
|
许心洁
|
85a44b1baa
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
许心洁
|
19f30ce4f9
|
流程配置+定时处理错误移动单给错误信息赋值过长
|
6 years ago |
|
jenkins
|
0c7b87bf24
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
|
jimmy
|
f39abebd90
|
qc HQL修改
|
6 years ago |
|
Silliter
|
0291c3976e
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
jimmy
|
b1d8addd0f
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
jimmy
|
c72c2fa891
|
散件盘点
|
6 years ago |
|
刘敏
|
7ffa55fbe8
|
查询条件方法优化
|
6 years ago |
|
Silliter
|
f8b89c930b
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
许心洁
|
53dc8aaa15
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
许心洁
|
2231000f9a
|
BUG#4050+基础数据服务划分代码优化
|
6 years ago |
|
刘敏
|
b61a2bbea7
|
实体数字类型get方法重写
|
6 years ago |
|
jenkins
|
850b372ab4
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
yihang.lv
|
e790b209e5
|
sweb开窗改为微服务
|
6 years ago |
|
jenkins
|
068c4d0ad3
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
|
许心洁
|
51c5e36838
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
许心洁
|
b17b15964f
|
交易处理主程序调用组件异常处理优化
|
6 years ago |
|
jenkins
|
2f57ee75d5
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
|
jimmy
|
5e625f45b8
|
增加WmsMoveMastersql
|
6 years ago |
柯裕
|
3d44d85633
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
柯裕
|
da153214f9
|
优化
|
6 years ago |
|
jenkins
|
2a7564e7c2
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
|
Silliter
|
931a4a04d3
|
开发全局配置接口
|
6 years ago |
|
jenkins
|
ed474fe112
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
|
Silliter
|
afae8d085e
|
任务明细开发
|
6 years ago |
|
Silliter
|
c03c7d3331
|
自定义规则开发
|
6 years ago |
|
Silliter
|
b3f4ccbb78
|
自定义脚本开发
|
6 years ago |
|
jenkins
|
3b49d7d970
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
|
jimmy
|
bb811306ff
|
修改 wmsShopping 为 wmsShipping
|
6 years ago |
|
Silliter
|
c8c8dc6750
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
yihang.lv
|
7da6627878
|
sweb通知公告
|
6 years ago |
|
jenkins
|
b1497a8565
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
|
Silliter
|
0eb50142fe
|
优化查询
|
6 years ago |