王杰
d7ddf4d5a0
mes-pcn定时任务数据同步日志表修改类型
6 years ago
王杰
6929e88570
mes-pcn定时任务
6 years ago
84bcdbaf7d
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
f09ac4d897
安灯任务
...
Signed-off-by: crish <570360737@qq.com>
6 years ago
399a51b044
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
27d574314d
getList未查到数据要判断+补全所有showInformation区分颜色
6 years ago
95b48cdc54
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
71e7362216
PCN数据同步， 逻辑修改
...
Signed-off-by: crish <570360737@qq.com>
6 years ago
cfc0de67cf
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
057fa88904
revert
6 years ago
56a4d6b362
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
19253a9b6a
构造函数新增条码
6 years ago
c6584a9437
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
368a3a1c66
mes枚举
...
Signed-off-by: crish <570360737@qq.com>
6 years ago
7740503a97
getByProperty查询到多条数据抛异常
6 years ago
96a29d3de8
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
a2fe1a80f9
Merge remote-tracking branch 'origin/dev' into dev
6 years ago
90bb35c83f
用户默认分页配置功能开发
...
用户获取首页插件Bug 修复
6 years ago
18dac2b569
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
1b06c1d07f
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
王杰
5947f88da1
mes-pcn定时任务工作清单数据同步
6 years ago
b7e17c5451
Merge remote-tracking branch 'origin/dev' into dev
6 years ago
2325d18660
软件适配器 认证参数接口
6 years ago
3bedf8fb8d
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
...
# Conflicts:
# modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesNumberRuleRepository.java
6 years ago
953f593207
提交
6 years ago
0dc452c4c8
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
592cd15add
调试枚举删除、库位导入工厂字段添加
6 years ago
5df2db4b46
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
f820c449bb
工步条码打印
...
Signed-off-by: crish <570360737@qq.com>
6 years ago
b34be0b86e
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
6 years ago
2ef0dd5c3b
周期修改关联数据
6 years ago
9de4d79009
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
d2036fd841
任务961，962，966，973
6 years ago
59047b5b4c
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
王杰
12f6e2c14b
mes-pcn定时任务表维护
6 years ago
7e5d2e1e56
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
18eff49e63
hql语句拼接修改
6 years ago
08fbbee9c1
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
11aff72404
新增冗余字段
6 years ago
cf026d6dee
获取模板详情列表功能接口开发完成
6 years ago
1f1a9c39fc
异常国际化功能开发完成
6 years ago
f7b366fe29
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
6 years ago
c584f2e048
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
12a2a27b18
mes， pcn条码打印
...
Signed-off-by: crish <570360737@qq.com>
6 years ago
61822039c5
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
3f5f89bd1b
流程管家：获取ID真实值代码错误导致新增的组件缓存错误（手工领料历史记录无法查看）
6 years ago
9680112434
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
王杰
3b3ddd581a
mest条码生成规则最大值是否循环枚举
6 years ago
6d925d6b9f
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
王杰
b375983304
mes条码生成规则CURD及mesbug修复
6 years ago
a38347d2fb
revert
6 years ago
b20d333ae4
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
34e2c13b38
getByProperty获取到多条数据报错
6 years ago
856c77a965
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
c901f18f89
pom版本还原
6 years ago
0bc9f2e9bc
获取模板 微服务调用重新编写
6 years ago
188e2b5efd
pom版本还原
6 years ago
c7842e63a1
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
2deb384cca
提交
6 years ago
3093aa1e86
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
bfd682cb27
安灯按照产线过滤信息
...
Signed-off-by: crish <570360737@qq.com>
6 years ago
921859b996
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
fe65067ca2
1. 增加 IOT 接口配置表的 POJO
6 years ago
884f3e1a96
合并代码
6 years ago
王杰
aebe742280
mes枚举增加关键件条码规则信息模块的绑定规则
6 years ago
d7b0f30d91
IMPP 平台功能功能优化 . 软适适配功能开发
6 years ago
5e72d98ad8
提交
6 years ago
f56f8d714b
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
617bb73dad
增加业务类型字段、修改临时变量字段类型
...
修改hql查询字段
6 years ago
a83b552203
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
王杰
60eadfac7a
mes维护页面加模糊查询
6 years ago
2bc04b407e
计划日期、时间新增
6 years ago
cb49d8d848
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
ffb6f8a17c
任务列表不分页，主要查询字段加索引
6 years ago
4ff3677fba
Merge branch 'test' into dev
6 years ago
0aef9adac9
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
1328dc7ddd
#Merge branch 'dev' of http://git.estsh.com/i3-MES/i3plus-mes-pcn into dev
...
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
6 years ago
7ee5312303
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
dd418f8b51
开线信号发送逻辑修改
...
Signed-off-by: crish <570360737@qq.com>
6 years ago
曾贞一
acd1e6cfb6
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
曾贞一
ce70994a57
盘点 按照盘点差异类型汇总
6 years ago
4d00397411
修改盘点范围的排序规则
6 years ago
e83efe76e0
软件适配器 测试
6 years ago
1d587f831b
Merge remote-tracking branch 'origin/dev' into dev
6 years ago
王杰
3348d5c81a
merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
王杰
e4aadf35ed
mes生产工单页面按钮控制
6 years ago
王杰
4f37dc42ef
pojo-mes-time-update-wangjie
6 years ago
0b13c6dd70
order by 列类型装换
6 years ago
f10ff69ce0
Merge remote-tracking branch 'origin/dev' into dev
6 years ago
1d55cd22a6
order by 列类型装换
6 years ago
39a00d3a19
order by 列类型装换
6 years ago
7eed51791f
软件适配器-定时适配任务
6 years ago
1b30b927ce
自定义表单功能优化
6 years ago
b3a552d65d
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
070bacf20e
所有外部单据增加创建时间和创建人的查询条件
6 years ago
2ca432b6a8
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
f2380f6d14
Merge remote-tracking branch 'origin/dev' into dev
6 years ago
02d60ed1a8
软件适配器-数据适配转换
6 years ago
7a935276a1
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
bc953bb2c8
查询条件封装
6 years ago
de381d438a
领料单模板创建
6 years ago
3711873c29
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
c34a369e93
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
曾贞一
9d70008912
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
曾贞一
61ce4d1b3f
优化
6 years ago
ef1450e912
Merge branch 'dev' of http://git.estsh.com/i3-MES/i3plus-mes-pcn into dev
...
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
6 years ago
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
94924cb264
POJO 合并
6 years ago
718ec36747
POJO 合并
6 years ago
41aff3b560
``
6 years ago
619251474d
Merge remote-tracking branch 'origin/dev' into dev
6 years ago
f5c0ca9383
软适配模型调整
6 years ago
曾贞一
abf155ecd9
库存报表 创建人、创建时间添加
6 years ago
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
63d86a4b0d
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
ecba29948f
816 add method
6 years ago
221f05b175
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
69525fbaa9
表单菜单排序
6 years ago
839c139222
库存移动条码报表优化
6 years ago
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
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
aee54acafc
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
46c710e559
表单功能优化，虚拟属性连表查询，时间格式化对接
6 years ago
68e4b74e0a
平台权限系功能优化
6 years ago
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
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
d04d441711
用户管理修改密码 Bug 修复
6 years ago
78267a3a45
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
0f99cb1027
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
66f49f3fdc
自定义表单功能调整
6 years ago
5df9896258
维修， 报废， 系统配置， pcn节点基础数据接口
...
Signed-off-by: crish <570360737@qq.com>
6 years ago
66e20acfe9
0730 Add File Operation in ODS Module untested
6 years ago
曾贞一
7ca6e46e4b
Merge branch 'dev' into test
6 years ago
781a1d2333
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
6b442cda1c
PCN接口开发， 数据同步配置
...
Signed-off-by: crish <570360737@qq.com>
6 years ago
76684b82c0
PCN接口开发， 数据同步配置
...
Signed-off-by: crish <570360737@qq.com>
6 years ago
0e444aa993
PCN接口开发， 数据同步配置
...
Signed-off-by: crish <570360737@qq.com>
6 years ago
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
d826c47d5a
修改了mesEvent pojo
6 years ago
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
837d6ea567
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
476d943a69
流程管家：自定义按钮触发的时候不需要预先调用当前步骤的回显信息
6 years ago
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
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
737c485652
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
...
mes增加了一个方法
6 years ago
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
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
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
750e4d75dc
添加 XStream 插件
6 years ago
bda52f76c6
软适配 Json 请求适配完成
6 years ago
059688410c
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
17be4078be
设备信息开发
6 years ago
24bbd75c81
Merge branch 'dev' into test
6 years ago
曾贞一
c7571b4c66
IS_GENERAL_TASK 添加单据是否生成任务状态 撤销
6 years ago
b2328bb085
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
1fe05ab150
Merge branch 'dev' into test
6 years ago
曾贞一
c3fe273954
解决冲突
6 years ago
60e6d51d35
流程管家2.0
6 years ago
4393c02bb3
Merge branch 'dev' into test
6 years ago
4bad223c0d
直送发运JOB
6 years ago
341994c326
安灯报表优化
6 years ago
曾贞一
7a4d68c409
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
曾贞一
a7144e3a1f
同步标识 2
6 years ago
e09ad49fc9
物料新增结算供应商字段
6 years ago
1c69b311a6
Merge branch 'dev' into test
6 years ago
bfcd3ebaf0
Merge remote-tracking branch 'origin/dev' into dev
6 years ago
8f977719c0
Merge branch 'dev' into test
6 years ago
5a7ce32761
冲突
6 years ago
0a78cf4ec5
数字类型新增get
6 years ago
5e08aeb273
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
b5c204f873
软适配接口制作完成
6 years ago
ce7095932c
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
1de613a09c
同步频率
6 years ago
739f12657e
Merge branch 'dev' into test
6 years ago
07008f8e1b
实体修改
6 years ago
5c48b2eb79
Merge branch 'dev' into test
6 years ago
曾贞一
df49ab097b
赋默认值“待同步”为1
6 years ago
035a8b5924
定时任务日志信息优化
6 years ago
90439f55fd
添加 XStream 插件
6 years ago
c4db15db9b
添加 XStream 插件
6 years ago
f8fd8dbab0
同步标识修改
6 years ago
8daa2789a4
Merge branch 'dev' into test
6 years ago
曾贞一
1d1a2ac8b1
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
曾贞一
cf33f70e31
代码规范
6 years ago
2aa1e9811e
数字类型方法重写
6 years ago
7181e85ba5
安灯导出实体注解
...
定时任务日志添加字段
6 years ago
2e6f11daa8
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
bc9ac8d207
Merge branch 'dev' into test
6 years ago
98d660f907
实体新增
6 years ago
7811157312
实体字段新增
6 years ago
曾贞一
792dc0a190
WMS_MOVE_TO_ERP 增加字段年份
6 years ago
5a195bfe2e
Merge branch 'dev' into test
6 years ago
曾贞一
2045b33801
单据锁定 SapOrderLock 添加字段同步标识
6 years ago
6e30549ad4
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
00fc0de4a9
冲突
6 years ago
742e0a6f49
冲突
6 years ago
7bcff3cc66
Merge branch 'dev' into test
6 years ago
cd70d9f66a
Merge branch 'dev' into test
6 years ago
89edbcb80a
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
98041fe58d
流程管家优化
6 years ago
b4a538ebb5
单位换算
6 years ago
曾贞一
0341dd2f5e
bug #5030
6 years ago
ccf0764ee6
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
bc7267b777
Merge branch 'dev' into test
6 years ago
63d7c2c6b8
1. 增加脚本引擎的POJO注释
6 years ago
eafdcac5a4
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
23c4b0742d
库存条码管理查询条件封装
6 years ago
595a81f4b9
Merge branch 'dev' into test
6 years ago
812be94ed3
Merge branch 'dev' into test
6 years ago
曾贞一
d5d6e21a15
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
曾贞一
8c5f7906af
bug #5038
...
bug #5045
6 years ago
03a261a048
Merge remote-tracking branch 'origin/dev' into dev
6 years ago
1819089a5a
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
8c9a790faa
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
0fc49d5b2a
IQ、OQ增加工厂字段
6 years ago
9a61249756
库存条码管理查询条件封装
6 years ago
7f35883b08
登录会话添加设备ID
...
自定义表单添加数据表唯一教研
自定义表单添加映射类型
6 years ago
90fb9d3190
登录会话添加设备ID
...
自定义表单添加数据表唯一教研
自定义表单添加映射类型
6 years ago
fb743ebafc
登录会话添加设备ID
...
自定义表单添加数据表唯一教研
自定义表单添加映射类型
6 years ago
曾贞一
062f4becf4
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
曾贞一
471aec30fe
开发 WIP报废出库
6 years ago
11cdc2bfa3
Merge branch 'dev' into test
6 years ago
ddedecc11c
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
5d7a44cec3
库存条码管理查询条件封装
6 years ago
曾贞一
1716628563
开发 发泡打箱包装job
6 years ago
409cbb8492
Merge branch 'dev' into test
6 years ago
db3d47cd6e
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
4a717ec544
直送发运JOB+交易处理程序（下线结算）逻辑变动
6 years ago
f4141fd2c6
Merge branch 'dev' into test
6 years ago
曾贞一
c3ddcbb81a
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
曾贞一
86d3f8de48
开发 发泡打箱包装job
6 years ago
76b244bc08
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
40e20f7054
设备编号
6 years ago
曾贞一
60feef4bb5
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
曾贞一
2240819def
发泡打箱包装
6 years ago
6e2cf70951
库位校验枚举添加
6 years ago
c969b09b85
Merge branch 'dev' into test
6 years ago
曾贞一
f75630b64d
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
曾贞一
3f5c28e1af
盘点单 优化提交组件回显信息
...
复盘开发
部分业务增加模糊查询
6 years ago
49a936c660
Merge branch 'dev' into test
6 years ago
06bd10152c
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
0942ff4636
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
7f1ef0bca7
自定义报表表单打通， 用户在线设置功能优化
6 years ago
e3819b31f5
Merge branch 'dev' into test
6 years ago
7d5ea5bfec
客户物料号默认值
6 years ago
d63974140d
Merge remote-tracking branch 'origin/dev' into dev
6 years ago
af2e1a811c
andon组织模型导入功能
...
andon删除关联数据校验
6 years ago
577e1372ab
Merge branch 'dev' into test
6 years ago
a064c6b84a
枚举新增条码类型
...
库存条码表新增字段
6 years ago
90048c3f0a
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
934da4419f
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
4f553c0857
添加序列化ID , 用户登录在线机制完成
6 years ago
ad09180809
Merge branch 'dev' into test
6 years ago
8e9ddf0ead
Merge remote-tracking branch 'origin/dev' into dev
6 years ago
c1ca7cbcae
Andon组织模型操作接口
...
Andon班次计算调整
6 years ago
4149183450
Merge branch 'dev' into test
6 years ago
48ab7a49d8
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
ecd72ed41e
ASN订单明细数据新增分组查询接口
6 years ago
c11cc65e8f
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
曾贞一
0a680275f3
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
曾贞一
d7b79c659c
WMS获取系统配置信息
6 years ago
e2fde20be5
Merge branch 'dev' into test
6 years ago
73b5758dc4
移动单主表返回数据
6 years ago
9ab2165086
Merge branch 'dev' into test
6 years ago
67c70189b3
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
b601329fe8
Merge remote-tracking branch 'origin/dev' into dev
6 years ago
9b6ef53c08
添加组织功能优化
6 years ago
460dff866f
Merge branch 'dev' into test
6 years ago
曾贞一
77d6345c15
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
曾贞一
6a2b19d3e3
bug #4953
6 years ago
79d4055ab7
Merge branch 'dev' into test
6 years ago
8461e12248
用户获取菜单信息调整
6 years ago
9a60664fb3
需求变更：ASN订单类型为AMP时任务明细的业务类型描述要给AMP
...
+BUG:交易处理组件：下线扣减：物料可能没有维护默认入库库位
6 years ago
541198a1e9
Merge branch 'dev' into test
6 years ago
曾贞一
d258b846ac
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
曾贞一
483b93cb9f
bug #4939
...
#4914
6 years ago
25d8df360d
实体字段修改hql
6 years ago
0526fcf05c
Merge branch 'dev' into test
6 years ago
df8d025668
接口映射表基础数据维护
6 years ago
a3ccb4d449
hql提交
6 years ago
19afeb92b7
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
c87f964668
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
7c8e02c0c9
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
51efe95e86
pojo
6 years ago
1514f9434e
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
623d17a2ec
字段默认值赋值
6 years ago
73c474ee9d
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
b941354087
盘点导入默认值
6 years ago
fea0d476a4
基础操作,数据补全
6 years ago
2a587524ff
基础操作,数据补全
6 years ago
0e15934d16
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
6a3662283b
枚举修改赋值
6 years ago
0ed90485a6
安灯基础数据导入导出
6 years ago
4350a82043
1. 完善脚本引擎
6 years ago
72ac1f39f4
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
d75570c987
库存报表问题修改
6 years ago
5dc8cd5bda
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
02044789dc
1. TO ERP 增加单据行号字段
...
2. 脚本引擎 & 规则引擎 增加工厂代码
6 years ago
f26cdda8ec
实体新增字段
6 years ago
eb4914ae7a
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
9c189dce3c
库存移动单查询接口
6 years ago
2aa2dca77f
用户权限调整
6 years ago
70fc1618a3
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
be78ed2636
用户权限调整 帐号管理权限完成
6 years ago
c858475bd2
用户权限调整 部门权限调整完成
6 years ago
3a19888ddf
用户权限调整 岗位功能调整完成
6 years ago
53d34096f7
Merge branch 'dev' into test
6 years ago
a95b1c9623
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
cf7957525a
盘点指令默认值赋值
6 years ago
8e39e6d9fb
Merge remote-tracking branch 'origin/dev' into dev
6 years ago
8a5a7c23ca
andonPLC MQ 推送配置
6 years ago
0041ce328e
定时删除日志
6 years ago
78cd5dc77e
用户权限调整
6 years ago
6861d44a1c
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
a1a77b63db
下线结算标识、是否录入生产批次。
...
POJO默认赋值2
6 years ago
d9ef2677fb
Merge branch 'dev' into test
6 years ago
b2866c85dd
bug修改
6 years ago
1b1bc67c90
用户权限调整
6 years ago
0ca528bade
用户权限调整
6 years ago
61ecc2a74f
Merge branch 'dev' into test
6 years ago
fba99de795
枚举修改
6 years ago
d47c9f8650
合并冲突pojo
6 years ago
f0e0867e2c
库存移动pojo新增字段
6 years ago
a1f8ca3096
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
b330676d61
库存报表业务改动以及bug修改
6 years ago
af278555d0
库存报表业务改动以及bug修改
6 years ago
曾贞一
019087fe48
Merge remote-tracking branch 'origin/dev' into dev
6 years ago
曾贞一
71087e5d43
组织树 数据权限修复
6 years ago
0c841b645e
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
8f182f962d
库存移动单查询接口
6 years ago
d2839f6cf2
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
58b067e3cc
库存报表存储区级联子存储区查询
6 years ago
5bed1d27ec
Merge branch 'dev' into test
6 years ago
79b36a30a4
冲突合并
6 years ago
fe3d392e9b
新增枚举信息
...
移库单明细表冗余主表临时字段
新增物料表字段
6 years ago
d7cb05e390
树DEMO 功能完成
6 years ago
6cd229e286
本地无法启动,更新代码
6 years ago
曾贞一
1f0bfd4554
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
曾贞一
cf96de8043
盘点 盘点差异结果同步ERP
6 years ago
8f5d952c4f
单位查询工厂添加
6 years ago
f3eb8d2356
Merge branch 'dev' into test
6 years ago
541b40d182
合并代码
6 years ago
b39d7038fa
Merge branch 'dev' into test
6 years ago
e6d60f6886
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
dec3743911
流程管家推队列查询条件没有封装
6 years ago
2cbc082c7b
动态对象 空数据处理
6 years ago
36b2d36fdd
Merge branch 'dev' into test
6 years ago
曾贞一
51753bb237
bug#4515
6 years ago
32a563e053
Merge branch 'dev' into test
6 years ago
dcb9b59ec9
新增一个实体封装
6 years ago
37b8755485
Merge branch 'dev' into test
6 years ago
37022efee8
合并代码
6 years ago
78cfff1748
功能优化
6 years ago
d3deaa6081
安灯bug解决
...
1.操作详情中一直同一个工位同种呼叫同一个呼叫单任务有多条
2.PLC：安灯类型、标签地址、标签名字条件查询失效
3.通知对象：通知对象值不能修改
4.通知配置：页面数据显示不全。
5.事件原因：安灯类型条件查询失效
6 years ago
073393a5b1
bug修改
6 years ago
7dd78d1983
bug修改
6 years ago
172fc81bee
bug修改
6 years ago
9dc634d63e
用户查询功能优化
6 years ago
e43c493463
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
994da92b4e
交易处理组件：冻结全部数量；stockQuan添加getVal方法；下线扣减BUG
6 years ago
b18d393fe0
Merge branch 'dev' into test
6 years ago
曾贞一
b684bd2355
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
曾贞一
81ed2465e3
盘点实盘信息 增加字段 是否范围内
6 years ago
e95db40c23
123
6 years ago
52addcf5ea
Merge branch 'dev' into test
6 years ago
7ee861d61e
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
2c28d6303f
bug修改
6 years ago
543171dfbb
Merge branch 'dev' into test
6 years ago
f853f06ceb
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
97b60f0906
下线结算HQL的BUG
6 years ago
b34ddf5f64
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
681ca7eebe
修改取值为空时的问题
6 years ago
1ac5542541
动态表单分页功能完成
6 years ago
bd28a7ac63
Merge branch 'dev' into test
6 years ago
1ee48f4ef8
xxx
6 years ago
fede09a5eb
WMS_ERP库存移动表修改item的数据类型
6 years ago
7be287137a
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
19b5764776
收货回执打印信息新增 供应商字段新增 出库条码规则校验修改
6 years ago
7b70f47c64
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
27ba751a09
修改iqc数据库默认值
6 years ago
e3354f52bd
Merge branch 'dev' into test
6 years ago
52b9e09835
条码打印-条码模糊查询
6 years ago
92daec97e3
枚举修改名字
6 years ago
47d8360a3b
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
9b9f94f059
盘点调差暂时处理
6 years ago
b8730fac47
Merge branch 'dev' into test
6 years ago
ac5bf14d6b
动态表单动态操作 功能优化
6 years ago
ebf517cb3d
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
81eb13bafd
写入SAP单据锁定表
6 years ago
15386ae5c2
枚举
6 years ago
628f1db31c
Merge branch 'dev' into test
6 years ago
曾贞一
842f322188
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
曾贞一
529617a8b7
优化
6 years ago
ff9a5dcd17
Merge remote-tracking branch 'origin/dev' into dev
6 years ago
4fe3701929
还原
6 years ago
98de08ba4a
文件上传优化
...
字段删除异常
日志添加索引
6 years ago
96264870c2
Merge branch 'dev' into test
6 years ago
efbe9dac9e
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
bf02cbf8a4
PDA任务显示关联单据业务类型busiTypeDesc+交易处理组件：下线结算
6 years ago
cef6d9c3ad
bug修改
6 years ago
da5d5d1af0
客户编号-模糊查询
6 years ago
9c38ed702a
Merge branch 'dev' into test
6 years ago
e00a0a9d9d
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
c2609be241
作业类型分页查询 模糊查询
6 years ago
97adebba21
枚举新增 实体字段新增
6 years ago
eefaf55f24
供应商字段类型修改
6 years ago
7fc7fab54c
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
493fbb83d9
条码查询条件
6 years ago
3b1d19bbab
Merge branch 'dev' into test
6 years ago
曾贞一
a7fbc9e58f
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
曾贞一
b5ff789263
开发 wms推送AMP库存数据
6 years ago
a8dee4713a
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
31f6f4deef
枚举字段新增AMP
...
ASN主表、生产报工明细表新增属性
hql查询ASN主表信息
6 years ago
16301be9dc
JOB开发实体新增
6 years ago
1b569ff3a8
ERP同步标识枚举添加
6 years ago
3090b2aaad
实体缺失字段新增
6 years ago
8cbc19eb37
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
da12d8f6b0
错误信息字段冗余
6 years ago
c7aca0a94d
交易处理主程序转换数据错误+出入移库查找添加条件
6 years ago
ee5a4f1dfe
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
曾贞一
703dc6851c
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
曾贞一
f85a0296ae
开发 bom拆解功能
6 years ago
dd2408cd4a
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
72ef115db8
1. 批次字段不允许为空
6 years ago
d1cbfa27e8
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
0962b810ce
Json 转换精度丢失
6 years ago
0a69cddb53
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
b98b48e4e5
SAP_产品报工汇总表新增
6 years ago
ede4458709
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
6f41158ecb
生产发运新增实体属性
6 years ago
5d2695a5cb
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
08af5fde04
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
a551249165
Merge branch 'dev' into test
6 years ago
30bed57c04
Merge remote-tracking branch 'origin/dev' into dev
6 years ago
7e9a7698a0
Merge remote-tracking branch 'origin/dev' into dev
6 years ago
2eba4bb745
文件上传接口
...
excel通用导出优化
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
2e5b7466c8
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
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
1b4e5143aa
用户单帐号多平台登录
6 years ago
b29d5722bc
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
31b7e2d8dc
库存交易报表和未完成订单报表bug修复
6 years ago
364efedc42
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
c783d9119c
任务列表查询查出了状态为30的任务+流程处理组件execute方法提升事务级别+枚举添加根据枚举名查找枚举详情的静态方法
6 years ago
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
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
03ec13ca5c
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
299c0c5bee
DataObject Key 动态获取
6 years ago
0656fa6078
Merge remote-tracking branch 'origin/dev' into dev
6 years ago
a7bfc692fe
EXCEL数据通用导出
6 years ago
7ac3509f96
状态查询添加是否有效
6 years ago
400b380b55
未完成订单查询报表代码提交
6 years ago
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
ee440bc487
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
3cc4aec00a
库存预警看板
6 years ago
6c7bd177ca
文件上传微服务接口优化
...
excel通用导出优化
任务提示优化
6 years ago
2f1a3080ba
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
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
4b924c64a3
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
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
ced56de9de
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
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
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
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
eb2f61c32f
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
6 years ago
5bc455798b
Merge remote-tracking branch 'origin/dev' into dev
6 years ago
4309454d2a
邮件异常提示优化
...
EXCEL数据通用导出
6 years ago
d0d9a467a3
乐观锁修改数字类型
6 years ago
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
f32f7e72a2
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
6 years ago
f3151cbbe3
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
e13d4163b7
库存交易报表代码提交
6 years ago
f1c49c1cae
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
6 years ago
曾贞一
4d37e2a095
合并
6 years ago
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
4ce22aaa3f
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
d4dce36280
流程管家优化
6 years ago
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
c12cdea29f
Merge branch 'dev' into test
6 years ago
96e031b2f2
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
062b20af23
物料清单dao层
6 years ago
8d8c91f352
盘点调差导入接口表开发
6 years ago
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
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
78c8d3b689
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
9d2146b23d
客户零件号功能完成
6 years ago
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
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
f6bc967e07
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
bcd3e43867
库存交易报表部分代码提交以及供应商物料bug修复
6 years ago
b6ae6c64ed
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
add3f05985
数据权限hql修改
6 years ago
734340fe63
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
6 years ago
7b83985f40
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
f6bf244b12
流程管家放MOVENO的BUG
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
f4fe91ace0
Merge remote-tracking branch 'origin/dev' into dev
6 years ago
6259bd56bc
通用EXCEl导出MODEL
6 years ago
15c22e28fd
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
0182dd3cc3
生产线(工作中心) 存储区关系管理功能完成
6 years ago
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
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
4212c9b61e
Merge remote-tracking branch 'origin/dev' into test
6 years ago
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
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
baee01a070
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
5f898661c7
添加产线(工作中心)-存储区信息 repository
6 years ago
王杰
crish
jimmy.zeng
许心洁
刘敏
wei.peng
汪云昊
WYnneaoapc
陈思洁
于学杰
曾贞一
peter.pan
jenkins
Chnx
shiyanghuan
jiajack
jenkins
sky.meng
alwaysfrin