袁津哲
|
0c3d14a3f9
|
wms插件枚举新增按钮增强插件类型
|
5 years ago |
 王杰
|
a9a7d78bd5
|
解决冲突
|
5 years ago |
wei.peng
|
549f2ff797
|
授权拦截功能完成 .
|
5 years ago |
|
袁津哲
|
35a4c9039a
|
Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
# modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
|
5 years ago |
|
袁津哲
|
2a0204ad99
|
开发WMS动态加载插件功能
|
5 years ago |
qianhs
|
564ba1e116
|
【1472 工步-设备状态采集（原PLC采集【设备状态】）】
|
5 years ago |
陈思洁
|
cc207240b4
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
陈思洁
|
bacab3fb88
|
【MES_新增设备工装关系和工装操作记录pojo】
|
5 years ago |
|
王杰
|
9f8e51830e
|
mes enum
|
5 years ago |
joke lin
|
126440c976
|
[任务：1435 客户JIT导入]
|
5 years ago |
|
陈思洁
|
736b292d83
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
陈思洁
|
310bf49af6
|
【MES_校验是否换膜并推送换模信号 】
|
5 years ago |
|
陈思洁
|
22788f1c44
|
还原POM文件TEST-DEV
|
5 years ago |
许心洁
|
8178e90abd
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
许心洁
|
5bf7133ff1
|
动态查询：BUG#7845；BUG#7676；BUG#7675
|
5 years ago |
|
王杰
|
f5e4bba761
|
ptlpcnenum
|
5 years ago |
 曾贞一
|
5291d5d13d
|
【7838 修改分组管理中的按钮名称】
|
5 years ago |
|
曾贞一
|
779b9d209c
|
【修改 DEV-pom.xml】
|
5 years ago |
|
陈思洁
|
474bb995d6
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
汪云昊
|
41a39990f4
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
陈思洁
|
b3e38170e6
|
【1440 PLC采集工步【生产数据】】
|
5 years ago |
|
汪云昊
|
081db93d0d
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
王杰
|
b6a83fff5d
|
Merge branch 'dev' into test
|
5 years ago |
|
王杰
|
0b8c3317b8
|
ptlpcn enum
|
5 years ago |
zcg
|
3d28840bae
|
【新增枚举，pojo】
|
5 years ago |
|
zcg
|
b28c092ade
|
【新增枚举】
|
5 years ago |
luweihao
|
d1d52ce389
|
Merge branch 'dev' into test
|
5 years ago |
|
luweihao
|
8148b1654f
|
补上mes枚举
|
5 years ago |
|
luweihao
|
16879a4f20
|
Merge branch 'dev' into test
|
5 years ago |
|
陆卫豪
|
a65350bbf8
|
Merge branch 'dev' of chungui.zhou/i3plus-pojo into dev
|
5 years ago |
|
luweihao
|
12579c7a14
|
还原pom
|
5 years ago |
|
luweihao
|
b52bb02d73
|
task `1430` 工位扫描，产品信号监听，队列监听
|
5 years ago |
|
zcg
|
9388e3b4f2
|
【pojo 冲突提交】
|
5 years ago |
|
luweihao
|
679319635a
|
task `1430` 工位扫描，产品信号监听，队列监听
|
5 years ago |
|
陆卫豪
|
60ab731ffd
|
Merge branch 'dev' of huasheng.qian/i3plus-pojo into dev
|
5 years ago |
|
陆卫豪
|
d8d48bd913
|
Merge branch 'dev' of gragon.xu/i3plus-pojo into dev
|
5 years ago |
|
joke lin
|
5ec9c55784
|
Merge remote-tracking branch 'pojo/dev' into dev
|
5 years ago |
|
qianhs
|
65572b34a0
|
【1432 工位扫描-ESOP展示组件开发，队列组件调整】【工位扫描-ESOP展示组件开发，队列组件调整】
|
5 years ago |
|
王杰
|
999aae6fc0
|
解决冲突
|
5 years ago |
|
王杰
|
78d7861b44
|
Merge branch 'test' of jhforever.wang/wangjie-i3plus-pojo into dev
|
5 years ago |
|
王杰
|
4b8cd0da38
|
ptlpcn enum
|
5 years ago |
|
许心洁
|
46273325d3
|
动态查询：新增isQuery字段用于控制是否可作为查询条件（BUG#7675）
|
5 years ago |
|
许心洁
|
8a98efa9a6
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
许心洁
|
eaed7962ab
|
动态查询：工厂代码可以展示在表格中但是不能作为可选查询条件（BUG#7675）+
3D仓库：库位和存储区新增修改的长宽高校验都去掉（BUG#7723）
|
5 years ago |
|
zcg
|
bd82a0fba7
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
joke lin
|
6b9b44995e
|
Merge remote-tracking branch 'pojo/dev' into dev
|
5 years ago |
|
曾贞一
|
38f1bd3b01
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
曾贞一
|
c0ce05e07c
|
【7648 在发运界面增加一个打开单据按钮】
|
5 years ago |
|
曾贞一
|
2625c2cb0f
|
【修改 TSET-pom.xml】
|
5 years ago |
|
joke lin
|
4823660070
|
[任务：1435 计划管理]
|
5 years ago |
|
汪云昊
|
f2ccb20095
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
汪云昊
|
a3ecc3132f
|
表单约束管理
|
5 years ago |
|
王杰
|
80ca438ce3
|
test合并到dev解决pom冲突
|
5 years ago |
|
王杰
|
d9e4ea8ea9
|
Merge branch 'test' into dev
|
5 years ago |
|
王杰
|
8ace0c363d
|
ptl enum
|
5 years ago |
宋军超
|
d34f3b8215
|
2020-03-12/14:59 -- 数据清除定时任务出异常时，将异常信息存进数据库syncErrLog表中
|
5 years ago |
 钮海涛
|
669874cb9b
|
Merge branch 'dev' into test
|
5 years ago |
|
许心洁
|
368986e9d8
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
许心洁
|
1d90195de6
|
3D仓库
|
5 years ago |
|
曾贞一
|
5ebb5cbf20
|
【修改 TSET-pom.xml】
|
5 years ago |
|
王杰
|
068a0956db
|
解决冲突
|
5 years ago |
|
王杰
|
b77d3065a4
|
Merge branch 'test' into dev
|
5 years ago |
|
王杰
|
cd19bfb429
|
ptlpcn
|
5 years ago |
|
joke lin
|
cb09776bdb
|
[任务：1435 计划管理]
|
5 years ago |
|
宋军超
|
ac4a8b0ab4
|
修改ptl数据清除功能
|
5 years ago |
|
陆卫豪
|
e43aee2e82
|
Merge branch 'dev' of joke.wang/joke-i3plus-pojo into dev
|
5 years ago |
|
王杰
|
01c5bb59e1
|
Merge branch 'dev' into test
|
5 years ago |
|
宋军超
|
4d701aa9c4
|
添加ptl数据删除定时任务
|
5 years ago |
|
zcg
|
5e78985247
|
【task 1436 工步-关键件绑定校验并转过程条码 】解决冲突
|
5 years ago |
|
zcg
|
7aecf9dcc0
|
【task 1436 工步-关键件绑定校验并转过程条码】
|
5 years ago |
|
joke lin
|
ccf2817788
|
[计划管理]
|
5 years ago |
|
曾贞一
|
0acf2dc0ae
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
5 years ago |
|
钮海涛
|
35c1114230
|
Merge branch 'dev' of puxiao.liao/i3plus-pojo-lpx into dev
|
5 years ago |
|
钮海涛
|
ca6e094271
|
Merge branch 'dev' of joke.wang/joke-i3plus-pojo into dev
|
5 years ago |
puxiao.liao
|
50d3de9b77
|
7600 二维码零件标签打印功能修改。
7565 收货分组功能要求。
7633 条码明细中，点击导出，日生产计划产生的条码无法被导出，界面上的导出应该是查到什么就导出什么，不需要再加其他额外的条件
7628 库存调整盘点时，扫描库位后的提示增加一个库位
7640 解冻扫描条码后的提示没有显示条码，冻结是有的。需要统一都显示
7536 没库存时领料与发运的提示修改为下列
7659 创建盘点单冻结条码时条码is_vaild=2
7617 出库单明细中的打印客户标签按钮，需要检测单据明细有没有提交，状态为创建的才可以打印，并且只能打印一次。
7652 在条码状态报表中增加组号字段显示，查询框也需要增加
7454 需要一个配料撤销（针对单个条码，而不是单据）的功能，已经配料的条码需要被撤回到仓库中，需要考虑各种库存移动单状态。
7631 在盘点明细中的盘点范围界面增加一个字段，把数据库中的src_order_no显示出来，字段取名为原始单号
7526 发运单接收时，在主表中增加一个字段，在讲单据信息写入数据库时，如果该单据条码中只存在一步法的零件号，则该字段需要在前台显示为一步法，如果存在两步法的零件号，则显示为两步法。
7617 出库单明细中的打印客户标签按钮，需要检测单据明细有没有提交，状态为创建的才可以打印，并且只能打印一次。
|
5 years ago |
|
王杰
|
880d449dfb
|
Merge branch 'dev' into test
|
5 years ago |
|
王杰
|
b10ddbc958
|
ptl enum
|
5 years ago |
joke
|
531596d2d4
|
[mes: 49 JIT计划与管理]
|
5 years ago |
|
王杰
|
e0a018b871
|
Merge branch 'dev' into test
|
5 years ago |
|
王杰
|
dd1e5778a9
|
ptl enum
|
5 years ago |
|
王杰
|
fa9c02705b
|
ptl enum
|
5 years ago |
|
王杰
|
cd8dea1814
|
ptl
|
5 years ago |
 Administrator
|
797f3b3433
|
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
许心洁
|
906576cb52
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
许心洁
|
1e0d88fb0e
|
动态查询：开窗和时间查询优化+3D仓库基础数据校验优化
|
5 years ago |
|
钮海涛
|
de73821fc7
|
Merge branch 'dev' of puxiao.liao/i3plus-pojo-lpx into test
|
5 years ago |
|
joke
|
a7e8e1095d
|
Merge remote-tracking branch 'i3plus-pojo/dev' into dev
|
5 years ago |
|
joke
|
aa403e9691
|
[ptl-pcn:39 校验物料号]
|
5 years ago |
|
qianhs
|
1fc4ae1ff9
|
1,回退代码
|
5 years ago |
|
宋军超
|
e15c2b6065
|
添加PTL数据同步功能
|
5 years ago |
|
王杰
|
1428b5f0aa
|
ptl
|
5 years ago |
|
曾贞一
|
9cc001fd17
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
曾贞一
|
fe72dc26d9
|
【 bug 7581 1.在同批次条码提示中增加一个库位。2.同批次按钮做全局变量属性'单库位'，'单人'，如果为'单库位'保持现在逻辑不变，如果为'单人'则显示当前用户责任区下所有同批次条码(不限制库位)】
|
5 years ago |
|
luweihao
|
dd6007656c
|
Merge branch 'dev' into test
|
5 years ago |
|
王杰
|
abb737f265
|
ptl
|
5 years ago |
|
王杰
|
cde65d0e7a
|
Merge branch 'dev' of gragon.xu/i3plus-pojo into dev
|
5 years ago |
|
王杰
|
37d032ca24
|
ptl反馈信息枚举
|
5 years ago |
|
王杰
|
5610a25ab7
|
ptl反馈信息枚举
|
5 years ago |
|
汪云昊
|
31a8a7705a
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
汪云昊
|
0471038b9b
|
sqlserver数据库适配
|
5 years ago |
|
许心洁
|
a49b747c18
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
许心洁
|
cc98e84ba4
|
动态查询：增加开窗功能
|
5 years ago |
|
宋军超
|
80d9852dd6
|
添加数据同步和定时任务功能
|
5 years ago |
|
钮海涛
|
85dff1fde9
|
Merge remote-tracking branch 'origin/dev' into test
|
5 years ago |
|
王杰
|
e1d133de61
|
ptl enum
|
5 years ago |
|
宋军超
|
96c5b35f83
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
王杰
|
0a0318d639
|
ptl
|
5 years ago |
|
宋军超
|
51d666b5bc
|
开发PTL--PCN节点维护,同步配置和对象映射功能
|
5 years ago |
|
luweihao
|
f67dd06cd4
|
Merge branch 'dev' into test
|
5 years ago |
|
puxiao.liao
|
05d0a0a375
|
【 1423 拣货-更新FIFO推荐组件、更新FIFO检查组件
】拣货-更新FIFO推荐组件、更新FIFO检查组件
|
5 years ago |
|
王杰
|
644af42dfe
|
ptl enum
|
5 years ago |
|
joke
|
d871869f3a
|
[ptl-pcn: 32 亮灯作业]
|
5 years ago |
|
joke
|
ccd62f8d31
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
joke
|
d212b5cd30
|
[ptl-pcn: 32 亮灯作业]
|
5 years ago |
|
luweihao
|
66f7121975
|
Merge branch 'dev' into test
|
5 years ago |
|
陈思洁
|
f8d4e7f1fd
|
【PTL_标签打印pojo新增】
|
5 years ago |
|
陈思洁
|
faaf184e01
|
【PTL_增加主任务状态的枚举】
|
5 years ago |
|
luweihao
|
51152656cc
|
Merge branch 'dev' into test
|
5 years ago |
|
joke
|
3c408dd194
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
joke
|
ab9e9a8638
|
解决冲突
|
5 years ago |
|
王杰
|
35efadd243
|
ptl枚举
|
5 years ago |
|
joke
|
f362f9931f
|
[ptl:32 亮灯作业]
|
5 years ago |
|
joke
|
c73cd26574
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
joke
|
f01b3664c2
|
[ptl: 32 亮灯作业程序]
|
5 years ago |
|
宋军超
|
464c8b68cc
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
宋军超
|
d56756e9e5
|
添加主任务、区域、区段枚举
|
5 years ago |
|
陈思洁
|
728f46b43d
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
陈思洁
|
2c305e0ca6
|
【修改枚举类名大写（部分）】
|
5 years ago |
|
许心洁
|
2a09c009f3
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
宋军超
|
0fe0abff63
|
新增区域、区段、标签控制器、标签信息、BOM和物料 基础数据
|
5 years ago |
|
宋军超
|
896bd9b35b
|
添加基础数据枚举
|
5 years ago |
jenkins
|
1ada447069
|
Jenkins自动合并
|
5 years ago |
|
qianhs
|
91b43823c9
|
【 日生产计划生成的条码在条码打印界面只能补打，不能打印】【bug7514】
|
5 years ago |
|
jenkins
|
9fc85191fe
|
Jenkins自动合并
|
5 years ago |
|
王杰
|
748ef11ccf
|
ptl-pcn标签控制器枚举
|
5 years ago |
|
jenkins
|
499a5ed894
|
Jenkins自动合并
|
5 years ago |
|
luweihao
|
1ec56edcdc
|
task `1295` mes添加索引
|
5 years ago |
|
jenkins
|
1e2029fbbb
|
Jenkins自动合并
|
5 years ago |
|
luweihao
|
0d212df73a
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
luweihao
|
b6477202e7
|
新增枚举调用类
|
5 years ago |
|
jenkins
|
83a9b74c43
|
Jenkins自动合并
|
5 years ago |
|
汪云昊
|
6d1d41a4a7
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
jenkins
|
7decc606cb
|
Jenkins自动合并
|
5 years ago |
|
luweihao
|
5afcf20a9e
|
ptlpcn 添加界面信号枚举
|
5 years ago |
|
汪云昊
|
05d6f132ce
|
表单拾取
任务检查功能优化
|
5 years ago |
|
luweihao
|
f358c13b04
|
ptl迁移4
|
5 years ago |
|
jenkins
|
a9d94ecff7
|
Jenkins自动合并
|
5 years ago |
|
luweihao
|
bbfcdfdd64
|
ptl pojo 提交
|
5 years ago |
|
jenkins
|
1a2b706e24
|
Jenkins自动合并
|
5 years ago |
|
luweihao
|
3bed5974f6
|
ptl pojo init
|
5 years ago |