WYnneaoapc
|
766d195088
|
开线合并代码
|
6 years ago |
|
WYnneaoapc
|
183fd78eac
|
冲突解决
|
6 years ago |
 曾贞一
|
3fb2e44eaa
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
曾贞一
|
c509f3c707
|
VDA 生产快速入库
|
6 years ago |
wei.peng
|
eb70017396
|
Xml 解析添加重试机制
|
6 years ago |
|
曾贞一
|
bc83b57f8e
|
合并代码
|
6 years ago |
|
曾贞一
|
fb86682652
|
VDA 生产快速入库
|
6 years ago |
陈思洁
|
26684524f1
|
生产报工组件和生产报工标签组件提交
|
6 years ago |
|
陈思洁
|
3ba6508b0c
|
新增打印机配置表
|
6 years ago |
|
陈思洁
|
22fbbe2a91
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
陈思洁
|
edfc78995b
|
新增打印机配置表
|
6 years ago |
汪云昊
|
3b46d242a7
|
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/BlockSoftSwitchEnumUtil.java
|
6 years ago |
|
汪云昊
|
d830c78d03
|
FTP适配器
|
6 years ago |
|
wei.peng
|
4e303413ff
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
wei.peng
|
c0fc2c36bf
|
Socket 适配器完成
MQ 适配器完成
|
6 years ago |
刘敏
|
8a94b054d8
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
刘敏
|
c2a75d96da
|
实体字段get方法修改
|
6 years ago |
许心洁
|
bc5dfb2f4f
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
许心洁
|
f1f712c997
|
流程管家关联查询流程明细BUG：导致流程错乱
|
6 years ago |
 王杰
|
804574090f
|
pcn生产工单
|
6 years ago |
crish
|
a601d5ddf3
|
orderBy方法去掉为空判断
|
6 years ago |
|
crish
|
d8824ab066
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
crish
|
4173f0637f
|
安灯正式环境发布
|
6 years ago |
|
曾贞一
|
8a89b95ebf
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
曾贞一
|
cd8a5df991
|
VDA 生产快速入库组件开发
|
6 years ago |
 钮海涛
|
1d281da531
|
add order spread to aps
|
6 years ago |
|
许心洁
|
dcf326366e
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
许心洁
|
8f7d3b371b
|
流程管家：回显给前端当前步骤参数类型
|
6 years ago |
|
刘敏
|
ef6c47dc35
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
刘敏
|
e42cd80b8b
|
条码打印枚举添加待退料状态
|
6 years ago |
|
crish
|
7ea051b42e
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
许心洁
|
49bdbacc2f
|
盘点差异回显样式需求（存储区：红色；库位，数量：黄色）
|
6 years ago |
|
crish
|
87dfdc6471
|
增加方法notInPackArray（）， 修复工具类 notInPack() notInPackString()方法无效的问题
|
6 years ago |
|
钮海涛
|
be30cecf13
|
add integration to aps
|
6 years ago |
|
王杰
|
80bad03881
|
mes-pcn生产工单
|
6 years ago |
|
刘敏
|
bc1dea29ad
|
po、asn查询条件添加
|
6 years ago |
|
WYnneaoapc
|
033b23321f
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
WYnneaoapc
|
7c472b386a
|
提交
|
6 years ago |
lbwgithub
|
3ba7719160
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
lbwgithub
|
31b32be60d
|
颜色状态
|
6 years ago |
|
许心洁
|
3fc42f03b5
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
许心洁
|
750a216fd2
|
任务列表显示：添加创建时间和源存储区字段（盘点）
|
6 years ago |
|
王杰
|
704d4f2098
|
mes生产工单
|
6 years ago |
|
wei.peng
|
355cd49649
|
注释 WebService 发送邮件客户端
|
6 years ago |
|
王杰
|
e5a20d4733
|
生产工单
|
6 years ago |
|
钮海涛
|
47054bf0c6
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
钮海涛
|
4a78dfa493
|
add integration to aps
|
6 years ago |
|
汪云昊
|
7131271edc
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
钮海涛
|
3e06a11cb3
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
钮海涛
|
f8b385d274
|
add integration to aps
|
6 years ago |
|
刘敏
|
522efe67b6
|
excel导出优化--单据状态显示枚举描述
|
6 years ago |
|
王杰
|
b1f5f4f073
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
王杰
|
d676bcf974
|
mes生产工单下达配置状态
|
6 years ago |
|
钮海涛
|
34beff6cc7
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
钮海涛
|
153238d31a
|
add integration to aps
|
6 years ago |
|
刘敏
|
0f82f3fbe5
|
导出状态添加
|
6 years ago |
|
许心洁
|
e5591eafc5
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
汪云昊
|
c10bf2e3e1
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
钮海涛
|
33233ba80c
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
钮海涛
|
6b182cf4b5
|
add fix controller bugs
|
6 years ago |
|
王杰
|
310d0f0606
|
mes生产工单审批
|
6 years ago |
|
刘敏
|
e02f2bfeee
|
单据条码实体临时字段增加
|
6 years ago |
|
许心洁
|
ec3ef597e8
|
根据工厂代码调整库存
|
6 years ago |
|
WYnneaoapc
|
5cb2e7994b
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
WYnneaoapc
|
cf64f0118a
|
提交
|
6 years ago |
|
刘敏
|
a9e369e716
|
任务枚举添加导出转换方法
|
6 years ago |
|
刘敏
|
ed29263655
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
刘敏
|
adf699f618
|
移动单表是否快照临时字段新增
|
6 years ago |
|
crish
|
9f0f6da4c7
|
安灯原因统计报表增加发生频次统计
|
6 years ago |
|
汪云昊
|
0b8bc114bc
|
服务端调整
|
6 years ago |
|
crish
|
1ca98cebf3
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
crish
|
2d911c4257
|
安灯优化
|
6 years ago |
bleakney.liu
|
53dd9cface
|
add 物流路线pojo
|
6 years ago |
|
WYnneaoapc
|
27a7aa960c
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
WYnneaoapc
|
37701bed62
|
提交
|
6 years ago |
|
王杰
|
9b82b0be2a
|
mes班组维护
|
6 years ago |
|
刘敏
|
f6e9dd03b4
|
库存快照job开发【任务1011】
|
6 years ago |
|
刘敏
|
4e46760fb6
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
刘敏
|
f57dd8e999
|
库存信息表、库存条码、移动单三张表快照时间新增
|
6 years ago |
|
王杰
|
8570b88761
|
mes生产工单
|
6 years ago |
|
WYnneaoapc
|
4e1635fe7e
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
WYnneaoapc
|
9b0c5de954
|
提交
|
6 years ago |
|
crish
|
b473fd1b46
|
pojo开发环境 pom文件修改为dev
|
6 years ago |
|
crish
|
87f8dc38a6
|
测试环境
|
6 years ago |
|
crish
|
96fd66456e
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
crish
|
d82e025eb9
|
dev环境pom文件修改为dev
|
6 years ago |
于学杰
|
c974cf1450
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
于学杰
|
d273159e3e
|
1. 增加目的质量状态（规则表）
|
6 years ago |
|
crish
|
81128be4e7
|
安灯事件原因报表增加日发生频次， 周发生频次
Signed-off-by: crish <570360737@qq.com>
|
6 years ago |
|
钮海涛
|
68da44de9e
|
add expression to aps
|
6 years ago |
|
钮海涛
|
d187f8b3e1
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
crish
|
52a770ad45
|
Merge branch 'dev' into test
|
6 years ago |
|
王杰
|
24a31c0bdf
|
生产工单实体
|
6 years ago |
|
crish
|
03a5481210
|
Merge branch 'dev' into test
|
6 years ago |
|
王杰
|
9ed873422e
|
mes生产计划
|
6 years ago |
|
钮海涛
|
d3194ac4bc
|
add expression to aps
|
6 years ago |
jenkins
|
541ea98d98
|
Merge branch 'dev' into test
|
6 years ago |
|
crish
|
a9a318e354
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
wei.peng
|
8f58627838
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
wei.peng
|
1e01f62188
|
Bug 修复
|
6 years ago |