crish
|
6c37a60ff4
|
MES-PCN获取平台打印数据
Signed-off-by: crish <570360737@qq.com>
|
6 years ago |
陈思洁
|
e9c596adce
|
盘点hql排序修改
|
6 years ago |
|
陈思洁
|
4573b09392
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
陈思洁
|
2058789438
|
盘点业务修改bug
|
6 years ago |
wei.peng
|
94924cb264
|
POJO 合并
|
6 years ago |
|
wei.peng
|
718ec36747
|
POJO 合并
|
6 years ago |
|
wei.peng
|
41aff3b560
|
``
|
6 years ago |
汪云昊
|
619251474d
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
汪云昊
|
f5c0ca9383
|
软适配模型调整
|
6 years ago |
 曾贞一
|
abf155ecd9
|
库存报表 创建人、创建时间添加
|
6 years ago |
WYnneaoapc
|
c05e3b13c6
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
汪云昊
|
391d0129e1
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
WYnneaoapc
|
63d86a4b0d
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
WYnneaoapc
|
ecba29948f
|
816 add method
|
6 years ago |
jimmy.zeng
|
221f05b175
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
汪云昊
|
69525fbaa9
|
表单菜单排序
|
6 years ago |
刘敏
|
839c139222
|
库存移动条码报表优化
|
6 years ago |
|
jimmy.zeng
|
235498b162
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
陈思洁
|
638d9cb1a1
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
陈思洁
|
9ff9c11c97
|
字段调整
|
6 years ago |
|
jimmy.zeng
|
b0d2812778
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
汪云昊
|
409c433b5c
|
添加字典分组
|
6 years ago |
|
汪云昊
|
42f067b987
|
软适配参数接口
|
6 years ago |
|
曾贞一
|
eb035aeaf6
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
汪云昊
|
cf5aded9d9
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
汪云昊
|
05b9298dec
|
软适配Repository初始化
|
6 years ago |
|
曾贞一
|
cef48801df
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
许心洁
|
a713e835fd
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
汪云昊
|
7455c6c640
|
软适配配置文件初始化
|
6 years ago |
|
汪云昊
|
f82011cf5b
|
实体
|
6 years ago |
|
汪云昊
|
1c98f0a3c4
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
汪云昊
|
dc78cf114f
|
实体
|
6 years ago |
|
wei.peng
|
aee54acafc
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
wei.peng
|
46c710e559
|
表单功能优化，虚拟属性连表查询，时间格式化对接
|
6 years ago |
|
wei.peng
|
68e4b74e0a
|
平台权限系功能优化
|
6 years ago |
|
wei.peng
|
6d99080069
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
曾贞一
|
ff52a412d4
|
库存初始化信息
|
6 years ago |
|
陈思洁
|
2860edf722
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
陈思洁
|
b604c5d9a0
|
交易记录增加字段
|
6 years ago |
|
许心洁
|
374c2bf76c
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
许心洁
|
92d4bf46ce
|
#5255,#5039
|
6 years ago |
|
jimmy.zeng
|
c986f7b2a3
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
汪云昊
|
090efb787f
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
汪云昊
|
9ee2901346
|
添加字典分组
优化redis资源键
|
6 years ago |
|
wei.peng
|
d04d441711
|
用户管理修改密码 Bug 修复
|
6 years ago |
|
jimmy.zeng
|
78267a3a45
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
WYnneaoapc
|
0f99cb1027
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
wei.peng
|
66f49f3fdc
|
自定义表单功能调整
|
6 years ago |
|
crish
|
5df9896258
|
维修， 报废， 系统配置， pcn节点基础数据接口
Signed-off-by: crish <570360737@qq.com>
|
6 years ago |
|
WYnneaoapc
|
66e20acfe9
|
0730 Add File Operation in ODS Module untested
|
6 years ago |
|
曾贞一
|
7ca6e46e4b
|
Merge branch 'dev' into test
|
6 years ago |
|
crish
|
781a1d2333
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
crish
|
6b442cda1c
|
PCN接口开发， 数据同步配置
Signed-off-by: crish <570360737@qq.com>
|
6 years ago |
|
crish
|
76684b82c0
|
PCN接口开发， 数据同步配置
Signed-off-by: crish <570360737@qq.com>
|
6 years ago |
|
crish
|
0e444aa993
|
PCN接口开发， 数据同步配置
Signed-off-by: crish <570360737@qq.com>
|
6 years ago |
|
jimmy.zeng
|
bf293d4758
|
生产报工时，原材料move单号写入关联移动单号中
|
6 years ago |
|
刘敏
|
dacc203119
|
库存报表修改
|
6 years ago |
|
曾贞一
|
380efb664e
|
Merge branch 'dev' into test
|
6 years ago |
|
刘敏
|
8034e9e505
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
刘敏
|
da1c9af3d4
|
库存报表新增
|
6 years ago |
|
曾贞一
|
f30a40520b
|
Merge branch 'dev' into test
|
6 years ago |
|
WYnneaoapc
|
d826c47d5a
|
修改了mesEvent pojo
|
6 years ago |
|
WYnneaoapc
|
e0089ab800
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
曾贞一
|
8b457c0618
|
DEV 合并 TEST pom.xml文件修改
|
6 years ago |
于学杰
|
4235184afc
|
Merge branch 'Process' into dev
|
6 years ago |
|
于学杰
|
e7913cfb26
|
1. 从 TEST 合并代码后 POM 文件中引用的版本不正确，修改为 DEV
|
6 years ago |
|
于学杰
|
24da688384
|
Merge branch 'test' into dev
|
6 years ago |
|
许心洁
|
b3f4e62a74
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into Process
|
6 years ago |
|
刘敏
|
794d4b69d6
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
刘敏
|
145600a5d0
|
单据查询精准查询
|
6 years ago |
|
许心洁
|
31313baec9
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into Process
|
6 years ago |
|
许心洁
|
f6c425c649
|
平台获取设备ID方式改变+所有pojo加上序列化
|
6 years ago |
|
曾贞一
|
3db421b825
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
曾贞一
|
b3a0a71065
|
库存初始化信息
|
6 years ago |
|
wei.peng
|
837d6ea567
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
许心洁
|
476d943a69
|
流程管家：自定义按钮触发的时候不需要预先调用当前步骤的回显信息
|
6 years ago |
|
wei.peng
|
5a6cd405b6
|
用户管理修改密码 Bug 修复
|
6 years ago |
|
许心洁
|
40fc36ef18
|
流程管家优化：快速提交流程手动提交校验
|
6 years ago |
|
许心洁
|
af7b2404dd
|
Merge branch 'Process' of http://git.estsh.com/i3-IMPP/i3plus-pojo into Process
|
6 years ago |
|
许心洁
|
d8786d8132
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
陈思洁
|
9a2798ef48
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
陈思洁
|
a4f2a7c848
|
hql修改asn订单明细
|
6 years ago |
|
曾贞一
|
fb07628555
|
Merge branch 'dev' into test
|
6 years ago |
|
汪云昊
|
c1cff11c7c
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
peter.pan
|
4d83030c51
|
Merge branch 'dev' into test
|
6 years ago |
|
许心洁
|
6431417462
|
dragon
|
6 years ago |
|
许心洁
|
fb0cc3446b
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
WYnneaoapc
|
737c485652
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
mes增加了一个方法
|
6 years ago |
|
WYnneaoapc
|
3dca11a963
|
add a hql
|
6 years ago |
|
陈思洁
|
1037f55f7e
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
陈思洁
|
30750923d1
|
字段修改类型
|
6 years ago |
|
刘敏
|
871dbed84a
|
查询条件封装
|
6 years ago |
|
peter.pan
|
d45b7b77f3
|
Merge branch 'dev' into test
|
6 years ago |
|
刘敏
|
05fdcb42d8
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
刘敏
|
651577d5ad
|
model字段修改（dragon）
|
6 years ago |
|
曾贞一
|
f20c33b7f5
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
曾贞一
|
898e1d39d4
|
盘点结果回传ERP，写入move_to_erp时做单位转换
原材料扣减，单位转换
|
6 years ago |
|
WYnneaoapc
|
33a59fdb0f
|
0730 add esop pojo and respository
|
6 years ago |
|
许心洁
|
bb8078cb94
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
许心洁
|
7f3d902a30
|
流程管家：提交检验+预回显优化；
直送发运JOB:#5132
|
6 years ago |