王杰
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
c29c350ef8
Merge branch 'dev' into test
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
4b17c6ca69
Merge branch 'dev' into test
6 years ago
王杰
310d0f0606
mes生产工单审批
6 years ago
e02f2bfeee
单据条码实体临时字段增加
6 years ago
ec3ef597e8
根据工厂代码调整库存
6 years ago
dcc13e622b
Merge branch 'dev' into test
6 years ago
5cb2e7994b
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
cf64f0118a
提交
6 years ago
4d5497929a
Merge branch 'dev' into test
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
9f0f6da4c7
安灯原因统计报表增加发生频次统计
6 years ago
0b8bc114bc
服务端调整
6 years ago
1ca98cebf3
Merge remote-tracking branch 'origin/dev' into dev
6 years ago
2d911c4257
安灯优化
6 years ago
53dd9cface
add 物流路线pojo
6 years ago
27a7aa960c
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
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
c47c617aab
Merge branch 'dev' into test
6 years ago
王杰
8570b88761
mes生产工单
6 years ago
c17039ce4a
Merge branch 'dev' into test
6 years ago
4e1635fe7e
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
9b0c5de954
提交
6 years ago
曾贞一
a4262c5e1e
pom文件修改 dev改成test
6 years ago
b473fd1b46
pojo开发环境 pom文件修改为dev
6 years ago
87f8dc38a6
测试环境
6 years ago
96fd66456e
Merge remote-tracking branch 'origin/dev' into dev
6 years ago
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
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
52a770ad45
Merge branch 'dev' into test
6 years ago
王杰
24a31c0bdf
生产工单实体
6 years ago
03a5481210
Merge branch 'dev' into test
6 years ago
王杰
9ed873422e
mes生产计划
6 years ago
钮海涛
d3194ac4bc
add expression to aps
6 years ago
541ea98d98
Merge branch 'dev' into test
6 years ago
a9a318e354
Merge remote-tracking branch 'origin/dev' into dev
6 years ago
8f58627838
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
6 years ago
1e01f62188
Bug 修复
6 years ago
61b0dfdc3b
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
曾贞一
cb5eb56fe4
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
曾贞一
5d1e6e8474
VDA收货 库位推荐入库规则
6 years ago
baf39dc0ce
生产退料导入实体新增
6 years ago
809478be44
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
d8bc8d713d
条码打印model字段添加
6 years ago
41588f37d7
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
d1d7e65f97
Merge remote-tracking branch 'origin/dev' into dev
6 years ago
c6badc59c6
适配记录添加id参数
6 years ago
c7ed8613d6
软适配添加WebService 默认处理
6 years ago
83f400a36b
sql 注入 删除斜杠
6 years ago
b31162c5d6
安灯工位放行， 安灯任务管理界面数据权限控制
...
Signed-off-by: crish <570360737@qq.com>
6 years ago
2c146d39bf
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
e52c310d38
add 入库pojo 和response
6 years ago
4bfa05698f
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
曾贞一
9e2169fa87
推荐入库 组件开发
6 years ago
曾贞一
15d399e4c7
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
曾贞一
512ebb495c
VDA收货 提交组件
6 years ago
6cbcea7c2c
系统菜单默认排序值改动
6 years ago
f6bb2ee21f
Merge branch 'dev' into test
6 years ago
曾贞一
337e5f7084
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
曾贞一
f17c1d3d25
推荐入库 组件开发
6 years ago
王杰
2460fbc3b4
生产计划
6 years ago
baa23aab03
Merge remote-tracking branch 'origin/dev' into dev
6 years ago
23c59d4326
Merge branch 'dev' into test
6 years ago
564deb4d6b
适配记录及数据库适配器
6 years ago
271a26d2b8
提交
6 years ago
26179650f0
Merge branch 'dev' into test
6 years ago
787f12387d
流程管家：关联单据类型为盘点时不需要查询其它移动单+移动单的业务类型为质检时查询关联移动单的逻辑特殊处理
6 years ago
9033584a52
Merge branch 'dev' into test
6 years ago
钮海涛
70868503d4
add beans services controllers to aps
6 years ago
bca4f7745f
Merge branch 'dev' into test
6 years ago
90b731fde4
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
de6792426e
流程管家：单据完成提交所有待提交移动单；只推送当前移动单
...
PDA收货组件：改数后删除历史记录BUG修复
6 years ago
33473f9903
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
6 years ago
f51ba09666
提交
6 years ago
钮海涛
30ecc48007
Merge remote-tracking branch 'origin/dev' into dev
6 years ago
钮海涛
3c907fe88a
add material bean to aps
6 years ago
989cbbdee8
安灯目录结构调整
...
Signed-off-by: crish <570360737@qq.com>
6 years ago
4ca0851386
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
曾贞一
d509e5755a
vda 收货超收处理
6 years ago
603647bc82
Merge branch 'dev' into test
6 years ago
曾贞一
c5f43236a3
开口合同与po关系
6 years ago
3474bb82c6
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
f978ee39c8
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
6093ec0621
Merge remote-tracking branch 'origin/dev' into dev
6 years ago
f6c1eff0f1
excel通用导入优化
6 years ago
54db1929b1
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
05dc432c57
1. 增加关联单位和关联数量字段
6 years ago
d120b1615a
国际化工具类
6 years ago
ee979c6e02
Merge branch 'dev' into test
6 years ago
9caf9a4458
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
2f904f9eee
数据库适配器
6 years ago
c27449a185
异常信息国际化
6 years ago
王杰
f5164d82fb
通用查询方法
6 years ago
bd466610d5
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
72fec8146d
修改
6 years ago
b5eb716a4e
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
钮海涛
46bde2804d
Merge remote-tracking branch 'origin/dev' into dev
6 years ago
钮海涛
6008478aec
add customer field function
6 years ago
d23045a667
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
5b6477bba6
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
510485d2f0
excel导出优化--单据状态显示枚举描述
6 years ago
a86f2e49c5
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
51974a46b9
WebService 调用发送邮件测试
6 years ago
59569cef66
移动单主表去掉乐观锁（处理错误移动单JOB一个事务内对一个表进行了两次操作不行，导致程序直接挂掉，事务也没回滚）+
...
交易处理组件（出入移库）：待入库的可能是不合格的+
公共PDA组件抛异常获取值为空
6 years ago
35beb0c60e
Merge branch 'dev' into test
6 years ago
40a2a789be
参数描述调整
6 years ago
377a875fec
软适配客户端代码结构调整。
6 years ago
1661e4e0a9
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
...
Conflicts:
modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/BsSuitCaseModel.java
6 years ago
fc1c7ab797
软适配添加-所有适配命令 接口
6 years ago
ca7d5a2896
Merge remote-tracking branch 'origin/dev' into dev
6 years ago
8b0e851eb8
数据源适配套件相关接口
6 years ago
2c6b223628
软适配客户端代码结构调整。
6 years ago
02270ea6e8
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
f5d2398e0e
VDA收货--开口合同增加字段
...
供应商增加字段
6 years ago
01c58e8653
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
3454712bd2
1. 增加库存快照的类文件
6 years ago
873f91a2eb
Merge remote-tracking branch 'origin/dev' into dev
6 years ago
f718a5dac5
excel通用导入优化
6 years ago
f777c82ea7
Merge remote-tracking branch 'origin/dev' into dev
6 years ago
5b7ac2c344
ASN字段修改
6 years ago
212cfb02af
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
71798e9f51
软适配功能配置优化
6 years ago
21240ffa53
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
eeff3517c6
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
...
# Conflicts:
# modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/BsSuitCaseModel.java
# modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCase.java
# modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java
6 years ago
e8b9f58f43
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
262f7efe05
如果有异常信息需要叠加在提示信息前一起返回给前端
6 years ago
07688db533
软适配实体
6 years ago
74bdaccfbd
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
8ed0d4d60e
枚举维护业务类型数据
6 years ago
f2e2dd1670
软件适配器 数据源适配器
...
单号生成高并发优化
6 years ago
21241e45ca
软适配功能配置优化
6 years ago
王杰
58d6305bd3
mes动作
6 years ago
c7734b7e26
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
5144d15ac4
采购单报表开发
6 years ago
4a1ad40dfa
Merge branch 'dev' into test
6 years ago
726600fccd
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
f205373964
安灯事件报表安灯类型导出
...
Signed-off-by: crish <570360737@qq.com>
6 years ago
03ef38f853
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
315787197a
交易处理组件（收货）：免检写入收货事务取目的库位的值+乐观锁去掉临时属性
6 years ago
曾贞一
b5dfa7dbd2
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
曾贞一
8d6e4fdfa5
盘点实盘导入功能
6 years ago
677632748d
VDA收货逻辑组件修改--修改sql中增加库存地字段显示
6 years ago
4c39e84094
asn主表添加
6 years ago
ca28ae6cad
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
0ac5232eb0
自定义表单 默认值取值方式修改
6 years ago
b899c5c8c5
软适配 WebService 功能接口开发
6 years ago
王杰
c950019077
pcn定时任务
6 years ago
3b174fc782
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
f63cd5071b
新增开口合同实体
6 years ago
8fc5788f64
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
e921bb72d2
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
9ec5e63da6
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
5b200f824f
软适配 WebService 功能开发
6 years ago
3eef8ea750
Merge remote-tracking branch 'origin/dev' into dev
6 years ago
029d7eac62
软适配model
6 years ago
a959964950
移动单三张表加上乐观锁
6 years ago
39e0fbca80
Merge branch 'dev' into test
6 years ago
3266c9b1e0
安灯状态导出
...
Signed-off-by: crish <570360737@qq.com>
6 years ago
e58aaf95b9
软适配 WebService 功能开发
6 years ago
2d376575a3
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
3c6d17a283
修改pojo数据类型
6 years ago
ccffe9b7bd
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
曾贞一
229587fcf3
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
曾贞一
ceced4c4b6
欧洲项目 检查数量 批次格式组件编写
6 years ago
c44a99eb40
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
61a7985afc
提交 0905
6 years ago
5b97a9e0cb
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
241a478f65
excel导出优化--单据状态显示枚举描述
6 years ago
8d8752b8b4
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
89b0a4a68a
条码打印调试
...
Signed-off-by: crish <570360737@qq.com>
6 years ago
f0fba5e23a
盘点枚举添加--excel导出
6 years ago
b3b913d768
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
8ac4f214b3
#5596
6 years ago
王杰
fe455a7147
pcn离线登陆
6 years ago
836b0e933e
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
曾贞一
09aab6d87a
盘点添加 存储区多个查询
6 years ago
a4725e20c6
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
a59f95080c
自定义表单-同步对象功能优化
...
自定义表单-动态页面数据导出
6 years ago
曾贞一
a12a008713
盘点库位添加查询条件
6 years ago
曾贞一
b7bd96fa44
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
546d9dc7a5
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
61ed3d821d
提交 0905
6 years ago
曾贞一
d4007f6ca5
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
曾贞一
64aed1f49c
开发 Restful 接口测试PDA
6 years ago
fd76f08af4
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
王杰
d2995520d4
mes-pcn定时任务增加字段
6 years ago
曾贞一
8b9a4fb109
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
曾贞一
575aa6ea2f
库存移动单报表 添加修改人，修改时间的查询条件和列表
6 years ago
20bd7994a3
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
e4cf678000
构造新增字段
6 years ago
4b982fc4fe
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
1332f11a23
提交
6 years ago
8f1ac3fdae
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
f370f377d4
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
7ce78b170f
工作参数枚举
...
Signed-off-by: crish <570360737@qq.com>
6 years ago
c05b22668f
字段修改
6 years ago
835245f8f4
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
2108a7f8e7
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
4852a4754c
字段枚举值添加
6 years ago
65cb39d7ba
工作中心代码修改
...
Signed-off-by: crish <570360737@qq.com>
6 years ago
7da95b1ad2
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
876571e877
任务：994；BUG：5498
6 years ago
0a3339ba8d
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
67b1e5d4f6
Merge remote-tracking branch 'origin/dev' into dev
6 years ago
ff462900b7
枚举描述添加
6 years ago
6e48f0a677
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
曾贞一
d8568e6d22
盘点优化代码。
6 years ago
曾贞一
5290ba6f63
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
曾贞一
01cb76da6d
指令移库 根据目标存储区扫描库位
6 years ago
836f1bf870
字段修改
6 years ago
2af903f029
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
254f08da32
物料描述修改
6 years ago
2e8a70d8b4
pom版本还原--pojo
6 years ago
5fb7ffc40b
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
0faeaa6047
导出枚举添加
6 years ago
王杰
482159b322
mes-pcn定时任务枚举修改
6 years ago
193eba75d8
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
5b735fe3a2
移动单枚举导出
6 years ago
71b6c64ed0
Merge remote-tracking branch 'origin/dev' into dev
6 years ago
3b86092577
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
5f539afd6d
移动单明细注解添加
6 years ago
53a08621fd
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
db4f6bcdb1
流程管家：添加作业记录明细（快速流程每一次扫条码都会生成一个新的移动单）
6 years ago
b760543b3b
excel通用导入优化
6 years ago
a5b01bbaae
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
69d2932ca4
http请求增加不需要设置请求内容枚举
...
Signed-off-by: crish <570360737@qq.com>
6 years ago
fe793f0431
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
3a1cf7a2b7
判断属性是否有final修饰
6 years ago
d87cbd9c4f
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
b4b095c970
判断属性是否有final修饰
6 years ago
5db4307fa5
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
4d5c92df78
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
王杰
d5cfe77ac5
mes定时任务枚举
6 years ago
32502582c1
新增属性初始化
6 years ago
王杰
46d220f3ec
mes条码规则校验
6 years ago
bb975b208b
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
cbcdcabd82
测试修改提交
6 years ago
84ace781a3
流程添加默认值方式错误
6 years ago
503b68a0a5
拉了测试的代码POM文件错乱
6 years ago
6068ca9fd8
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
7d19c1bbed
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
cafd923d3a
流程管家：添加作业记录明细（作业记录不再更新移动单号：一个步骤记录一个作业记录明细）
6 years ago
706ddcbba7
流程新增初始化组件明细组件赋默认值0
6 years ago
04f8aaa783
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
6 years ago
eadb86ce60
excel通用导入优化
6 years ago
fb3b8a033d
excel通用导入优化
6 years ago
4f58949e2d
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
5ea81cc34e
实体修改
6 years ago
2a90329fcf
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
63be82f044
实体修改
6 years ago
73b6088977
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
6f87b97721
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
d484efb69e
明细构造新增
6 years ago
7c29add7ca
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
c9df6efd1c
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
65b336f708
任务993+生产报工产生的移动明细单位错误BUG修复+PDA颜色回显完成的明细颜色没有与处理中的区分开BUG修复
6 years ago
7aec1fdb6a
添加工步类型枚举
...
Signed-off-by: crish <570360737@qq.com>
6 years ago
7f3f39af06
提交
6 years ago
63c0f02f32
提交
6 years ago
146cf768d6
提交
6 years ago
fef022ce13
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
2a7ba550d6
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
24a9d3ff2c
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
8a5337daad
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
235a728c0e
andon
...
Signed-off-by: crish <570360737@qq.com>
6 years ago
b1dd7d3915
合并冲突
6 years ago
d269576dbf
新增字段
6 years ago
08b697a72e
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
9c26f45cd5
明细状态枚举添加
6 years ago
王杰
2e86ff81d0
mes工作单元参数增加枚举
6 years ago
06927a31bd
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
王杰
09eee24769
mes工作单元参数CRUD
6 years ago
王杰
8034e104c8
mes工作单元参数
6 years ago
王杰
5388c4405b
mes-pcn-task表修改
6 years ago
154730e69b
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
6e5176c3fc
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
b10262b21f
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
ac1090d661
报表返回字段信息添加
6 years ago
9981c4089b
修改唯一性校验， 不能新增禁用的信息
...
Signed-off-by: crish <570360737@qq.com>
6 years ago
王杰
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
王杰
钮海涛
刘敏
jenkins
许心洁
汪云昊
crish
WYnneaoapc
bleakney.liu
曾贞一
于学杰
wei.peng
jimmy.zeng
陈思洁