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 |
|
jenkins
|
8c5020b098
|
Jenkins自动合并
|
5 years ago |
 曾贞一
|
9607c91582
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
曾贞一
|
44648e4218
|
【1396 亚太-领料任务明细看板】
|
5 years ago |
|
jenkins
|
f45a0d69b0
|
Jenkins自动合并
|
5 years ago |
|
jokelone
|
54cd3cfc45
|
业务表增加唯一索引
|
5 years ago |
|
luweihao
|
b27bbb6158
|
Merge branch 'dev' into test
|
5 years ago |
|
王杰
|
3f77135a17
|
枚举
|
5 years ago |
|
jenkins
|
138b2cf7b7
|
Jenkins自动合并
|
5 years ago |
|
jokelone
|
30cb7f7b9d
|
工单类型去除JIT类型
|
5 years ago |
|
jenkins
|
521973a2f5
|
Jenkins自动合并
|
5 years ago |
zcg
|
db3b06071d
|
【枚举修改】
|
5 years ago |
|
zcg
|
8a04ca4e3d
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
zcg
|
bc1825fd35
|
【mes枚举修改，mesModel修改,pcn枚举修改】
|
5 years ago |
|
jenkins
|
cf44b8866a
|
Jenkins自动合并
|
5 years ago |
 钮海涛
|
9e0158e749
|
修改test分支POM配置
|
5 years ago |
|
jenkins
|
c90df4e96a
|
Jenkins自动合并
|
5 years ago |
|
许心洁
|
28ce8615fd
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
许心洁
|
51d60a107a
|
SAP指令锁定逻辑修改：
根据单号查询(之前：任务明细;现在：单据明细)获取行号记录到sap_order_lock表；
原因：SAP要的是单据的行号，任务明细可能是单据明细的拆分或者合并所得，行号不一定准；
|
5 years ago |
|
jenkins
|
f927ee21ac
|
Jenkins自动合并
|
5 years ago |
|
王杰
|
bf71cd07d0
|
JIS发运
|
5 years ago |
|
jenkins
|
134757c92b
|
Jenkins自动合并
|
5 years ago |
wei.peng
|
32d715a29c
|
APS 调用失败bug 修复
动态报表 下拉问题修复
|
5 years ago |
|
宋军超
|
964afe73cd
|
2020-01-16 16:42 添加自定义列枚举
|
5 years ago |
|
宋军超
|
851067b8d2
|
2020-01-16 16:37 自定义列表优化
|
5 years ago |
|
jenkins
|
d790bcf355
|
Jenkins自动合并
|
5 years ago |
袁津哲
|
67ef5c5516
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
袁津哲
|
89a7cafee4
|
Wms动态搜索与自定义列表，表单开发
|
5 years ago |
|
jenkins
|
33e68b7e9f
|
Jenkins自动合并
|
5 years ago |
|
wei.peng
|
cb68f62e46
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
wei.peng
|
8a4974f369
|
自定义报表 调用调整
|
5 years ago |
|
jenkins
|
6371e8df60
|
Jenkins自动合并
|
5 years ago |
|
袁津哲
|
f7c98e3982
|
Wms动态搜索与自定义列表，表单开发
|
5 years ago |
|
jenkins
|
69ff58a67e
|
Jenkins自动合并
|
5 years ago |
|
qianhs
|
61303a9f38
|
【盘点--调差后库存对不上(C202001070020，C202001070021)】【bug7314 】
|
5 years ago |
|
jenkins
|
002ce795f4
|
Jenkins自动合并
|
5 years ago |
|
luweihao
|
01a694be70
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
luweihao
|
6baeeee71e
|
task `1392` 调整工步 错误处理实现
|
5 years ago |
|
jenkins
|
458137d216
|
Jenkins自动合并
|
5 years ago |
|
许心洁
|
fff79a7846
|
GROUP_COMMIT_MODE枚举漏提交
|
5 years ago |
|
许心洁
|
0e54d9a5b6
|
任务#1403 流程isCommitRefMove属性改为commitMode
|
5 years ago |
|
jenkins
|
c1609539cf
|
Jenkins自动合并
|
5 years ago |
|
许心洁
|
de0d57179c
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
许心洁
|
35839db806
|
BUG#7359 任务列表分组字段和移动单赋值逻辑更改
|
5 years ago |
|
jenkins
|
8f6b53c5ea
|
Jenkins自动合并
|
5 years ago |
|
wei.peng
|
3e31641b20
|
PTL 项目初始化
PTL PCN 项目初始化
|
5 years ago |
|
jenkins
|
a0b67a3723
|
Jenkins自动合并
|
5 years ago |
|
袁津哲
|
8285c87624
|
Wms动态搜索与自定义列表，表单开发
|
5 years ago |
|
jenkins
|
7057c685cc
|
Jenkins自动合并
|
5 years ago |
|
zcg
|
2396863bab
|
【任务:1383 数据监听定时数据抓取】
|
5 years ago |
|
jenkins
|
64438ac61c
|
Jenkins自动合并
|
5 years ago |
|
qianhs
|
41047a17c1
|
【盘点--调差后库存对不上(C202001070020，C202001070021)】【bug7314 】
|
5 years ago |
|
jenkins
|
8e168c5109
|
Jenkins自动合并
|
5 years ago |
|
wei.peng
|
503f3cd7a3
|
自定义表单功能优化
|
5 years ago |
|
曾贞一
|
5c841c706b
|
【7201 收货BOP移库流程图】
|
5 years ago |
|
jenkins
|
56e53906ec
|
Jenkins自动合并
|
5 years ago |
|
jokelone
|
f1096e9ec5
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
jokelone
|
51839d7be5
|
【任务：1381】
|
5 years ago |
|
zcg
|
add40a27e3
|
【任务：1382，数据监听基础模块开发】
|
5 years ago |
|
汪云昊
|
536200cf2b
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
5 years ago |
gcj
|
cbe87c6bd7
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
gcj
|
c14d6c6916
|
【宁德问题清单】
|
5 years ago |
|
袁津哲
|
7d4ba10449
|
Wms初始化扫描实体字段新增逻辑优化
|
5 years ago |
|
jenkins
|
75dc17f4c4
|
Jenkins自动合并
|
5 years ago |
|
jokelone
|
d0cd9d03b9
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
jokelone
|
0d7aca73a8
|
【需求：7315 生产工单变更】
|
5 years ago |
|
王杰
|
54bdf8f6a0
|
JIS
|
5 years ago |
e-jiawentao1
|
9fbc120666
|
动态搜索与自定义列表初始化扫描Bean字段
|
5 years ago |
|
王杰
|
685d7949bf
|
Merge branch 'dev' into test
|
5 years ago |
|
zcg
|
b84a305b26
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
jenkins
|
497b963f60
|
Jenkins自动合并
|
5 years ago |
|
王杰
|
bf62494236
|
JIS
|
5 years ago |
|
jenkins
|
fa4cc8610f
|
Jenkins自动合并
|
5 years ago |
puxiao.liao
|
8584946ce5
|
【 条码状态报表，导出时下列三个字段为中文
】bug7196
|
5 years ago |
|
zcg
|
c86f3e280e
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
王杰
|
f88041df1e
|
Merge branch 'dev' into test
|
5 years ago |
|
王杰
|
3fe50125ae
|
JIS
|
5 years ago |
|
jokelone
|
c226e61acf
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
zcg
|
d9990f0cb8
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
wei.peng
|
823f818abf
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
5 years ago |
|
wei.peng
|
44af186f2f
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
wei.peng
|
af6083ddff
|
日志存储优化
|
5 years ago |
|
jokelone
|
68eb60c6cb
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
zcg
|
f38e54e496
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
jenkins
|
422aa1835f
|
Jenkins自动合并
|
5 years ago |
|
钮海涛
|
4013ed776b
|
修复炉资源排程问题
|
5 years ago |
|
jenkins
|
dfb06def2b
|
Jenkins自动合并
|
5 years ago |
|
曾贞一
|
9e9d3e2afa
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
曾贞一
|
5a4510cedb
|
【7168 对于发运单标签补打功能，根据发运单中的ship-to获取标签模板进行打印】
|
5 years ago |
|
qianhs
|
81bab75132
|
【库存调整盘点需要修改为，扫描新的库位时就对上一个库位中的数据做调整（更新条码状态），每个库位的扫描数据还是存在同一张盘点单内，点击提交时该张盘点单关闭。去除页面上的未盘移库按钮，未盘条码直接做移库。】【bug7148 】
|
5 years ago |
WYnneaoapc
|
adb4bd2a1c
|
Merge branch 'dev' into test
|
5 years ago |
|
许心洁
|
7594b3d515
|
SAP取消指令：按行取消函数逻辑从软删明细和条码变为更新单据明细和条码的状态为行取消
|
5 years ago |
|
jenkins
|
688d976683
|
Jenkins自动合并
|
5 years ago |
|
王杰
|
8a4aa9fed2
|
jis发运
|
5 years ago |
|
jokelone
|
ebe34e4ba9
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
zcg
|
ad08ff21bb
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
WYnneaoapc
|
569c2613fe
|
Merge branch 'dev' into test
|
5 years ago |
|
wei.peng
|
f768247c4f
|
代码合并 2019-12-30 15:59:52
|
5 years ago |
|
jokelone
|
39790fd50b
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
jokelone
|
d47a097c53
|
【任务：1344 通用接口增加批量数据处理】
|
5 years ago |
|
zcg
|
1230906c3e
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
wei.peng
|
3b7b374b23
|
自定报表对象模型调整
|
5 years ago |
|
汪云昊
|
b12f67e34b
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
5 years ago |
|
汪云昊
|
6b02d9969a
|
数据源批量写入优化
|
5 years ago |
|
王杰
|
7287aaeb77
|
其他组未提交的代码
|
5 years ago |
|
jenkins
|
471016b345
|
Jenkins自动合并
|
5 years ago |
|
汪云昊
|
20ccf65c5c
|
资源加载优化
|
5 years ago |
|
汪云昊
|
d89ed44bcc
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
汪云昊
|
1d9ab80ae8
|
数据源适配器 - 批量写入优化
|
5 years ago |
|
zcg
|
192034152b
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
王杰
|
3ddadad142
|
Merge branch 'dev' into test
|
5 years ago |
|
王杰
|
019cb91a4c
|
【需求：1329】
|
5 years ago |
|
zcg
|
dbe2d32bb6
|
[需求：1322，枚举修改]
|
5 years ago |
|
王杰
|
91ab421d5e
|
Merge branch 'dev' into test
|
5 years ago |
|
jokelone
|
f857a4065d
|
【任务：1327JIT生产】
|
5 years ago |
E
|
e5452056b6
|
【bug7083 KT器具管理】新增业务类型和作业类型
|
5 years ago |
|
puxiao.liao
|
794992d687
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
puxiao.liao
|
734b54d1b2
|
【 领料上线扫描时，在扫描完条码后将目标库位带出。
】bug7024
|
5 years ago |
|
王杰
|
06afd98334
|
Merge branch 'dev' into test
|
5 years ago |
|
jokelone
|
0e84990f3c
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |